refactor(projects): 重构流程设计菜单层级

docs/sql/sys_menu.sql

@@ -38,5 +38,6 @@ UPDATE `sys_menu` SET `path` = 'https://gitee.com/xlsea/ruoyi-plus-soybean', `co
 UPDATE `sys_menu` SET `status` = '1' WHERE `menu_id` IN ( '116', '130', '131', '132', '11700', '11701' );
 
 -- 工作流菜单
-UPDATE `sys_menu` SET `component` = 'workflow/processDefinition/design/index' WHERE `menu_id` = 11700;
+UPDATE `ry-soy`.`sys_menu` SET `component` = 'workflow/design/index' WHERE `menu_id` = 11700;
+
 

src/locales/langs/en-us.ts

@@ -235,8 +235,8 @@ const local: App.I18n.Schema = {
     exception_403: '403',
     exception_404: '404',
     exception_500: '500',
+    workflow_design: 'Process Design',
     'workflow_process-definition': 'Process Definition',
-    'workflow_process-definition_design': 'Process Definition Design',
     'workflow_process-instance': 'Process Instance',
     workflow_leave: 'Leave Apply'
   },

src/locales/langs/zh-cn.ts

@@ -235,8 +235,8 @@ const local: App.I18n.Schema = {
     exception_403: '403',
     exception_404: '404',
     exception_500: '500',
+    workflow_design: '流程设计',
     'workflow_process-definition': '流程定义',
-    'workflow_process-definition_design': '流程设计',
     'workflow_process-instance': '流程实例',
     workflow_leave: '请假申请'
   },

src/router/elegant/imports.ts

@@ -44,8 +44,8 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   system_user: () => import("@/views/system/user/index.vue"),
   tool_gen: () => import("@/views/tool/gen/index.vue"),
   workflow_category: () => import("@/views/workflow/category/index.vue"),
+  workflow_design: () => import("@/views/workflow/design/index.vue"),
   workflow_leave: () => import("@/views/workflow/leave/index.vue"),
-  "workflow_process-definition": () => import("@/views/workflow/process-definition/definition/index.vue"),
-  "workflow_process-definition_design": () => import("@/views/workflow/process-definition/design/index.vue"),
+  "workflow_process-definition": () => import("@/views/workflow/process-definition/index.vue"),
   "workflow_process-instance": () => import("@/views/workflow/process-instance/index.vue"),
 };

src/router/elegant/routes.ts

@@ -350,6 +350,15 @@ export const generatedRoutes: GeneratedRoute[] = [
           i18nKey: 'route.workflow_category'
         }
       },
+      {
+        name: 'workflow_design',
+        path: '/workflow/design',
+        component: 'view.workflow_design',
+        meta: {
+          title: 'workflow_design',
+          i18nKey: 'route.workflow_design'
+        }
+      },
       {
         name: 'workflow_leave',
         path: '/workflow/leave',
@@ -361,14 +370,13 @@ export const generatedRoutes: GeneratedRoute[] = [
       },
       {
         name: 'workflow_process-definition',
-        path: '/workflow/process-definition/definition',
+        path: '/workflow/process-definition',
         component: 'view.workflow_process-definition',
         meta: {
           title: 'workflow_process-definition',
           i18nKey: 'route.workflow_process-definition'
         }
       },
-
       {
         name: 'workflow_process-instance',
         path: '/workflow/process-instance',

src/router/elegant/transform.ts

@@ -201,9 +201,9 @@ const routeMap: RouteMap = {
   "user-center": "/user-center",
   "workflow": "/workflow",
   "workflow_category": "/workflow/category",
+  "workflow_design": "/workflow/design",
   "workflow_leave": "/workflow/leave",
-  "workflow_process-definition": "/workflow/process-definition/definition",
-  "workflow_process-definition_design": "/workflow/process-definition/design",
+  "workflow_process-definition": "/workflow/process-definition",
   "workflow_process-instance": "/workflow/process-instance"
 };
 

src/typings/components.d.ts

@@ -56,6 +56,7 @@ declare module 'vue' {
     IconUilSearch: typeof import('~icons/uil/search')['default']
     JsonPreview: typeof import('./../components/custom/json-preview.vue')['default']
     LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
+    LeaveEdit: typeof import('./../components/custom/leave-edit/index.vue')['default']
     LeaveForm: typeof import('../components/custom/workflow-leave-form.vue')['default']
     LookForward: typeof import('./../components/custom/look-forward.vue')['default']
     MenuToggler: typeof import('./../components/common/menu-toggler.vue')['default']

src/typings/elegant-router.d.ts

@@ -55,9 +55,9 @@ declare module "@elegant-router/types" {
     "user-center": "/user-center";
     "workflow": "/workflow";
     "workflow_category": "/workflow/category";
+    "workflow_design": "/workflow/design";
     "workflow_leave": "/workflow/leave";
-    "workflow_process-definition": "/workflow/process-definition/definition";
-    "workflow_process-definition_design": "/workflow/process-definition/design";
+    "workflow_process-definition": "/workflow/process-definition";
     "workflow_process-instance": "/workflow/process-instance";
   };
 
@@ -153,9 +153,9 @@ declare module "@elegant-router/types" {
     | "system_user"
     | "tool_gen"
     | "workflow_category"
+    | "workflow_design"
     | "workflow_leave"
     | "workflow_process-definition"
-    | "workflow_process-definition_design"
     | "workflow_process-instance"
   >;
 
@@ -231,7 +231,7 @@ declare module "@elegant-router/types" {
         component: `view.${K}`;
       }
     : never;
-
+  
   /**
    * the center level route
    */
@@ -254,7 +254,7 @@ declare module "@elegant-router/types" {
         children: (CenterLevelRoute<GetChildRouteKey<K>> | LastLevelRoute<GetChildRouteKey<K>>)[];
       }
     : never;
-
+  
   /**
    * the custom first level route
    */

src/views/workflow/leave/modules/leave-operate-drawer.vue

@@ -178,7 +178,6 @@ watch(visible, () => {
 <template>
   <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
     <NDrawerContent :title="title" :native-scrollbar="false" closable>
-      <div></div>
       <NForm ref="formRef" :model="model" :rules="rules">
         <NFormItem label="流程类型" path="flowCode">
           <NSelect v-model:value="model.flowCode" placeholder="请输入流程类型" :options="flowCodeTypeOptions" />

src/views/workflow/process-definition/index.vue

@@ -20,9 +20,9 @@ import { useTable, useTableOperate } from '@/hooks/common/table';
 import { useRouterPush } from '@/hooks/common/router';
 import { $t } from '@/locales';
 import ButtonIcon from '@/components/custom/button-icon.vue';
-import DefinitionOperateDrawer from '../modules/definition-operate-drawer.vue';
-import DefinitionSearch from '../modules/definition-search.vue';
-import DefinitionImportModal from '../modules/definition-import-modal.vue';
+import DefinitionOperateDrawer from './modules/definition-operate-drawer.vue';
+import DefinitionSearch from './modules/definition-search.vue';
+import DefinitionImportModal from './modules/definition-import-modal.vue';
 
 defineOptions({
   name: 'DefinitionList'
@@ -326,7 +326,7 @@ async function handleCopy(id: CommonType.IdType) {
 }
 
 function handleDesign(id: CommonType.IdType) {
-  routerPushByKey('workflow_process-definition_design', {
+  routerPushByKey('workflow_design', {
     query: {
       definitionId: id.toString(),
       disabled: 'false'
@@ -335,7 +335,7 @@ function handleDesign(id: CommonType.IdType) {
 }
 
 function handlePreview(id: CommonType.IdType) {
-  routerPushByKey('workflow_process-definition_design', {
+  routerPushByKey('workflow_design', {
     query: {
       definitionId: id.toString(),
       disabled: 'true'