cloud-web-corejs 1.0.54-dev.640 → 1.0.54-dev.641

package/package.json

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

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

@@ -429,6 +429,7 @@
                         <el-option value="TextArea" :label="$t1('长文本')"></el-option>
                         <el-option value="DateTime" :label="$t1('日期时间')"></el-option>
                         <el-option value="Reference" :label="$t1('关联表')"></el-option>
+                        <el-option value="ReferenceLong" :label="$t1('关联表(长整型)')"></el-option>
                       </el-select>
                     </fieldCompare>
                   </el-form-item>
@@ -462,9 +463,10 @@
                         class="search-input"
                         v-model="row.referenceZd"
                         v-el-readonly
-                        v-if="row.zdType == 'Reference'"
+                        v-if="isReferenceZdType(row.zdType)"
                         :disabled="!row.zdEn"
                         clearable
+                        @clear="clearReferenceZd(row)"
                       >
                         <i
                           slot="suffix"

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

@@ -122,6 +122,7 @@ modules = {
         TextArea: "长文本",
         DateTime: "日期时间",
         Reference: "关联表",
+        ReferenceLong: "关联表(长整型)",
       },
 
       treeFlagMap:{
@@ -680,6 +681,9 @@ modules = {
         });
       });
     },
+    isReferenceZdType(zdType) {
+      return zdType === "Reference" || zdType === "ReferenceLong";
+    },
     openReferenceZdDialog(row, rowIndex, $table) {
       let referenceZd = row.referenceZd;
       let referenceZd2 = row.referenceZd + "." + row.zdEn;
@@ -693,16 +697,13 @@ modules = {
         referenceKey = referenceZd.substr(index + 1);
         referenceShowFields = this.szTaMb.szTaZdMbDTOs
           .filter((item) => {
-            // return referenceZd == item.relationZd;
             let flag = false;
             if (item.relationZd === referenceZd || item.relationZd === referenceZd2) {
               flag = true
             }
             return flag;
-            // return referenceZd == item.relationZd ;
           })
           .map((item) => {
-            // return item.referenceZd.split(".")[1]
             return item.referenceZd.substr(index + 1);
           });
       }
@@ -725,42 +726,31 @@ modules = {
       let map = {
         "Integer": "11",
         "Long": "20",
+        "ReferenceLong": "20",
         "Decimal": "21,6",
         "Money": "21,2",
         "Text": "255"
       }
       row.zdLength = map[row.zdType] || null;
-      this.clearReferenceZd(row);
+      if (!this.isReferenceZdType(row.zdType)) {
+        this.clearReferenceZd(row);
+      }
     },
     clearReferenceZd(row) {
       let referenceZd = row.referenceZd;
       if (referenceZd) {
-        let referenceZd2 = row.referenceZd + "." + row.zdEn;
+        let referenceZd2 = referenceZd + "." + row.zdEn;
         this.szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs.filter((item) => {
           return referenceZd !== item.relationZd && referenceZd2 !== item.relationZd;
         });
-        row.referenceZd = null;
-      }
-
-
-      /*let oldReferenceZd = row.referenceZd;
-      if (oldReferenceZd) {
-        let oldReferenceZd2 = row.referenceZd + "." + row.zdEn;
-        let index0 = oldReferenceZd.indexOf(".");
-        let oldReferenceEntity = oldReferenceZd.substring(0, index0);
-        let delIndex = [];
-        this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-          if (item.relationZd && (oldReferenceZd == item.relationZd || oldReferenceZd2 == item.relationZd)) {
-            delIndex.push(index);
-          }
+      } else if (row.zdEn) {
+        let relationZdSuffix = "." + row.zdEn;
+        this.szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs.filter((item) => {
+          return !(item.relationZd && item.relationZd.endsWith(relationZdSuffix));
         });
-        if (delIndex.length) {
-          delIndex.reverse().forEach((i) => {
-            this.szTaMb.szTaZdMbDTOs.splice(i, 1);
-          });
-        }
-        row.referenceZd = null;
-      }*/
+      }
+      row.referenceZd = null;
+      row.refServiceName = null;
     },
     confirmReferenceZdDialog() {
       let row = this.szTaMb.szTaZdMbDTOs[this.currentIndex];
@@ -781,15 +771,15 @@ modules = {
         let index0 = oldReferenceZd.indexOf(".");
         let oldReferenceEntity = oldReferenceZd.substring(0, index0);
         let delIndex = [];
-        if (referenceEntity != oldReferenceEntity) {
+        if (referenceEntity !== oldReferenceEntity) {
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (item.relationZd && (oldReferenceZd == item.relationZd || oldReferenceZd2 == item.relationZd)) {
+            if (item.relationZd && (oldReferenceZd === item.relationZd || oldReferenceZd2 === item.relationZd)) {
               delIndex.push(index);
             }
           });
         } else {
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (oldReferenceZd == item.relationZd || oldReferenceZd2 == item.relationZd) {
+            if (oldReferenceZd === item.relationZd || oldReferenceZd2 === item.relationZd) {
               if (!keys.includes(item.referenceZd)) {
                 delIndex.push(index);
               } else {
@@ -806,7 +796,7 @@ modules = {
       }
 
       let oldKeys = this.szTaMb.szTaZdMbDTOs
-        .filter((item) => (referenceZd == item.relationZd || (referenceZd + "." + item.zdEn) == item.relationZd))
+        .filter((item) => (referenceZd === item.relationZd || (referenceZd + "." + item.zdEn) === item.relationZd))
         .map((item) => item.referenceZd);
       let addReferenceShowFields = referenceShowFields.filter((item, index) => {
         return !oldKeys.includes(referenceEntity + "." + item);
@@ -814,7 +804,7 @@ modules = {
 
       let addIndex = -1;
       let lastIndex = this.szTaMb.szTaZdMbDTOs.findLastIndex((item) => {
-        return referenceZd == item.relationZd || (referenceZd + "." + item.zdEn) == item.relationZd;
+        return referenceZd === item.relationZd || (referenceZd + "." + item.zdEn) === item.relationZd;
       });
       addIndex = lastIndex >= 0 ? lastIndex + 1 : this.currentIndex + 1;
 
@@ -898,7 +888,7 @@ modules = {
     confirmEntityDialog(rows) {
       if (rows.length) {
         let row = rows[0];
-        if (this.referenceEntity != row.taBm) {
+        if (this.referenceEntity !== row.taBm) {
           this.referenceKey = null;
           this.referenceShowFields = [];
         }
@@ -979,7 +969,7 @@ modules = {
     changeTaRule(val) {
       let treeDefaultZds = this.$baseLodash.cloneDeep(this.treeDefaultZds);
       let szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs;
-      if (val == 1) {
+      if (val === 1) {
         let zdEns = szTaZdMbDTOs
           .filter((item) => !!item.zdEn)
           .map((item) => item.zdEn);
@@ -1020,7 +1010,7 @@ modules = {
       let szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs;
       let value = 0;
       let allOrders = szTaZdMbDTOs
-        .filter((item) => item.orders != null && item.orders != undefined)
+        .filter((item) => item.orders !== null && item.orders !== undefined)
         .map((item) => item.orders);
       szTaZdMbDTOs.forEach((item) => {
         let orders = item.orders;
@@ -1034,7 +1024,7 @@ modules = {
     getBdEnv() {
       getBdFlag({
         success: (res) => {
-          this.isDev = res.objx == 1;
+          this.isDev = res.objx === 1;
         },
       });
     },
@@ -1160,14 +1150,14 @@ modules = {
       let toTaBmZdField = null;
       if (toTaBmZd) {
         toTaBmZd.split(".").forEach((item, index) => {
-          if (index == 0) {
+          if (index === 0) {
             toTaBmZdEntity = item;
-          } else if (index == 1) {
+          } else if (index === 1) {
             toTaBmZdField = item;
           }
         });
       } else {
-        if (this.szTaMb.taType == 1 && this.szTaMb.sszstBm) {
+        if (this.szTaMb.taType === 1 && this.szTaMb.sszstBm) {
           toTaBmZdEntity = this.szTaMb.sszstBm;
         }
       }
@@ -1197,7 +1187,7 @@ modules = {
     confirmEntityDialog3(rows) {
       if (rows.length) {
         let row = rows[0];
-        if (this.toTaBmZdEntity != row.taBm) {
+        if (this.toTaBmZdEntity !== row.taBm) {
           this.toTaBmZdEntity = row.taBm;
           this.toTaBmZdField = null;
         }
@@ -1225,13 +1215,13 @@ modules = {
       if(!this.fkey)return
       let oldVal = this.preValue;
       let newVal = val
-      if (row.zdType === 'Reference') {
+      if (this.isReferenceZdType(row.zdType)) {
         let referenceZd = row.referenceZd;
         if (referenceZd) {
           let referenceZd2 = row.referenceZd + "." + oldVal
           let relationZd = row.referenceZd + "." + newVal
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (referenceZd == item.relationZd || referenceZd2 == item.relationZd) {
+            if (referenceZd === item.relationZd || referenceZd2 === item.relationZd) {
               item.relationZd = relationZd;
             }
           });
@@ -1267,9 +1257,9 @@ modules = {
     getHValue(row, column) {
       if (row.hData && row.hData.id) {
         let result = row.hData[column.property];
-        if(column.property == 'zdType'){
+        if(column.property === 'zdType'){
           result = this.zdTypeMap[result]
-        }else if(column.property == 'treeFlag'){
+        }else if(column.property === 'treeFlag'){
           result = this.treeFlagMap[result]
         }
         return result

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

@@ -36,7 +36,8 @@ modules = {
         Text: this.$t1('文本'),
         TextArea: this.$t1('长文本'),
         DateTime: this.$t1('日期时间'),
-        Reference: this.$t1('关联表')
+        Reference: this.$t1('关联表'),
+        ReferenceLong: this.$t1('关联表(长整型)')
       }
 
       let tableOption = {