diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 78ec658d..c2c3e769 100644 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -253,7 +253,7 @@ class Crud extends Command // 如果默认值为空,则是一个必选项 if ($v['COLUMN_DEFAULT'] == '') { - $attrArr['required'] = ''; + $attrArr['data-rule'] = 'required'; } if ($field == 'status' && in_array($inputType, ['text', 'number'])) { diff --git a/application/admin/controller/Category.php b/application/admin/controller/Category.php index c0a5e81a..a3e6ba41 100644 --- a/application/admin/controller/Category.php +++ b/application/admin/controller/Category.php @@ -46,7 +46,7 @@ class Category extends Backend //构造父类select列表选项数据 $list = $this->categorylist; $total = count($list); - $result = array("total" => $total, "rows" => $list); + $result = array("total" => 1, "rows" => $list); return json($result); } diff --git a/application/admin/view/auth/rule/edit.html b/application/admin/view/auth/rule/edit.html index 872a809d..b58fe79b 100644 --- a/application/admin/view/auth/rule/edit.html +++ b/application/admin/view/auth/rule/edit.html @@ -35,7 +35,7 @@
- +
diff --git a/application/admin/view/category/add.html b/application/admin/view/category/add.html index ae9fff21..8d3f1c06 100644 --- a/application/admin/view/category/add.html +++ b/application/admin/view/category/add.html @@ -3,15 +3,15 @@
- {:build_select('row[type]', $typelist, [], ['id'=>'c-type','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[type]', $typelist, [], ['id'=>'c-type','class'=>'form-control selectpicker','data-rule'=>'required'])}
- +
- +
@@ -25,7 +25,7 @@
- +
@@ -34,11 +34,11 @@
- {:build_select('row[pid]', $parentlist, null, ['id'=>'c-pid','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[pid]', $parentlist, null, ['id'=>'c-pid','class'=>'form-control selectpicker','data-rule'=>'required'])}
- {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], null, ['id'=>'c-flag','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], null, ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])}
diff --git a/application/admin/view/category/edit.html b/application/admin/view/category/edit.html index 9ee0898a..08bdce46 100644 --- a/application/admin/view/category/edit.html +++ b/application/admin/view/category/edit.html @@ -3,15 +3,15 @@
- {:build_select('row[type]', $typelist, $row['type'], ['id'=>'c-type','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[type]', $typelist, $row['type'], ['id'=>'c-type','class'=>'form-control selectpicker','data-rule'=>'required'])}
- +
- +
@@ -25,7 +25,7 @@
- +
@@ -34,11 +34,11 @@
- {:build_select('row[pid]', $parentlist, $row['pid'], ['id'=>'c-pid','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[pid]', $parentlist, $row['pid'], ['id'=>'c-pid','class'=>'form-control selectpicker','data-rule'=>'required'])}
- {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])}
diff --git a/application/admin/view/general/configvalue/add.html b/application/admin/view/general/configvalue/add.html index f32d49e2..49bb3020 100644 --- a/application/admin/view/general/configvalue/add.html +++ b/application/admin/view/general/configvalue/add.html @@ -8,13 +8,13 @@
- +
- +
@@ -38,7 +38,7 @@
- +
diff --git a/application/admin/view/general/configvalue/edit.html b/application/admin/view/general/configvalue/edit.html index 7bc56bec..f89ab92f 100644 --- a/application/admin/view/general/configvalue/edit.html +++ b/application/admin/view/general/configvalue/edit.html @@ -8,13 +8,13 @@
- +
- +
@@ -40,7 +40,7 @@
- +
diff --git a/application/admin/view/general/crontab/add.html b/application/admin/view/general/crontab/add.html index 4bb4c5d4..2cc566c2 100644 --- a/application/admin/view/general/crontab/add.html +++ b/application/admin/view/general/crontab/add.html @@ -3,60 +3,60 @@ padding-top:7px; } -
+
- +
- {:build_select('row[type]', $typedata, null, ['class'=>'form-control'])} + {:build_select('row[type]', $typedata, null, ['class'=>'form-control', 'data-rule'=>'required'])}
- +
- +
- +
- +
- +
- +
- +
diff --git a/application/admin/view/general/crontab/edit.html b/application/admin/view/general/crontab/edit.html index d8f4926c..fb43553a 100644 --- a/application/admin/view/general/crontab/edit.html +++ b/application/admin/view/general/crontab/edit.html @@ -7,50 +7,56 @@
- +
- {:build_select('row[type]', $typedata, $row['type'], ['class'=>'form-control'])} + {:build_select('row[type]', $typedata, $row['type'], ['class'=>'form-control', 'data-rule'=>'required'])}
- +
- +
- +
- + +
+
+
+ +
+
- +
- +
diff --git a/application/admin/view/page/add.html b/application/admin/view/page/add.html index 28c18584..88154f44 100644 --- a/application/admin/view/page/add.html +++ b/application/admin/view/page/add.html @@ -20,7 +20,7 @@
- {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], null, ['id'=>'c-flag','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], null, ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])}
diff --git a/application/admin/view/page/edit.html b/application/admin/view/page/edit.html index 5d35f689..14e9960e 100644 --- a/application/admin/view/page/edit.html +++ b/application/admin/view/page/edit.html @@ -21,7 +21,7 @@
- {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','required'=>''])} + {:build_select('row[flag]', ['recommend'=>__('Recommend'), 'index'=>__('Index'), 'hot'=>__('Hot')], $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','data-rule'=>'required'])}
diff --git a/application/admin/view/wechat/config/add.html b/application/admin/view/wechat/config/add.html index d70b74fe..f1715563 100644 --- a/application/admin/view/wechat/config/add.html +++ b/application/admin/view/wechat/config/add.html @@ -2,19 +2,19 @@
- +
- +
diff --git a/application/admin/view/wechat/config/edit.html b/application/admin/view/wechat/config/edit.html index 59f40164..5a4a0942 100644 --- a/application/admin/view/wechat/config/edit.html +++ b/application/admin/view/wechat/config/edit.html @@ -2,19 +2,19 @@
- +
- +
- + {:__('Insert link')}
diff --git a/application/admin/view/wechat/response/add.html b/application/admin/view/wechat/response/add.html index 9b9efd6a..91c81e72 100644 --- a/application/admin/view/wechat/response/add.html +++ b/application/admin/view/wechat/response/add.html @@ -2,7 +2,7 @@
- +
diff --git a/application/admin/view/wechat/response/edit.html b/application/admin/view/wechat/response/edit.html index a09ff330..32936d05 100644 --- a/application/admin/view/wechat/response/edit.html +++ b/application/admin/view/wechat/response/edit.html @@ -3,13 +3,13 @@
- +
- +
diff --git a/public/assets/css/backend.css b/public/assets/css/backend.css index 8a28eab9..51a06992 100644 --- a/public/assets/css/backend.css +++ b/public/assets/css/backend.css @@ -11,6 +11,9 @@ body { background: #f1f4f6; } +body.is-dialog { + background: #fff; +} .selection { position: absolute; border: 1px solid #8B9; diff --git a/public/assets/js/backend/general/crontab.js b/public/assets/js/backend/general/crontab.js index 1aa4262a..92690653 100644 --- a/public/assets/js/backend/general/crontab.js +++ b/public/assets/js/backend/general/crontab.js @@ -42,18 +42,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin Table.api.bindevent(table); }, add: function () { - Form.api.bindevent($("form[role=form]")); Controller.api.bindevent(); }, edit: function () { - Form.api.bindevent($("form[role=form]")); Controller.api.bindevent(); }, api: { bindevent: function () { - $(document).on("click", "#fieldlist .append", function () { - - }); + Form.api.bindevent($("form[role=form]")); //拖拽排序 require(['crontab'], function () { $('#schedulepicker').jqCron({ diff --git a/public/assets/less/backend.less b/public/assets/less/backend.less index eef8dfc5..7866fea3 100644 --- a/public/assets/less/backend.less +++ b/public/assets/less/backend.less @@ -33,6 +33,9 @@ body { background:#f1f4f6; } +body.is-dialog { + background:#fff; +} .selection { position: absolute;