From 8612f1ffaec1fb2d01bd76c5d0e62469c5884d47 Mon Sep 17 00:00:00 2001 From: tensent Date: Mon, 20 Apr 2020 20:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/admin/Form.php | 6 +++--- app/http/form/template/password.html | 2 +- app/model/AdPlace.php | 8 ++++---- app/model/Attribute.php | 4 ++-- app/model/AuthGroup.php | 2 +- app/model/Form.php | 6 +++--- app/model/Member.php | 6 +++--- view/admin/category/edit.html | 10 +++++----- view/admin/channel/edit.html | 4 ++-- view/admin/client/add.html | 4 ++-- view/admin/menu/edit.html | 2 +- view/admin/model/add.html | 8 ++++---- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/controller/admin/Form.php b/app/controller/admin/Form.php index b3be9fd8..7c0c5ae5 100644 --- a/app/controller/admin/Form.php +++ b/app/controller/admin/Form.php @@ -255,9 +255,9 @@ class Form extends Base { $config = \think\facade\Cache::get('system_config_data'); return array( array('name' => 'id', 'title' => 'id', 'help' => '', 'type' => 'hidden'), - array('name' => 'form_id', 'title' => 'model_id', 'help' => '', 'type' => 'hidden'), - array('name' => 'name', 'title' => '字段名', 'help' => '英文字母开头，长度不超过30', 'type' => 'text'), - array('name' => 'title', 'title' => '字段标题', 'help' => '请输入字段标题，用于表单显示', 'type' => 'text'), + array('name' => 'form_id', 'title' => 'form_id', 'help' => '', 'is_must'=> true, 'type' => 'hidden'), + array('name' => 'name', 'title' => '字段名', 'help' => '英文字母开头，长度不超过30', 'is_must'=> true, 'type' => 'text'), + array('name' => 'title', 'title' => '字段标题', 'help' => '请输入字段标题，用于表单显示', 'is_must'=> true, 'type' => 'text'), array('name' => 'type', 'title' => '字段类型', 'help' => '用于表单中的展示方式', 'type' => 'select', 'option' => $config['config_type_list'], 'help' => ''), array('name' => 'length', 'title' => '字段长度', 'help' => '字段的长度值', 'type' => 'text'), array('name' => 'extra', 'title' => '参数', 'help' => '布尔、枚举、多选字段类型的定义数据', 'type' => 'textarea'), diff --git a/app/http/form/template/password.html b/app/http/form/template/password.html index e11478d0..19185374 100644 --- a/app/http/form/template/password.html +++ b/app/http/form/template/password.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/model/AdPlace.php b/app/model/AdPlace.php index 170ad0c7..708c43ca 100644 --- a/app/model/AdPlace.php +++ b/app/model/AdPlace.php @@ -32,12 +32,12 @@ class AdPlace extends \think\Model{ public static $keyList = [ ['name' => 'id', 'title' => 'ID', 'type' => 'hidden', 'help' => '', 'option' => ''], - ['name' => 'title', 'title' => '广告位名称', 'type' => 'text', 'help' => '', 'option' => ''], - ['name' => 'name', 'title' => '广告位标识', 'type' => 'text', 'help' => '调用使用{:ad("广告位标识",参数)}', 'option' => ''], + ['name' => 'title', 'title' => '广告位名称', 'type' => 'text', 'is_must'=> true, 'help' => '', 'option' => ''], + ['name' => 'name', 'title' => '广告位标识', 'type' => 'text', 'is_must'=> true, 'help' => '调用使用{:ad("广告位标识",参数)}', 'option' => ''], ['name' => 'show_type', 'title' => '类型', 'type' => 'select', 'help' => '', 'option' => ''], ['name' => 'show_num', 'title' => '显示条数', 'type' => 'num', 'help' => '', 'option' => ''], - ['name' => 'start_time', 'title' => '开始时间', 'type' => 'datetime', 'help' => '', 'option' => ''], - ['name' => 'end_time', 'title' => '结束时间', 'type' => 'datetime', 'help' => '', 'option' => ''], + ['name' => 'start_time', 'title' => '开始时间', 'type' => 'datetime', 'is_must'=> true, 'help' => '', 'option' => ''], + ['name' => 'end_time', 'title' => '结束时间', 'type' => 'datetime', 'is_must'=> true, 'help' => '', 'option' => ''], ['name' => 'template', 'title' => '广告模版', 'type' => 'text', 'help' => '', 'option' => ''], ['name' => 'status', 'title' => '状态', 'type' => 'select', 'help' => '', 'option' => [['key' => '0', 'label'=>'禁用'],['key' => '1', 'label'=>'启用']]], ]; diff --git a/app/model/Attribute.php b/app/model/Attribute.php index 108fc2ef..a0391ce2 100644 --- a/app/model/Attribute.php +++ b/app/model/Attribute.php @@ -173,8 +173,8 @@ class Attribute extends \think\Model { '基础' => [ ['name' => 'id', 'title' => 'id', 'help' => '', 'type' => 'hidden'], ['name' => 'model_id', 'title' => 'model_id', 'help' => '', 'type' => 'hidden'], - ['name' => 'name', 'title' => '字段名', 'help' => '英文字母开头，长度不超过30', 'type' => 'text'], - ['name' => 'title', 'title' => '字段标题', 'help' => '请输入字段标题，用于表单显示', 'type' => 'text'], + ['name' => 'name', 'title' => '字段名', 'help' => '英文字母开头，长度不超过30', 'is_must'=> true, 'type' => 'text'], + ['name' => 'title', 'title' => '字段标题', 'help' => '请输入字段标题，用于表单显示', 'is_must'=> true, 'type' => 'text'], ['name' => 'type', 'title' => '字段类型', 'help' => '用于表单中的展示方式', 'type' => 'select', 'option' => $config['config_type_list'], 'help' => ''], ['name' => 'length', 'title' => '字段长度', 'help' => '字段的长度值', 'type' => 'text'], ['name' => 'extra', 'title' => '参数', 'help' => '布尔、枚举、多选字段类型的定义数据', 'type' => 'textarea'], diff --git a/app/model/AuthGroup.php b/app/model/AuthGroup.php index 90021033..a9e56936 100644 --- a/app/model/AuthGroup.php +++ b/app/model/AuthGroup.php @@ -19,7 +19,7 @@ class AuthGroup extends Model{ public $keyList = [ ['name'=>'id', 'title'=>'ID', 'type'=>'hidden', 'help'=>'', 'option'=>''], ['name'=>'module', 'title'=>'所属模块', 'type'=>'hidden', 'help'=>'', 'option'=>''], - ['name'=>'title', 'title'=>'用户组名', 'type'=>'text', 'help'=>'', 'option'=>''], + ['name'=>'title', 'title'=>'用户组名', 'type'=>'text', 'is_must'=> true, 'help'=>'', 'option'=>''], ['name'=>'description', 'title'=>'分组描述', 'type'=>'textarea', 'help'=>'', 'option'=>''], ['name'=>'status', 'title'=>'状态', 'type'=>'select', 'help'=>'', 'option'=> [['key' => 0, 'label' => '禁用'],['key' => 1, 'label' => '启用']]], ]; diff --git a/app/model/Form.php b/app/model/Form.php index 7faaeab7..af8f21bc 100644 --- a/app/model/Form.php +++ b/app/model/Form.php @@ -23,12 +23,12 @@ class Form extends \think\Model { ]; public $addField = [ - ['name' => 'name', 'title' => '标识', 'type' => 'text', 'help' => ''], - ['name' => 'title', 'title' => '标题', 'type' => 'text', 'help' => ''], + ['name' => 'name', 'title' => '标识', 'type' => 'text', 'is_must'=> true, 'help' => ''], + ['name' => 'title', 'title' => '标题', 'type' => 'text', 'is_must'=> true, 'help' => ''], ['name' => 'logo', 'title' => '显示Logo', 'type' => 'image', 'help' => ''], ['name' => 'cover', 'title' => 'banner图片', 'type' => 'image', 'help' => ''], ['name' => 'content', 'title' => '内容', 'type' => 'editor', 'help' => ''], - ['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'help' => ''], + ['name' => 'list_grid', 'title' => '列表定义', 'type' => 'textarea', 'is_must'=> true, 'help' => ''], ]; public $editField = [ diff --git a/app/model/Member.php b/app/model/Member.php index 4f4f2b24..0fcf7780 100644 --- a/app/model/Member.php +++ b/app/model/Member.php @@ -35,10 +35,10 @@ class Member extends Model { ]; public $addfield = [ - ['name'=>'username','title'=>'用户名','type'=>'text','help'=>'用户名会作为默认的昵称'], + ['name'=>'username','title'=>'用户名','type'=>'text', 'is_must'=> true,'help'=>'用户名会作为默认的昵称'], ['name'=>'nickname','title'=>'昵称','type'=>'text','help'=>''], - ['name'=>'password','title'=>'密码','type'=>'password','help'=>'用户密码不能少于6位'], - ['name'=>'repassword','title'=>'确认密码','type'=>'password','help'=>'确认密码'], + ['name'=>'password','title'=>'密码','type'=>'password', 'is_must'=> true, 'help'=>'用户密码不能少于6位'], + ['name'=>'repassword','title'=>'确认密码','type'=>'password', 'is_must'=> true, 'help'=>'确认密码'], ['name'=>'email','title'=>'邮箱','type'=>'text','help'=>'用户邮箱，用于找回密码等安全操作'], ]; diff --git a/view/admin/category/edit.html b/view/admin/category/edit.html index ec0b9d90..c8929d14 100644 --- a/view/admin/category/edit.html +++ b/view/admin/category/edit.html @@ -18,7 +18,7 @@