功能调整

src/router/modules/daas.ts

@@ -4,41 +4,44 @@ const Layout = () => import('@/layouts/index.vue')
 
 const routes: RouteRecordRaw[] = [
   {
-    path: '/daas/model',
+    path: '/daas/data',
     component: Layout,
-    redirect: '/daas/model/index',
-    name: 'daasModel',
+    redirect: '/daas/data/database',
+    name: 'daas_data',
     meta: {
-      title: '数据模型',
-      icon: 'ic:twotone-double-arrow',
+      title: '数据仓库',
+      icon: 'ep:coin',
     },
     children: [
       {
-        path: 'index',
-        name: 'daasModelList',
-        component: () => import('@/views/daas/model/index.vue'),
-        meta: {
-          title: '模型对象',
-        },
-      },
-      {
-        path: 'daas/object/:modelId/:objectId',
-        name: 'daasObjectEdit',
-        component: () => import('@/views/daas/object/index.vue'),
+        path: 'database',
+        name: 'daas_data_index',
+        component: () => import('@/views/daas/database/index.vue'),
         meta: {
-          title: '对象编辑',
+          title: '数据仓库',
           sidebar: false,
-          activeMenu: '/daas/model',
-          cache: true,
-          noCache: 'daasObjectEdit',
+          breadcrumb: false,
+          activeMenu: '/daas/data',
         },
       },
+    ],
+  },
+  {
+    path: '/daas/data/access',
+    component: Layout,
+    redirect: '/daas/data/type',
+    name: 'dataTypeList',
+    meta: {
+      title: '数据库接入配置',
+      icon: 'ep:coin',
+    },
+    children: [
       {
-        path: 'behavior',
-        name: 'daasBehaviorList',
-        component: () => import('@/views/daas/behavior/index.vue'),
+        path: 'database-type',
+        name: 'database_type',
+        component: () => import('@/views/daas/database_type/index.vue'),
         meta: {
-          title: '行为规则',
+          title: '数据库类别',
         },
       },
     ],
@@ -46,22 +49,19 @@ const routes: RouteRecordRaw[] = [
   {
     path: '/daas/data',
     component: Layout,
-    redirect: '/daas/data/index',
-    name: 'daas_data',
+    redirect: '/daas/data/type',
+    name: 'dataTypeList',
     meta: {
-      title: '数据仓库',
+      title: '数据库接入配置',
       icon: 'ep:coin',
     },
     children: [
       {
-        path: 'index',
-        name: 'daas_data_index',
-        component: () => import('@/views/daas/data/index.vue'),
+        path: 'database-type',
+        name: 'database_type',
+        component: () => import('@/views/daas/database_type/index.vue'),
         meta: {
-          title: '数据仓库',
-          sidebar: false,
-          breadcrumb: false,
-          activeMenu: '/daas/data',
+          title: '数据库类别',
         },
       },
     ],

src/router/modules/model.ts

@@ -0,0 +1,62 @@
+import type { RouteRecordRaw } from 'vue-router'
+
+const Layout = () => import('@/layouts/index.vue')
+
+const routes: RouteRecordRaw[] = [
+  {
+    path: '/daas/model/object',
+    component: Layout,
+    redirect: '/daas/model/object/index',
+    name: 'daasModel',
+    meta: {
+      title: '数据模型',
+      icon: 'ep:coin',
+    },
+    children: [
+      {
+        path: 'index',
+        name: 'daasModelList',
+        component: () => import('@/views/daas/model/index.vue'),
+        meta: {
+          title: '对象定义',
+          sidebar: false,
+          breadcrumb: false,
+          activeMenu: '/daas/data',
+        },
+      },
+      {
+        path: 'daas/model/object/:modelId/:objectId',
+        name: 'daasObjectEdit',
+        component: () => import('@/views/daas/object/index.vue'),
+        meta: {
+          title: '对象编辑',
+          sidebar: false,
+          activeMenu: '/daas/model/',
+          cache: true,
+          noCache: 'daasObjectEdit',
+        },
+      },
+    ],
+  },
+  {
+    path: '/daas/model/manipulation',
+    component: Layout,
+    redirect: '/daas/model/manipulation/index',
+    name: 'daasModel',
+    meta: {
+      title: '对象操作',
+      icon: 'ic:twotone-double-arrow',
+    },
+    children: [
+      {
+        path: 'behavior',
+        name: 'daasManipulationList',
+        component: () => import('@/views/daas/manipulation/index.vue'),
+        meta: {
+          title: '对象操作',
+        },
+      },
+    ],
+  },
+]
+export default routes

src/router/modules/system.ts

@@ -113,14 +113,7 @@ const routes: RouteRecordRaw[] = [
           title: '应用分类',
         },
       },
-      {
-        path: 'database-type',
-        name: 'database_type',
-        component: () => import('@/views/daas/database_type/index.vue'),
-        meta: {
-          title: '数据库类别',
-        },
-      },
+
     ],
   },
 ]

src/router/routes.ts

@@ -4,6 +4,7 @@ import type { RouteRecordRaw } from 'vue-router'
 import SystemEntries from './modules/system'
 import DaaSEntries from './modules/daas'
 import PaaSEntries from './modules/paas'
+import ModelEntries from './modules/model'
 import AppCenterEntries from '@/router/modules/app.center'
 import type { Route } from '#/global'
 import useSettingsStore from '@/store/modules/settings'
@@ -96,17 +97,26 @@ const systemRoutes: RouteRecordRaw[] = [
 const asyncRoutes: Route.recordMainRaw[] = [
   {
     meta: {
-      title: '数据',
+      title: '模型',
       icon: 'uim:box',
     },
     children: [
+      ...ModelEntries,
+    ],
+  },
+  {
+    meta: {
+      title: '数据',
+      icon: 'ep:coin',
+    },
+    children: [
       ...DaaSEntries,
     ],
   },
   {
     meta: {
       title: '业务',
-      icon: 'uim:box',
+      icon: 'ep:cpu',
     },
     children: [
       ...PaaSEntries,
@@ -115,7 +125,7 @@ const asyncRoutes: Route.recordMainRaw[] = [
   {
     meta: {
       title: '应用',
-      icon: 'uim:box',
+      icon: 'ep:menu',
     },
     children: [
       ...AppCenterEntries,
@@ -124,7 +134,7 @@ const asyncRoutes: Route.recordMainRaw[] = [
   {
     meta: {
       title: '系统',
-      icon: 'uim:box',
+      icon: 'ep:setting',
     },
     children: [
       ...SystemEntries,

src/views/daas/behavior/index.vue → src/views/daas/manipulation/index.vue

@@ -219,20 +219,24 @@ const onObjectClick = () => { }
   display: flex;
   flex-direction: column;
 }
+
 .absolute-container {
   h2{
     padding: 0;
     margin: 0;
   }
+
   .right-conatiner{
       .right-conatiner-tree{
         width: 350px;
         box-sizing: border-box;
       }
+
       .container{
         flex: 1;
       }
   }
+
   :deep(.left-side) ,:deep(.right-conatiner-tree){
     display: flex;
     flex-direction: column;