From 5f7ede6b28051cc50391695c4d0074dfb583a4cf Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Tue, 6 Dec 2022 17:29:48 +0800
Subject: [PATCH] save

---
 .../app/controller/AdminRuleController.php    |   4 +
 src/plugin/admin/app/view/dict/index.html     |   1 +
 .../admin/app/view/upload/attachment.html     | 109 +++++++++++-------
 src/plugin/admin/app/view/upload/index.html   |  13 ++-
 src/plugin/admin/config/menu.php              |  16 ++-
 5 files changed, 95 insertions(+), 48 deletions(-)

diff --git a/src/plugin/admin/app/controller/AdminRuleController.php b/src/plugin/admin/app/controller/AdminRuleController.php
index f740c82..83b3471 100644
--- a/src/plugin/admin/app/controller/AdminRuleController.php
+++ b/src/plugin/admin/app/controller/AdminRuleController.php
@@ -219,6 +219,7 @@ class AdminRuleController extends Crud
             return view('admin-rule/insert');
         }
         $data = $this->insertInput($request);
+        $data['key'] = str_replace('\\\\', '\\', $data['key']);
         $key = $data['key'] ?? '';
         if ($this->model->where('key', $key)->first()) {
             return $this->json(1, "菜单标识 $key 已经存在");
@@ -247,6 +248,9 @@ class AdminRuleController extends Crud
         if ($data['pid'] == $row['id']) {
             return $this->json(2, '不能将自己设置为上级菜单');
         }
+        if (isset($data['key'])) {
+            $data['key'] = str_replace('\\\\', '\\', $data['key']);
+        }
         $this->doUpdate($id, $data);
         return $this->json(0);
     }
diff --git a/src/plugin/admin/app/view/dict/index.html b/src/plugin/admin/app/view/dict/index.html
index 2761088..b5c87a8 100644
--- a/src/plugin/admin/app/view/dict/index.html
+++ b/src/plugin/admin/app/view/dict/index.html
@@ -67,6 +67,7 @@
         <script>
 
             // 相关接口
+            const CONTROLLER = 'plugin\\admin\\app\\controller\\DictController';
             const SELECT_API = "/app/admin/dict/select";
             const UPDATE_API = "/app/admin/dict/update";
             const DELETE_API = "/app/admin/dict/delete";
diff --git a/src/plugin/admin/app/view/upload/attachment.html b/src/plugin/admin/app/view/upload/attachment.html
index f5b2451..2f6b7c9 100644
--- a/src/plugin/admin/app/view/upload/attachment.html
+++ b/src/plugin/admin/app/view/upload/attachment.html
@@ -34,14 +34,14 @@
                             <input type="text" name="name" value="" class="layui-input">
                         </div>
                     </div>
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">管理员id</label>
                         <div class="layui-input-block">
                             <input type="number" name="admin_id" value="" class="layui-input">
                         </div>
                     </div>
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">上传时间</label>
                         <div class="layui-input-block">
@@ -77,6 +77,16 @@
             </div>
         </div>
 
+        <!-- 表格顶部工具栏 -->
+        <script type="text/html" id="table-toolbar">
+            <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="insert">
+                <i class="layui-icon layui-icon-add-1"></i>新增
+            </button>
+            <button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="delete">
+                <i class="layui-icon layui-icon-delete"></i>删除
+            </button>
+        </script>
+
         <!-- 表格行工具栏 -->
         <script type="text/html" id="table-bar">
             <button class="pear-btn pear-btn-xs pear-btn-primary" lay-event="select">选择</button>
@@ -89,14 +99,15 @@
 
             // 相关接口
             const PRIMARY_KEY = 'id';
+            const CONTROLLER = "plugin\\admin\\app\\controller\\UploadController";
             const SELECT_API = "/app/admin/upload/select";
             const UPDATE_API = "/app/admin/upload/update";
             const DELETE_API = "/app/admin/upload/delete";
             const INSERT_URL = "/app/admin/upload/insert";
             const UPDATE_URL = "/app/admin/upload/update";
-
+            
             // 表格渲染
-            layui.use(['table', 'form', 'common', 'popup', 'util', 'laydate', 'xmSelect'], function() {
+            layui.use(['table', 'form', 'common', 'popup', 'util'], function() {
                 let table = layui.table;
                 let form = layui.form;
                 let $ = layui.$;
@@ -104,35 +115,39 @@
                 let util = layui.util;
 
                 // 字段 上传时间 created_at
-                layui.laydate.render({
-                    elem: "#created_at",
-                    range: ["#created_at-date-start", "#created_at-date-end"],
-                    type: 'datetime',
-                });
+                layui.use(["laydate"], function() {
+                    layui.laydate.render({
+                        elem: "#created_at",
+                        range: ["#created_at-date-start", "#created_at-date-end"],
+                        type: 'datetime',
+                    });
+                })
 
                 // 字段 类别 category
-                $.ajax({
-                    url: "/app/admin/dict/get/upload",
-                    dataType: "json",
-                    success: function (e) {
-                        let value = layui.$("#category").attr("value");
-                        let initValue = value ? value.split(",") : [];
-                        layui.xmSelect.render({
-                            el: "#category",
-                            name: "category",
-                            initValue: initValue,
-                            data: e.data,
-                            model: {"icon":"hidden","label":{"type":"text"}},
-                            clickClose: 'true',
-                            radio: 'true',
-                            on: function(data){
-                                let value = data.arr[0] ? data.arr[0].value : '';
-                                table.reload('data-table', {
-                                    where: {category: value}
-                                })
-                            },
-                        })
-                    }
+                layui.use(["jquery", "xmSelect"], function() {
+                    layui.$.ajax({
+                        url: "/app/admin/dict/get/upload",
+                        dataType: "json",
+                        success: function (e) {
+                            let value = layui.$("#category").attr("value");
+                            let initValue = value ? value.split(",") : [];
+                            layui.xmSelect.render({
+                                el: "#category",
+                                name: "category",
+                                initValue: initValue,
+                                data: e.data,
+                                model: {"icon":"hidden","label":{"type":"text"}},
+                                clickClose: 'true',
+                                radio: 'true',
+                                on: function(data){
+                                    let value = data.arr[0] ? data.arr[0].value : '';
+                                    table.reload('data-table', {
+                                        where: {category: value}
+                                    })
+                                },
+                            })
+                        }
+                    });
                 });
                 
 				// 表头参数
@@ -208,11 +223,11 @@
 						field: "updated_at",
 						hide: true,
 					},{
-						title: "操作",
-						toolbar: "#table-bar",
-						align: "center",
-						fixed: "right",
-					}
+                        title: "操作",
+                        toolbar: "#table-bar",
+                        align: "center",
+                        fixed: "right",
+                    }
 				];
 				
 				// 渲染表格
@@ -230,6 +245,7 @@
 				        cols: [cols],
 				        skin: "line",
 				        size: "lg",
+				        toolbar: "#table-toolbar",
 				        autoSort: false,
                         where: {ext: searchExt},
 				        defaultToolbar: [{
@@ -277,12 +293,15 @@
 				    render();
 				}
 				
-                // 编辑或删除行事件
+                // 编辑删除或选择行事件
                 table.on('tool(data-table)', function(obj) {
-                    let index = parent.layer.getFrameIndex(window.name);
-                    let callback = parent.layui.$("#layui-layer" + index).data("callback");
-                    callback(obj.data);
-                    parent.layer.close(index);
+                    if (obj.event === 'remove') {
+                        remove(obj);
+                    } else if (obj.event === 'edit') {
+                        edit(obj);
+                    } else if (obj.event === 'select') {
+                        select(obj);
+                    }
                 });
 
                 // 表格顶部工具栏事件
@@ -387,6 +406,14 @@
                     });
                 }
 
+                // 选择行
+                let select = function (obj) {
+                    let index = parent.layer.getFrameIndex(window.name);
+                    let callback = parent.layui.$("#layui-layer" + index).data("callback");
+                    callback(obj.data);
+                    parent.layer.close(index);
+                };
+
                 // 刷新表格数据
                 window.refreshTable = function(param) {
                     table.reloadData('data-table', {
diff --git a/src/plugin/admin/app/view/upload/index.html b/src/plugin/admin/app/view/upload/index.html
index 7ae4e4d..9cd4050 100644
--- a/src/plugin/admin/app/view/upload/index.html
+++ b/src/plugin/admin/app/view/upload/index.html
@@ -107,6 +107,7 @@
 
             // 相关接口
             const PRIMARY_KEY = 'id';
+            const CONTROLLER = "plugin\\admin\\app\\controller\\UploadController";
             const SELECT_API = "/app/admin/upload/select";
             const UPDATE_API = "/app/admin/upload/update";
             const DELETE_API = "/app/admin/upload/delete";
@@ -224,11 +225,11 @@
 						field: "updated_at",
 						hide: true,
 					},{
-						title: "操作",
-						toolbar: "#table-bar",
-						align: "center",
-						fixed: "right",
-					}
+                        title: "操作",
+                        toolbar: "#table-bar",
+                        align: "center",
+                        fixed: "right",
+                    }
 				];
 				
 				// 渲染表格
@@ -288,7 +289,7 @@
 				    render();
 				}
 				
-                // 编辑或删除行事件
+                // 编辑删除或选择行事件
                 table.on('tool(data-table)', function(obj) {
                     if (obj.event === 'remove') {
                         remove(obj);
diff --git a/src/plugin/admin/config/menu.php b/src/plugin/admin/config/menu.php
index 06a250b..7cf2508 100644
--- a/src/plugin/admin/config/menu.php
+++ b/src/plugin/admin/config/menu.php
@@ -83,7 +83,21 @@ return [
                 'href' => '/app/admin/config/index',
                 'type' => 1,
                 'weight' => 700,
-            ]
+            ],
+            [
+                'title' => '附件管理',
+                'key' => 'plugin\\admin\\app\\controller\\UploadController',
+                'href' => '/app/admin/upload/index',
+                'type' => 1,
+                'weight' => 600,
+            ],
+            [
+                'title' => '字典设置',
+                'key' => 'plugin\\admin\\app\\controller\\DictController',
+                'href' => '/app/admin/dict/index',
+                'type' => 1,
+                'weight' => 500,
+            ],
         ]
     ],
     [