正在显示
2 个修改的文件
包含
10 行增加
和
10 行删除
@@ -255,7 +255,7 @@ class Crud extends Command | @@ -255,7 +255,7 @@ class Crud extends Command | ||
255 | $controller = str_replace('_', '', $controller); | 255 | $controller = str_replace('_', '', $controller); |
256 | $controllerArr = !$controller ? explode('_', strtolower($table)) : explode('/', strtolower($controller)); | 256 | $controllerArr = !$controller ? explode('_', strtolower($table)) : explode('/', strtolower($controller)); |
257 | $controllerUrl = implode('/', $controllerArr); | 257 | $controllerUrl = implode('/', $controllerArr); |
258 | - $controllerName = mb_ucfirst(array_pop($controllerArr)); | 258 | + $controllerName = ucfirst(array_pop($controllerArr)); |
259 | $controllerDir = implode(DS, $controllerArr); | 259 | $controllerDir = implode(DS, $controllerArr); |
260 | $controllerFile = ($controllerDir ? $controllerDir . DS : '') . $controllerName . '.php'; | 260 | $controllerFile = ($controllerDir ? $controllerDir . DS : '') . $controllerName . '.php'; |
261 | $viewDir = $adminPath . 'view' . DS . $controllerUrl . DS; | 261 | $viewDir = $adminPath . 'view' . DS . $controllerUrl . DS; |
@@ -810,7 +810,7 @@ class Crud extends Command | @@ -810,7 +810,7 @@ class Crud extends Command | ||
810 | if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio'])) | 810 | if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio'])) |
811 | return; | 811 | return; |
812 | $fieldList = $this->getFieldListName($field); | 812 | $fieldList = $this->getFieldListName($field); |
813 | - $methodName = 'get' . mb_ucfirst($fieldList); | 813 | + $methodName = 'get' . ucfirst($fieldList); |
814 | foreach ($itemArr as $k => &$v) | 814 | foreach ($itemArr as $k => &$v) |
815 | { | 815 | { |
816 | $v = "__('" . mb_ucfirst($v) . "')"; | 816 | $v = "__('" . mb_ucfirst($v) . "')"; |
@@ -832,7 +832,7 @@ EOD; | @@ -832,7 +832,7 @@ EOD; | ||
832 | { | 832 | { |
833 | if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio'])) | 833 | if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio'])) |
834 | return; | 834 | return; |
835 | - $attrField = mb_ucfirst($this->getCamelizeName($field)); | 835 | + $attrField = ucfirst($this->getCamelizeName($field)); |
836 | $getAttr[] = $this->getReplacedStub("mixins" . DS . $inputType, ['field' => $field, 'methodName' => "get{$attrField}TextAttr", 'listMethodName' => "get{$attrField}List"]); | 836 | $getAttr[] = $this->getReplacedStub("mixins" . DS . $inputType, ['field' => $field, 'methodName' => "get{$attrField}TextAttr", 'listMethodName' => "get{$attrField}List"]); |
837 | } | 837 | } |
838 | 838 | ||
@@ -840,7 +840,7 @@ EOD; | @@ -840,7 +840,7 @@ EOD; | ||
840 | { | 840 | { |
841 | if ($inputType != 'datetime') | 841 | if ($inputType != 'datetime') |
842 | return; | 842 | return; |
843 | - $attrField = mb_ucfirst($this->getCamelizeName($field)); | 843 | + $attrField = ucfirst($this->getCamelizeName($field)); |
844 | if ($inputType == 'datetime') | 844 | if ($inputType == 'datetime') |
845 | { | 845 | { |
846 | $return = <<<EOD | 846 | $return = <<<EOD |
@@ -868,13 +868,13 @@ EOD; | @@ -868,13 +868,13 @@ EOD; | ||
868 | { | 868 | { |
869 | $modelarr = explode('_', strtolower($table)); | 869 | $modelarr = explode('_', strtolower($table)); |
870 | foreach ($modelarr as $k => &$v) | 870 | foreach ($modelarr as $k => &$v) |
871 | - $v = mb_ucfirst($v); | 871 | + $v = ucfirst($v); |
872 | unset($v); | 872 | unset($v); |
873 | $modelName = implode('', $modelarr); | 873 | $modelName = implode('', $modelarr); |
874 | } | 874 | } |
875 | else | 875 | else |
876 | { | 876 | { |
877 | - $modelName = mb_ucfirst($model); | 877 | + $modelName = ucfirst($model); |
878 | } | 878 | } |
879 | return $modelName; | 879 | return $modelName; |
880 | } | 880 | } |
@@ -215,7 +215,7 @@ class Menu extends Command | @@ -215,7 +215,7 @@ class Menu extends Command | ||
215 | 215 | ||
216 | //导入中文语言包 | 216 | //导入中文语言包 |
217 | \think\Lang::load(dirname(__DIR__) . DS . 'lang/zh-cn.php'); | 217 | \think\Lang::load(dirname(__DIR__) . DS . 'lang/zh-cn.php'); |
218 | - | 218 | + |
219 | //先定入菜单的数据 | 219 | //先定入菜单的数据 |
220 | $pid = 0; | 220 | $pid = 0; |
221 | foreach ($controllerArr as $k => $v) | 221 | foreach ($controllerArr as $k => $v) |
@@ -225,7 +225,7 @@ class Menu extends Command | @@ -225,7 +225,7 @@ class Menu extends Command | ||
225 | $title = (!isset($controllerArr[$key]) ? $controllerTitle : ''); | 225 | $title = (!isset($controllerArr[$key]) ? $controllerTitle : ''); |
226 | $icon = (!isset($controllerArr[$key]) ? $controllerIcon : 'fa fa-list'); | 226 | $icon = (!isset($controllerArr[$key]) ? $controllerIcon : 'fa fa-list'); |
227 | $remark = (!isset($controllerArr[$key]) ? $controllerRemark : ''); | 227 | $remark = (!isset($controllerArr[$key]) ? $controllerRemark : ''); |
228 | - $title = $title ? $title : ucfirst($v); | 228 | + $title = $title ? $title : $v; |
229 | $rulemodel = $this->model->get(['name' => $name]); | 229 | $rulemodel = $this->model->get(['name' => $name]); |
230 | if (!$rulemodel) | 230 | if (!$rulemodel) |
231 | { | 231 | { |
@@ -263,9 +263,9 @@ class Menu extends Command | @@ -263,9 +263,9 @@ class Menu extends Command | ||
263 | //过滤掉其它字符 | 263 | //过滤掉其它字符 |
264 | $comment = preg_replace(array('/^\/\*\*(.*)[\n\r\t]/u', '/[\s]+\*\//u', '/\*\s@(.*)/u', '/[\s|\*]+/u'), '', $comment); | 264 | $comment = preg_replace(array('/^\/\*\*(.*)[\n\r\t]/u', '/[\s]+\*\//u', '/\*\s@(.*)/u', '/[\s|\*]+/u'), '', $comment); |
265 | 265 | ||
266 | - $title = $comment ? $comment : $n->name; | 266 | + $title = $comment ? $comment : ucfirst($n->name); |
267 | 267 | ||
268 | - $ruleArr[] = array('pid' => $pid, 'name' => $name . "/" . strtolower($n->name), 'icon' => 'fa fa-circle-o', 'title' => ucfirst($name), 'ismenu' => 0, 'status' => 'normal'); | 268 | + $ruleArr[] = array('pid' => $pid, 'name' => $name . "/" . strtolower($n->name), 'icon' => 'fa fa-circle-o', 'title' => $title, 'ismenu' => 0, 'status' => 'normal'); |
269 | } | 269 | } |
270 | $this->model->saveAll($ruleArr); | 270 | $this->model->saveAll($ruleArr); |
271 | } | 271 | } |
-
请 注册 或 登录 后发表评论