切换导航条
此项目
正在载入...
登录
何书鹏
/
recruit
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
Karson
8 years ago
提交
23f4fb1b8cf9c26bd2002b3c89592d1f834109df
1 个父辈
cb929e82
master
修复命令行生成菜单的错误。
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
10 行增加
和
10 行删除
application/admin/command/Crud.php
application/admin/command/Menu.php
application/admin/command/Crud.php
查看文件 @
23f4fb1
...
...
@@ -255,7 +255,7 @@ class Crud extends Command
$controller
=
str_replace
(
'_'
,
''
,
$controller
);
$controllerArr
=
!
$controller
?
explode
(
'_'
,
strtolower
(
$table
))
:
explode
(
'/'
,
strtolower
(
$controller
));
$controllerUrl
=
implode
(
'/'
,
$controllerArr
);
$controllerName
=
mb_
ucfirst
(
array_pop
(
$controllerArr
));
$controllerName
=
ucfirst
(
array_pop
(
$controllerArr
));
$controllerDir
=
implode
(
DS
,
$controllerArr
);
$controllerFile
=
(
$controllerDir
?
$controllerDir
.
DS
:
''
)
.
$controllerName
.
'.php'
;
$viewDir
=
$adminPath
.
'view'
.
DS
.
$controllerUrl
.
DS
;
...
...
@@ -810,7 +810,7 @@ class Crud extends Command
if (!in_array(
$inputType
, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
return;
$fieldList
=
$this->getFieldListName
(
$field
);
$methodName
= 'get' .
mb_
ucfirst(
$fieldList
);
$methodName
= 'get' . ucfirst(
$fieldList
);
foreach (
$itemArr
as
$k
=> &
$v
)
{
$v
= "
__
(
'" . mb_ucfirst($v) . "'
)
";
...
...
@@ -832,7 +832,7 @@ EOD;
{
if (!in_array(
$inputType
, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
return;
$attrField
=
mb_
ucfirst(
$this->getCamelizeName
(
$field
));
$attrField
= ucfirst(
$this->getCamelizeName
(
$field
));
$getAttr
[] =
$this->getReplacedStub
("
mixins
" . DS .
$inputType
, ['field' =>
$field
, 'methodName' => "
get
{
$attrField
}
TextAttr
", 'listMethodName' => "
get
{
$attrField
}
List
"]);
}
...
...
@@ -840,7 +840,7 @@ EOD;
{
if (
$inputType
!= 'datetime')
return;
$attrField
=
mb_
ucfirst(
$this->getCamelizeName
(
$field
));
$attrField
= ucfirst(
$this->getCamelizeName
(
$field
));
if (
$inputType
== 'datetime')
{
$return
= <<<EOD
...
...
@@ -868,13 +868,13 @@ EOD;
{
$modelarr
= explode('_', strtolower(
$table
));
foreach (
$modelarr
as
$k
=> &
$v
)
$v
=
mb_
ucfirst(
$v
);
$v
= ucfirst(
$v
);
unset(
$v
);
$modelName
= implode('',
$modelarr
);
}
else
{
$modelName
=
mb_
ucfirst(
$model
);
$modelName
= ucfirst(
$model
);
}
return
$modelName
;
}
...
...
application/admin/command/Menu.php
查看文件 @
23f4fb1
...
...
@@ -215,7 +215,7 @@ class Menu extends Command
//导入中文语言包
\think\Lang
::
load
(
dirname
(
__DIR__
)
.
DS
.
'lang/zh-cn.php'
);
//先定入菜单的数据
$pid
=
0
;
foreach
(
$controllerArr
as
$k
=>
$v
)
...
...
@@ -225,7 +225,7 @@ class Menu extends Command
$title
=
(
!
isset
(
$controllerArr
[
$key
])
?
$controllerTitle
:
''
);
$icon
=
(
!
isset
(
$controllerArr
[
$key
])
?
$controllerIcon
:
'fa fa-list'
);
$remark
=
(
!
isset
(
$controllerArr
[
$key
])
?
$controllerRemark
:
''
);
$title
=
$title
?
$title
:
ucfirst
(
$v
)
;
$title
=
$title
?
$title
:
$v
;
$rulemodel
=
$this
->
model
->
get
([
'name'
=>
$name
]);
if
(
!
$rulemodel
)
{
...
...
@@ -263,9 +263,9 @@ class Menu extends Command
//过滤掉其它字符
$comment
=
preg_replace
(
array
(
'/^\/\*\*(.*)[\n\r\t]/u'
,
'/[\s]+\*\//u'
,
'/\*\s@(.*)/u'
,
'/[\s|\*]+/u'
),
''
,
$comment
);
$title
=
$comment
?
$comment
:
$n
->
name
;
$title
=
$comment
?
$comment
:
ucfirst
(
$n
->
name
)
;
$ruleArr
[]
=
array
(
'pid'
=>
$pid
,
'name'
=>
$name
.
"/"
.
strtolower
(
$n
->
name
),
'icon'
=>
'fa fa-circle-o'
,
'title'
=>
ucfirst
(
$name
)
,
'ismenu'
=>
0
,
'status'
=>
'normal'
);
$ruleArr
[]
=
array
(
'pid'
=>
$pid
,
'name'
=>
$name
.
"/"
.
strtolower
(
$n
->
name
),
'icon'
=>
'fa fa-circle-o'
,
'title'
=>
$title
,
'ismenu'
=>
0
,
'status'
=>
'normal'
);
}
$this
->
model
->
saveAll
(
$ruleArr
);
}
...
...
请
注册
或
登录
后发表评论