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

---
 src/plugin/admin/app/controller/Crud.php      |  5 +--
 .../admin/app/controller/UploadController.php | 41 +++++++++++--------
 src/plugin/admin/app/view/admin/insert.html   | 12 +++---
 src/plugin/admin/app/view/admin/update.html   | 10 ++---
 src/plugin/admin/app/view/upload/insert.html  |  4 +-
 src/plugin/admin/app/view/upload/update.html  |  4 +-
 src/plugin/admin/app/view/user/insert.html    | 18 ++++----
 src/plugin/admin/app/view/user/update.html    | 16 ++++----
 8 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/src/plugin/admin/app/controller/Crud.php b/src/plugin/admin/app/controller/Crud.php
index 98b28d6..5250c48 100644
--- a/src/plugin/admin/app/controller/Crud.php
+++ b/src/plugin/admin/app/controller/Crud.php
@@ -74,7 +74,7 @@ class Crud extends Base
      * @param Request $request
      * @return Response
      */
-    public function schema(Request $request): Response
+    /*public function schema(Request $request): Response
     {
         $table = $this->model->getTable();
         $data = Util::getSchema($table);
@@ -85,8 +85,7 @@ class Crud extends Base
             'forms' => array_values($data['forms']),
             'keys' => array_values($data['keys']),
         ]);
-    }
-
+    }*/
 
     /**
      * 查询前置
diff --git a/src/plugin/admin/app/controller/UploadController.php b/src/plugin/admin/app/controller/UploadController.php
index 7670f52..4da1c84 100644
--- a/src/plugin/admin/app/controller/UploadController.php
+++ b/src/plugin/admin/app/controller/UploadController.php
@@ -19,7 +19,7 @@ class UploadController extends Crud
     /**
      * 不需要鉴权的方法
      */
-    public $noNeedAuth = ['file', 'image'];
+    public $noNeedAuth = ['insert'];
     
     /**
      * @var Upload
@@ -45,7 +45,16 @@ class UploadController extends Crud
     }
 
     /**
-     * 查询
+     * 浏览附件
+     * @return Response
+     */
+    public function attachment(): Response
+    {
+        return view('upload/attachment');
+    }
+
+    /**
+     * 查询附件
      * @param Request $request
      * @return Response
      * @throws BusinessException
@@ -64,17 +73,7 @@ class UploadController extends Crud
     }
 
     /**
-     * 插入
-     * @param Request $request
-     * @return Response
-     */
-    public function insert(Request $request): Response
-    {
-        return view('upload/insert');
-    }
-
-    /**
-     * 更新
+     * 更新附件
      * @param Request $request
      * @return Response
      * @throws BusinessException
@@ -117,15 +116,15 @@ class UploadController extends Crud
     }
 
     /**
-     * 上传附件
+     * 添加附件
      * @param Request $request
      * @return Response
      * @throws Exception
      */
-    public function attachment(Request $request): Response
+    public function insert(Request $request): Response
     {
         if ($request->method() === 'GET') {
-            return view('upload/attachment');
+            return view('upload/insert');
         }
         $file = current($request->file());
         if (!$file || !$file->isValid()) {
@@ -246,6 +245,16 @@ class UploadController extends Crud
         ]);
     }
 
+    /**
+     * 删除附件
+     * @param Request $request
+     * @return Response
+     */
+    public function delete(Request $request): Response
+    {
+        return parent::delete($request);
+    }
+
     /**
      * 获取上传数据
      * @param Request $request
diff --git a/src/plugin/admin/app/view/admin/insert.html b/src/plugin/admin/app/view/admin/insert.html
index ca5d531..f5859ec 100644
--- a/src/plugin/admin/app/view/admin/insert.html
+++ b/src/plugin/admin/app/view/admin/insert.html
@@ -111,10 +111,10 @@
                     });
                 });
                 layui.upload.render({
-                    elem: "#avatar",
-                    url: '/app/admin/upload/avatar',
-                    value: '/app/admin/avatar.png',
-                    acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
+                    elem: "#avatar",
+                    url: '/app/admin/upload/avatar',
+                    value: '/app/admin/avatar.png',
+                    acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
                     field: '__file__',
                     done: function (res) {
                         if (res.code > 0) return layui.layer.msg(res.msg);
@@ -135,8 +135,8 @@
                             el: "#roles",
                             name: "roles",
                             initValue: initValue,
-                            data: e.data, 
-                            tree: {"show":true},
+                            data: e.data, 
+                            tree: {"show":true},
                             toolbar: {"show":true,"list":["ALL","CLEAR","REVERSE"]},
                         })
                     }
diff --git a/src/plugin/admin/app/view/admin/update.html b/src/plugin/admin/app/view/admin/update.html
index 00e335d..10072eb 100644
--- a/src/plugin/admin/app/view/admin/update.html
+++ b/src/plugin/admin/app/view/admin/update.html
@@ -135,9 +135,9 @@
                                 });
                             });
                             layui.upload.render({
-                                elem: "#avatar",
-                                url: '/app/admin/upload/avatar',
-                                acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
+                                elem: "#avatar",
+                                url: '/app/admin/upload/avatar',
+                                acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
                                 field: '__file__',
                                 done: function (res) {
                                     if (res.code > 0) return layui.layer.msg(res.msg);
@@ -158,8 +158,8 @@
                                         el: "#roles",
                                         name: "roles",
                                         initValue: initValue,
-                                        data: e.data, 
-                                        tree: {"show":true},
+                                        data: e.data, 
+                                        tree: {"show":true},
                                         toolbar: {"show":true,"list":["ALL","CLEAR","REVERSE"]},
                                     })
                                 }
diff --git a/src/plugin/admin/app/view/upload/insert.html b/src/plugin/admin/app/view/upload/insert.html
index a5d5e78..7e5d759 100644
--- a/src/plugin/admin/app/view/upload/insert.html
+++ b/src/plugin/admin/app/view/upload/insert.html
@@ -40,7 +40,7 @@
         <script src="/app/admin/component/pear/pear.js"></script>
         <script>
             
-            // 字段 url url
+            // 字段 文件 url
             layui.use(['upload', 'layer', 'popup', 'util'], function() {
                 let input = layui.$('#url').prev();
                 input.prev().html(layui.util.escape(input.val()));
@@ -50,7 +50,7 @@
                     data: {category: function () {
                         return layui.$('input[name="category"]').val();
                     }},
-                    url: '/app/admin/upload/attachment',
+                    url: '/app/admin/upload/insert',
                     field: '__file__',
                     done: function (res) {
                         if (res.code) return layui.popup.failure(res.msg);
diff --git a/src/plugin/admin/app/view/upload/update.html b/src/plugin/admin/app/view/upload/update.html
index 9ca5508..ee487ba 100644
--- a/src/plugin/admin/app/view/upload/update.html
+++ b/src/plugin/admin/app/view/upload/update.html
@@ -60,13 +60,13 @@
                             obj.attr('value', value);
                         });
                         
-                        // 字段 url url
+                        // 字段 文件 url
                         layui.use(['upload', 'layer', 'popup', 'util'], function() {
                             let input = layui.$('#url').prev();
                             input.prev().html(layui.util.escape(input.val()));
                             layui.upload.render({
                                 elem: "#url",
-                                url: '/app/admin/upload/attachment',
+                                url: '/app/admin/upload/update',
                                 accept: 'file',
                                 field: '__file__',
                                 done: function (res) {
diff --git a/src/plugin/admin/app/view/user/insert.html b/src/plugin/admin/app/view/user/insert.html
index dc602d1..f4a2647 100644
--- a/src/plugin/admin/app/view/user/insert.html
+++ b/src/plugin/admin/app/view/user/insert.html
@@ -169,10 +169,10 @@
                             el: "#sex",
                             name: "sex",
                             initValue: initValue,
-                            data: e.data, 
-                            value: '1',
-                            model: {"icon":"hidden","label":{"type":"text"}},
-                            clickClose: 'true',
+                            data: e.data, 
+                            value: '1',
+                            model: {"icon":"hidden","label":{"type":"text"}},
+                            clickClose: 'true',
                             radio: 'true',
                         })
                     }
@@ -197,9 +197,9 @@
                     });
                 });
                 layui.upload.render({
-                    elem: "#avatar",
-                    url: '/app/admin/upload/avatar',
-                    acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
+                    elem: "#avatar",
+                    url: '/app/admin/upload/avatar',
+                    acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
                     field: '__file__',
                     done: function (res) {
                         if (res.code > 0) return layui.layer.msg(res.msg);
@@ -218,7 +218,7 @@
             // 字段 登录时间 last_time
             layui.use(["laydate"], function() {
                 layui.laydate.render({
-                    elem: "#last_time",
+                    elem: "#last_time",
                     type: 'datetime',
                 });
             })
@@ -226,7 +226,7 @@
             // 字段 注册时间 join_time
             layui.use(["laydate"], function() {
                 layui.laydate.render({
-                    elem: "#join_time",
+                    elem: "#join_time",
                     type: 'datetime',
                 });
             })
diff --git a/src/plugin/admin/app/view/user/update.html b/src/plugin/admin/app/view/user/update.html
index cb28747..f82091f 100644
--- a/src/plugin/admin/app/view/user/update.html
+++ b/src/plugin/admin/app/view/user/update.html
@@ -193,9 +193,9 @@
                                         el: "#sex",
                                         name: "sex",
                                         initValue: initValue,
-                                        data: e.data, 
-                                        model: {"icon":"hidden","label":{"type":"text"}},
-                                        clickClose: 'true',
+                                        data: e.data, 
+                                        model: {"icon":"hidden","label":{"type":"text"}},
+                                        clickClose: 'true',
                                         radio: 'true',
                                     })
                                 }
@@ -220,9 +220,9 @@
                                 });
                             });
                             layui.upload.render({
-                                elem: "#avatar",
-                                url: '/app/admin/upload/avatar',
-                                acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
+                                elem: "#avatar",
+                                url: '/app/admin/upload/avatar',
+                                acceptMime: 'image/gif,image/jpeg,image/jpg,image/png',
                                 field: '__file__',
                                 done: function (res) {
                                     if (res.code > 0) return layui.layer.msg(res.msg);
@@ -241,7 +241,7 @@
                         // 字段 登录时间 last_time
                         layui.use(["laydate"], function() {
                             layui.laydate.render({
-                                elem: "#last_time",
+                                elem: "#last_time",
                                 type: 'datetime',
                             });
                         })
@@ -249,7 +249,7 @@
                         // 字段 注册时间 join_time
                         layui.use(["laydate"], function() {
                             layui.laydate.render({
-                                elem: "#join_time",
+                                elem: "#join_time",
                                 type: 'datetime',
                             });
                         })