From 62296e732b81a81b3ce85fa934869d5f49bf0561 Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Fri, 24 Feb 2023 09:29:50 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=91=E5=BD=A2=E9=80=89=E6=8B=A9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=8A=A0=E8=BD=BD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E8=8A=82=E7=82=B9=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=9A=84=E6=A0=91=E5=BD=A2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/dept/form.vue   |  3 +--
 src/views/admin/menu/form.vue   |  6 ++++--
 src/views/gen/table/preview.vue | 10 ++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/admin/dept/form.vue b/src/views/admin/dept/form.vue
index c3c865e9..b0e48670 100644
--- a/src/views/admin/dept/form.vue
+++ b/src/views/admin/dept/form.vue
@@ -7,8 +7,7 @@
 						<el-form-item :label="$t('sysdept.parentId')" prop="parentId">
               <el-tree-select v-model="dataForm.parentId" :data="parentData"
                               :props="{ value: 'id', label: 'name', children: 'children' }" class="w100" clearable check-strictly
-                              default-expand-all
-                              :placeholder="$t('sysdept.inputparentIdTip')"/>
+                              :render-after-expand="false" :placeholder="$t('sysdept.inputparentIdTip')"/>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
diff --git a/src/views/admin/menu/form.vue b/src/views/admin/menu/form.vue
index 41e3556b..4b216926 100644
--- a/src/views/admin/menu/form.vue
+++ b/src/views/admin/menu/form.vue
@@ -13,7 +13,7 @@
         </el-col>
         <el-col :span="12" class="mb20">
           <el-form-item :label="$t('sysmenu.parentId')" prop="parentId">
-            <el-tree-select v-model="state.ruleForm.parentId" :data="state.parentData" default-expand-all
+            <el-tree-select v-model="state.ruleForm.parentId" :data="state.parentData" :render-after-expand="false"
               :props="{ value: 'id', label: 'name', children: 'children' }" class="w100" clearable check-strictly
               :placeholder="$t('sysmenu.inputParentIdTip')">
             </el-tree-select>
@@ -115,7 +115,9 @@ const state = reactive({
 // 从后端获取菜单信息
 const getMenuData = () => {
   state.parentData = []
-  pageList().then(res => {
+  pageList({
+    type: '0'
+  }).then(res => {
     let menu = {
       createBy: "",
       createTime: "",
diff --git a/src/views/gen/table/preview.vue b/src/views/gen/table/preview.vue
index 0978a9d8..93ab55e4 100644
--- a/src/views/gen/table/preview.vue
+++ b/src/views/gen/table/preview.vue
@@ -2,7 +2,7 @@
     <el-dialog title="代码预览" v-model="visible" width="90%" top="3vh" append-to-body :close-on-click-modal="false">
         <el-row :gutter="20">
             <el-col :span="6">
-                <el-card :gutter="12" shadow="hover">
+                <el-card :gutter="12" shadow="hover" v-loading="loading">
                     <el-scrollbar height="calc(100vh - 300px)">
                         <el-tree ref="treeRef" node-key="id" :data="preview.fileTree" :expand-on-click-node="false"
                             highlight-current @node-click="handleNodeClick" />
@@ -24,6 +24,7 @@
 <script setup lang="ts" name="preview">
 import { useGeneratorPreviewApi } from '/@/api/gen/table';
 import { handleTree } from '/@/utils/other';
+import {validatePhone} from "/@/api/admin/user";
 
 const visible = ref(false)
 // ======== 显示页面 ========
@@ -42,17 +43,22 @@ const openDialog = async (id: string) => {
     visible.value = true
 }
 
+const loading = ref(false)
+
 const getGenCodeFile = (id: string) => {
+    loading.value = true
+    fileTreeOriginal.value = []
     useGeneratorPreviewApi(id).then((res: any) => {
         previewCodegen.value = res
         for (let index in res) {
             fileTreeOriginal.value.push(res[index].codePath)
         }
-
         // 默认选中第一个 选项卡
         preview.activeName = res[0].codePath
         const files = handleFiles(fileTreeOriginal)
         preview.fileTree = handleTree(files, 'id', 'parentId', 'children', '/')
+    }).finally(() => {
+      loading.value = false
     })
 }