From 086cea6462e82a30541b86c8499d1fb90a1d5987 Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Tue, 6 Dec 2022 14:20:23 +0800
Subject: [PATCH] save

---
 .../admin/app/controller/TableController.php  |  2 +-
 .../admin/app/view/admin-role/index.html      |  2 +-
 .../admin/app/view/admin-rule/index.html      |  2 +-
 src/plugin/admin/app/view/admin/index.html    |  2 +-
 src/plugin/admin/app/view/dict/index.html     |  2 +-
 src/plugin/admin/app/view/table/view.html     |  2 +-
 .../admin/app/view/upload/attachment.html     |  2 +-
 src/plugin/admin/app/view/upload/index.html   |  2 +-
 src/plugin/admin/app/view/user/index.html     |  3 +--
 .../public/admin/js/{index.js => common.js}   | 23 +++++++++++++++++++
 .../admin/public/admin/js/permission.js       | 22 ------------------
 11 files changed, 32 insertions(+), 32 deletions(-)
 rename src/plugin/admin/public/admin/js/{index.js => common.js} (61%)
 delete mode 100644 src/plugin/admin/public/admin/js/permission.js

diff --git a/src/plugin/admin/app/controller/TableController.php b/src/plugin/admin/app/controller/TableController.php
index b3f91ed..3cd8142 100644
--- a/src/plugin/admin/app/controller/TableController.php
+++ b/src/plugin/admin/app/controller/TableController.php
@@ -769,7 +769,7 @@ EOF
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/app/view/admin-role/index.html b/src/plugin/admin/app/view/admin-role/index.html
index 557ab57..07b90c5 100644
--- a/src/plugin/admin/app/view/admin-role/index.html
+++ b/src/plugin/admin/app/view/admin-role/index.html
@@ -74,7 +74,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/app/view/admin-rule/index.html b/src/plugin/admin/app/view/admin-rule/index.html
index 59b3b9e..fbb8f37 100644
--- a/src/plugin/admin/app/view/admin-rule/index.html
+++ b/src/plugin/admin/app/view/admin-rule/index.html
@@ -61,7 +61,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
 
         <script>
 
diff --git a/src/plugin/admin/app/view/admin/index.html b/src/plugin/admin/app/view/admin/index.html
index 16dbdee..80f8c54 100644
--- a/src/plugin/admin/app/view/admin/index.html
+++ b/src/plugin/admin/app/view/admin/index.html
@@ -95,7 +95,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/app/view/dict/index.html b/src/plugin/admin/app/view/dict/index.html
index a53c3d0..799e489 100644
--- a/src/plugin/admin/app/view/dict/index.html
+++ b/src/plugin/admin/app/view/dict/index.html
@@ -63,7 +63,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/app/view/table/view.html b/src/plugin/admin/app/view/table/view.html
index 89602a0..44a1b37 100644
--- a/src/plugin/admin/app/view/table/view.html
+++ b/src/plugin/admin/app/view/table/view.html
@@ -52,7 +52,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
 
         <script>
 
diff --git a/src/plugin/admin/app/view/upload/attachment.html b/src/plugin/admin/app/view/upload/attachment.html
index af358d2..f5b2451 100644
--- a/src/plugin/admin/app/view/upload/attachment.html
+++ b/src/plugin/admin/app/view/upload/attachment.html
@@ -84,7 +84,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/app/view/upload/index.html b/src/plugin/admin/app/view/upload/index.html
index 28940b2..137b6a3 100644
--- a/src/plugin/admin/app/view/upload/index.html
+++ b/src/plugin/admin/app/view/upload/index.html
@@ -102,7 +102,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/app/view/user/index.html b/src/plugin/admin/app/view/user/index.html
index 66be892..b942dfc 100644
--- a/src/plugin/admin/app/view/user/index.html
+++ b/src/plugin/admin/app/view/user/index.html
@@ -166,8 +166,7 @@
 
         <script src="/app/admin/component/layui/layui.js"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
-        <script src="/app/admin/admin/js/index.js"></script>
-        <script src="/app/admin/admin/js/permission.js"></script>
+        <script src="/app/admin/admin/js/common.js"></script>
         <script>
 
             // 相关接口
diff --git a/src/plugin/admin/public/admin/js/index.js b/src/plugin/admin/public/admin/js/common.js
similarity index 61%
rename from src/plugin/admin/public/admin/js/index.js
rename to src/plugin/admin/public/admin/js/common.js
index edbbfa9..768b550 100644
--- a/src/plugin/admin/public/admin/js/index.js
+++ b/src/plugin/admin/public/admin/js/common.js
@@ -32,6 +32,29 @@ function toggleSearchFormShow()
     $('.top-search-from .toggle-btn a:first').addClass('layui-hide');
 }
 
+/**
+ * 获取控制器详细权限，并决定展示哪些按钮或dom元素
+ */
+layui.$(function () {
+    let $ = layui.$;
+    $.ajax({
+        url: "/app/admin/admin-rule/permission",
+        dataType: "json",
+        data: {controller: CONTROLLER},
+        success: function (res) {
+            let style = '';
+            layui.each(res.data || [], function (k, action) {
+                if (action === '*') {
+                    style = '*[permission]{display: initial}';
+                    return;
+                }
+                style += '*[permission="'+action+'"]{display: initial}';
+            });
+            $("head").append("<style>"+style+"</style>");
+        }
+    });
+});
+
 layui.$(function () {
     toggleSearchFormShow();
 });
diff --git a/src/plugin/admin/public/admin/js/permission.js b/src/plugin/admin/public/admin/js/permission.js
deleted file mode 100644
index 64bb7d2..0000000
--- a/src/plugin/admin/public/admin/js/permission.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * 获取控制器详细权限，并决定展示哪些按钮或dom元素
- */
-layui.$(function () {
-    let $ = layui.$;
-    $.ajax({
-        url: "/app/admin/admin-rule/permission",
-        dataType: "json",
-        data: {controller: CONTROLLER},
-        success: function (res) {
-            let style = '';
-            layui.each(res.data || [], function (k, action) {
-                if (action === '*') {
-                    style = '*[permission]{display: initial}';
-                    return;
-                }
-                style += '*[permission="'+action+'"]{display: initial}';
-            });
-            $("head").append("<style>"+style+"</style>");
-        }
-    });
-});
\ No newline at end of file