feat(projects): ✨ sync add VTableGantt (#31)

soybeanjs · Dec 21, 2024 · f32b675 · f32b675
1 parent fc7bdf2
commit f32b675
Show file tree

Hide file tree

Showing 11 changed files with 1,549 additions and 5 deletions.
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
@@ -220,6 +220,8 @@ const local: App.I18n.Schema = {
     plugin_excel: 'Excel',
     plugin_pdf: 'PDF preview',
     plugin_gantt: 'Gantt Chart',
+    plugin_gantt_dhtmlx: 'dhtmlxGantt',
+    plugin_gantt_vtable: 'VTableGantt',
     plugin_typeit: 'Typeit',
     plugin_tables: 'Tables',
     plugin_tables_vtable: 'VTable'

diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
@@ -220,6 +220,8 @@ const local: App.I18n.Schema = {
     plugin_excel: 'Excel',
     plugin_pdf: 'PDF 预览',
     plugin_gantt: '甘特图',
+    plugin_gantt_dhtmlx: 'dhtmlxGantt',
+    plugin_gantt_vtable: 'VTableGantt',
     plugin_typeit: '打字机',
     plugin_tables: '表格',
     plugin_tables_vtable: 'VTable'

diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts
@@ -47,7 +47,8 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   plugin_editor_markdown: () => import("@/views/plugin/editor/markdown/index.vue"),
   plugin_editor_quill: () => import("@/views/plugin/editor/quill/index.vue"),
   plugin_excel: () => import("@/views/plugin/excel/index.vue"),
-  plugin_gantt: () => import("@/views/plugin/gantt/index.vue"),
+  plugin_gantt_dhtmlx: () => import("@/views/plugin/gantt/dhtmlx/index.vue"),
+  plugin_gantt_vtable: () => import("@/views/plugin/gantt/vtable/index.vue"),
   plugin_icon: () => import("@/views/plugin/icon/index.vue"),
   plugin_map: () => import("@/views/plugin/map/index.vue"),
   plugin_pdf: () => import("@/views/plugin/pdf/index.vue"),

diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
@@ -492,12 +492,33 @@ export const generatedRoutes: GeneratedRoute[] = [
       {
         name: 'plugin_gantt',
         path: '/plugin/gantt',
-        component: 'view.plugin_gantt',
         meta: {
           title: 'plugin_gantt',
           i18nKey: 'route.plugin_gantt',
           icon: 'ant-design:bar-chart-outlined'
-        }
+        },
+        children: [
+          {
+            name: 'plugin_gantt_dhtmlx',
+            path: '/plugin/gantt/dhtmlx',
+            component: 'view.plugin_gantt_dhtmlx',
+            meta: {
+              title: 'plugin_gantt_dhtmlx',
+              i18nKey: 'route.plugin_gantt_dhtmlx',
+              icon: 'gridicons:posts'
+            }
+          },
+          {
+            name: 'plugin_gantt_vtable',
+            path: '/plugin/gantt/vtable',
+            component: 'view.plugin_gantt_vtable',
+            meta: {
+              title: 'plugin_gantt_vtable',
+              i18nKey: 'route.plugin_gantt_vtable',
+              localIcon: 'visactor'
+            }
+          }
+        ]
       },
       {
         name: 'plugin_icon',

diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts
@@ -221,6 +221,8 @@ const routeMap: RouteMap = {
   "plugin_editor_quill": "/plugin/editor/quill",
   "plugin_excel": "/plugin/excel",
   "plugin_gantt": "/plugin/gantt",
+  "plugin_gantt_dhtmlx": "/plugin/gantt/dhtmlx",
+  "plugin_gantt_vtable": "/plugin/gantt/vtable",
   "plugin_icon": "/plugin/icon",
   "plugin_map": "/plugin/map",
   "plugin_pdf": "/plugin/pdf",

diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts
@@ -75,6 +75,8 @@ declare module "@elegant-router/types" {
     "plugin_editor_quill": "/plugin/editor/quill";
     "plugin_excel": "/plugin/excel";
     "plugin_gantt": "/plugin/gantt";
+    "plugin_gantt_dhtmlx": "/plugin/gantt/dhtmlx";
+    "plugin_gantt_vtable": "/plugin/gantt/vtable";
     "plugin_icon": "/plugin/icon";
     "plugin_map": "/plugin/map";
     "plugin_pdf": "/plugin/pdf";
@@ -194,7 +196,8 @@ declare module "@elegant-router/types" {
     | "plugin_editor_markdown"
     | "plugin_editor_quill"
     | "plugin_excel"
-    | "plugin_gantt"
+    | "plugin_gantt_dhtmlx"
+    | "plugin_gantt_vtable"
     | "plugin_icon"
     | "plugin_map"
     | "plugin_pdf"

diff --git a/src/views/alova/user/modules/user-search.vue b/src/views/alova/user/modules/user-search.vue
@@ -43,7 +43,7 @@ async function search() {
 
 <template>
   <ElCard class="card-wrapper">
-    <ElCollapse :default-expanded-names="['user-search']">
+    <ElCollapse>
       <ElCollapseItem :title="$t('common.search')" name="user-search">
         <ElForm ref="formRef" :model="model" :rules="rules" label-position="right" :label-width="80">
           <ElRow :gutter="24">

diff --git a/src/views/plugin/gantt/data.ts → src/views/plugin/gantt/dhtmlx/data.ts b/src/views/plugin/gantt/data.ts → src/views/plugin/gantt/dhtmlx/data.ts
diff --git a/src/views/plugin/gantt/index.vue → src/views/plugin/gantt/dhtmlx/index.vue b/src/views/plugin/gantt/index.vue → src/views/plugin/gantt/dhtmlx/index.vue