From 6b4cb9c52a75734a06dc966d99f5b49c4b0610dd Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 17 Aug 2017 14:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6=E5=9F=BA?=
 =?UTF-8?q?=E7=B1=BBController=E8=A2=AB=E8=B0=83=E7=94=A8=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E7=9A=84BUG=20=E6=B7=BB=E5=8A=A0=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E8=A1=8C=E4=B8=BA=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E5=A7=8B=E7=BB=88=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=8E=92=E5=BA=8F=E6=8C=89=E9=92=AE=E7=9A=84BUG=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E8=A7=86=E5=9B=BE=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=B8=8A=E4=BC=A0=E6=8F=92=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/common.php                    |  2 +-
 application/admin/controller/Addon.php          |  2 ++
 application/admin/view/auth/admin/index.html    |  8 ++++----
 application/admin/view/auth/adminlog/index.html |  8 ++++----
 application/admin/view/auth/group/index.html    |  6 ++++--
 application/admin/view/auth/rule/index.html     |  6 ++++--
 application/admin/view/category/index.html      |  7 +++++--
 application/index/view/index/index.html         |  4 ++--
 application/tags.php                            |  4 ++++
 public/assets/js/require-backend.min.js         | 10 ++++------
 public/assets/js/require-table.js               | 10 ++++------
 11 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/application/admin/common.php b/application/admin/common.php
index 7c13b028..705cba8e 100644
--- a/application/admin/common.php
+++ b/application/admin/common.php
@@ -89,7 +89,7 @@ function build_category_select($name, $type, $selected = null, $attr = [], $head
 function build_toolbar($btns = NULL, $attr = [])
 {
     $auth = \app\admin\library\Auth::instance();
-    $controller = strtolower(think\Request::instance()->controller());
+    $controller = str_replace('.','/',strtolower(think\Request::instance()->controller()));
     $btns = $btns ? $btns : ['refresh', 'add', 'edit', 'del'];
     $btns = is_array($btns) ? $btns : explode(',', $btns);
     $index = array_search('delete', $btns);
diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 803c7be5..de368e0e 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -196,6 +196,8 @@ class Addon extends Backend
      */
     public function local()
     {
+        Config::set('default_return_type', 'json');
+        
         $file = $this->request->file('file');
         $addonTmpDir = RUNTIME_PATH . 'addons' . DS;
         if (!is_dir($addonTmpDir))
diff --git a/application/admin/view/auth/admin/index.html b/application/admin/view/auth/admin/index.html
index 9e3f7940..b4ed2565 100644
--- a/application/admin/view/auth/admin/index.html
+++ b/application/admin/view/auth/admin/index.html
@@ -8,11 +8,11 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh,add,delete')}
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
+                    <table id="table" class="table table-striped table-bordered table-hover" 
+                           data-operate-edit="{:$auth->check('auth/admin/edit')}" 
+                           data-operate-del="{:$auth->check('auth/admin/del')}" 
+                           width="100%">
                     </table>
-
-
                 </div>
             </div>
 
diff --git a/application/admin/view/auth/adminlog/index.html b/application/admin/view/auth/adminlog/index.html
index 8d61a3a5..e0a711f6 100644
--- a/application/admin/view/auth/adminlog/index.html
+++ b/application/admin/view/auth/adminlog/index.html
@@ -8,11 +8,11 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh,delete')}
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
+                    <table id="table" class="table table-striped table-bordered table-hover" 
+                           data-operate-detail="{:$auth->check('auth/adminlog/index')}" 
+                           data-operate-del="{:$auth->check('auth/adminlog/del')}" 
+                           width="100%">
                     </table>
-
-
                 </div>
             </div>
 
diff --git a/application/admin/view/auth/group/index.html b/application/admin/view/auth/group/index.html
index 327313d8..9ad38482 100644
--- a/application/admin/view/auth/group/index.html
+++ b/application/admin/view/auth/group/index.html
@@ -8,8 +8,10 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh,add,delete')}
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover" width="100%">
-
+                    <table id="table" class="table table-striped table-bordered table-hover" 
+                           data-operate-edit="{:$auth->check('auth/group/edit')}" 
+                           data-operate-del="{:$auth->check('auth/group/del')}" 
+                           width="100%">
                     </table>
                 </div>
             </div>
diff --git a/application/admin/view/auth/rule/index.html b/application/admin/view/auth/rule/index.html
index 0d6331f4..667de5dc 100644
--- a/application/admin/view/auth/rule/index.html
+++ b/application/admin/view/auth/rule/index.html
@@ -9,8 +9,10 @@
                         {:build_toolbar()}
                         <a href="javascript:;" class="btn btn-danger btn-toggle-all"><i class="fa fa-plus"></i> {:__('Toggle all')}</a>
                     </div>
-                    <table id="table" class="table table-bordered table-hover" width="100%">
-
+                    <table id="table" class="table table-bordered table-hover" 
+                           data-operate-edit="{:$auth->check('auth/rule/edit')}" 
+                           data-operate-del="{:$auth->check('auth/rule/del')}" 
+                           width="100%">
                     </table>
                 </div>
             </div>
diff --git a/application/admin/view/category/index.html b/application/admin/view/category/index.html
index d3eefa4f..3c07c85b 100644
--- a/application/admin/view/category/index.html
+++ b/application/admin/view/category/index.html
@@ -7,7 +7,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar()}
-                        <div class="dropdown btn-group">
+                        <div class="dropdown btn-group {:$auth->check('category/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
@@ -15,7 +15,10 @@
                             </ul>
                         </div>
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover" width="100%">
+                    <table id="table" class="table table-striped table-bordered table-hover" 
+                           data-operate-edit="{:$auth->check('category/edit')}" 
+                           data-operate-del="{:$auth->check('category/del')}" 
+                           width="100%">
                     </table>
                 </div>
             </div>
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 36cf2e70..c7c97677 100644
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -13,7 +13,7 @@
 
         <!-- Bootstrap Core CSS -->
         <link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-        <link href="/assets/css/index.css" rel="stylesheet">
+        <link href="__CDN__/assets/css/index.css" rel="stylesheet">
 
         <!-- Plugin CSS -->
         <link href="//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
@@ -34,7 +34,7 @@
                     <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-menu">
                         <span class="sr-only">Toggle navigation</span><i class="fa fa-bars"></i>
                     </button>
-                    <a class="navbar-brand page-scroll" href="#page-top"><img src="/assets/img/logo.png" style="width:200px;" alt=""></a>
+                    <a class="navbar-brand page-scroll" href="#page-top"><img src="__CDN__/assets/img/logo.png" style="width:200px;" alt=""></a>
                 </div>
 
                 <div class="collapse navbar-collapse" id="navbar-collapse-menu">
diff --git a/application/tags.php b/application/tags.php
index 9b939a39..726ed6ea 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -19,6 +19,10 @@ return [
     'module_init'  => [
         'app\\common\\behavior\\Common',
     ],
+    // 模块初始化
+    'addons_init'  => [
+        'app\\common\\behavior\\Common',
+    ],
     // 操作开始执行
     'action_begin' => [],
     // 视图内容过滤
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 1c278861..287f327f 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -7992,11 +7992,6 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
                     }
                 }
             },
-            auth: {
-                check: function (name) {
-
-                }
-            },
             // 单元格数据格式化
             formatter: {
                 icon: function (value, row, index) {
@@ -8087,8 +8082,11 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
                     buttons.push({name: 'del', icon: 'fa fa-trash', classname: 'btn btn-xs btn-danger btn-delone'});
                     var html = [];
                     $.each(buttons, function (i, j) {
+                        if (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] === 'undefined') {
+                            return true;
+                        }
                         var attr = table.data("operate-" + j.name);
-                        if ((typeof attr === 'undefined' || attr) || (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] == 'undefined')) {
+                        if (typeof attr === 'undefined' || attr) {
                             if (['add', 'edit', 'del', 'multi'].indexOf(j.name) > -1 && !options.extend[j.name + "_url"]) {
                                 return true;
                             }
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 69b57711..c97c655f 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -287,11 +287,6 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     }
                 }
             },
-            auth: {
-                check: function (name) {
-
-                }
-            },
             // 单元格数据格式化
             formatter: {
                 icon: function (value, row, index) {
@@ -382,8 +377,11 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     buttons.push({name: 'del', icon: 'fa fa-trash', classname: 'btn btn-xs btn-danger btn-delone'});
                     var html = [];
                     $.each(buttons, function (i, j) {
+                        if (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] === 'undefined') {
+                            return true;
+                        }
                         var attr = table.data("operate-" + j.name);
-                        if ((typeof attr === 'undefined' || attr) || (j.name === 'dragsort' && typeof row[Table.config.dragsortfield] == 'undefined')) {
+                        if (typeof attr === 'undefined' || attr) {
                             if (['add', 'edit', 'del', 'multi'].indexOf(j.name) > -1 && !options.extend[j.name + "_url"]) {
                                 return true;
                             }