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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.640",
+  "version": "1.0.54-dev.642",
   "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,15 +463,20 @@
                         class="search-input"
                         v-model="row.referenceZd"
                         v-el-readonly
-                        v-if="row.zdType == 'Reference'"
+                        v-if="isReferenceZdType(row.zdType)"
                         :disabled="!row.zdEn"
-                        clearable
                       >
-                        <i
-                          slot="suffix"
-                          class="el-input__icon el-icon-search"
-                          @click="openReferenceZdDialog(row, rowIndex, $table)"
-                        ></i>
+                        <span slot="suffix" class="el-input__suffix-inner">
+                          <i
+                            v-if="row.referenceZd"
+                            class="el-input__icon el-icon-circle-close"
+                            @click.stop="confirmClearReferenceZd(row)"
+                          ></i>
+                          <i
+                            class="el-input__icon el-icon-search"
+                            @click="openReferenceZdDialog(row, rowIndex, $table)"
+                          ></i>
+                        </span>
                       </el-input>
                       <template v-else>
                         {{ row.referenceZd }}

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

@@ -121,7 +121,8 @@ modules = {
         Text: "文本",
         TextArea: "长文本",
         DateTime: "日期时间",
-        Reference: "关联表",
+        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,66 @@ 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);
+      }
+    },
+    getReferenceChildRows(row) {
+      let referenceZd = row.referenceZd;
+      if (!referenceZd && !row.zdEn) {
+        return [];
+      }
+      let referenceZd2 = referenceZd ? referenceZd + "." + row.zdEn : null;
+      let relationZdSuffix = row.zdEn ? "." + row.zdEn : null;
+      return this.szTaMb.szTaZdMbDTOs.filter((item) => {
+        if (referenceZd && (referenceZd === item.relationZd || referenceZd2 === item.relationZd)) {
+          return true;
+        }
+        if (relationZdSuffix && item.relationZd && item.relationZd.endsWith(relationZdSuffix)) {
+          return true;
+        }
+        return false;
+      });
+    },
+    confirmClearReferenceZd(row) {
+      if (!row.referenceZd) {
+        return;
+      }
+      if (this.hasFieldCreated(row)) {
+        this.$baseAlert(this.$t1("该字段已在数据库中创建，不能清空关联配置"));
+        return;
+      }
+      let childRows = this.getReferenceChildRows(row);
+      if (childRows.some((item) => this.hasFieldCreated(item))) {
+        this.$baseAlert(this.$t1("关联显示字段已在数据库中创建，不能清空关联配置"));
+        return;
+      }
+      let text = this.$t1("清空关联配置将同时删除关联显示字段，您确定要继续吗？");
+      this.$baseConfirm(text).then(() => {
+        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 +806,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 +831,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 +839,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 +923,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 +1004,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 +1045,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 +1059,7 @@ modules = {
     getBdEnv() {
       getBdFlag({
         success: (res) => {
-          this.isDev = res.objx == 1;
+          this.isDev = res.objx === 1;
         },
       });
     },
@@ -1160,14 +1185,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 +1222,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 +1250,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 +1292,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

@@ -1,9 +1,9 @@
-import {selectDialogMixins} from "@base/mixins/selectDialog";
+import { selectDialogMixins } from "@base/mixins/selectDialog";
 
 let modules = {};
 modules = {
-  name: 'zdDialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'taBm'],
+  name: "zdDialog",
+  props: ["visiable", "multi", "rows", "param", "taBm"],
   mixins: [selectDialogMixins],
   components: {},
   created() {
@@ -20,7 +20,7 @@ modules = {
       formData: {},
       vxeOption: {},
       showSaleOrgDialog: false,
-      fieldKey: "taZdMc"
+      fieldKey: "taZdMc",
     };
   },
   methods: {
@@ -28,85 +28,89 @@ modules = {
       let that = this;
 
       let zdTypeMap = {
-        Boolean: this.$t1('布尔'),
-        Integer: this.$t1('整数'),
-        Long: this.$t1('长整数'),
-        Decimal: this.$t1('精度小数'),
-        Money: this.$t1('金额'),
-        Text: this.$t1('文本'),
-        TextArea: this.$t1('长文本'),
-        DateTime: this.$t1('日期时间'),
-        Reference: this.$t1('关联表')
-      }
+        Boolean: this.$t1("布尔"),
+        Integer: this.$t1("整数"),
+        Long: this.$t1("长整数"),
+        Decimal: this.$t1("精度小数"),
+        Money: this.$t1("金额"),
+        Text: this.$t1("文本"),
+        TextArea: this.$t1("长文本"),
+        DateTime: this.$t1("日期时间"),
+        Reference: this.$t1("关联表(文本)"),
+        ReferenceLong: this.$t1("关联表(长整型)"),
+      };
 
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'bd_table_model_field_dialog-m1',
-        path: USER_PREFIX + '/szTaMb/getSzTaZdMbsByTaBm',
+        tableRef: "table-m1",
+        tableName: "bd_table_model_field_dialog-m1",
+        path: USER_PREFIX + "/szTaMb/getSzTaZdMbsByTaBm",
         param: () => {
           return {
             taBm: this.taBm,
             enabled: true,
             searchDb: true,
             ...this.formData,
-            ...this.param
+            ...this.param,
           };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t1('实体字段名称'),
-            field: 'zdEn',
-            width: 150
+            title: this.$t1("实体字段名称"),
+            field: "zdEn",
+            width: 150,
           },
           {
-            title: this.$t1('数据库表字段名'),
-            field: 'taZdMc',
-            width: 150
+            title: this.$t1("数据库表字段名"),
+            field: "taZdMc",
+            width: 150,
           },
           {
-            title: this.$t1('字段描述'),
-            field: 'zdCh',
-            width: 150
+            title: this.$t1("字段描述"),
+            field: "zdCh",
+            width: 150,
           },
           {
-            title: this.$t1('字段类型'), field: 'zdType', width: 150, slots: {
-              default: ({row, rowIndex, $table}) => {
+            title: this.$t1("字段类型"),
+            field: "zdType",
+            width: 150,
+            slots: {
+              default: ({ row, rowIndex, $table }) => {
                 return zdTypeMap[row.zdType];
-              }
-            }
+              },
+            },
           },
           {
-            title: this.$t1('关联字段'),
-            field: 'referenceZd',
-            width: 150
+            title: this.$t1("关联字段"),
+            field: "referenceZd",
+            width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
+            trigger: "row",
           },
           proxyConfig: {
             props: {
               result: "objx", // 配置响应结果列表字段
               total: "objx.length", // 配置响应结果总页数字段
-            }
-          }
-        }
+            },
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
     },
-  }
+  },
 };
-export default modules
+export default modules;