diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 8ce00df9f8dc6327c5078cd77735d6cbbdc4df24..8cd6d4647d649e7c588aded5eb96367566af3d2e 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -359,11 +359,12 @@ class Crud extends Command //验证器 list($validateNamespace, $validateName, $validateFile, $validateArr) = $this->getValidateData($validateModuleName, $validate, $table); - $controllerUrl = strtolower(implode('/', $controllerArr)); + //如果控制器名为双驼峰形式，链接则需转为下划线与一键生成菜单保持一致 + $controllerUrl = strtolower(preg_replace('/(?<=[a-z])([A-Z])/', '_$1', implode('/', $controllerArr))); $controllerBaseName = strtolower(implode(DS, $controllerArr)); - //视图文件 - $viewDir = $adminPath . 'view' . DS . $controllerBaseName . DS; + //视图文件 -- 如果控制器名为双驼峰形式，视图目录名则需转为下划线 + $viewDir = $adminPath . 'view' . DS . strtolower(preg_replace('/(?<=[a-z])([A-Z])/', '_$1', implode(DS, $controllerArr))) . DS; //最终将生成的文件路径 $javascriptFile = ROOT_PATH . 'public' . DS . 'assets' . DS . 'js' . DS . 'backend' . DS . $controllerBaseName . '.js'; @@ -523,6 +524,7 @@ class Crud extends Command //循环所有字段,开始构造视图的HTML和JS信息 foreach ($columnList as $k => $v) { $field = $v['COLUMN_NAME']; + $langField = mb_ucfirst($field); $itemArr = []; // 这里构建Enum和Set类型的列表数据 if (in_array($v['DATA_TYPE'], ['enum', 'set', 'tinyint'])) { @@ -580,6 +582,7 @@ class Crud extends Command $formEditElement = $this->getReplacedStub('html/select', ['field' => $field, 'fieldName' => $fieldName, 'fieldList' => $this->getFieldListName($field), 'attrStr' => Form::attributes($attrArr), 'selectedValue' => "\$row.{$field}"]); } elseif ($inputType == 'datetime') { $cssClassArr[] = 'datetimepicker'; + $attrArr['placeholder'] = "{:__('Please select')}{:__('{$langField}')}"; $attrArr['class'] = implode(' ', $cssClassArr); $format = "YYYY-MM-DD HH:mm:ss"; $phpFormat = "Y-m-d H:i:s"; @@ -636,6 +639,7 @@ class Crud extends Command $formEditElement = $this->getReplacedStub('html/' . $inputType, ['field' => $field, 'fieldName' => $fieldName, 'fieldList' => $this->getFieldListName($field), 'attrStr' => Form::attributes($attrArr), 'selectedValue' => "\$row.{$field}"]); } elseif ($inputType == 'textarea') { $cssClassArr[] = $this->isMatchSuffix($field, $this->editorSuffix) ? $this->editorClass : ''; + $attrArr['placeholder'] = "{:__('Please input')}{:__('{$langField}')}"; $attrArr['class'] = implode(' ', $cssClassArr); $attrArr['rows'] = 5; $formAddElement = Form::textarea($fieldName, $defaultValue, $attrArr); @@ -656,17 +660,20 @@ class Crud extends Command $formAddElement = $this->getReplacedStub('html/' . $inputType, ['field' => $field, 'fieldName' => $fieldName, 'fieldYes' => $yes, 'fieldNo' => $no, 'attrStr' => Form::attributes($attrArr), 'fieldValue' => $defaultValue, 'fieldSwitchClass' => $defaultValue == $no ? $stateNoClass : '']); $formEditElement = $this->getReplacedStub('html/' . $inputType, ['field' => $field, 'fieldName' => $fieldName, 'fieldYes' => $yes, 'fieldNo' => $no, 'attrStr' => Form::attributes($attrArr), 'fieldValue' => "{\$row.{$field}}", 'fieldSwitchClass' => "{eq name=\"\$row.{$field}\" value=\"{$no}\"}fa-flip-horizontal text-gray{/eq}"]); } elseif ($inputType == 'citypicker') { + $attrArr['placeholder'] = "{:__('Please select')}{:__('{$langField}')}"; $attrArr['class'] = implode(' ', $cssClassArr); $attrArr['data-toggle'] = "city-picker"; $formAddElement = sprintf("
%s
", Form::input('text', $fieldName, $defaultValue, $attrArr)); $formEditElement = sprintf("
%s
", Form::input('text', $fieldName, $editValue, $attrArr)); } else { + $attrArr['placeholder'] = "{:__('Please input')}{:__('{$langField}')}"; $search = $replace = ''; //特殊字段为关联搜索 if ($this->isMatchSuffix($field, $this->selectpageSuffix)) { $inputType = 'text'; $defaultValue = ''; $attrArr['data-rule'] = 'required'; + $attrArr['placeholder'] = "{:__('Please select')}{:__('{$langField}')}"; $cssClassArr[] = 'selectpage'; $selectpageController = str_replace('_', '/', substr($field, 0, strripos($field, '_'))); $attrArr['data-source'] = $selectpageController . "/index"; @@ -1310,8 +1317,8 @@ EOD; $langField = mb_ucfirst($field); return << - -
+ +
{$content}
@@ -1337,11 +1344,11 @@ EOD; return << {$content} +
- {$previewcontainer} EOD; diff --git a/application/admin/command/Crud/stubs/add.stub b/application/admin/command/Crud/stubs/add.stub index 68d6de24138cf9d2f3b1aea801b6f07f6e54201b..d4bd212c2d3dec091b1a8d483707346159f26f73 100644 --- a/application/admin/command/Crud/stubs/add.stub +++ b/application/admin/command/Crud/stubs/add.stub @@ -1,9 +1,7 @@ -
- + {%addList%}
- -
+
diff --git a/application/admin/command/Crud/stubs/controller.stub b/application/admin/command/Crud/stubs/controller.stub index 70b07a1a2edf35710b2240924b5137232a236e7b..1185f11deb27709279a3067c5307f628d931f935 100644 --- a/application/admin/command/Crud/stubs/controller.stub +++ b/application/admin/command/Crud/stubs/controller.stub @@ -11,7 +11,7 @@ use app\common\controller\Backend; */ class {%controllerName%} extends Backend { - + /** * {%modelName%}模型对象 * @var \{%modelNamespace%}\{%modelName%} @@ -24,7 +24,7 @@ class {%controllerName%} extends Backend $this->model = new \{%modelNamespace%}\{%modelName%}; {%controllerAssignList%} } - + /** * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 diff --git a/application/admin/command/Crud/stubs/edit.stub b/application/admin/command/Crud/stubs/edit.stub index 1a6f297c34d3c2076d2fe9075b2fe70e7e1f1fd0..4a9f117f479d4dfa92c4fe1820d0a8ec70227b82 100644 --- a/application/admin/command/Crud/stubs/edit.stub +++ b/application/admin/command/Crud/stubs/edit.stub @@ -1,9 +1,7 @@ - - + {%editList%}
- -
+
diff --git a/application/admin/command/Crud/stubs/html/radio.stub b/application/admin/command/Crud/stubs/html/radio.stub index a3c7b2ec00d6885934e6122ac55216967839fe3d..976c12aad72675cad5dd46e470bdfad6f36aeee4 100644 --- a/application/admin/command/Crud/stubs/html/radio.stub +++ b/application/admin/command/Crud/stubs/html/radio.stub @@ -1,5 +1,4 @@ - -
+
{foreach name="{%fieldList%}" item="vo"} {/foreach} diff --git a/application/admin/command/Crud/stubs/html/select.stub b/application/admin/command/Crud/stubs/html/select.stub index b55baaafa299cf2d1178cf92c029dd8901f3e646..891ef92267af330ab67b8c2ea8ef5c2f4ef9460c 100644 --- a/application/admin/command/Crud/stubs/html/select.stub +++ b/application/admin/command/Crud/stubs/html/select.stub @@ -1,5 +1,4 @@ - - {foreach name="{%fieldList%}" item="vo"} {/foreach} diff --git a/application/admin/command/Crud/stubs/javascript.stub b/application/admin/command/Crud/stubs/javascript.stub index 12fbb70fd06cb950bf528b38128c3cd10701fcd0..e06cd8296ae29c2ee9d1bfb389710a64b00a6361 100644 --- a/application/admin/command/Crud/stubs/javascript.stub +++ b/application/admin/command/Crud/stubs/javascript.stub @@ -25,7 +25,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {%javascriptList%} ] - ] + ], + //禁用默认搜索 + search: false, + //启用普通表单搜索 + commonSearch: true, + //可以控制是否默认显示搜索表单,false则隐藏,默认为false + searchFormVisible: false, + showColumns: false, + showToggle: false, }); // 为表格绑定事件 diff --git a/application/admin/command/Crud/stubs/mixins/radio.stub b/application/admin/command/Crud/stubs/mixins/radio.stub index 527151a9c6778af8b84478096626f1a89b55c745..71234a63354d823a9ac536e861ab173e872121e8 100644 --- a/application/admin/command/Crud/stubs/mixins/radio.stub +++ b/application/admin/command/Crud/stubs/mixins/radio.stub @@ -1,6 +1,6 @@ public function {%methodName%}($value, $data) - { + { $value = $value ? $value : (isset($data['{%field%}']) ? $data['{%field%}'] : ''); $list = $this->{%listMethodName%}(); return isset($list[$value]) ? $list[$value] : ''; diff --git a/application/admin/command/Crud/stubs/mixins/select.stub b/application/admin/command/Crud/stubs/mixins/select.stub index 527151a9c6778af8b84478096626f1a89b55c745..71234a63354d823a9ac536e861ab173e872121e8 100644 --- a/application/admin/command/Crud/stubs/mixins/select.stub +++ b/application/admin/command/Crud/stubs/mixins/select.stub @@ -1,6 +1,6 @@ public function {%methodName%}($value, $data) - { + { $value = $value ? $value : (isset($data['{%field%}']) ? $data['{%field%}'] : ''); $list = $this->{%listMethodName%}(); return isset($list[$value]) ? $list[$value] : ''; diff --git a/application/admin/command/Crud/stubs/model.stub b/application/admin/command/Crud/stubs/model.stub index ff0372cf6a4802cae866c485545a9ab3e25b1708..9f9d9bc8e60eea45971c980a8f784e1a182a4254 100755 --- a/application/admin/command/Crud/stubs/model.stub +++ b/application/admin/command/Crud/stubs/model.stub @@ -12,7 +12,7 @@ class {%modelName%} extends Model // 表名 protected ${%modelTableType%} = '{%modelTableTypeName%}'; - + // 自动写入时间戳字段 protected $autoWriteTimestamp = {%modelAutoWriteTimestamp%}; @@ -25,9 +25,9 @@ class {%modelName%} extends Model protected $append = [ {%appendAttrList%} ]; - + {%modelInit%} - + {%getEnumList%} {%getAttrList%} diff --git a/application/admin/command/Menu.php b/application/admin/command/Menu.php index a4d2e08098eb84f9dbd88128d8872d9008c3ae2b..06dbe0f988690ecc7b16da005134225f3c22e82e 100755 --- a/application/admin/command/Menu.php +++ b/application/admin/command/Menu.php @@ -199,6 +199,13 @@ class Menu extends Command if (in_array('trashed', get_class_methods($model))) { $withSofeDelete = true; } + } else { + preg_match_all("/\\\$this\->model\s*=\s*new\s+([a-zA-Z\\\]+);/", $classContent, $matches); + \think\Request::instance()->module('admin'); + $model = new $matches[1][0]; + if (in_array('trashed', get_class_methods($model))) { + $withSofeDelete = true; + } } //忽略的类 if (stripos($classComment, "@internal") !== false) { diff --git a/application/admin/common.php b/application/admin/common.php index 9ecbf8392a60210b2bfb57dd93d252b2c0441a88..09ba0b854b73c0d1feb76933850c20e8f2bd7411 100755 --- a/application/admin/common.php +++ b/application/admin/common.php @@ -130,21 +130,21 @@ if (!function_exists('build_toolbar')) { $template = str_replace('/', '_', $controller); $download = ''; if (file_exists("./template/{$template}.xlsx")) { - $download .= "
  • XLSX模版
    • "; + $download .= "\n
  • __('%s template', 'XLSX')
    • "; } if (file_exists("./template/{$template}.xls")) { - $download .= "
  • XLS模版
    • "; + $download .= "\n
  • __('%s template', 'XLSX')
    • "; } if (file_exists("./template/{$template}.csv")) { - $download .= empty($download) ? '' : "
  • "; - $download .= "
  • CSV模版
    • "; + $download .= empty($download) ? '' : "\n
  • "; + $download .= "\n
  • __('%s template', 'CSV')
    • "; } $download .= empty($download) ? '' : "\n "; if (!empty($download)) { $html[] = << - diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 7b85612a59974328b69d877b2bf369c68936bb0c..abf61dee935c3e68f143636b186be0f561030dc5 100755 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -17,6 +17,8 @@ return [ 'Del' => '删除', 'Delete' => '删除', 'Import' => '导入', + 'Download bulk import template' => '下载批量导入模版', + '%s template' => '%s模版', 'Export' => '导出', 'All' => '全部', 'Detail' => '详情', diff --git a/application/admin/lang/zh-cn/general/attachment.php b/application/admin/lang/zh-cn/general/attachment.php index 96ea7af7223dd9e297d4fa77d2690007ad68103f..83f0fde2a9aea2b0bb2766a119fa91bcf652c8ce 100644 --- a/application/admin/lang/zh-cn/general/attachment.php +++ b/application/admin/lang/zh-cn/general/attachment.php @@ -1,22 +1,25 @@ 'ID', - 'Admin_id' => '管理员ID', - 'User_id' => '会员ID', - 'Url' => '物理路径', - 'Imagewidth' => '宽度', - 'Imageheight' => '高度', - 'Imagetype' => '图片类型', - 'Imageframes' => '图片帧数', - 'Preview' => '预览', - 'Filesize' => '文件大小', - 'Mimetype' => 'Mime类型', - 'Extparam' => '透传数据', - 'Createtime' => '创建日期', - 'Uploadtime' => '上传时间', - 'Storage' => '存储引擎', - 'Upload to third' => '上传到第三方', - 'Upload to local' => '上传到本地', - 'Upload from editor' => '从编辑器上传' + 'Id' => 'ID', + 'Admin_id' => '管理员ID', + 'User_id' => '会员ID', + 'Url' => '物理路径', + 'Imagewidth' => '宽度', + 'Imageheight' => '高度', + 'Imagetype' => '图片类型', + 'Imageframes' => '图片帧数', + 'Preview' => '预览', + 'Filesize' => '文件大小', + 'Mimetype' => 'Mime类型', + 'Extparam' => '透传数据', + 'Createtime' => '创建日期', + 'Uploadtime' => '上传时间', + 'Storage' => '存储引擎', + 'Upload to third' => '上传到第三方', + 'Upload to local' => '上传到本地', + 'Upload from editor' => '从编辑器上传', + 'No file upload or server upload limit exceeded' => '未上传文件或超出服务器上传限制', + 'Uploaded file format is limited' => '上传文件格式受限制', + 'Upload successful' => '上传成功', ]; diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php index d231811c0c0421d12db2487c7aea5f17c4c76c7d..3269c7499b393e01da514e52ccb08a9e70d57e54 100755 --- a/application/admin/library/traits/Backend.php +++ b/application/admin/library/traits/Backend.php @@ -12,6 +12,15 @@ use think\Exception; trait Backend { + /** + * 空操作 + * @internal + */ + public function _empty() + { + $this->error(__('An unexpected error occurred')); + } + /** * 排除前台提交过来的字段 * @param $params diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 089ba2ed0b660283a9f841502dddbbf63e9bb6b4..26237720ed9183164255db1b505846f7800fa45e 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -3,6 +3,9 @@ {include file="common/meta" /} +
    diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html index 7b2bbecf9a038bb793742749fa72ce3c5b2ad50c..37d9eaf5e3f99c1e73e547263837e57f877c6345 100644 --- a/application/admin/view/index/login.html +++ b/application/admin/view/index/login.html @@ -2,7 +2,9 @@ {include file="common/meta" /} - +