From a909d723a2c25b90a27e51ba1ef5d39c37654b2d Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Thu, 11 Jul 2024 17:37:38 +0800
Subject: [PATCH] =?UTF-8?q?*=20fix=20IABKQN=20=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=94=B6=E6=B8=85=E9=99=A4=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=88=96=E9=80=89=E6=8B=A9=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Mvc/Views/ModuleManager/Index.cshtml | 87 ++++++++++---------
 OpenAuth.Mvc/wwwroot/userJs/modules.js        | 57 ++++--------
 2 files changed, 61 insertions(+), 83 deletions(-)

diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
index d28748d9..470d350d 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
@@ -1,9 +1,10 @@
 @section header
 {
-     <link rel="stylesheet" href="/css/treetable.css" />
-    <link rel="stylesheet" href="/js/dtree/dtree.css" />
-    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css" />
+    <link rel="stylesheet" href="/css/treetable.css"/>
+    <link rel="stylesheet" href="/js/dtree/dtree.css"/>
+    <link rel="stylesheet" href="/js/dtree/font/dtreefont.css"/>
 }
+
 <blockquote class="layui-elem-quote news_search toolList" id="menus">
 </blockquote>
 
@@ -18,45 +19,45 @@
                lay-data="{height: 'full-80', id:'mainList'}"
                lay-filter="list" lay-size="sm">
             <thead>
-                <tr>
-                    <th lay-data="{checkbox:true, fixed: true}"></th>
-                    <th lay-data="{field:'Name', width:120, sort: true, fixed: true}">模块名称</th>
-                    <th lay-data="{field:'Status', width:100,templet: '#statusTpl'}">导航栏展示</th>
-                     <th lay-data="{field:'IsSys', width:100,templet: '#sysTpl'}">模块类型</th>
-                    <th lay-data="{field:'IconName', width:60,templet: '#iconTpl'}">图标</th>
-                    <th lay-data="{field:'CascadeId', width:80}">层级ID</th>
-                    <th lay-data="{field:'Code', width:80}">模块标识</th>
-                    <th lay-data="{field:'Url', width:200}">Url</th>
-                    <th lay-data="{field:'ParentName', width:135}">父节点名称</th>
-                    <th lay-data="{field:'SortNo', width:80}">排序号</th>
-                </tr>
+            <tr>
+                <th lay-data="{checkbox:true, fixed: true}"></th>
+                <th lay-data="{field:'Name', width:120, sort: true, fixed: true}">模块名称</th>
+                <th lay-data="{field:'Status', width:100,templet: '#statusTpl'}">导航栏展示</th>
+                <th lay-data="{field:'IsSys', width:100,templet: '#sysTpl'}">模块类型</th>
+                <th lay-data="{field:'IconName', width:60,templet: '#iconTpl'}">图标</th>
+                <th lay-data="{field:'CascadeId', width:80}">层级ID</th>
+                <th lay-data="{field:'Code', width:80}">模块标识</th>
+                <th lay-data="{field:'Url', width:200}">Url</th>
+                <th lay-data="{field:'ParentName', width:135}">父节点名称</th>
+                <th lay-data="{field:'SortNo', width:80}">排序号</th>
+            </tr>
             </thead>
         </table>
         <script type="text/html" id="iconTpl">
-            {{#  if( d.IconName != null && d.IconName != ''){ }}
+            {{# if( d.IconName != null && d.IconName != ''){ }}
             <i class="layui-icon {{ d.IconName }}"></i>
-            {{#  } else { }}
+            {{# } else { }}
             {{ d.IconName }}
-            {{#  } }}
+            {{# } }}
         </script>
 
         <script type="text/html" id="statusTpl">
-            {{#  if( d.Status == -1){ }}
+            {{# if( d.Status == -1){ }}
             <span style="color:red">隐藏</span>
-            {{#  } else { }}
+            {{# } else { }}
             <span style="color:green">显示</span>
-            {{#  } }}
+            {{# } }}
         </script>
 
-         <script type="text/html" id="sysTpl">
-            {{#  if( d.IsSys == 1){ }}
+        <script type="text/html" id="sysTpl">
+            {{# if( d.IsSys == 1){ }}
             <span class="layui-badge">内置</span>
-            {{#  } else { }}
+            {{# } else { }}
             <span class="layui-badge layui-bg-green">自定义</span>
-            {{#  } }}
+            {{# } }}
         </script>
     </div>
-    
+
     <div class="layui-col-xs">
         <!--菜单列表-->
         <table class="layui-table"
@@ -69,7 +70,7 @@
             </tr>
             </thead>
         </table>
-       
+
         <script type="text/html" id="menuTpl">
             <button class="layui-btn layui-btn-xs {{ d.Class }} layui-btn-fluid" alt="{{ d.DomId }}"> <i class="layui-icon {{ d.Icon }}"></i> {{ d.Name }}</button>
         </script>
@@ -94,7 +95,7 @@
             <label class="layui-form-label">导航栏展示</label>
             <div class="layui-input-block">
                 <select name="Status" required lay-verify="required">
-                    <option value="0" selected="selected" >正常</option>
+                    <option value="0" selected="selected">正常</option>
                     <option value="-1">隐藏</option>
                 </select>
 
@@ -103,27 +104,27 @@
         <div class="layui-form-item">
             <label class="layui-form-label">模块标识</label>
             <div class="layui-input-block">
-                <input type="text" name="Code"  
+                <input type="text" name="Code"
                        placeholder="比如：Module" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">URL地址</label>
             <div class="layui-input-block">
-                <input type="text" name="Url"  required lay-verify="required"
+                <input type="text" name="Url" required lay-verify="required"
                        placeholder="请输入URL" 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" id="IconName" name="IconName"  lay-filter="iconPicker" class="layui-input"> 
+                <input type="text" id="IconName" name="IconName" lay-filter="iconPicker" 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="SortNo"  required lay-verify="required"
+                <input type="text" name="SortNo" required lay-verify="required"
                        placeholder="请输入排序号" autocomplete="off" class="layui-input">
             </div>
         </div>
@@ -131,8 +132,8 @@
         <div class="layui-form-item">
             <label class="layui-form-label">所属模块</label>
             <div class="layui-input-block">
-                <input id="ParentName" name="ParentName"  class="layui-input" />
-                <input id="ParentId" name="ParentId"   type="hidden" />
+                <input id="ParentName" name="ParentName" class="layui-input"/>
+                <input id="ParentId" name="ParentId" type="hidden"/>
             </div>
         </div>
 
@@ -147,15 +148,15 @@
 
 <!--添加菜单窗口-->
 <div id="divMenuEdit" style="display: none">
-    <form class="layui-form layui-form-pane" action="" id="mfromEdit">
+<form class="layui-form layui-form-pane" action="" id="mfromEdit" lay-filter="mfromEdit">
 
-        <input type="hidden" name="Id" v-model="tmp.Id" />
-        <input type="hidden" name="ModuleId" v-model="tmp.ModuleId" />  
+        <input type="hidden" name="Id"/>
+        <input type="hidden" name="ModuleId"/>
 
         <div class="layui-form-item">
             <label class="layui-form-label">菜单名称</label>
             <div class="layui-input-block">
-                <input type="text" name="Name" v-model="tmp.Name" required lay-verify="required"
+                <input type="text" name="Name" required lay-verify="required"
                        placeholder="请输入名称" autocomplete="off" class="layui-input">
             </div>
         </div>
@@ -163,28 +164,28 @@
         <div class="layui-form-item">
             <label class="layui-form-label">DomId</label>
             <div class="layui-input-block">
-                <input type="text" name="DomId" v-model="tmp.DomId" required lay-verify="required"
+                <input type="text" name="DomId" required lay-verify="required"
                        placeholder="请输入DomId" autocomplete="off" class="layui-input">
             </div>
         </div>
 
-          <div class="layui-form-item">
+        <div class="layui-form-item">
             <label class="layui-form-label">图标</label>
             <div class="layui-input-block">
-                <input type="text" id="Icon" name="Icon" v-model="tmp.Icon" lay-filter="btnIconPicker" class="layui-input"> 
+                <input type="text" id="Icon" name="Icon" lay-filter="btnIconPicker" 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="Class" v-model="tmp.Class"
+                <input type="text" name="Class"
                        placeholder="菜单的样式，如：layui-btn-danger" 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="Sort" v-model="tmp.Sort" required lay-verify="required"
+                <input type="text" name="Sort" required lay-verify="required"
                        placeholder="请输入排序号" autocomplete="off" class="layui-input">
             </div>
         </div>
diff --git a/OpenAuth.Mvc/wwwroot/userJs/modules.js b/OpenAuth.Mvc/wwwroot/userJs/modules.js
index 6a562a9d..dd7cc9b4 100644
--- a/OpenAuth.Mvc/wwwroot/userJs/modules.js
+++ b/OpenAuth.Mvc/wwwroot/userJs/modules.js
@@ -1,30 +1,11 @@
 layui.config({
     base: "/js/"
-}).use(['form', 'vue', 'ztree', 'layer', 'jquery', 'table', 'droptree', 'openauth', 'iconPicker', 'utils'], function () {
+}).use(['form', 'ztree', 'layer', 'jquery', 'table', 'droptree', 'openauth', 'iconPicker', 'utils'], function () {
     var form = layui.form,
         layer = layui.layer,
         $ = layui.jquery;
     var iconPicker = layui.iconPicker;
     var btnIconPicker = layui.iconPicker;
-    var vmMenu = new Vue({
-        el: "#mfromEdit",
-        data() {
-            return {
-                tmp: {}
-            }
-        },
-        watch: {
-            tmp(val) {
-                this.$nextTick(function () {
-                    form.render();  //刷新select等
-                    btnIconPicker.checkIcon('btnIconPicker', this.tmp.Icon);
-                })
-            }
-        },
-        mounted() {
-            form.render();
-        }
-    });
     var moduleInitVal = {  //模块初始化的值
         Id: "",
         SortNo: 1,
@@ -37,6 +18,15 @@ layui.config({
         Remark: '',
         Code: ''
     };
+    var menuInital={ //菜单初始化的值
+        Id: "",
+        ModuleId: "",
+        Name:'',
+        DomeId:'',
+        Class:'',
+        Sort: 1,
+        Icon: 'layui-icon-app'
+    }
 
     iconPicker.render({
         // 选择器，推荐使用input
@@ -51,10 +41,6 @@ layui.config({
         type: 'fontClass',
         // 每个图标格子的宽度：'43px'或'20%'
         cellWidth: '43px',
-        // 点击回调
-        click: function (data) {
-            vmMenu.tmp.Icon = data.icon;
-        }
     });
 
     var table = layui.table;
@@ -182,8 +168,7 @@ layui.config({
 
     //添加菜单对话框
     var meditDlg = function () {
-        var update = false;  //是否为更新
-        var show = function (data) {
+        var show = function (update, data) {
             var title = update ? "编辑信息" : "添加";
             layer.open({
                 title: title,
@@ -191,12 +176,11 @@ layui.config({
                 type: 1,
                 content: $('#divMenuEdit'),
                 success: function () {
-                    if (data.Id == '') {
-                        for (var key in vmMenu.tmp) {
-                            delete vmMenu.tmp[key];
-                        }
+                    if (data == undefined) {
+                        form.val("mfromEdit", menuInital);
+                    } else {
+                        form.val("mfromEdit", data);
                     }
-                    vmMenu.tmp = Object.assign({}, vmMenu.tmp, data)
                 },
                 end: menuList
             });
@@ -218,17 +202,10 @@ layui.config({
         }
         return {
             add: function (moduleId) { //弹出添加
-                update = false;
-                show({
-                    Id: "",
-                    ModuleId: moduleId,
-                    Sort: 1,
-                    Icon: 'layui-icon-app'
-                });
+                show(false);
             },
             update: function (data) { //弹出编辑框
-                update = true;
-                show(data);
+                show(true,data);
             }
         };
     }();