cnhis-design-vue 2.1.16 → 2.1.17

package/packages/big-table/src/utils/batchEditing.js

@@ -1,5 +1,5 @@
 // import { mapMutations, mapActions } from "vuex";
-import utils from "@/utils/utils-map";
+import utils from '@/utils/utils-map';
 export default {
   props: {
     // 曾经的getters
@@ -43,10 +43,10 @@ export default {
       return {
         isLoadData: this.isLoadData,
         isLoadColumn: this.isLoadColumn
-      }
+      };
     },
     isTableEdit() {
-      return this.isInlineOperating || this.isInlineAdding
+      return this.isInlineOperating || this.isInlineAdding;
     }
   },
   watch: {
@@ -55,7 +55,7 @@ export default {
       let { isLoadData, isLoadColumn } = obj;
       if (!(isLoadData && isLoadColumn)) return;
       if (this.isBatchEditing) return;
-      this.$emit('tableLoad', true)
+      this.$emit('tableLoad', true);
     },
     /**
      * 编辑
@@ -69,7 +69,7 @@ export default {
       }
       // 非行内按钮触发
       if (!this.isRowEditing) {
-        await this.toggleColumn()
+        await this.toggleColumn();
       }
       this.hideSelectCloumns();
       this.handleClickBatchEditBtnByInline();
@@ -90,7 +90,7 @@ export default {
       if (!val || this.isNestTable) return false;
       if (this.isTree != 0 || !this.isMatchComponent) return false;
       if (!this.checkOperateCurrentTable()) return false;
-      await this.toggleColumn('showColumn')
+      await this.toggleColumn('showColumn');
       this.handleClickBatchCancelBtnByInline();
     },
     /**
@@ -109,17 +109,17 @@ export default {
         this.resetBatchOperationRowStatus();
         return false;
       }
-      await this.toggleColumn()
+      await this.toggleColumn();
       this.hideSelectCloumns();
-      this.handleClickAddRow()
+      this.handleClickAddRow();
     }
   },
   methods: {
     toggleColumn(key) {
-      let method = key || 'hideColumn'
+      let method = key || 'hideColumn';
       const xGrid = this.$refs.xGrid;
       if (!xGrid) return Promise.resolve();
-      let operate = xGrid.getColumnByField("operatorColumn")
+      let operate = xGrid.getColumnByField('operatorColumn');
       if (method === 'showColumn' && operate.visible) {
         return Promise.resolve();
       }
@@ -233,10 +233,18 @@ export default {
       this.$emit('resetBatchEditDoneStatus');
 
       let formDom = document.querySelectorAll('.js-inlineEditForm');
-      let sliceLen = this.handleEditFormLength();
-      // HACK: vxeTable行内编辑时复制的DOM节点，无需触发提交
-      formDom = [...formDom].slice(0, sliceLen);
-      formDom.forEach(item => {
+      let filterFormDom = [];
+      [...formDom].map(item => {
+        let pNode = item.parentNode?.parentNode;
+        if (pNode) {
+          if (pNode.classList.contains('vxe-body--column') && !pNode.classList.contains('fixed--hidden')) {
+            filterFormDom.push(item);
+          }
+        }
+      });
+      if (!filterFormDom.length) return false;
+      // // HACK: vxeTable行内编辑时复制的DOM节点，无需触发提交
+      filterFormDom.forEach(item => {
         item.__vue__.handleSubmitForm();
       });
     },
@@ -340,22 +348,21 @@ export default {
       return editColumnMap;
     },
     async handleRequestedUniqueKey(id) {
-      let handleEditFormRequestedUniqueKey = this.editFormApiConfig?.handleEditFormRequestedUniqueKey
+      let handleEditFormRequestedUniqueKey = this.editFormApiConfig?.handleEditFormRequestedUniqueKey;
       if (!handleEditFormRequestedUniqueKey || typeof handleEditFormRequestedUniqueKey !== 'function') {
         handleEditFormRequestedUniqueKey = this.getPrimaryKeyRequest;
       }
-      return handleEditFormRequestedUniqueKey({ tableId: id }).then((val) => {
-        val && (this.cacheUniqueKey[id] = { value: val, status: true })
-      })
-
+      return handleEditFormRequestedUniqueKey({ tableId: id }).then(val => {
+        val && (this.cacheUniqueKey[id] = { value: val, status: true });
+      });
     },
     getPrimaryKeyRequest(params) {
       return new Promise((resolve, reject) => {
         this.axios
-          .get("tableList/getPrimaryKey", { params })
+          .get('tableList/getPrimaryKey', { params })
           .then(({ data }) => {
             let result;
-            if (data.result == "SUCCESS") {
+            if (data.result == 'SUCCESS') {
               const { map = {} } = data;
               result = map.primaryKey || undefined;
             } else {
@@ -413,7 +420,7 @@ export default {
         let originalRow = this.pageIndexOldtableData.find(item => {
           let oldItemVal = utils.handleCurValue(item[this.primaryKey]);
           let rowVal = utils.handleCurValue(row[this.primaryKey]);
-          return oldItemVal == rowVal
+          return oldItemVal == rowVal;
         });
         defaultCombinationForm = this.setDefaultFormData(column.property, fieldItem, originalRow);
       }
@@ -504,7 +511,7 @@ export default {
         this.$emit('triggerSpinning', false);
         return;
       }
-      let { listFormUnionSetting } = this
+      let { listFormUnionSetting } = this;
       let { formId } = listFormUnionSetting;
       let params = this.handleSubmitParams(this.batchFormData);
       if (!formId || !params) {
@@ -543,7 +550,7 @@ export default {
       let arr = [];
       for (let key in batchFormData) {
         // v[this.primaryKey] 可能为数字
-        // key 为字符串 用全等匹配不到 改为 == 
+        // key 为字符串 用全等匹配不到 改为 ==
         let matchItem = this.oldtableData.find(v => v[this.primaryKey] == key);
         let obj = batchFormData[key];
         if (matchItem) {
@@ -556,11 +563,11 @@ export default {
       return arr;
     },
     savaForm(formId, params) {
-      let handleEditFormSavaForm = this.editFormApiConfig?.handleEditFormSavaForm
+      let handleEditFormSavaForm = this.editFormApiConfig?.handleEditFormSavaForm;
       if (!handleEditFormSavaForm || typeof handleEditFormSavaForm !== 'function') {
-        handleEditFormSavaForm = this.savaFormRequest
+        handleEditFormSavaForm = this.savaFormRequest;
       }
-      return handleEditFormSavaForm(params, { formId })
+      return handleEditFormSavaForm(params, { formId });
     },
     savaFormRequest(params, config) {
       let url = `/form/editRows/update/${config.formId}`;

package/packages/big-table/src/utils/bigTableProps.js

@@ -1,95 +1,95 @@
-const bigTableProps = {
-  data: { type: Array, default: () => [] },
-  MAX_CHECK_SIZE: [String, Number],
-  showFooter: Boolean,
-  sumData: { type: Object, default: () => ({}) },
-  avgData: { type: Object, default: () => ({}) },
-  columnConfig: {
-    type: Object,
-    default: () => {
-      return {};
-    }
-  },
-  refreshRow: Number,
-  relatedItems: {
-    type: Object,
-    default: () => {
-      return {
-        triggerMethodPc: '', // 相关项打开方式
-        triggerMethodField: '' // 相关项打开字段
-      };
-    }
-  },
-  pageVO: {
-    type: Object,
-    default: () => {
-      return {
-        pageIndex: 1, // 当前第几页
-        pageSize: 20, // 每页几条数据
-        total: 20 // 总数多少条
-      };
-    }
-  },
-  tableOptions: { type: Object, default: () => ({}) },
-  quickSearchConfig: { type: Array, default: () => [] },
-  primaryKey: String,
-  tableDataCache: { type: Array, default: () => [] },
-  oldtableData: { type: Array, default: () => [] }, // 原始数据
-  tableName: String,
-  fieldListOriginal: { type: Array, default: () => [] },
-  tableParams: { type: Object, default: () => ({}) },
-  emptyItems: {
-    type: Object,
-    default: () => {
-      return {
-        noDataImg: 'nodata',
-        noDataTip: ''
-      };
-    }
-  },
-  styleSetting: { type: Object, default: () => ({}) },
-  sysImageSize: { type: Array, default: () => [] },
-  height: String,
-  groupCountFields: { type: Array, default: () => [] },
-  groupCountMap: { type: Object, default: () => ({}) },
-  listFormUnionSetting: { type: Object, default: () => ({}) },
-  inlineEditFormConfig: { type: Object, default: () => ({}) },
-  clickRowData: { type: Object, default: () => ({}) },
-  btnList: { type: Array, default: () => [] },
-  spinning: Boolean,
-  rowGroupSetting: { type: Object, default: () => ({}) },
-  isInlineOperating: Boolean,
-  inlineEditCurrentOperateBtnId: String,
-  tableRefreshCache: { type: Object, default: () => ({}) }, // 记录需要刷新的列表，当切换到当前列表时更新
-  userInfo: { type: Object, default: () => ({}) },
-  isInlineAdding: Boolean,
-  isRowEditing: Boolean,
-  pageIndexOldtableData: {
-    // 原始数据
-    type: Array,
-    default: () => []
-  },
-  submitForm: Function,
-  isMatchComponent: { type: Boolean, default: true }, // 为了兼容低代码(组件内部)与二次开发平台(vuex)
-  asyncCount: Boolean,
-  showSettings: { type: Object, default: () => ({}) },
-  filterDomPortal: { // 表头筛选挂载的地方
-    type: String,
-    default: "body"
-  },
-  filterTopOffset: { // 表头 top 调节
-    type: Number,
-    default: 0
-  },
-  editFormApiConfig: Object, // 编辑表格api
-  defaultEditAllRow: Boolean,
-  editTableUid: [String, Number],
-  curBatchBtnData: { type: Object, default: () => ({}) },
-  rowBtnAutoLayout:{// 行内按钮自适应布局
-    type: Boolean,
-    default: true
-  },
-  listCountParams:{ type: Object, default: () => ({}) },
-};
-
-export default bigTableProps;
+const bigTableProps = {
+  data: { type: Array, default: () => [] },
+  MAX_CHECK_SIZE: [String, Number],
+  showFooter: Boolean,
+  sumData: { type: Object, default: () => ({}) },
+  avgData: { type: Object, default: () => ({}) },
+  columnConfig: {
+    type: Object,
+    default: () => {
+      return {};
+    }
+  },
+  refreshRow: Number,
+  relatedItems: {
+    type: Object,
+    default: () => {
+      return {
+        triggerMethodPc: '', // 相关项打开方式
+        triggerMethodField: '' // 相关项打开字段
+      };
+    }
+  },
+  pageVO: {
+    type: Object,
+    default: () => {
+      return {
+        pageIndex: 1, // 当前第几页
+        pageSize: 20, // 每页几条数据
+        total: 20 // 总数多少条
+      };
+    }
+  },
+  tableOptions: { type: Object, default: () => ({}) },
+  quickSearchConfig: { type: Array, default: () => [] },
+  primaryKey: String,
+  tableDataCache: { type: Array, default: () => [] },
+  oldtableData: { type: Array, default: () => [] }, // 原始数据
+  tableName: String,
+  fieldListOriginal: { type: Array, default: () => [] },
+  tableParams: { type: Object, default: () => ({}) },
+  emptyItems: {
+    type: Object,
+    default: () => {
+      return {
+        noDataImg: 'nodata',
+        noDataTip: ''
+      };
+    }
+  },
+  styleSetting: { type: Object, default: () => ({}) },
+  sysImageSize: { type: Array, default: () => [] },
+  height: String,
+  groupCountFields: { type: Array, default: () => [] },
+  groupCountMap: { type: Object, default: () => ({}) },
+  listFormUnionSetting: { type: Object, default: () => ({}) },
+  inlineEditFormConfig: { type: Object, default: () => ({}) },
+  clickRowData: { type: Object, default: () => ({}) },
+  btnList: { type: Array, default: () => [] },
+  spinning: Boolean,
+  rowGroupSetting: { type: Object, default: () => ({}) },
+  isInlineOperating: Boolean,
+  inlineEditCurrentOperateBtnId: String,
+  tableRefreshCache: { type: Object, default: () => ({}) }, // 记录需要刷新的列表，当切换到当前列表时更新
+  userInfo: { type: Object, default: () => ({}) },
+  isInlineAdding: Boolean,
+  isRowEditing: Boolean,
+  pageIndexOldtableData: {
+    // 原始数据
+    type: Array,
+    default: () => []
+  },
+  submitForm: Function,
+  isMatchComponent: { type: Boolean, default: true }, // 为了兼容低代码(组件内部)与二次开发平台(vuex)
+  asyncCount: Boolean,
+  showSettings: { type: Object, default: () => ({}) },
+  filterDomPortal: { // 表头筛选挂载的地方
+    type: String,
+    default: "body"
+  },
+  filterTopOffset: { // 表头 top 调节
+    type: Number,
+    default: 0
+  },
+  editFormApiConfig: Object, // 编辑表格api
+  defaultEditAllRow: Boolean,
+  editTableUid: [String, Number],
+  curBatchBtnData: { type: Object, default: () => ({}) },
+  rowBtnAutoLayout:{// 行内按钮自适应布局
+    type: Boolean,
+    default: true
+  },
+  listCountParams:{ type: Object, default: () => ({}) },
+};
+
+export default bigTableProps;