cloud-web-corejs 1.0.250 → 1.0.251

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

@@ -84,6 +84,11 @@
                       :option="deleteProjectTagOption"
                       v-if="isDev && (currentFormType.editAuth === 1 || otherFlag)"
                     ></projectTagDeleteButton>
+                    <base-table-export
+                      v-if="userFlag === 6"
+                      :option="{ title: $t1('数据表导出'), targetRef: 'table-m1' }"
+                      :parent-target="_self"
+                    />
                   </template>
                   <template #buttonRight>
                     <vxe-button
@@ -139,6 +144,29 @@
                   :readonly="true"
                 ></projectTagView>
               </template>
+              <template #operation="{ row }">
+                <formVersionButton
+                  objType="SzTaMb"
+                  :objCode="row.taCode"
+                  @reverCallback="searchEvent"
+                ></formVersionButton>
+                <a
+                  v-if="exportArchiveEnabled"
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="jsonExportArchive(row)"
+                >
+                  <el-tooltip
+                    :enterable="false"
+                    effect="dark"
+                    :content="$t1('导出归档')"
+                    placement="top"
+                    popper-class="tooltip-skin"
+                  >
+                    <i class="el-icon-upload2" />
+                  </el-tooltip>
+                </a>
+              </template>
             </vxe-grid>
           </div>
         </div>

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

@@ -45,7 +45,7 @@ modules = {
           {
             title: this.$t1('表类型'), field: 'taType', width: 150, slots: {
               default: ({row}) => {
-                return row.taType == 0 ? this.$t1('主表') : this.$t1('明细表')
+                return row.taType === 0 ? this.$t1('主表') : this.$t1('明细表')
               }
             }
           },

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

@@ -7,7 +7,7 @@ import zdDialog from "@base/views/bd/setting/table_model/zdDialog.vue";
 import {getBdFlag} from "@base/api/user";
 import {getJsxBtn} from "@base/views/bd/setting/utils/index";
 import otherAuthDialog from "../otherAuthDialog.vue";
-
+import { mapGetters } from "vuex";
 
 let modules = {};
 modules = {
@@ -15,8 +15,11 @@ modules = {
   props: {
     _dataId: [String, Number],
     currentFormType: Object,
-    readonly: Boolean,
-    otherFlag:Boolean
+    // readonly: Boolean,
+    otherFlag:Boolean,
+    hData: Object,
+    compareHData: Object,
+    extractedObj: Object,
   },
   components: {
     formOplogTable,
@@ -49,6 +52,23 @@ modules = {
         taBm: null,
         sszstBm: null,
       },
+      oldSzTaMb: {
+        enabled: true,
+        taType: 0,
+        szTaZdMbDTOs: [],
+        menuKindName: null,
+        menuKindCode: null,
+        serviceName: null,
+        taRule: 0,
+        dataRange: 0,
+        szTaMbTagDTOs: [],
+        fromTable: false,
+        taCh: null,
+        sszstEn: null,
+        taEn: null,
+        taBm: null,
+        sszstBm: null,
+      },
       treeDefaultZds: [],
       productOption: {},
       showSzTaMbDialog: false,
@@ -90,10 +110,46 @@ modules = {
       preValue: null,        // 上一次的值（变更前的值）
 
       sid: null,
-      showOtherAuthDialog:false
+      showOtherAuthDialog:false,
+
+      zdTypeMap: {
+        Boolean: "布尔",
+        Integer: "整数",
+        Long: "长整数",
+        Decimal: "精度小数",
+        Money: "金额",
+        Text: "文本",
+        TextArea: "长文本",
+        DateTime: "日期时间",
+        Reference: "关联表(文本)",
+        ReferenceLong: "关联表(长整型)",
+      },
+
+      treeFlagMap:{
+        name: "名称",
+        wbs: "WBS码",
+        parent: "上级ID",
+        treePath: "树ID路径",
+        treePathName: "树名称路径",
+        hasChild: "是否有下级",
+        grade: "层级",
+      },
+
+      readonly: false,
+      isCompare: false,
     };
   },
+  computed: {
+    ...mapGetters([
+      "userFlag",
+    ]),
+  },
   created() {
+    if(this.hData){
+      this.readonly = true;
+    }else{
+      this.readonly = this.$attrs.readonly || false;
+    }
     if (this._dataId && !isNaN(this._dataId)) {
       this.dataId = this._dataId;
     } else {
@@ -109,8 +165,26 @@ modules = {
     this.getData();
   },
   methods: {
+    initData(formData){
+      if(!!formData?.id)this.isEdit = true;
+      this.szTaMb = formData;
+      this.getMenuKindAuth(formData.menuKindCode);
+      if(!!formData?.id)this.getCreatedTableColumns();
+    },
     getData(callback) {
-      if (this.dataId && !isNaN(this.dataId)) {
+      if(this.extractedObj){
+        this.dataId = this.extractedObj.id;
+        this.initData(this.extractedObj)
+        //获取操作日志数据
+        this.$refs["oplogTable"].initData({
+          param: () => {
+            return {
+              logType: "SzTaMb",
+              logObjCode: this.szTaMb.taCode,
+            };
+          },
+        });
+      }else if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$http({
           aes: true,
@@ -127,10 +201,11 @@ modules = {
               szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs;
               szTaMb.attachmentDTOs = this.szTaMb.attachmentDTOs;
               szTaMb.oplogDTOs = this.szTaMb.oplogDTOs;
-              this.szTaMb = szTaMb;
 
-              this.getCreatedTableColumns();
-              this.getMenuKindAuth(this.szTaMb.menuKindCode);
+              // this.szTaMb = szTaMb;
+              // this.getCreatedTableColumns();
+              // this.getMenuKindAuth(this.szTaMb.menuKindCode);
+              this.initData(szTaMb);
             } else {
               callback(res);
             }
@@ -145,6 +220,22 @@ modules = {
             });
           },
         });
+      } else if (this.hData){
+        this.dataId = this.hData.id
+        /* this.isEdit = true;
+        this.szTaMb = this.$baseLodash.cloneDeep(this.hData);
+        this.getMenuKindAuth(this.szTaMb.menuKindCode);
+        this.getCreatedTableColumns(); */
+        this.initData(this.$baseLodash.cloneDeep(this.hData));
+        if (this.compareHData && this.$attrs.isCompare) {
+          this.oldSzTaMb = this.$baseLodash.cloneDeep(this.compareHData);
+          let oldSzTaZdMbDTOs = this.$baseLodash.cloneDeep(this.compareHData.szTaZdMbDTOs) || [];
+          this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
+            let oldItem = oldSzTaZdMbDTOs.find((pItem) => pItem.zdEn === item.zdEn);
+            item.hData = oldItem || {};
+          })
+          this.isCompare = true;
+        }
       } else {
         this.getMenuKindAuth(this.szTaMb.menuKindCode);
       }
@@ -249,22 +340,6 @@ modules = {
             fixed: "left",
             slots: {
               default: "zdEn",
-              /*default: ({row, rowIndex, $table}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                if (!disabled) {
-                  return [
-                    <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdEn'}
-                                  rules={[{required: true, trigger: ['blur', 'change']}]}>
-                      <el-input v-model={row.zdEn} clearable/>
-                    </el-form-item>
-                  ];
-                } else {
-                  let style = !!row.relationZd ? "margin-left:20px" : "";
-                  return [
-                    <div style={style}>{row.zdEn}</div>
-                  ]
-                }
-              }*/
             },
           },
           {
@@ -281,9 +356,23 @@ modules = {
               default: ({row, rowIndex, $table}) => {
                 let taZdMc = row.taZdMc;
                 let createdTableColumnArray = this.createdTableColumnArray;
-                return taZdMc && createdTableColumnArray.includes(taZdMc)
+                let oldResult = createdTableColumnArray.includes(row?.hData?.taZdMc)
+                  ? "是"
+                  : "_";
+                let result = taZdMc && createdTableColumnArray.includes(taZdMc)
                   ? "是"
                   : "_";
+                  return [
+                    <el-form-item>
+                      <fieldCompare
+                        isCompare={this.isCompare}
+                        oldVal={oldResult}
+                        newVal={result}
+                      >
+                        {result}
+                      </fieldCompare>
+                    </el-form-item>
+                  ]
               },
             },
           },
@@ -293,14 +382,6 @@ modules = {
             width: 150,
             slots: {
               default: "zdCh",
-              /*default: ({row, rowIndex, $table}) => {
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdCh'}
-                                rules={[{required: true, trigger: ['blur', 'change']}]}>
-                    <el-input v-model={row.zdCh} clearable disabled={!!row.systems}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -359,43 +440,32 @@ modules = {
             width: 200,
             slots: {
               default: "zdTypeValues",
-              /*default: ({row, rowIndex, $table}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdTypeValues'}
-                                rules={[{required: false, trigger: ['blur', 'change']}]}>
-                    <el-input v-model={row.zdTypeValues} clearable disabled={disabled}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
             title: this.$t1("是否必填项"),
             field: "required",
             width: 140,
+            params: {
+              exportVal:({row,column})=>{
+                return this.$t1(row[column.field]? "是": "否")
+              }
+            },
             slots: {
               default: "required",
-              /*default: ({row, $table, rowIndex}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-checkbox v-model={row.required} disabled={disabled}/>
-                ];
-              }*/
             },
           },
           {
             title: this.$t1("是否启用"),
             field: "enabled",
             width: 120,
+            params: {
+              exportVal:({row,column})=>{
+                return this.$t1(row[column.field]? "是": "否")
+              }
+            },
             slots: {
               default: "enabled",
-              /*default: ({row, $table, rowIndex}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-checkbox v-model={row.enabled} disabled={disabled}/>
-                ];
-              }*/
             },
           },
 
@@ -403,20 +473,24 @@ modules = {
             title: this.$t1("是否自动生成编码"),
             field: "generateCode",
             width: 180,
+            params: {
+              exportVal:({row,column})=>{
+                return this.$t1(row[column.field]? "是": "否")
+              }
+            },
             slots: {
               default: "generateCode",
-              /*default: ({row, $table, rowIndex}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-checkbox v-model={row.generateCode} disabled={disabled}/>
-                ];
-              }*/
             },
           },
           {
             title: this.$t1('数据库字段加密'),
             field: 'atened',
             width: 180,
+            params: {
+              exportVal:({row,column})=>{
+                return this.$t1(row[column.field]? "是": "否")
+              }
+            },
             slots: {
               default: "atened"
             }
@@ -425,6 +499,11 @@ modules = {
             title: this.$t1('是否更新忽略字段'),
             field: 'updateIgnore',
             width: 180,
+            params: {
+              exportVal:({row,column})=>{
+                return this.$t1(row[column.field]? "是": "否")
+              }
+            },
             slots: {
               default: "updateIgnore"
             }
@@ -435,15 +514,6 @@ modules = {
             width: 150,
             slots: {
               default: "codeType",
-              /*default: ({row, rowIndex, $table}) => {
-                let disabled = !!row.systems || !!row.relationZd;
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.codeType'}
-                                rules={[{required: false, trigger: ['blur', 'change']}]}>
-                    <el-input v-model={row.codeType} clearable disabled={disabled}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -452,16 +522,6 @@ modules = {
             width: 150,
             slots: {
               default: "orders",
-              /*default: ({row, rowIndex, $table}) => {
-                return [
-                  <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.orders'}
-                                rules={[{required: false, trigger: ['blur', 'change']}]}>
-                    <base-input-number v-model={row.orders} disabled={!!row.systems} onchange={() => {
-                      this.changeOrders(row);
-                    }}/>
-                  </el-form-item>
-                ];
-              }*/
             },
           },
           {
@@ -477,7 +537,7 @@ modules = {
                 let hasCreated =
                   !!taZdMc && createdTableColumnArray.includes(taZdMc);
                 // let style = !row.relationZd ? "margin-left:20px" : "";
-                if (!row.systems && !hasCreated) {
+                if (!row.systems && !hasCreated && !this.readonly) {
                   //非内置，未创建字段，非关联表带出来的字段
                   return getJsxBtn({
                     iconName: "el-icon-delete",
@@ -491,6 +551,11 @@ modules = {
             },
           },
         ],
+        config:{
+          // rowConfig:{
+          //   height: 60,
+          // }
+        }
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.productOption = opts;
@@ -616,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;
@@ -629,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);
           });
       }
@@ -661,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];
@@ -717,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 {
@@ -742,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);
@@ -750,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;
 
@@ -834,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 = [];
         }
@@ -915,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);
@@ -956,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;
@@ -970,7 +1059,7 @@ modules = {
     getBdEnv() {
       getBdFlag({
         success: (res) => {
-          this.isDev = res.objx == 1;
+          this.isDev = res.objx === 1;
         },
       });
     },
@@ -1096,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;
         }
       }
@@ -1133,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;
         }
@@ -1161,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;
             }
           });
@@ -1197,6 +1286,24 @@ modules = {
     confirmOtherAuthDialog(){
       this.$baseReload()
     },
+    excelExport(){
+      this.$excelExport({title: '数据表字段明细导出', targetRef: 'table-szTaZdMb', prefix: USER_PREFIX, type: 'selected'})
+    },
+    getHValue(row, column) {
+      if (row.hData && row.hData.id) {
+        let result = row.hData[column.property];
+        if(column.property === 'zdType'){
+          result = this.zdTypeMap[result]
+        }else if(column.property === 'treeFlag'){
+          result = this.treeFlagMap[result]
+        }
+        return result
+      }/*  else if (!row?.hData?.id) {
+        return "HAS_NO_HDATA";
+      } */ else {
+        return null;
+      }
+    },
   },
 };
 export default modules;