更新

deatil · Jun 7, 2024 · 8937cca · 8937cca
1 parent 2da61b7
commit 8937cca
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 110 deletions.
diff --git a/resources/assets/js/layui-extend/lake-admin/lakeTool.js b/resources/assets/js/layui-extend/lake-admin/lakeTool.js
@@ -362,6 +362,8 @@ layui.define(['table', 'element', 'layer', 'form', 'notice'], function(exports)
                             }
                         }
                     });
+                }).error(function() {
+                    layer.msg("请求失败");
                 });
             });
         } else {
@@ -375,6 +377,8 @@ layui.define(['table', 'element', 'layer', 'form', 'notice'], function(exports)
                         }
                     }
                 });
+            }).error(function() {
+                layer.msg("请求失败");
             });
         };
         return false;
@@ -413,6 +417,8 @@ layui.define(['table', 'element', 'layer', 'form', 'notice'], function(exports)
                         }
                     }, 1500);
                 }
+            }).error(function() {
+                layer.msg("请求失败");
             });
         }
 

diff --git a/resources/config/laket.php b/resources/config/laket.php
@@ -4,8 +4,8 @@
     'admin' => [
         "name"      => "LaketAdmin",
         "name_mini" => "Laket",
-        "version"   => "1.2.5",
-        "release"   => "1.2.5.20240607",
+        "version"   => "1.2.6",
+        "release"   => "1.2.6.20240607",
     ],
 
     // 登录

diff --git a/resources/views/admin/index.html b/resources/views/admin/index.html
@@ -9,7 +9,7 @@
                 <div class="layui-inline">
                     <select name="field" class="lake-admin-search-field">
                         <option value="">全部类型</option>
-                        <option value="name">登录名</option>
+                        <option value="name">账号</option>
                         <option value="email">邮箱</option>
                         <option value="nickname">昵称</option>
                     </select>
@@ -20,9 +20,6 @@
                 <div class="layui-inline">
                     <a class="layui-btn lake-admin-search-btn" data-type="search">搜索</a>
                 </div>
-                <div class="layui-inline">
-                    <a class="layui-btn" href="{:laket_route('admin.admin.index')}">查看全部</a>
-                </div>
             </form>
         </blockquote>
 
@@ -85,6 +82,13 @@
         toolbar: '#toolbarDemo',
         url: '{:laket_route("admin.admin.index-data")}',
         method: 'get',
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cols: [
             [
                 { field: 'name', width: 120, title: '账号', templet: '#nameTpl' },

diff --git a/resources/views/attachment/index.html b/resources/views/attachment/index.html
@@ -15,9 +15,6 @@
                 <div class="layui-inline">
                     <a class="layui-btn search_btn" data-type="reload">搜索</a>
                 </div>
-                <div class="layui-inline">
-                    <a class="layui-btn" href="{:laket_route('admin.attachment.index')}">查看全部</a>
-                </div>
             </form>
         </blockquote>
 
@@ -71,6 +68,13 @@
         toolbar: '#toolbarTop',
         url: '{:laket_route("admin.attachment.index-data")}',
         method: 'get',
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cols: [
             [
                 { type: 'checkbox', fixed: 'left' },

diff --git a/resources/views/auth-group/all.html b/resources/views/auth-group/all.html
@@ -77,6 +77,13 @@
         toolbar: '#toolbarTop',
         url: '{:laket_route("admin.auth-group.all-data")}',
         method: 'get',
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cols: [
             [
                 { field: 'listorder', align: 'center', width: 70, title: '排序', edit: 'text' },

diff --git a/resources/views/auth-group/index.html b/resources/views/auth-group/index.html
@@ -63,6 +63,13 @@
         toolbar: '#toolbarTop',
         url: '{:laket_route("admin.auth-group.index-data")}',
         method: 'get',
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cols: [
             [
                 { field: 'listorder', align: 'center', width: 70, title: '排序', edit: 'text' },

diff --git a/resources/views/auth-rule/all.html b/resources/views/auth-rule/all.html
@@ -70,6 +70,13 @@
         toolbar: '#toolbar',
         url: '{:laket_route("admin.auth-rule.all-data")}',
         method: 'get',
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cols: [
             [
                 { field: 'listorder', align: 'center', width: 80, title: '排序', edit: 'text' },

diff --git a/resources/views/auth-rule/index.html b/resources/views/auth-rule/index.html
@@ -54,6 +54,13 @@
         idField: 'id',
         url: "{:laket_route('admin.auth-rule.index-data')}",
         method: 'get',
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cellMinWidth: 100,
         treeId: 'id', //树形id字段名称
         treeUpId: 'parentid', //树形父id字段名称

diff --git a/resources/views/flash/index.html b/resources/views/flash/index.html
@@ -45,9 +45,6 @@
                         <div class="layui-inline">
                             <a class="layui-btn laket-admin-search-btn" data-type="search">搜索</a>
                         </div>
-                        <div class="layui-inline">
-                            <a href="javascript:;" class="layui-btn laket-admin-search-all-btn">查看全部</a>
-                        </div>
                     </form>
                 </blockquote>
 
@@ -73,12 +70,12 @@
 
 <script type="text/html" id="nameTpl">
     {{# if(d.homepage){ }} 
-    <a href="{{ d.homepage }}" target="_blank" title="点击查看主页">
-        <i class="iconfont icon-lianjie"></i>
-    </a>
+        <a href="{{ d.homepage }}" target="_blank" title="点击查看主页">
+            <i class="iconfont icon-lianjie"></i>
+        </a>
     {{#  } }}
-
-    {{ d.name }}
+    
+    <span>{{ d.name }}</span>
 </script>
 
 <script type="text/html" id="titleTpl">
@@ -130,7 +127,7 @@
     {{# if (d.settinglist.length > 0) { }}
         <a class="layui-btn layui-btn-xs layui-iframe" 
             href='{:laket_route("admin.flash.setting")}?name={{ d.name }}'
-            title="设置"
+            title="插件设置"
             >设置</a>
     {{# } }}
 
@@ -171,6 +168,13 @@
         url: '{:laket_route("admin.flash.index-data")}',
         method: 'get',
         page: 10,
+        parseData: function(res) {
+            return {
+                "code": res.code == 1 ? 0 : 1,
+                "count": res.data.count,
+                "data": res.data.list,
+            };
+        },
         cols: [
             [
                 { field: 'listorder', align: 'center', width: 60, title: '排序', edit: 'text' },
@@ -244,23 +248,6 @@
         })
     });
 
-    // 搜索
-    $(".laket-admin-search-all-btn").on("click", function() {
-        $(".laket-admin-search-field").val('');
-        $(".laket-admin-search-val").val('');
-        layui.form.render('select');
-
-        table.reload("table", {
-            page: {
-                curr: 1
-            },
-            where: {
-                search_field: '',
-                keyword: '',
-            }
-        })
-    });
-
     // 监听单元格编辑
     table.on('edit(table)', function(obj) {
         var value = obj.value,

diff --git a/resources/views/flash/setting.html b/resources/views/flash/setting.html
@@ -2,7 +2,7 @@
 
 {block name="main"}
 <div class="layui-card">
-    <div class="layui-card-header layui-bg-cyan">设置</div>
+    <div class="layui-card-header layui-bg-cyan">插件设置</div>
     <div class="layui-card-body">
         <div class="layui-tab">
             <div class="layui-tab-content lake-admin-tab-content">

diff --git a/src/Controller/Admin.php b/src/Controller/Admin.php
@@ -58,12 +58,10 @@ public function indexData()
         $total = AdminModel::where($map)
             ->count();
 
-        $result = [
-            "code" => 0, 
+        return $this->success('获取成功', '', [
             "count" => $total, 
-            "data" => $list
-        ];
-        return $this->json($result);
+            "list"  => $list,
+        ]);
     }
 
     /**

diff --git a/src/Controller/Attachment.php b/src/Controller/Attachment.php
@@ -47,12 +47,10 @@ public function indexData()
             ->order('create_time desc')
             ->count();
 
-        $result = [
-            "code" => 0, 
+        return $this->success('获取成功', '', [
             "count" => $total, 
-            "data" => $list,
-        ];
-        return $this->json($result);
+            "list"  => $list,
+        ]);
     }
 
     /**

diff --git a/src/Controller/AuthGroup.php b/src/Controller/AuthGroup.php
@@ -43,13 +43,10 @@ public function indexData()
         $list = $tree->buildArray(0);
         $list = $tree->buildFormatList($list, 'title');
 
-        $result = [
-            "code" => 0, 
+        return $this->success('获取成功', '', [
             "count" => $total, 
-            "data" => $list,
-        ];
-
-        return $this->json($result);
+            "list"  => $list
+        ]);
     }
 
     /**
@@ -76,19 +73,17 @@ public function allData()
             $map[] = [$searchField, 'like', "%$keyword%"];
         }
 
-        $data = AuthGroupModel::where($map)
+        $list = AuthGroupModel::where($map)
             ->page($page, $limit)
             ->order('listorder DESC, add_time ASC')
             ->select()
             ->toArray();
         $total = AuthGroupModel::where($map)->count();
 
-        $result = [
-            "code" => 0, 
+        return $this->success('获取成功', '', [
             "count" => $total, 
-            "data" => $data,
-        ];
-        return $this->json($result);
+            "list"  => $list,
+        ]);
     }
 
     /**

diff --git a/src/Controller/AuthRule.php b/src/Controller/AuthRule.php
@@ -37,15 +37,13 @@ public function indexData()
 
         $Tree = make(Tree::class);
         $menuTree = $Tree->withData($result)->buildArray(0);
-        $menus = $Tree->buildFormatList($menuTree, 'title');
-        $total = count($menus);
+        $list = $Tree->buildFormatList($menuTree, 'title');
+        $total = count($list);
 
-        $result = [
-            "code" => 0, 
+        return $this->success('获取成功', '', [
             "count" => $total, 
-            "data" => $menus
-        ];
-        return $this->json($result);
+            "list"  => $list,
+        ]);
     }
 
     /**
@@ -72,19 +70,17 @@ public function allData()
             $map[] = [$searchField, 'like', "%$keyword%"];
         }
 
-        $data = AuthRuleModel::where($map)
+        $list = AuthRuleModel::where($map)
             ->page($page, $limit)
             ->order('slug ASC, url ASC, id ASC')
             ->select()
             ->toArray();
         $total = AuthRuleModel::where($map)->count();
 
-        $result = [
-            "code" => 0, 
+        return $this->success('获取成功', '', [
             "count" => $total, 
-            "data" => $data,
-        ];
-        return $this->json($result);
+            "list"  => $list,
+        ]);
     }
 
     /**