cloud-web-corejs 1.0.54-dev.251 → 1.0.54-dev.252

package/package.json

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

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

@@ -355,6 +355,7 @@
                     v-el-readonly
                     v-if="row.zdType == 'Reference'"
                     :disabled="!row.zdEn"
+                    clearable
                   >
                     <i
                       slot="suffix"

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

@@ -469,7 +469,7 @@ modules = {
                 let hasCreated =
                   !!taZdMc && createdTableColumnArray.includes(taZdMc);
                 // let style = !row.relationZd ? "margin-left:20px" : "";
-                if (!row.systems && !hasCreated && !row.relationZd) {
+                if (!row.systems && !hasCreated) {
                   //非内置，未创建字段，非关联表带出来的字段
                   return getJsxBtn({
                     iconName: "el-icon-delete",
@@ -530,14 +530,10 @@ modules = {
       this.szTaMb.szTaZdMbDTOs.splice(0, 0, item);
     },
     deleteItem(row, rowIndex) {
-      let referenceZd = row.referenceZd;
-      let referenceZd2 = row.referenceZd +"."+row.zdEn;
-      this.szTaMb.szTaZdMbDTOs.splice(rowIndex, 1);
-      if (referenceZd) {
-        this.szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs.filter((item) => {
-          return referenceZd !== item.relationZd && referenceZd2 !== item.relationZd;
-        });
+      if (row.referenceZd) {
+        this.clearReferenceZd(row);
       }
+      this.szTaMb.szTaZdMbDTOs.splice(rowIndex, 1);
     },
     confirmInsertSzTaMb(rows) {
       if (rows.length > 0) {
@@ -646,6 +642,39 @@ modules = {
       this.currentIndex = rowIndex;
       this.showReferenceZdDialog = true;
     },
+    changeZdType(row) {
+      this.clearReferenceZd(row);
+    },
+    clearReferenceZd(row) {
+      let referenceZd = row.referenceZd;
+      if (referenceZd) {
+        let referenceZd2 = row.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);
+          }
+        });
+        if (delIndex.length) {
+          delIndex.reverse().forEach((i) => {
+            this.szTaMb.szTaZdMbDTOs.splice(i, 1);
+          });
+        }
+        row.referenceZd = null;
+      }*/
+    },
     confirmReferenceZdDialog() {
       let row = this.szTaMb.szTaZdMbDTOs[this.currentIndex];
       let oldReferenceZd = row.referenceZd;
@@ -653,9 +682,11 @@ modules = {
 
       let referenceEntity = this.referenceEntity;
       let refServiceName = this.refServiceName;
+      let referenceKey = this.referenceKey
+      let referenceZd = referenceEntity && referenceKey ? (referenceEntity + "." + referenceKey) : null;
 
-      let referenceZd = referenceEntity + "." + this.referenceKey;
       let referenceShowFields = this.referenceShowFields;
+
       let keys = referenceShowFields.map((item) => {
         return referenceEntity + "." + item;
       });
@@ -669,13 +700,7 @@ modules = {
               delIndex.push(index);
             }
           });
-        } /*else if (oldReferenceZd != referenceZd) {
-          this.szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (oldReferenceZd == item.relationZd) {
-              delIndex.push(index)
-            }
-          })
-        }*/ else {
+        } else {
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
             if (oldReferenceZd == item.relationZd || oldReferenceZd2 == item.relationZd) {
               if (!keys.includes(item.referenceZd)) {
@@ -687,18 +712,12 @@ modules = {
           });
         }
         if (delIndex.length) {
-          /*this.szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs.filter((item, index) => {
-            return !delIndex.includes(index);
-          })*/
           delIndex.reverse().forEach((i) => {
             this.szTaMb.szTaZdMbDTOs.splice(i, 1);
           });
         }
       }
 
-      /*let addReferenceShowFields = referenceShowFields.filter((item, index) => {
-        return !keys.includes(item)
-      })*/
       let oldKeys = this.szTaMb.szTaZdMbDTOs
         .filter((item) => (referenceZd == item.relationZd || (referenceZd + "." + item.zdEn) == item.relationZd))
         .map((item) => item.referenceZd);
@@ -743,6 +762,7 @@ modules = {
       this.handleReferenceOrders(row);
       this.showReferenceZdDialog = false;
     },
+
     changeOrders(row) {
       this.handleReferenceOrders(row);
     },