cnhis-design-vue 2.1.14 → 2.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.14",
+  "version": "2.1.17",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -101,21 +101,12 @@
     >
       <template v-slot:empty>
         <div v-if="isShowEmpty">
-          <NoData
-            :noDataImg="emptyItems.noDataImg"
-            :noDataTip="emptyItems.noDataTip"
-            :showImg="!isNestTable"
-          ></NoData>
+          <NoData :noDataImg="emptyItems.noDataImg" :noDataTip="emptyItems.noDataTip" :showImg="!isNestTable"></NoData>
         </div>
       </template>
       <!-- 修复 vxe-table升级3.x版本 原自定义checkbox样式失效 -->
       <template v-slot:tooltip_checkbox="{ row, checked }">
-        <a-tooltip
-          v-if="row.forbiddenBatchSelect"
-          :title="row.forbiddenBatchSelectReason"
-          placement="right"
-          trigger="hover"
-        >
+        <a-tooltip v-if="row.forbiddenBatchSelect" :title="row.forbiddenBatchSelectReason" placement="right" trigger="hover">
           <i class="disabled-checked-tips"></i>
         </a-tooltip>
         <a-checkbox class="tooltip-checkbox-item" v-else :checked="checked"></a-checkbox>
@@ -197,7 +188,10 @@ export default create({
   mixins: [format, batchEditing, nestTable],
   props: Object.assign({}, bigTableProps),
   beforeCreate() {
-    Vue.use(Button).use(Checkbox).use(Input).use(DomPortal);
+    Vue.use(Button)
+      .use(Checkbox)
+      .use(Input)
+      .use(DomPortal);
     !this.$xss && Vue.use(VueXss);
   },
   mounted() {
@@ -295,7 +289,7 @@ export default create({
       return this.isTree > 0 ? this.primaryKey || 'theUniqueKey' : 'theUniqueKey';
     },
     handleName() {
-      return function (item, key = 'name') {
+      return function(item, key = 'name') {
         return item.alias || item[key];
       };
     },
@@ -394,13 +388,13 @@ export default create({
       this.loadData(list);
     },
     quickSearchConfig: {
-      handler: function () {
+      handler: function() {
         this.setFilterStatus();
       },
       deep: true
     },
     tableDataCache: {
-      handler: function (val) {
+      handler: function(val) {
         this.setAllCheckedRows(val);
       },
       deep: true
@@ -1656,7 +1650,7 @@ export default create({
       let showTitleFeildDescribe = feildDescribe || feildDescribeI18n;
       let titleFeildDescribe = '';
       if (showTitleFeildDescribe) {
-        titleFeildDescribe = (feildDescribeI18n && this.$root.$t(feildDescribeI18n)) || feildDescribe;
+        titleFeildDescribe = (feildDescribeI18n && this.$root?.$t?.(feildDescribeI18n)) || feildDescribe;
       }
       return (
         <div class={['table-title-wrap', { 'table-title-wrap-describe': showTitleFeildDescribe }]}>
@@ -1739,7 +1733,7 @@ export default create({
                 )}
                 <div class="checkbox-box">
                   <div class="checkbox-wrap js-checkbox-wrap" style={{ height: this.filterHeight + this.distance + 'px' }}>
-                    {!field.searchFilterText && (field.advanceOptionSetting) != '0' ? (
+                    {!field.searchFilterText && field.advanceOptionSetting != '0' ? (
                       <div class="ant-checkbox-group">
                         <a-checkbox
                           indeterminate={field.indeterminate}
@@ -1896,7 +1890,7 @@ export default create({
     handleFilterChange(newValue, name, field) {
       this.reScrollFilterWrap();
       let value = newValue;
-      value = this.getSingleConvert(value,this.filterFields[name].CONVERT,field);
+      value = this.getSingleConvert(value, this.filterFields[name].CONVERT, field);
       this.filterFields[name].CONVERT = value;
 
       field.checkAll = value.length === field.setting.showSetting.length;
@@ -1910,12 +1904,12 @@ export default create({
         let addItems = value.filter(item => {
           return !beforeSearchConvert.includes(item);
         });
-        if(field.advanceOptionSetting == '0'){
-          if(Array.isArray(this.filterFields[columnName].CONVERT)){
+        if (field.advanceOptionSetting == '0') {
+          if (Array.isArray(this.filterFields[columnName].CONVERT)) {
             this.filterFields[columnName].CONVERT.length = 0;
           }
         }
-          this.filterFields[columnName].CONVERT.push(...addItems);
+        this.filterFields[columnName].CONVERT.push(...addItems);
       } else {
         let removeItems = beforeSearchConvert.filter(item => {
           return !value.includes(item);
@@ -1926,7 +1920,7 @@ export default create({
       }
 
       let newValue = value;
-      newValue = this.getSingleConvert(newValue,field.searchFilterCONVERT,field);
+      newValue = this.getSingleConvert(newValue, field.searchFilterCONVERT, field);
 
       field.searchFilterCONVERT = newValue;
       beforeSearchConvert = vexutils.clone(newValue, true);
@@ -3021,17 +3015,17 @@ export default create({
     /**
      * 映射值如果配置了单选，限制只能选一个
      */
-    getSingleConvert(value,old,field){
+    getSingleConvert(value, old, field) {
       let cValue = value;
-      if(!Array.isArray(old) || !Array.isArray(value)) return cValue;
+      if (!Array.isArray(old) || !Array.isArray(value)) return cValue;
       // 单选
-      if((field.advanceOptionSetting) == '0' && (value?.length || 0)>1){
-        cValue = cValue.filter(v=> !old?.includes?.(v));
-        if(cValue.length > 1){
-          return [cValue[0]]
+      if (field.advanceOptionSetting == '0' && (value?.length || 0) > 1) {
+        cValue = cValue.filter(v => !old?.includes?.(v));
+        if (cValue.length > 1) {
+          return [cValue[0]];
         }
       }
-        return cValue;
+      return cValue;
     }
   }
 });

package/packages/big-table/src/components/AutoLayoutButton.vue

@@ -215,7 +215,7 @@ export default {
             return;
           }
           btnTotalWidth += (this.btnShowWidthObj[btn.id] || 0) + 10;
-          if (btnTotalWidth < (wrapWidth-15)) {
+          if (btnTotalWidth < (wrapWidth)) {
             btn.showType = '_show';
           } else {
             btn.showType = '_hide';

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/button/src/ButtonPrint/index.vue

@@ -171,6 +171,10 @@ export default create({
   mounted() {
     this.isInited = false;
   },
+  beforeDestroy() {
+    // 创建Print实例的时候会在webview中注册一个事件, 需要调用printInstance.destroy()手动清除
+    printInstance?.destroy?.()
+  },
   watch: {
     // 监听变化, 重新格式化printParams
     params: {