From 99ec34cd68a38199126a5acdf07de5f832fd5316 Mon Sep 17 00:00:00 2001 From: Karson Date: Thu, 22 Jun 2017 23:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A2=84=E6=9C=9F=E6=89=A7=E8=A1=8C=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9ECSS=E4=B8=ADfixed-footer=E7=B1=BB=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?Install=E6=97=B6=E7=9A=84=E6=9D=83=E9=99=90=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9Eloadlang=E5=8A=A0=E8=BD=BD=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=8C=85=E6=96=B9=E6=B3=95=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B6=85=E5=87=BA=E5=A4=A7=E5=B0=8F=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=96=87=E5=AD=97=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?SQL=E6=97=B6=E7=9A=84BUG=20=E7=A7=BB=E9=99=A4=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90JS=E4=B8=AD=E4=B8=BB=E9=94=AE=E7=9A=84state?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Crud.php | 3 +- application/admin/command/Crud/stubs/add.stub | 2 +- .../admin/command/Crud/stubs/edit.stub | 2 +- .../admin/command/Install/fastadmin.sql | 22 +------- application/admin/controller/Ajax.php | 9 ++- .../admin/controller/general/Crontab.php | 56 +++++++++++++++++-- application/admin/lang/zh-cn/auth/group.php | 2 + .../admin/lang/zh-cn/general/crontab.php | 21 ++++--- .../admin/view/general/attachment/index.html | 7 --- .../admin/view/general/crontab/add.html | 21 ++++--- .../admin/view/general/crontab/edit.html | 21 ++++--- application/admin/view/page/add.html | 2 +- application/admin/view/version/add.html | 8 ++- .../admin/view/wechat/config/edit.html | 2 +- application/common/controller/Backend.php | 11 +++- application/common/controller/Frontend.php | 11 +++- application/common/model/Crontab.php | 17 ++++++ application/index/controller/Ajax.php | 3 +- application/index/controller/Autotask.php | 7 ++- composer.json | 3 +- public/assets/css/backend.css | 13 +++++ public/assets/css/backend.min.css | 2 +- public/assets/js/backend.js | 17 ++++-- public/assets/js/backend/general/crontab.js | 34 +++++------ public/assets/js/require-backend.min.js | 19 ++++--- public/assets/js/require-upload.js | 2 +- public/assets/less/backend.less | 13 +++++ public/install.php | 6 +- 28 files changed, 230 insertions(+), 106 deletions(-) diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index a60628a5..df2f7b17 100644 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -553,7 +553,7 @@ class Crud extends Command if ($v['COLUMN_KEY'] == 'PRI' && !$priDefined) { $priDefined = TRUE; - $javascriptList[] = "{field: 'state', checkbox: true}"; + $javascriptList[] = "{checkbox: true}"; } //构造JS列信息 $javascriptList[] = $this->getJsColumn($field, $v['DATA_TYPE']); @@ -708,7 +708,6 @@ class Crud extends Command return; $fieldList = $this->getFieldListName($field); $methodName = 'get' . ucfirst($fieldList); - unset($v); foreach ($itemArr as $k => &$v) { $v = "__('" . ucfirst($v) . "')"; diff --git a/application/admin/command/Crud/stubs/add.stub b/application/admin/command/Crud/stubs/add.stub index ac078159..61a84b3b 100644 --- a/application/admin/command/Crud/stubs/add.stub +++ b/application/admin/command/Crud/stubs/add.stub @@ -1,7 +1,7 @@
{%addList%} -