From 607cbc94ba6099bd901c8bc541e3452249b122c5 Mon Sep 17 00:00:00 2001
From: zhengxinonly <pyxxponly@gmail.com>
Date: Tue, 10 Oct 2023 22:55:15 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E6=9D=83=E9=99=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pear_admin/apis/rights.py         |  22 +++
 pear_admin/orms/rights.py         |   8 +-
 static/data/ums_rights.csv        |   2 +-
 templates/includes/script.html    |  12 ++
 templates/views/rights/index.html | 239 +++++++++++++++++++++++++++---
 5 files changed, 254 insertions(+), 29 deletions(-)

diff --git a/pear_admin/apis/rights.py b/pear_admin/apis/rights.py
index 7c6fd95..9e7354f 100644
--- a/pear_admin/apis/rights.py
+++ b/pear_admin/apis/rights.py
@@ -33,3 +33,25 @@ def rights_list():
             data["isParent"] = True
         ret.append(data)
     return {"code": 0, "message": "请求权限数据成功", "count": pages.total, "data": ret}
+
+
+@rights_api.post("/rights")
+@jwt_required()
+def create_rights():
+    data = request.get_json()
+    rights_obj = RightsORM(**data)
+    rights_obj.save()
+    return {"code": 0, "message": "新增权限数据成功"}
+
+
+@rights_api.put("/rights/<int:rid>")
+@jwt_required()
+def change_rights(rid):
+    data = request.get_json()
+    del data["id"]
+
+    rights_obj = RightsORM.query.get(rid)
+    for key, value in data.items():
+        setattr(rights_obj, key, value)
+    rights_obj.save()
+    return {"code": 0, "message": "修改权限数据成功"}
diff --git a/pear_admin/orms/rights.py b/pear_admin/orms/rights.py
index cd60eca..f06f0c0 100644
--- a/pear_admin/orms/rights.py
+++ b/pear_admin/orms/rights.py
@@ -14,9 +14,9 @@ class RightsORM(BaseORM):
     type = db.Column(db.String(30), comment="权限类型")
     url = db.Column(db.String(30), comment="路径地址")
 
-    icon = db.Column(db.String(128), comment="图标")
+    icon_sign = db.Column(db.String(128), comment="图标")
     status = db.Column(db.Boolean, default=True, comment="是否开启")
-    sort = db.Column(db.Integer, default=1)
+    sort = db.Column(db.Integer, default=0)
     open_type = db.Column(db.String(128), comment="打开方式")
     pid = db.Column(
         db.Integer,
@@ -37,7 +37,7 @@ class RightsORM(BaseORM):
             "code": self.code,
             "type": self.type,
             "url": self.url,
-            "icon_sign": self.icon,
+            "icon_sign": self.icon_sign,
             "status": self.status,
             "sort": self.sort,
             "open_type": self.open_type,
@@ -53,7 +53,7 @@ class RightsORM(BaseORM):
             "title": self.name,
             "type": type_map_dict[self.type],
             "href": self.url,
-            "icon": self.icon,
+            "icon": self.icon_sign,
             "sort": self.sort,
             "openType": self.open_type,
         }
diff --git a/static/data/ums_rights.csv b/static/data/ums_rights.csv
index 8249d70..249a728 100644
--- a/static/data/ums_rights.csv
+++ b/static/data/ums_rights.csv
@@ -1,4 +1,4 @@
-id,name,code,type,url,icon,status,sort,open_type,pid
+id,name,code,type,url,icon_sign,status,sort,open_type,pid
 100,系统管理,ums:rights,menu,,layui-icon layui-icon-set-fill,,2,,0
 101,权限管理,ums:rights:list,path,/views/rights,layui-icon layui-icon-console,,1,,100
 102,新增权限,ums:rights:create,auth,,,,0,,101
diff --git a/templates/includes/script.html b/templates/includes/script.html
index d8f7175..1da6642 100644
--- a/templates/includes/script.html
+++ b/templates/includes/script.html
@@ -6,3 +6,15 @@
 <!-- 依 赖 脚 本 -->
 <script src="/static/component/layui/layui.js"></script>
 <script src="/static/component/pear/pear.js"></script>
+<script>
+  function getCookie(name) {
+    let matches = document.cookie.match(
+      new RegExp(
+        "(?:^|; )" +
+          name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, "\\$1") +
+          "=([^;]*)",
+      ),
+    );
+    return matches ? decodeURIComponent(matches[1]) : undefined;
+  }
+</script>
diff --git a/templates/views/rights/index.html b/templates/views/rights/index.html
index 2ecddff..f58cf20 100644
--- a/templates/views/rights/index.html
+++ b/templates/views/rights/index.html
@@ -25,7 +25,7 @@
     </div>
     <script type="text/html" id="rights-toolbar">
       <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm" lay-event="toolbar-add">
+        <button class="layui-btn layui-btn-sm" lay-event="rights-toolbar-add">
           新增权限
         </button>
       </div>
@@ -46,11 +46,156 @@
         </button>
       </div>
     </script>
+    <form
+      class="layui-form"
+      lay-filter="rights-form"
+      id="rights-form"
+      style="padding: 15px"
+    >
+      <div class="layui-form-item" style="display: none">
+        <label class="layui-form-label">ID</label>
+        <div class="layui-input-block">
+          <input
+            type="text"
+            name="id"
+            value="0"
+            lay-verify="required"
+            placeholder="请输入权限名"
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">权限名</label>
+        <div class="layui-input-block">
+          <input
+            type="text"
+            name="name"
+            lay-verify="required"
+            placeholder="请输入权限名"
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">权限标识</label>
+        <div class="layui-input-block">
+          <input
+            type="text"
+            name="code"
+            autocomplete="off"
+            lay-reqtext="请输入权限标识"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">图标</label>
+        <div class="layui-input-inline">
+          <input
+            type="text"
+            name="icon_sign"
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+
+      <div class="layui-form-item">
+        <label class="layui-form-label">权限类型</label>
+        <div class="layui-input-block">
+          <input type="radio" name="type" value="menu" title="菜单" checked />
+          <input type="radio" name="type" value="path" title="路由" />
+          <input type="radio" name="type" value="auth" title="权限" />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">访问地址</label>
+        <div class="layui-input-block">
+          <input
+            type="text"
+            name="code"
+            lay-verify=""
+            placeholder="权限类路由时输入访问地址，其他情况下不需要输入"
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block">
+          <input
+            type="checkbox"
+            name="status"
+            lay-skin="switch"
+            lay-filter="rights-row-status"
+            checked
+            title="启用|禁用"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">序号</label>
+        <div class="layui-input-inline">
+          <input
+            type="text"
+            name="sort"
+            placeholder=""
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">打开方式</label>
+        <div class="layui-input-inline">
+          <input
+            type="text"
+            name="open_type"
+            placeholder=""
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label">父元素 ID</label>
+        <div class="layui-input-inline">
+          <input
+            type="text"
+            name="pid"
+            placeholder=""
+            autocomplete="off"
+            class="layui-input"
+          />
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <button
+            type="submit"
+            class="layui-btn"
+            lay-submit
+            lay-filter="rights-form-btn"
+          >
+            立即提交
+          </button>
+          <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+      </div>
+    </form>
     <script>
       layui.use(function () {
         var treeTable = layui.treeTable;
+        var $ = layui.$;
+        var form = layui.form;
+        var layer = layui.layer;
         treeTable.render({
           elem: "#rights-table",
+          id: "rights-table",
           url: "/api/v1/rights?type=treetable", // 此处为静态模拟数据，实际使用时需换成真实接口
           height: "full-35", // 最大高度减去其他容器已占有的高度差
           toolbar: "#rights-toolbar",
@@ -66,27 +211,6 @@
               },
               { field: "name", title: "权限名", width: 180 },
               { field: "code", title: "权限标识", width: 150 },
-              {
-                field: "icon_sign",
-                title: "图标",
-                width: 90,
-                templet: (d) => {
-                  return `<i class="${d.icon_sign}"></i> `;
-                },
-              },
-              { field: "open_type", title: "打开方式", width: 100 },
-              {
-                field: "status",
-                title: "状态",
-                width: 100,
-                templet: (d) => {
-                  return `<input type="checkbox" name="status" value="${
-                    d.id
-                  }" title="启用|禁用" lay-skin="switch" ${
-                    d.status ? "checked" : ""
-                  } lay-filter="rights-table-switch-status"/>`;
-                },
-              },
               {
                 field: "type",
                 title: "类型",
@@ -101,6 +225,29 @@
                   }
                 },
               },
+              { field: "url", title: "访问地址", width: 200 },
+              {
+                field: "icon_sign",
+                title: "图标",
+                width: 90,
+                templet: (d) => {
+                  return `<i class="${d.icon_sign}"></i> `;
+                },
+              },
+              { field: "open_type", title: "打开方式", width: 100 },
+              { field: "sort", title: "排序", width: 100 },
+              {
+                field: "status",
+                title: "状态",
+                width: 100,
+                templet: (d) => {
+                  return `<input type="checkbox" name="status" value="${
+                    d.id
+                  }" title="启用|禁用" lay-skin="switch" ${
+                    d.status ? "checked" : ""
+                  } lay-filter="rights-table-switch-status"/>`;
+                },
+              },
               {
                 fixed: "right",
                 title: "操作",
@@ -115,14 +262,58 @@
 
         treeTable.on("toolbar(rights-table)", function (obj) {
           if (obj.event === "rights-toolbar-add") {
-            console.log("新增权限");
+            layer.open({
+              type: 1,
+              shade: false,
+              content: $("#rights-form"),
+              area: ["50%", "80%"],
+            });
+            form.render($("#rights-form"));
           }
         });
 
+        // 提交事件
+        form.on("submit(rights-form-btn)", function (data) {
+          let field = data.field;
+          field.status = !!field.status;
+          let method, url;
+          if (field.id == 0) {
+            field.id = null;
+            method = "POST";
+            url = "/api/v1/rights";
+          } else {
+            method = "PUT";
+            url = `/api/v1/rights/${field.id}`;
+          }
+          $.ajax({
+            url: url,
+            type: method,
+            contentType: "application/json",
+            headers: {
+              "X-CSRF-TOKEN": getCookie("csrf_access_token"),
+            },
+            data: JSON.stringify(field),
+            success: function (res) {
+              if (!res.code) {
+                layer.closeAll();
+                treeTable.reloadData("rights-table");
+              }
+            },
+          });
+
+          return false; // 阻止默认 form 跳转
+        });
+
         treeTable.on("tool(rights-table)", function (obj) {
           var layEvent = obj.event;
           if (layEvent === "rights-tool-edit") {
-            console.log("编辑权限");
+            form.val("rights-form", obj.data);
+            layer.open({
+              type: 1,
+              shade: false,
+              content: $("#rights-form"),
+              area: ["50%", "80%"],
+            });
           } else if (layEvent === "rights-tool-del") {
             console.log("删除权限");
           }