cloud-web-corejs 1.0.54-dev.117 → 1.0.54-dev.118

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.117",
+  "version": "1.0.54-dev.118",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/bd/setting/table_model/edit.vue

@@ -42,7 +42,7 @@
                 </th>
                 <td colspan="3">
                   <el-form-item prop="taEn" :rules="[{ required: true, trigger: ['blur', 'change'] }]">
-                    <el-input type="text" autocomplete="off" v-model="szTaMb.taEn" clearable :disabled="szTaMb.fromTable"/>
+                    <el-input type="text" autocomplete="off" v-model="szTaMb.taEn" clearable />
                   </el-form-item>
                 </td>
                 <th><em class="f-red">*</em>{{ $t1('数据库表名') }}</th>
@@ -476,11 +476,9 @@
 
 <script>
 import mixin from "./mixins/edit";
-import viewDialog from "@/layout/components/extractedCode/viewDialog.vue";
 
 export default {
   name: 'szTaMbEdit',
-  components: {viewDialog},
   mixins: [mixin]
 }
 </script>

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -40,7 +40,9 @@ modules = {
         szTaMbTagDTOs: [],
         fromTable: false,
         taCh: null,
-        sszstEn:null
+        sszstEn: null,
+        taEn: null,
+        taBm: null
       },
       treeDefaultZds: [],
       productOption: {},
@@ -805,21 +807,27 @@ modules = {
       this.showDtDialog = true;
     },
     confirmDtDialog() {
-      if (!this.dbTable) {
-        this.$baseAlert("数据表不能为空");
+      let dbTable = this.dbTable;
+      if (!dbTable) {
+        this.$baseAlert(this.$t1("数据表不能为空"));
         return
       }
+      this.showDtDialog = false;
       this.$http({
         // aes: true,
         url: "/" + this.szTaMb.serviceName + `/dbTable/getSzTaZdMbs`,
         method: `post`,
         data: {
-          stringOne: this.dbTable
+          stringOne: dbTable
         },
         isLoading: true,
         success: res => {
           let items = res.objx || [];
-          /*let szTaZdMbDTOs = items.map(item => {
+          if (!items.length) {
+            this.$baseAlert(this.$t1("数据表[{dbTable}]不存在", {dbTable}));
+            return
+          }
+          let szTaZdMbDTOs = items.filter(item => !item.systems).map(item => {
             return {
               ...item,
               createBy: null,
@@ -830,23 +838,9 @@ modules = {
               modifyDate: null
             }
           })
-          let newRow = {
-            ...row,
-            createBy: null,
-            createDate: null,
-            fromTable: true,
-            id: null,
-            modifyBy: null,
-            modifyDate: null,
-            sid: null
-          }
-          Object.keys(newRow).forEach(key => {
-            if (key.endsWith('DTOs')) {
-              delete newRow[key]
-            }
-          })
-          Object.assign(this.szTaMb, newRow);
-          this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;*/
+          this.szTaMb.taEn = dbTable;
+          this.szTaMb.taBm = dbTable;
+          this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;
         }
       });
     },
@@ -888,7 +882,7 @@ modules = {
               modifyBy: null,
               modifyDate: null,
               sid: null,
-              taBm: null,
+              // taBm: null,
               taCode: null
             }
             Object.keys(newRow).forEach(key => {