菜单列表调整

apps/web-ele/.env.development

@@ -5,6 +5,7 @@ VITE_BASE=/
 
 # 接口地址
 VITE_GLOB_API_URL=http://39.164.159.226:8088
+# VITE_GLOB_API_URL=http://192.168.1.170:8080
 
 # 是否开启 Nitro Mock服务，true 为开启，false 为关闭
 VITE_NITRO_MOCK=false

apps/web-ele/src/router/routes/local.ts

@@ -49,17 +49,6 @@ const localRoutes: RouteRecordStringComponent[] = [
     path: '/questScoring/view/:id',
   },
   {
-    component: '/examManage/questScoring/correct',
-    meta: {
-      activePath: '/examManage/questScoring',
-      icon: 'carbon:edit',
-      title: '问卷批改',
-      hideInMenu: true,
-    },
-    name: 'QuestScoringCorrect',
-    path: '/questScoring/correct/:id',
-  },
-  {
     component: '/examManage/myExamPaper/view',
     meta: {
       activePath: '/examManage/myExamPaper',

apps/web-ele/src/views/system/menu/menu-drawer.vue

@@ -13,223 +13,234 @@ import { getDictOptions } from '#/utils/dict';
 import { menuTypeOptions, yesNoOptions } from './table-data';
 
 const emit = defineEmits<{ reload: [] }>();
+const currentSource = ref<number>(0); // 默认PC端
 // 侧拉内置容器 Form表单的配置项
-const [Form, FormApi] = useVbenForm({
-  // 不显示提交和重置按钮
-  showDefaultActions: false,
-  // 垂直布局，label和input在不同行，值为vertical
-  // 水平布局，label和input在同一行
-  layout: 'horizontal',
-  schema: [
-    {
-      component: 'Input',
-      fieldName: 'menuId',
-      dependencies: {
-        show: () => false,
-        triggerFields: [''],
-      },
+// 动态生成图标组件配置
+const getIconComponentConfig = () => {
+  return {
+    component: currentSource.value === 1 ? 'Input' : 'IconPicker',
+    componentProps: currentSource.value === 1 ? {
+      maxlength: 50,
+    } : {
+      prefix: 'carbon',
     },
-    {
-      component: 'ApiTreeSelect',
-      componentProps: {
-        api: async () => {
-          const menuArray = await menuList();
-          // support i18n
-          menuArray.forEach((item) => {
-            item.menuName = $t(item.menuName);
-          });
-          // const folderArray = menuArray.filter((item) => item.menuType === 'M');
-          /**
-           * 这里需要过滤掉按钮类型
-           * 不允许在按钮下添加数据
-           */
-          const filteredList = menuArray.filter(
-            (item) => item.menuType !== 'F',
-          );
-          const menuTree = listToTree(filteredList, {
-            id: 'menuId',
-            pid: 'parentId',
-          });
-          const fullMenuTree = [
-            {
-              menuId: 0,
-              menuName: $t('menu.root'),
-              children: menuTree,
-            },
-          ];
-          addFullName(fullMenuTree, 'menuName', ' / ');
-          return fullMenuTree;
-        },
-        getPopupContainer,
-        labelField: 'menuName',
-        valueField: 'menuId',
-        childrenField: 'children',
-        checkStrictly: true,
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'F';
       },
-      defaultValue: 0,
-      rules: 'selectRequired',
-      fieldName: 'parentId',
-      label: $t('menus.parentId'),
+      triggerFields: ['menuType'],
     },
-    {
-      component: 'RadioGroup',
-      fieldName: 'menuType',
-      label: $t('menus.menu-type'),
-      defaultValue: 'M',
-      componentProps: {
-        buttonStyle: 'solid',
-        isButton: true,
-        options: menuTypeOptions,
-        optionType: 'button',
-      },
+    fieldName: 'icon',
+    label: $t('menus.icon'),
+  };
+};
+
+// 定义表单schema
+const formSchema = ref([
+  {
+    component: 'Input',
+    fieldName: 'menuId',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
     },
-    {
-      component: 'IconPicker',
-      componentProps: {
-        prefix: 'carbon',
-      },
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'F';
-        },
-        triggerFields: ['menuType'],
+  },
+  {
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const menuArray = await menuList();
+        // support i18n
+        menuArray.forEach((item) => {
+          item.menuName = $t(item.menuName);
+        });
+        // const folderArray = menuArray.filter((item) => item.menuType === 'M');
+        /**
+         * 这里需要过滤掉按钮类型
+         * 不允许在按钮下添加数据
+         */
+        const filteredList = menuArray.filter(
+          (item) => item.menuType !== 'F',
+        );
+        const menuTree = listToTree(filteredList, {
+          id: 'menuId',
+          pid: 'parentId',
+        });
+        const fullMenuTree = [
+          {
+            menuId: 0,
+            menuName: $t('menu.root'),
+            children: menuTree,
+          },
+        ];
+        addFullName(fullMenuTree, 'menuName', ' / ');
+        return fullMenuTree;
       },
-      fieldName: 'icon',
-      label: $t('menus.icon'),
+      getPopupContainer,
+      labelField: 'menuName',
+      valueField: 'menuId',
+      childrenField: 'children',
+      checkStrictly: true,
     },
-    {
-      component: 'Input',
-      fieldName: 'menuName',
-      componentProps: {
-        maxlength: 50,
-      },
-      label: $t('menus.menu-name'),
-      rules: 'required',
+    defaultValue: 0,
+    rules: 'selectRequired',
+    fieldName: 'parentId',
+    label: $t('menus.parentId'),
+  },
+  {
+    component: 'RadioGroup',
+    fieldName: 'menuType',
+    label: $t('menus.menu-type'),
+    defaultValue: 'M',
+    componentProps: {
+      buttonStyle: 'solid',
+      isButton: true,
+      options: menuTypeOptions,
+      optionType: 'button',
     },
-    {
-      component: 'InputNumber',
-      fieldName: 'orderNum',
-      componentProps: {
-        max: 9999,
-      },
-      defaultValue: 0,
-      label: $t('menus.order-num'),
-      rules: 'required',
+  },
+  getIconComponentConfig(),
+  {
+    component: 'Input',
+    fieldName: 'menuName',
+    componentProps: {
+      maxlength: 50,
     },
-    {
-      component: 'Input',
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'F';
-        },
-        triggerFields: ['menuType'],
-      },
-      fieldName: 'path',
-      componentProps: {
-        maxlength: 200,
-      },
-      label: $t('menus.path'),
-      rules: 'required',
+    label: $t('menus.menu-name'),
+    rules: 'required',
+  },
+  {
+    component: 'InputNumber',
+    fieldName: 'orderNum',
+    componentProps: {
+      max: 9999,
     },
-    {
-      component: 'Input',
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'F';
-        },
-        triggerFields: ['menuType'],
-      },
-      fieldName: 'query',
-      componentProps: {
-        maxlength: 200,
-        placeholder: '请输入路由参数',
+    defaultValue: 0,
+    label: $t('menus.order-num'),
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'F' && currentSource.value !== 1;
       },
-      label: $t('menus.query'),
+      triggerFields: ['menuType'],
     },
-    {
-      component: 'Input',
-      dependencies: {
-        show: (values) => {
-          return values.menuType === 'C';
-        },
-        triggerFields: ['menuType'],
-      },
-      fieldName: 'component',
-      componentProps: {
-        maxlength: 255,
-      },
-      label: $t('menus.component'),
-      rules: 'required',
+    fieldName: 'path',
+    componentProps: {
+      maxlength: 200,
     },
-    {
-      component: 'Input',
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'M';
-        },
-        triggerFields: ['menuType'],
-      },
-      fieldName: 'perms',
-      componentProps: {
-        maxlength: 100,
+    label: $t('menus.path'),
+    rules: currentSource.value !== 1 ? 'required' : '',
+  },
+  {
+    component: 'Input',
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'F' && currentSource.value !== 1;
       },
-      label: $t('menus.perms'),
+      triggerFields: ['menuType'],
     },
-    {
-      component: 'RadioGroup',
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'F';
-        },
-        triggerFields: ['menuType'],
-      },
-      fieldName: 'isFrame',
-      label: $t('menus.is-frame'),
-      defaultValue: '1',
-      componentProps: {
-        buttonStyle: 'solid',
-        isButton: true,
-        options: yesNoOptions,
-        optionType: 'button',
+    fieldName: 'query',
+    componentProps: {
+      maxlength: 200,
+      placeholder: '请输入路由参数',
+    },
+    label: $t('menus.query'),
+  },
+  {
+    component: 'Input',
+    dependencies: {
+      show: (values) => {
+        return values.menuType === 'C';
       },
+      triggerFields: ['menuType'],
     },
-    {
-      component: 'RadioGroup',
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'F';
-        },
-        triggerFields: ['menuType'],
+    fieldName: 'component',
+    componentProps: {
+      maxlength: 255,
+    },
+    label: $t('menus.component'),
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'M';
       },
-      fieldName: 'visible',
-      label: $t('menus.is-visible'),
-      defaultValue: '0',
-      componentProps: {
-        buttonStyle: 'solid',
-        isButton: true,
-        options: getDictOptions(DictEnum.SYS_SHOW_HIDE),
-        optionType: 'button',
+      triggerFields: ['menuType'],
+    },
+    fieldName: 'perms',
+    componentProps: {
+      maxlength: 100,
+    },
+    label: $t('menus.perms'),
+  },
+  {
+    component: 'RadioGroup',
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'F';
       },
+      triggerFields: ['menuType'],
     },
-    {
-      component: 'RadioGroup',
-      dependencies: {
-        show: (values) => {
-          return values.menuType !== 'F';
-        },
-        triggerFields: ['menuType'],
+    fieldName: 'isFrame',
+    label: $t('menus.is-frame'),
+    defaultValue: '1',
+    componentProps: {
+      buttonStyle: 'solid',
+      isButton: true,
+      options: yesNoOptions,
+      optionType: 'button',
+    },
+  },
+  {
+    component: 'RadioGroup',
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'F';
       },
-      fieldName: 'status',
-      label: $t('menus.status'),
-      defaultValue: '0',
-      componentProps: {
-        buttonStyle: 'solid',
-        isButton: true,
-        options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
-        optionType: 'button',
+      triggerFields: ['menuType'],
+    },
+    fieldName: 'visible',
+    label: $t('menus.is-visible'),
+    defaultValue: '0',
+    componentProps: {
+      buttonStyle: 'solid',
+      isButton: true,
+      options: getDictOptions(DictEnum.SYS_SHOW_HIDE),
+      optionType: 'button',
+    },
+  },
+  {
+    component: 'RadioGroup',
+    dependencies: {
+      show: (values) => {
+        return values.menuType !== 'F';
       },
+      triggerFields: ['menuType'],
+    },
+    fieldName: 'status',
+    label: $t('menus.status'),
+    defaultValue: '0',
+    componentProps: {
+      buttonStyle: 'solid',
+      isButton: true,
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      optionType: 'button',
     },
-  ],
+  },
+]);
+
+const [Form, FormApi] = useVbenForm({
+  // 不显示提交和重置按钮
+  showDefaultActions: false,
+  // 垂直布局，label和input在不同行，值为vertical
+  // 水平布局，label和input在同一行
+  layout: 'horizontal',
+  schema: formSchema,
 });
 interface ModalProps {
   id?: number | string;
@@ -238,7 +249,7 @@ interface ModalProps {
 }
 // 新增还是修改的标识
 const isUpdate = ref<boolean>(false);
-const currentSource = ref<number>(0); // 默认PC端
+
 
 const [Drawer, DrawerApi] = useVbenDrawer({
   // 点击侧拉的确定按钮执行逻辑
@@ -276,6 +287,205 @@ const [Drawer, DrawerApi] = useVbenDrawer({
     const { id, update, source } = DrawerApi.getData() as ModalProps;
     isUpdate.value = update;
     currentSource.value = source; // 保存当前source值
+    
+    // 重新生成完整的表单schema以更新所有字段的配置
+    formSchema.value = [
+      {
+        component: 'Input',
+        fieldName: 'menuId',
+        dependencies: {
+          show: () => false,
+          triggerFields: [''],
+        },
+      },
+      {
+        component: 'ApiTreeSelect',
+        componentProps: {
+          api: async () => {
+            const menuArray = await menuList();
+            // support i18n
+            menuArray.forEach((item) => {
+              item.menuName = $t(item.menuName);
+            });
+            /**
+             * 这里需要过滤掉按钮类型
+             * 不允许在按钮下添加数据
+             */
+            const filteredList = menuArray.filter(
+              (item) => item.menuType !== 'F',
+            );
+            const menuTree = listToTree(filteredList, {
+              id: 'menuId',
+              pid: 'parentId',
+            });
+            const fullMenuTree = [
+              {
+                menuId: 0,
+                menuName: $t('menu.root'),
+                children: menuTree,
+              },
+            ];
+            addFullName(fullMenuTree, 'menuName', ' / ');
+            return fullMenuTree;
+          },
+          getPopupContainer,
+          labelField: 'menuName',
+          valueField: 'menuId',
+          childrenField: 'children',
+          checkStrictly: true,
+        },
+        defaultValue: 0,
+        rules: 'selectRequired',
+        fieldName: 'parentId',
+        label: $t('menus.parentId'),
+      },
+      {
+        component: 'RadioGroup',
+        fieldName: 'menuType',
+        label: $t('menus.menu-type'),
+        defaultValue: 'M',
+        componentProps: {
+          buttonStyle: 'solid',
+          isButton: true,
+          options: menuTypeOptions,
+          optionType: 'button',
+        },
+      },
+      getIconComponentConfig(),
+      {
+        component: 'Input',
+        fieldName: 'menuName',
+        componentProps: {
+          maxlength: 50,
+        },
+        label: $t('menus.menu-name'),
+        rules: 'required',
+      },
+      {
+        component: 'InputNumber',
+        fieldName: 'orderNum',
+        componentProps: {
+          max: 9999,
+        },
+        defaultValue: 0,
+        label: $t('menus.order-num'),
+        rules: 'required',
+      },
+      {
+        component: 'Input',
+        dependencies: {
+          show: (values) => {
+            return values.menuType !== 'F' && currentSource.value !== 1;
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'path',
+        componentProps: {
+          maxlength: 200,
+        },
+        label: $t('menus.path'),
+        rules: currentSource.value !== 1 ? 'required' : '',
+      },
+      {
+        component: 'Input',
+        dependencies: {
+          show: (values) => {
+            return values.menuType !== 'F' && currentSource.value !== 1;
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'query',
+        componentProps: {
+          maxlength: 200,
+          placeholder: '请输入路由参数',
+        },
+        label: $t('menus.query'),
+      },
+      {
+        component: 'Input',
+        dependencies: {
+          show: (values) => {
+            return values.menuType === 'C';
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'component',
+        componentProps: {
+          maxlength: 255,
+        },
+        label: $t('menus.component'),
+        rules: 'required',
+      },
+      {
+        component: 'Input',
+        dependencies: {
+          show: (values) => {
+            return values.menuType !== 'M';
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'perms',
+        componentProps: {
+          maxlength: 100,
+        },
+        label: $t('menus.perms'),
+      },
+      {
+        component: 'RadioGroup',
+        dependencies: {
+          show: (values) => {
+            return values.menuType !== 'F' && currentSource.value !== 1;
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'isFrame',
+        label: $t('menus.is-frame'),
+        defaultValue: '1',
+        componentProps: {
+          buttonStyle: 'solid',
+          isButton: true,
+          options: yesNoOptions,
+          optionType: 'button',
+        },
+      },
+      {
+        component: 'RadioGroup',
+        dependencies: {
+          show: (values) => {
+            return values.menuType !== 'F';
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'visible',
+        label: $t('menus.is-visible'),
+        defaultValue: '0',
+        componentProps: {
+          buttonStyle: 'solid',
+          isButton: true,
+          options: getDictOptions(DictEnum.SYS_SHOW_HIDE),
+          optionType: 'button',
+        },
+      },
+      {
+        component: 'RadioGroup',
+        dependencies: {
+          show: (values) => {
+            return values.menuType !== 'F';
+          },
+          triggerFields: ['menuType'],
+        },
+        fieldName: 'status',
+        label: $t('menus.status'),
+        defaultValue: '0',
+        componentProps: {
+          buttonStyle: 'solid',
+          isButton: true,
+          options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+          optionType: 'button',
+        },
+      },
+    ];
+    
     if (id) {
       await FormApi.setFieldValue('parentId', id);
       if (update) {