From 7493f0f0c3705ccd041332a524bf9f2fe5032926 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Tue, 8 Nov 2016 00:02:14 +0800 Subject: [PATCH] =?UTF-8?q?added=20=E5=AE=8C=E5=96=84js=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E7=9A=84=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Menu.php | 30 ++++++------ application/admin/view/public/base.html | 11 +++++ public/admin/static/js/template/table.js | 46 ++++++++++++++++--- .../bootstrap/css/bootstrap.min.css.map | 1 - 4 files changed, 63 insertions(+), 25 deletions(-) delete mode 100644 public/admin/static/plugin/bootstrap/css/bootstrap.min.css.map diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php index bc00d5b..4641c87 100644 --- a/application/admin/controller/Menu.php +++ b/application/admin/controller/Menu.php @@ -43,18 +43,18 @@ class Menu extends Base { ], 'topButton' => [ [ - 'href' => 'Menu/add', - 'class'=> 'am-btn-success', + 'href' => url('Menu/add'), + 'class'=> 'btn-success', 'info'=> '新增', 'icon' => 'plus', - 'ajax' => 0, + 'confirm' => 0, ], [ - 'href' => 'Menu/del', - 'class'=> 'am-btn-danger del-all', + 'href' => url('Menu/del'), + 'class'=> 'btn-danger', 'info'=> '删除', 'icon' => 'trash', - 'ajax' => 1, + 'confirm' => 1, ] ], 'rightButton' => [ @@ -92,15 +92,13 @@ class Menu extends Base { 'module' => 'label', 'rule' => [ [ - 'info' => '显示', - 'class' => 'success', - 'show' => ['hide', 1] + 'info' => '隐藏', + 'class' => 'warning' ], [ - 'info' => '隐藏', - 'class' => 'warning', - 'show' => ['hide', 0] - ] + 'info' => '显示', + 'class' => 'success' + ], ] ], 'type' => [ @@ -108,13 +106,11 @@ class Menu extends Base { 'rule' => [ [ 'info' => '方法类功能', - 'class' => 'secondary', - 'show' => ['type', 0] + 'class' => 'secondary' ], [ 'info' => '模块类功能', - 'class' => 'primary', - 'show' => ['type', 1] + 'class' => 'primary' ] ] ] diff --git a/application/admin/view/public/base.html b/application/admin/view/public/base.html index 3dc01c7..8273f94 100644 --- a/application/admin/view/public/base.html +++ b/application/admin/view/public/base.html @@ -16,6 +16,17 @@ font-size: 1.6rem; font-family: "Segoe UI","Lucida Grande",Helvetica,Arial,"Microsoft YaHei",FreeSans,Arimo,"Droid Sans","wenquanyi micro hei","Hiragino Sans GB","Hiragino Sans GB W3",FontAwesome,sans-serif; } + .builder-data-empty { + margin-bottom: 20px; + background-color: #f9f9f9; + } + .no-data { + padding: 130px 0; + color: #555; + } + .am-text-center { + text-align: center !important; + } {block name="myStyle"}{/block}