fix: bug in tree select

suyuan32 · Sep 25, 2022 · e0db046 · e0db046
1 parent ba1b746
commit e0db046
Showing 5 changed files with 51 additions and 6 deletions.
diff --git a/src/api/sys/model/menuModel.ts b/src/api/sys/model/menuModel.ts
@@ -44,13 +44,19 @@ export interface MenuListItem {
   component: string;
   orderNo: number;
   disabled: boolean;
-  keepAlive: boolean;
+  title: string;
+  icon: string;
   hideMenu: boolean;
   hideBreadcrumb: boolean;
   currentActiveMenu: string;
-  title: string;
-  icon: string;
-  closeTab: boolean;
+  ignoreKeepAlive: boolean;
+  hideTab: boolean;
+  frameSrc: string;
+  carryParam: boolean;
+  hideChildrenInMenu: boolean;
+  affix: boolean;
+  dynamicLevel: number;
+  realPath: string;
   children?: MenuListItem[] | undefined;
 }
 

diff --git a/src/locales/lang/en/sys.ts b/src/locales/lang/en/sys.ts
@@ -146,6 +146,7 @@ export default {
     paramType: 'Type',
     paramValue: 'Value',
     paramList: 'Parameter List',
+    rootMenu: 'Root Menu',
     // action
     addMenu: 'Add Menu',
     editMenu: 'Eidt Menu',

diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts
@@ -140,6 +140,7 @@ export default {
     paramType: '参数类型',
     paramValue: '参数值',
     paramList: '参数列表',
+    rootMenu: '根菜单',
     // action
     addMenu: '新增菜单',
     editMenu: '编辑菜单',

diff --git a/src/views/sys/menu/MenuDrawer.vue b/src/views/sys/menu/MenuDrawer.vue
@@ -226,12 +226,44 @@
           });
         }
 
-        menuId.value = data.record.id;
+        if ('record' in data) {
+          menuId.value = data.record.id;
+        }
 
         // get tree data from data.data
         const treeData = await getAllMenu().then((data) => {
           return data.data;
         });
+
+        treeData.push({
+          name: 'root',
+          id: 1,
+          type: 0,
+          parentId: 0,
+          path: '',
+          redirect: '',
+          component: '',
+          orderNo: 0,
+          disabled: false,
+          title: 'sys.menu.rootMenu',
+          icon: '',
+          hideMenu: false,
+          hideBreadcrumb: false,
+          currentActiveMenu: '',
+          ignoreKeepAlive: false,
+          hideTab: false,
+          frameSrc: '',
+          carryParam: false,
+          hideChildrenInMenu: false,
+          affix: false,
+          dynamicLevel: 0,
+          realPath: '',
+        });
+
+        for (let i = 0; i < treeData.length; i++) {
+          treeData[i].title = t(treeData[i].title);
+        }
+
         updateSchema({
           field: 'parentId',
           componentProps: { treeData },

diff --git a/src/views/sys/menu/menu.data.ts b/src/views/sys/menu/menu.data.ts
@@ -132,11 +132,16 @@ export const formSchema: FormSchema[] = [
     field: 'parentId',
     label: t('sys.menu.menuParent'),
     component: 'TreeSelect',
+    defaultValue: {
+      label: t('sys.menu.rootMenu'),
+      key: 'root',
+      value: 1,
+    },
     componentProps: {
       // set the field name of the data from the server, the below show that
       // the label show the field of data.name
       fieldNames: {
-        label: 'name',
+        label: 'title',
         key: 'id',
         value: 'id',
       },