数据资源、模型：DDL解析接口返回数据格式更改

src/views/dataGovernance/dataModules/components/editBase.vue

@@ -118,6 +118,10 @@ export default {
   },
   created () {
     this.init()
+    if (Object.keys(this.names).length) {
+      this.formValues.name_zh = this.names?.name_zh
+      this.formValues.name_en = this.names?.name_en
+    }
     const val = this.itemData.data_model
     if (!val || !Object.keys(val).length) {
       return

src/views/dataGovernance/dataModules/components/editByDDL.vue

@@ -224,7 +224,7 @@
               </div>
             </v-overlay>
             <div class="pa-3 d-flex align-center justify-center flex-column">
-              <edit-base ref="base" style="max-width: 500px;" :item-data="itemData" :names="{name: select}"></edit-base>
+              <edit-base ref="base" style="max-width: 500px;" :item-data="itemData" :names="names"></edit-base>
               <v-btn
                 class="buttons"
                 color="primary"
@@ -326,6 +326,7 @@ export default {
           handle: this.handleSubmit
         }
       ],
+      names: {},
       loading: false,
       // relationList: [],
       // targetRelation: null,
@@ -392,6 +393,10 @@ export default {
     handleSelect (item, key) {
       this.select = key
       this.selected = [...item.meta]
+      this.names = {
+        name_zh: item.table_info?.name_zh,
+        name_en: item.table_info?.name_en
+      }
     },
     async handleChangeFile (file) {
       this.loadingUpload = true
@@ -400,11 +405,13 @@ export default {
       try {
         const { data } = await api.resourceParseDDL(query)
         this.select = null
-        this.items = Object.keys(data).reduce((res, key) => {
-          const { meta, ...obj } = data[key]
+        this.items = data.reduce((res, item) => {
+          const { columns, exist, table_info: tableInfo } = item
+          const key = tableInfo.name_zh || tableInfo.name_en
           res[key] = {
-            ...obj,
-            meta: meta.map(e => {
+            exist,
+            table_info: tableInfo,
+            meta: columns.map(e => {
               return {
                 ...e,
                 id: null,
@@ -508,6 +515,9 @@ export default {
               name_en: e.name_en,
               data_type: e.data_type,
               name_zh: e.name_zh,
+              comment: e.comment,
+              is_primary: e.is_primary,
+              nullable: e.nullable,
               data_standard: e.data_standard?.id ?? null,
               master_data: e.master_data?.id ?? null
             }
@@ -516,7 +526,7 @@ export default {
       ]
       const query = {
         ...obj,
-        name_en: this.select,
+        name_en: this.names.name_en,
         origin: 'sql'
       }
       if (this.itemData.id) {

src/views/dataGovernance/dataProcess/index.vue

@@ -76,7 +76,7 @@ export default {
   },
   computed: {
     title () {
-      return Object.keys(this.itemData).length ? '编辑' : '新增'
+      return Object.keys(this.itemData).length ? '编辑数据流程' : '新增数据流程'
     }
   },
   created () {

src/views/dataGovernance/dataResource/components/Database/index.vue

@@ -177,7 +177,7 @@ export default {
         text: e.name_zh
       }
     })
-    this.select = this.itemData.name_en
+    this.select = this.itemData.name_zh
     this.names = {
       name_zh: this.itemData.name_zh,
       name_en: this.itemData.name_en
@@ -190,11 +190,13 @@ export default {
       query.append('file', file)
       try {
         const { data } = await api.resourceParseDDL(query)
-        this.items = Object.keys(data).reduce((res, key) => {
-          const { meta, ...obj } = data[key]
+        this.items = data.reduce((res, item) => {
+          const { columns, exist, table_info: tableInfo } = item
+          const key = tableInfo.name_zh || tableInfo.name_en
           res[key] = {
-            ...obj,
-            meta: meta.map(e => {
+            exist,
+            table_info: tableInfo,
+            meta: columns.map(e => {
               return {
                 text: e.name_zh,
                 map: {
@@ -217,8 +219,8 @@ export default {
       this.select = key
       this.selectModel = item.meta
       this.names = {
-        name_zh: key,
-        name_en: key
+        name_zh: item.table_info?.name_zh,
+        name_en: item.table_info?.name_en
       }
     },
     handleSearch () {
@@ -261,7 +263,7 @@ export default {
               }
             }),
             type: 'database',
-            name_en: this.select
+            name_en: this.names.name_en
           })
         } else {
           Object.assign(params, {
@@ -274,8 +276,8 @@ export default {
                 }
               }),
               data_resource: {
-                name_en: this.select,
-                name_zh: obj.name_zh
+                name_en: this.names.name_en,
+                name_zh: this.names.name_zh
               }
             },
             type: 'database',

src/views/dataGovernance/dataResource/components/editBase.vue

@@ -165,6 +165,8 @@ export default {
   created () {
     this.init()
     if (!Object.keys(this.itemData).length) {
+      this.formValues.name_zh = this.names?.name_zh
+      this.formValues.name_en = this.names?.name_en
       return
     }
     Object.keys(this.formValues).forEach(key => {