Signed-off-by: zhaobao <528046418@qq.com>

src/views/daas/database_access/components/DBType.vue

@@ -6,7 +6,7 @@ meta:
 <script lang="ts" setup>
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { createDBType, getDBTypeById, updateDBType } from '@/api/daas/dbTypeApi'
+import { createDbType, getDbTypeById, updateDbType } from '@/api/daas/dbTypeApi'
 const emit = defineEmits(['success'])
 
 const formRef = ref<FormInstance>()
@@ -35,7 +35,7 @@ onMounted(() => {})
 
 const getData = async (dbTypeId: number) => {
   state.loading = true
-  const { data } = await getDBTypeById(dbTypeId)
+  const { data } = await getDbTypeById(dbTypeId)
   state.loading = false
   state.formData = data
 }
@@ -44,12 +44,12 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createDBType(state.formData)
+        await createDbType(state.formData)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateDBType(state.formData)
+        await updateDbType(state.formData)
         state.dialogVisible = false
         emit('success')
       }

src/views/daas/database_access/index.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup name="DBTypeIndex">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import DBType from './components/DBType.vue'
-import { deleteDBTypeById, getDBTypeByList } from '@/api/daas/dbTypeApi'
+import { deleteDbTypeById, getDbTypeByList } from '@/api/daas/dbTypeApi'
 
 const state = reactive({
   loading: false,
@@ -19,7 +19,7 @@ const appCatRef = ref()
 
 const getDataList = async () => {
   state.loading = true
-  const { data } = await getDBTypeByList({})
+  const { data } = await getDbTypeByList({})
   state.dataList = data
   state.loading = false
 }
@@ -41,7 +41,7 @@ function onDBTypeEdit(row: any) {
 
 function onDBTypeDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.dbTypeTitle}」吗？`, '确认信息').then(async () => {
-    await deleteDBTypeById(row.appCatId)
+    await deleteDbTypeById(row.appCatId)
     await getDataList()
     ElMessage.success({
       message: '删除成功',

src/views/model/model/index.vue

@@ -75,6 +75,9 @@ const getModelData = async () => {
 
   if (data && data.length > 0) {
     state.curModelId = data[0].modelId
+    nextTick(() => {
+      leftTreeRef.value.setCurrentKey(data[0].modelId)
+    })
     await getObjectData()
   }
 }
@@ -126,7 +129,7 @@ const onSearch = () => {
 const onObjectAdd = () => {
   if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.mergeTabsBy !== 'activeMenu') {
     tabbar.open({
-      name: 'daasObjectEdit',
+      name: 'modelObjectEdit',
       params: {
         modelId: state.curModelId,
         objectId: 0,
@@ -135,7 +138,7 @@ const onObjectAdd = () => {
   }
   else {
     router.push({
-      name: 'daasObjectEdit',
+      name: 'modelObjectEdit',
       params: {
         modelId: state.curModelId,
         objectId: 0,
@@ -148,7 +151,7 @@ const onObjectAdd = () => {
 const onObjectEdit = (row: { modelId: any; objectId: any }) => {
   if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.mergeTabsBy !== 'activeMenu') {
     tabbar.open({
-      name: 'daasObjectEdit',
+      name: 'modelObjectEdit',
       params: {
         modelId: row.modelId,
         objectId: row.objectId,
@@ -157,7 +160,7 @@ const onObjectEdit = (row: { modelId: any; objectId: any }) => {
   }
   else {
     router.push({
-      name: 'daasObjectEdit',
+      name: 'modelObjectEdit',
       params: {
         modelId: row.modelId,
         objectId: row.objectId,
@@ -199,7 +202,7 @@ const onObjectDelete = (row: any) => {
       <LayoutContainer left-side-width="300px" hide-left-side-toggle>
         <template #leftSide>
           <el-scrollbar class="tree">
-            <ElTree ref="leftTreeRef" :data="state.models" default-expand-all @node-click="onTreeNodeClick">
+            <ElTree ref="leftTreeRef" :data="state.models" default-expand-all node-key="modelId" @node-click="onTreeNodeClick">
               <template #default="{ node, data }">
                 <div class="custom-tree-node">
                   <div class="label" :title="node.label">

src/views/model/object/index.vue

@@ -167,10 +167,10 @@ function onCancel() {
 // 返回列表页
 function goBack() {
   if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.mergeTabsBy !== 'activeMenu') {
-    tabbar.close({ name: 'daasModel' })
+    tabbar.close({ name: 'model' })
   }
   else {
-    router.push({ name: 'daasModel' })
+    router.push({ name: 'model' })
   }
 }
 </script>

src/views/rule/cat/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <h1>RULE-CAT</h1>
+</template>