From 85f941fceff3f3a097184ced7f26f9c70e9b832b Mon Sep 17 00:00:00 2001
From: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
Date: Fri, 20 Jan 2023 14:14:45 +0000
Subject: [PATCH 1/4] =?UTF-8?q?update=20ZR.Service/System/SysMenuService.c?=
 =?UTF-8?q?s.=20=E5=BD=93=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9Enull=E5=80=BC?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9C=A8SysMenuController=E7=9A=8445?=
 =?UTF-8?q?=E8=A1=8C=20SUCCESS(sysMenuService.SelectTreeMenuList(menu,=20u?=
 =?UTF-8?q?serId),=20"yyyy-MM-dd=20HH:mm:ss");=20=E5=81=9Ajson=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E4=BC=9A=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
---
 ZR.Service/System/SysMenuService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index ca28efc0..caaeb11f 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -1,4 +1,4 @@
-using Infrastructure.Attribute;
+using Infrastructure.Attribute;
 using Infrastructure.Extensions;
 using SqlSugar;
 using System;
@@ -41,7 +41,7 @@ namespace ZR.Service
                 var userRoles = SysRoleService.SelectUserRoles(userId);
                 menuList = SelectTreeMenuListByRoles(menu, userRoles);
             }
-            return menuList;
+            return menuList ?? new List<SysMenu>();
         }
 
         /// <summary>
-- 
Gitee


From c90e76bac82be0ba58419a5872dc6938302312a4 Mon Sep 17 00:00:00 2001
From: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
Date: Sat, 21 Jan 2023 01:07:42 +0000
Subject: [PATCH 2/4] =?UTF-8?q?update=20ZR.Vue/src/views/system/menu/index?=
 =?UTF-8?q?.vue.=20=E5=A2=9E=E5=8A=A0=E4=BA=86table=20=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E5=90=8E=E5=88=B7=E6=96=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
---
 ZR.Vue/src/views/system/menu/index.vue | 32 ++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/ZR.Vue/src/views/system/menu/index.vue b/ZR.Vue/src/views/system/menu/index.vue
index 92f97895..b0799504 100644
--- a/ZR.Vue/src/views/system/menu/index.vue
+++ b/ZR.Vue/src/views/system/menu/index.vue
@@ -27,6 +27,7 @@
 
     <el-table v-if="refreshTable" v-loading="loading" :data="menuList" :default-expand-all="isExpandAll"
       row-key="menuId"
+      node-key="menuId"
       border
       lazy
       :load="loadMenu"
@@ -276,6 +277,8 @@ export default {
           { required: true, message: "路由地址不能为空", trigger: "blur" },
         ],
       },
+      // table树节点
+      tableTreeNodeMap: new Map(),
     };
   },
   created() {
@@ -397,13 +400,21 @@ export default {
             updateMenu(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              if (this.form.parentId == 0) {
+                this.getList();
+              } else {
+                this.refreshTableTree(this.form.parentId);
+              }
             });
           } else {
             addMenu(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              if (this.form.parentId == 0) {
+                this.getList();
+              } else {
+                this.refreshTableTree(this.form.parentId);
+              }
             });
           }
         }
@@ -424,7 +435,11 @@ export default {
           return delMenu(row.menuId);
         })
         .then(() => {
-          this.getList();
+          if (row.parentId == 0) {
+            this.getList();
+          } else {
+            this.refreshTableTree(row.parentId);
+          }
           this.msgSuccess("删除成功");
         });
     },
@@ -465,7 +480,16 @@ export default {
       listMenuById(row.menuId).then((res) => {
         resolve(res.data)
       })
-    }
+    },
+    //新增/修改/删除子节点时刷新子节点
+    refreshTableTree(key) {
+      const node = this.tableTreeNodeMap.get(key)
+      if (!node) {
+        return
+      }
+      const { row, treeNode, resolve } = node
+      this.loadMenu(row, treeNode, resolve)
+    },
   },
 };
 </script>
-- 
Gitee


From b7577619c3e777477236db1ace339c0a760b792e Mon Sep 17 00:00:00 2001
From: zhuxb <xbzhu@qq.com>
Date: Sat, 21 Jan 2023 12:05:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=B0=86basecontroller=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0ExportExcel=E6=94=B9=E4=B8=BA=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=92=8C=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=EF=BC=9B=E4=BF=AE=E6=94=B9=E4=BA=86wwwroot/c?=
 =?UTF-8?q?odegentempplate=E4=B8=AD=E7=9A=84tplvue=E5=92=8Ctplvueapi?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Controllers/BaseController.cs | 17 +++++++------
 .../wwwroot/CodeGenTemplate/TplVue.txt        | 24 ++++++++++++++-----
 .../wwwroot/CodeGenTemplate/TplVueApi.txt     | 11 +++++----
 ZR.Vue/src/main.js                            |  2 +-
 ZR.Vue/src/utils/request.js                   |  2 +-
 ZR.Vue/src/utils/ruoyi.js                     |  6 ++---
 6 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs
index fe5f6131..840e8acb 100644
--- a/ZR.Admin.WebApi/Controllers/BaseController.cs
+++ b/ZR.Admin.WebApi/Controllers/BaseController.cs
@@ -1,5 +1,6 @@
 using Infrastructure;
 using Infrastructure.Model;
+using JinianNet.JNTemplate;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
@@ -63,13 +64,11 @@ namespace ZR.Admin.WebApi.Controllers
         /// <returns></returns>
         protected IActionResult ExportExcel(string path, string fileName)
         {
-            //IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
-            //string fileDir = Path.Combine(webHostEnvironment.WebRootPath, path, fileName);
-
-            var stream = ff.File.OpenRead(path);  //创建文件流
-            return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName));
+            return SUCCESS(new { path = path, fileName = fileName });
+            //var stream = ff.File.OpenRead(path);  //创建文件流
+            //return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName));
         }
-        
+
         #region 方法
 
         /// <summary>
@@ -138,11 +137,11 @@ namespace ZR.Admin.WebApi.Controllers
             IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
             string sFileName = $"{fileName}{DateTime.Now:MM-dd-HHmmss}.xlsx";
             string fullPath = Path.Combine(webHostEnvironment.WebRootPath, "export", sFileName);
-            
+
             Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
 
             MiniExcel.SaveAs(fullPath, list, sheetName: sheetName);
-            return (sFileName, fullPath);
+            return (sFileName, "/export/" + sFileName);
         }
 
         /// <summary>
@@ -176,7 +175,7 @@ namespace ZR.Admin.WebApi.Controllers
             IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
             string sFileName = $"{fileName}模板.xlsx";
             string newFileName = Path.Combine(webHostEnvironment.WebRootPath, "importTemplate", sFileName);
-            
+
             if (!Directory.Exists(newFileName))
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(newFileName));
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index f4f5d5ac..859c2def 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -77,6 +77,7 @@ $end
   </div>
 </template>
 <script>
+import { Loading } from 'element-ui'
 import { 
   list${genTable.BusinessName},
   add${genTable.BusinessName},
@@ -377,12 +378,23 @@ $if(replaceDto.ShowBtnExport)
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(function () {
-          return export${genTable.BusinessName}(queryParams);
-        })
-        .then((response) => {
-          this.download(response.data.path);
-        });
+      .then(() => {
+        var loadop = {
+          lock: true,
+          text: '正在导出文件...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)',
+        }
+        const pageLoading = Loading.service(loadop)
+        export${genTable.BusinessName}(queryParams)
+          .then((res) => {
+            const { data } = res
+            this.download(data.path)
+            pageLoading.close()
+          })
+          .catch((erre) => {
+            pageLoading.close()
+          });
     },
 $end
   },
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
index 1e1678fc..90dfbfa9 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
@@ -2,9 +2,6 @@
 $if(replaceDto.SelectMulti == 1)
 import QS from 'qs'
 $end
-$if(replaceDto.ShowBtnExport)
-import { downFile } from '@/utils/request'
-$end
 
 /**
 * ${genTable.functionName}分页查询
@@ -92,8 +89,12 @@ export function clear${genTable.BusinessName}() {
 }
 
 // 导出${genTable.functionName}
-export async function export${genTable.BusinessName}(query) {
-  await downFile('${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
+export function export${genTable.BusinessName}(query) {
+  return request({
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/export',
+    method: 'get',
+    params: query,
+  })
 }
 
 $if(showCustomInput)
diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js
index 6b2b1fd3..4b918c7c 100644
--- a/ZR.Vue/src/main.js
+++ b/ZR.Vue/src/main.js
@@ -80,4 +80,4 @@ new Vue({
   router,
   store,
   render: h => h(App)
-})
\ No newline at end of file
+})
diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js
index 58a02621..3823d5cc 100644
--- a/ZR.Vue/src/utils/request.js
+++ b/ZR.Vue/src/utils/request.js
@@ -166,4 +166,4 @@ export function postForm(url, data, config) {
 //   })
 // }
 
-export default service
\ No newline at end of file
+export default service
diff --git a/ZR.Vue/src/utils/ruoyi.js b/ZR.Vue/src/utils/ruoyi.js
index 3d570c24..a492f279 100644
--- a/ZR.Vue/src/utils/ruoyi.js
+++ b/ZR.Vue/src/utils/ruoyi.js
@@ -55,10 +55,10 @@ export function resetForm(refName) {
 
 /**
  * 添加日期范围
- * @param { beginTime: '', endTime: '', page: 1} params 
+ * @param { beginTime: '', endTime: '', page: 1} params
  * @param {*} dateRange 日期范围数组
  * @param {*} propName C#属性名首字母大写
- * @returns 
+ * @returns
  */
 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
@@ -231,4 +231,4 @@ export async function blobValidate(data) {
   } catch (error) {
     return true;
   }
-}
\ No newline at end of file
+}
-- 
Gitee


From f278ef4e7bf80a3fed5c2c559f008cf0ffaf1df6 Mon Sep 17 00:00:00 2001
From: zhuxb <xbzhu@qq.com>
Date: Sat, 21 Jan 2023 14:29:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E5=AD=90=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=90=8E=E6=97=A0=E6=B3=95=E5=88=B7=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/appsettings.json       |   4 +-
 ZR.Vue/src/views/system/menu/index.vue | 253 ++++++++++++-------------
 2 files changed, 128 insertions(+), 129 deletions(-)

diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index a6864511..280a3aeb 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -7,7 +7,7 @@
     }
   },
   "ConnectionStrings": {
-    "conn_db": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=sa;Password=zradmin123;Initial Catalog=ZrAdmin;Integrated Security=SSPI", //其他连接字符串请看官方文档
+    "conn_db": "data source=.;initial catalog=zradmindev;integrated security=True;MultipleActiveResultSets=True;", //其他连接字符串请看官方文档
     "conn_db_type": "1" //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3
   },
   "urls": "http://localhost:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
@@ -43,7 +43,7 @@
     "SendUser": "@all"
   },
   "gen": {
-    "conn": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=sa;Password=zradmin123;Initial Catalog=ZrAdmin;Integrated Security=SSPI",
+    "conn": "data source=.;initial catalog=zradmindev;integrated security=True;MultipleActiveResultSets=True;",
     "dbType": 1, //MySql = 0, SqlServer = 1
     "autoPre": true, //自动去除表前缀
     "author": "admin",
diff --git a/ZR.Vue/src/views/system/menu/index.vue b/ZR.Vue/src/views/system/menu/index.vue
index b0799504..103d6597 100644
--- a/ZR.Vue/src/views/system/menu/index.vue
+++ b/ZR.Vue/src/views/system/menu/index.vue
@@ -25,13 +25,18 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" :default-expand-all="isExpandAll"
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="menuList"
+      :default-expand-all="isExpandAll"
       row-key="menuId"
       node-key="menuId"
       border
       lazy
       :load="loadMenu"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="80">
         <template slot-scope="scope">
@@ -48,9 +53,14 @@
       </el-table-column>
       <el-table-column prop="orderNum" label="排序" width="90" align="center">
         <template slot-scope="scope">
-          <span v-show="editIndex != scope.$index" @click="editCurrRow(scope.$index,'rowkeY')">{{scope.row.orderNum}}</span>
-          <el-input :id="scope.$index+'rowkeY'" size="mini" v-show="(editIndex == scope.$index)" v-model="scope.row.orderNum"
-            @blur="handleChangeSort(scope.row)"></el-input>
+          <span v-show="editIndex != scope.$index" @click="editCurrRow(scope.$index, 'rowkeY')">{{ scope.row.orderNum }}</span>
+          <el-input
+            :id="scope.$index + 'rowkeY'"
+            size="mini"
+            v-show="editIndex == scope.$index"
+            v-model="scope.row.orderNum"
+            @blur="handleChangeSort(scope.row)"
+          ></el-input>
         </template>
       </el-table-column>
       <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
@@ -70,7 +80,9 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">新增</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -81,8 +93,14 @@
         <el-row>
           <el-col :lg="24">
             <el-form-item label="上级菜单">
-              <treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" @select="handleTreeSelect"
-                placeholder="选择上级菜单" />
+              <treeselect
+                v-model="form.parentId"
+                :options="menuOptions"
+                :normalizer="normalizer"
+                :show-count="true"
+                @select="handleTreeSelect"
+                placeholder="选择上级菜单"
+              />
             </el-form-item>
           </el-col>
           <el-col :lg="24">
@@ -109,7 +127,7 @@
               <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
                 <IconSelect ref="iconSelect" @selected="selected" />
                 <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" clearable="" readonly>
-                  <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
+                  <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px; width: 16px" />
                   <i v-else slot="prefix" class="el-icon-search el-input__icon"></i>
                 </el-input>
               </el-popover>
@@ -159,7 +177,7 @@
                 显示状态
               </span>
               <el-radio-group v-model="form.visible">
-                <el-radio v-for="dict in visibleOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
+                <el-radio v-for="dict in visibleOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -186,7 +204,7 @@
                 菜单状态
               </span>
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -215,21 +233,13 @@
 </template>
 
 <script>
-import {
-  listMenu,
-  getMenu,
-  delMenu,
-  addMenu,
-  changeMenuSort,
-  updateMenu,
-  listMenuById
-} from "@/api/system/menu";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import IconSelect from "@/components/IconSelect";
+import { listMenu, getMenu, delMenu, addMenu, changeMenuSort, updateMenu, listMenuById } from '@/api/system/menu'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import IconSelect from '@/components/IconSelect'
 
 export default {
-  name: "menu1",
+  name: 'menu1',
   components: { Treeselect, IconSelect },
   data() {
     return {
@@ -242,7 +252,7 @@ export default {
       // 菜单树选项
       menuOptions: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 是否展开，默认全部折叠
@@ -267,28 +277,22 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        menuName: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" },
-        ],
-        orderNum: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" },
-        ],
-        path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" },
-        ],
+        menuName: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
+        orderNum: [{ required: true, message: '菜单顺序不能为空', trigger: 'blur' }],
+        path: [{ required: true, message: '路由地址不能为空', trigger: 'blur' }],
       },
       // table树节点
       tableTreeNodeMap: new Map(),
-    };
+    }
   },
   created() {
     // this.getList();
-    this.getDicts("sys_show_hide").then((response) => {
-      this.visibleOptions = response.data;
-    });
-    this.getDicts("sys_normal_disable").then((response) => {
-      this.statusOptions = response.data;
-    });
+    this.getDicts('sys_show_hide').then((response) => {
+      this.visibleOptions = response.data
+    })
+    this.getDicts('sys_normal_disable').then((response) => {
+      this.statusOptions = response.data
+    })
     listMenuById(0).then((response) => {
       this.menuList = response.data
     })
@@ -296,187 +300,182 @@ export default {
   methods: {
     // 选择图标
     selected(name) {
-      this.form.icon = name;
+      this.form.icon = name
     },
     /** 查询菜单列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listMenu(this.queryParams).then((response) => {
-        this.menuList = response.data;
+        this.menuList = response.data
         // this.menuList = this.handleTree(response.data, "menuId");
-        this.loading = false;
-      });
+        this.loading = false
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children;
+        delete node.children
       }
       return {
         id: node.menuId,
         label: node.menuName,
         children: node.children,
-      };
+      }
     },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
       listMenu({ menuTypeIds: 'M,C,F' }).then((response) => {
-        this.menuOptions = [];
-        const menu = { menuId: 0, menuName: "根菜单", children: [] };
-				menu.children = response.data;
+        this.menuOptions = []
+        const menu = { menuId: 0, menuName: '根菜单', children: [] }
+        menu.children = response.data
         //menu.children = this.handleTree(response.data, "menuId");
-        this.menuOptions.push(menu);
-      });
+        this.menuOptions.push(menu)
+      })
     },
     // 显示状态字典翻译
     visibleFormat(row, column) {
-      if (row.menuType == "F") {
-        return "";
+      if (row.menuType == 'F') {
+        return ''
       }
-      return this.selectDictLabel(this.visibleOptions, row.visible);
+      return this.selectDictLabel(this.visibleOptions, row.visible)
     },
     // 菜单状态字典翻译
     statusFormat(row, column) {
-      if (row.menuType == "F") {
-        return "";
+      if (row.menuType == 'F') {
+        return ''
       }
-      return this.selectDictLabel(this.statusOptions, row.status);
+      return this.selectDictLabel(this.statusOptions, row.status)
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
-      this.btnSubmitVisible = true;
+      this.btnSubmitVisible = true
       this.form = {
         menuId: undefined,
         parentId: 0,
         menuName: undefined,
         icon: undefined,
-        menuType: "M",
+        menuType: 'M',
         orderNum: 999,
-        isFrame: "0",
-        isCache: "0",
-        visible: "0",
-        status: "0",
-      };
-      this.resetForm("form");
+        isFrame: '0',
+        isCache: '0',
+        visible: '0',
+        status: '0',
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
-      this.getTreeselect();
+      this.reset()
+      this.getTreeselect()
 
-      this.form.parentId = row != null && row.menuId ? row.menuId : 0;
-      this.open = true;
-      this.title = "添加菜单";
+      this.form.parentId = row != null && row.menuId ? row.menuId : 0
+      this.open = true
+      this.title = '添加菜单'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
+      this.reset()
+      this.getTreeselect()
       getMenu(row.menuId).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改菜单";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改菜单'
+      })
     },
     /** 提交按钮 */
     submitForm: function () {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.menuId != undefined) {
             updateMenu(this.form).then((response) => {
-              this.msgSuccess("修改成功");
-              this.open = false;
+              this.msgSuccess('修改成功')
+              this.open = false
               if (this.form.parentId == 0) {
-                this.getList();
+                this.getList()
               } else {
-                this.refreshTableTree(this.form.parentId);
+                this.refreshTableTree(this.form.parentId)
               }
-            });
+            })
           } else {
             addMenu(this.form).then((response) => {
-              this.msgSuccess("新增成功");
-              this.open = false;
+              this.msgSuccess('新增成功')
+              this.open = false
               if (this.form.parentId == 0) {
-                this.getList();
+                this.getList()
               } else {
-                this.refreshTableTree(this.form.parentId);
+                this.refreshTableTree(this.form.parentId)
               }
-            });
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$confirm(
-        '是否确认删除名称为"' + row.menuName + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      this.$confirm('是否确认删除名称为"' + row.menuName + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
         .then(function () {
-          return delMenu(row.menuId);
+          return delMenu(row.menuId)
         })
         .then(() => {
           if (row.parentId == 0) {
-            this.getList();
+            this.getList()
           } else {
-            this.refreshTableTree(row.parentId);
+            this.refreshTableTree(row.parentId)
           }
-          this.msgSuccess("删除成功");
-        });
+          this.msgSuccess('删除成功')
+        })
     },
     /**
      * 保存排序
      */
     handleChangeSort(item) {
-      this.editIndex = -1;
-      changeMenuSort({ value: item.orderNum, id: item.menuId }).then(
-        (response) => {
-          this.msgSuccess("修改成功");
-          this.getList();
-        }
-      );
+      this.editIndex = -1
+      changeMenuSort({ value: item.orderNum, id: item.menuId }).then((response) => {
+        this.msgSuccess('修改成功')
+        this.getList()
+      })
     },
     handleTreeSelect(node, instanceId) {
       //如果是链接隐藏提交按钮
-      this.btnSubmitVisible = node.menuType == "L" ? false : true;
+      this.btnSubmitVisible = node.menuType == 'L' ? false : true
     },
     // 显示编辑排序
     editCurrRow(rowId, str) {
-      this.editIndex = rowId;
-      let id = rowId + str;
+      this.editIndex = rowId
+      let id = rowId + str
 
       setTimeout(() => {
-        document.getElementById(id).focus();
-      }, 100);
+        document.getElementById(id).focus()
+      }, 100)
     },
     //展开/折叠操作
     toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
+      this.refreshTable = false
+      this.isExpandAll = !this.isExpandAll
       this.$nextTick(() => {
-        this.refreshTable = true;
-      });
+        this.refreshTable = true
+      })
     },
-    loadMenu (row, treeNode, resolve) {
+    loadMenu(row, treeNode, resolve) {
+      this.tableTreeNodeMap.set(row.menuId, { row, treeNode, resolve });
       listMenuById(row.menuId).then((res) => {
         resolve(res.data)
       })
@@ -491,5 +490,5 @@ export default {
       this.loadMenu(row, treeNode, resolve)
     },
   },
-};
+}
 </script>
-- 
Gitee