From 2f4f1faf8245fa4347f2a84306c10d98ddc6d8e4 Mon Sep 17 00:00:00 2001
From: zhengxinonly <pyxxponly@gmail.com>
Date: Tue, 5 Dec 2023 16:50:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .flaskenv                          |  2 +-
 static/admin/css/other/profile.css | 85 ++++++++++++++---------------
 templates/views/rights/index.html  | 88 ++++++++++++++++++++++++------
 3 files changed, 113 insertions(+), 62 deletions(-)

diff --git a/.flaskenv b/.flaskenv
index 6386d39..b259414 100644
--- a/.flaskenv
+++ b/.flaskenv
@@ -1,4 +1,4 @@
 FLASK_DEBUG=True                # 开启调试模式
-FLASK_RUN_PORT=5050			    # 设置运行的端口
+FLASK_RUN_PORT=5000			    # 设置运行的端口
 FLASK_RUN_HOST=0.0.0.0		    # 设置监听的 ip
 FLASK_APP="pear_admin:create_app()"   # 运行程序
\ No newline at end of file
diff --git a/static/admin/css/other/profile.css b/static/admin/css/other/profile.css
index bbee69c..1b5b2a3 100644
--- a/static/admin/css/other/profile.css
+++ b/static/admin/css/other/profile.css
@@ -1,80 +1,77 @@
 .text-center {
-    text-align: center;
+  text-align: center;
 }
 
 .user-info-head {
-    width: 110px;
-    height: 110px;
-    line-height: 110px;
-    position: relative;
-    display: inline-block;
-    border-radius: 50%;
-    overflow: hidden;
-    cursor: pointer;
-    margin: 0 auto;
+  width: 110px;
+  height: 110px;
+  line-height: 110px;
+  position: relative;
+  display: inline-block;
+  border-radius: 50%;
+  overflow: hidden;
+  cursor: pointer;
+  margin: 0 auto;
 }
 
 .layui-line-dash {
-    border-bottom: 1px dashed #ccc;
-    margin: 15px 0;
+  border-bottom: 1px dashed #ccc;
+  margin: 15px 0;
 }
 
-
 .blog-title {
-    padding-left: 13.5px;
+  padding-left: 13.5px;
 }
 
 .blog-content {
-    padding-left: 13px;
-    font-size: 13px;
-    color: dimgray;
+  padding-left: 13px;
+  font-size: 13px;
+  color: dimgray;
 }
 
 .layui-tab-title {
-    border-bottom: none;
+  border-bottom: none;
 }
 
 .fl-item {
-    height: 30px;
-    font-size: 13.5;
+  height: 30px;
+  font-size: 13.5;
 }
 
 .dot {
-    width: 10px;
-    height: 10px;
-    border-radius: 50px;
-    background-color: gray;
-    display: inline-block;
-    margin-right: 10px;
+  width: 10px;
+  height: 10px;
+  border-radius: 50px;
+  background-color: gray;
+  display: inline-block;
+  margin-right: 10px;
 }
 
-
-
 .message-board {
-	padding: 0 10px 10px;
+  padding: 0 10px 10px;
 }
 
 .message-board li {
-	position: relative;
-	padding: 10px 0;
-	border-bottom: 1px solid #EEE;
+  position: relative;
+  padding: 10px 0;
+  border-bottom: 1px solid #eee;
 }
 
 .message-board li p {
-	padding-bottom: 10px;
-	padding-top: 3px;
+  padding-bottom: 10px;
+  padding-top: 3px;
 }
 
-.message-board li>span {
-	color: #999;
-	height: 24px;
-	line-height: 24px;
+.message-board li > span {
+  color: #999;
+  height: 24px;
+  line-height: 24px;
 }
 
 .message-board .message-board-reply {
-	position: absolute;
-	right: 20px;
-	bottom: 12px;
-	height: 24px;
-	line-height: 24px;
-}
\ No newline at end of file
+  position: absolute;
+  right: 20px;
+  bottom: 12px;
+  height: 24px;
+  line-height: 24px;
+}
diff --git a/templates/views/rights/index.html b/templates/views/rights/index.html
index 0e7debf..2837ead 100644
--- a/templates/views/rights/index.html
+++ b/templates/views/rights/index.html
@@ -91,6 +91,33 @@
           />
         </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="菜单"
+            lay-filter="form-rights-filter"
+            checked
+          />
+          <input
+            type="radio"
+            name="type"
+            value="path"
+            title="路由"
+            lay-filter="form-rights-filter"
+          />
+          <input
+            type="radio"
+            name="type"
+            value="auth"
+            title="权限"
+            lay-filter="form-rights-filter"
+          />
+        </div>
+      </div>
       <div class="layui-form-item">
         <label class="layui-form-label">图标</label>
         <div class="layui-input-inline">
@@ -102,22 +129,14 @@
           />
         </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">
+      <div class="layui-form-item" style="display: none">
         <label class="layui-form-label">访问地址</label>
         <div class="layui-input-block">
           <input
             type="text"
             name="url"
             lay-verify=""
-            placeholder="权限类路由时输入访问地址，其他情况下不需要输入"
+            placeholder="请输入访问地址"
             autocomplete="off"
             class="layui-input"
           />
@@ -152,13 +171,10 @@
       <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"
-          />
+          <select name="open_type" id="">
+            <option value="_component" selected>默认方式</option>
+            <option value="_blank">新窗口</option>
+          </select>
         </div>
       </div>
       <div class="layui-form-item">
@@ -193,6 +209,7 @@
         var $ = layui.$;
         var form = layui.form;
         var layer = layui.layer;
+
         treeTable.render({
           elem: "#rights-table",
           id: "rights-table",
@@ -281,6 +298,19 @@
             field.id = null;
             method = "POST";
             url = "/api/v1/rights";
+
+            if (field.type === "path") {
+              if (!/\//.test(field.url)) {
+                layer.msg("url 不符合格式");
+                return false;
+              }
+            } else if (field.type === "auth") {
+              console.log(field.pid);
+              if (!field.pid || field.pid === "0") {
+                layer.msg("权限必须填入父级 id");
+                return false;
+              }
+            }
           } else {
             method = "PUT";
             url = `/api/v1/rights/${field.id}`;
@@ -330,6 +360,30 @@
             });
           }
         });
+
+        form.on("radio(form-rights-filter)", function (data) {
+          var elem = data.elem; // 获得 radio 原始 DOM 对象
+          var checked = elem.checked; // 获得 radio 选中状态
+          var value = elem.value; // 获得 radio 值
+          var othis = data.othis; // 获得 radio 元素被替换后的 jQuery 对象
+
+          switch (value) {
+            case "menu":
+              $('[name="icon_sign"]').parent().parent().show();
+              $('[name="url"]').parent().parent().hide();
+              break;
+            case "path":
+              $('[name="icon_sign"]').parent().parent().hide();
+              $('[name="url"]').parent().parent().show();
+              break;
+            case "auth":
+              $('[name="url"]').parent().parent().hide();
+              $('[name="icon_sign"]').parent().parent().hide();
+              break;
+          }
+
+          layer.msg(["value: " + value, "checked: " + checked].join("<br>"));
+        });
       });
     </script>
   </body>