cnhis-design-vue 2.1.152 → 2.1.154

package/package.json

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

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

@@ -241,6 +241,7 @@ export default create({
       /* 树状已选 */
       visibleTreeCheck: false,
       treeTableLength: 0,
+      treeTableData: [],
       checkWidth: {
         'table-simple': '30',
         'table-classics': '24'
@@ -404,6 +405,9 @@ export default create({
       if(this.isTree == 1) return false;
       // 是否配置编辑表单
       return !!(this.listFormUnionSetting?.formId || false)
+    },
+    isTreeTable() {
+      return this.isTree != 0;
     }
   },
   watch: {
@@ -496,17 +500,6 @@ export default create({
         });
       }
     }
-    // isEditAllRow:{
-    //   handler(val){
-    //     // 全部行编辑需要隐藏“操作”列
-    //      this.customerInit();
-    //     // 有已选的数据，清空。
-    //     let len = this?.checkedRows?.length || 0;
-    //     if(len > 0){
-    //       this.removeCheckedRows(this.checkedRows)
-    //     }
-    //   }
-    // }
   },
   methods: {
     customerInit() {
@@ -1318,7 +1311,7 @@ export default create({
       });
     },
     resetOperationRowStatus() {
-      if (this.isTree != 0) return false;
+      if (this.isTreeTable) return false;
 
       const vxeTable = this.$refs.xGrid;
       let { row, rowIndex } = this.getInlineOpreateRow();
@@ -1335,7 +1328,7 @@ export default create({
       });
     },
     async removeInsert() {
-      if (this.isTree != 0) return false;
+      if (this.isTreeTable) return false;
 
       const vxeTable = this.$refs.xGrid;
       // let { row } = this.getInlineOpreateRow();
@@ -1353,7 +1346,7 @@ export default create({
       this.resetBatchOperationRowStatus();
     },
     resetStoreInlineOperationStatus() {
-      if (this.isTree != 0) return false;
+      if (this.isTreeTable) return false;
       this.isSaveForm = false;
     },
     removeInlineAddRow() {
@@ -1472,7 +1465,7 @@ export default create({
         // 有子列表fixed会遮盖 所以主表不设置fixed,子表可设置
         let fixed = this.isAboutNestTable && !this.isNestTable  ? '' : item.isFixed ? (item.isFixed == 1 ? 'left' : 'right') : '';
         let sortable = this.isTableEdit ? false : this.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
-        let treeNode = this.isNestTable ? false : this.isTree != 0 ? index === 0 : false;
+        let treeNode = this.isNestTable ? false : this.isTreeTable ? index === 0 : false;
         let type = index === 0 && this.showNestTable ? 'expand' : '';
 
         // 扫码打开的table只展示
@@ -2182,7 +2175,7 @@ export default create({
       let checkedRow = table.getCheckboxRecords();
       let rowLen = this.checkedRows.filter(item => !vexutils.has(item, GROUP_TITLE_KEY)).length;
       let newRow = [];
-      if (this.isTree != 0) {
+      if (this.isTreeTable) {
         // 点击树形表格的按钮 不需要触发选中行
         let { className, parentElement } = $event.target || {};
         if (className && className.includes('vxe-tree--node-btn')) return;
@@ -2190,13 +2183,6 @@ export default create({
         if(parentElement?.className && parentElement.className.includes('vxe-tree-cell')) {
           this.toggleCellTreeExpand(data, table)
         }
-        // // 树表格 无法选中有子集的行
-        // if (row.hasChildren) {
-        //   table.setAllCheckboxRow(false);
-        //   this.$set(this, 'checkedRows', [row]);
-        //   this.updateAddCheckedRows(row, true);
-        //   return;
-        // }
         // 树表格，点击行无需选中复选框
         if (this.selectType === 'checkbox') {
           let rowVal = {};
@@ -2210,7 +2196,10 @@ export default create({
             this.pubCheckChange([row]);
             rowVal = row;
           } else {
-            if (checkedRow.length > 1) return false;
+            if (checkedRow.length > 1) {
+              this.$set(this, 'checkedRows', []);
+              return false;
+            }
             rowVal = checked || (checkedRow.length === 1 && !checked) ? checkedRow[0] : {};
             this.$set(this, 'checkedRows', [rowVal]);
           }
@@ -2238,17 +2227,17 @@ export default create({
       let setChecked = checked;
       if (rowLen > 1) {
         this.selectType != 'radio' && table.setCheckboxRow([row], true);
-        this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange(newRow);
+        this.isTreeTable && this.selectType != 'radio' && this.pubCheckChange(newRow);
         this.selectType != 'radio' && this.$emit('handlerClickRow', row, rowIndex, { source, column, trigger });
       } else {
         setChecked = !setChecked;
         if (!setChecked) {
           !this.aboutPositionBtm && table.clearCurrentRow();
           this.selectType == 'radio' && table.clearRadioRow();
-          this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange([]);
+          this.isTreeTable && this.selectType != 'radio' && this.pubCheckChange([]);
         } else {
           this.selectType == 'radio' && table.setRadioRow(row);
-          this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange(newRow);
+          this.isTreeTable && this.selectType != 'radio' && this.pubCheckChange(newRow);
         }
         // 相关项位于底部，再次点击已选中数据不取消勾选
         let isBtmCheck = this.aboutPositionBtm && !setChecked;
@@ -2256,7 +2245,7 @@ export default create({
           table.setCheckboxRow([row], setChecked);
         }
       }
-      if (this.isTree != 0) {
+      if (this.isTreeTable) {
         setChecked && this.$emit('handlerClickRow', row, rowIndex, { source, column, trigger });
         this.setTableCurrentRow(table, row);
         return;
@@ -2431,7 +2420,7 @@ export default create({
         return false;
       }
 
-      this.pubCheckChange(records);
+      this.pubCheckChange(records, {setTreeData: true});
       return true;
     },
     setTableCurrentRow(table, row, isSet) {
@@ -2506,16 +2495,29 @@ export default create({
       this.setCurrentCheckedLength();
     },
     pubCheckChange(rows = [], config = {}) {
-      this.treeTableLength = rows.filter(item => {
-        let isGroupRow = vexutils.has(item, GROUP_TITLE_KEY);
-        return !isGroupRow;
-      }).length;
+    // 树表格, 选中与单击行有出入, 用新变量保存一下
+      const {setTreeData, ...others} = config
+      if (this.isTreeTable) {
+      if (setTreeData) {
+        let filterTreeTable = rows.filter(item => {
+          let isGroupRow = vexutils.has(item, GROUP_TITLE_KEY);
+          return !isGroupRow;
+        })
+        this.treeTableLength = filterTreeTable.length;
+        this.treeTableData = filterTreeTable;
+      } else {
+        this.treeTableLength = 0;
+        this.treeTableData = [];
+      }
+        this.$emit("setTreeSelectRow", this.treeTableData)
+      }
       this.visibleTreeCheck = rows.length > 1;
-      this.$emit('selectionChange', rows, config);
+      this.$emit('selectionChange', rows, others);
     },
     setCurrentPageRowChecked() {
       let table = this.$refs.xGrid;
       if (!table) return;
+      if(!this.currentCheckedKeys?.length) return;
 
       let currentPageTableData = table.getTableData()?.tableData;
       let currentPageSelectedRows = currentPageTableData.filter(row => {
@@ -2852,6 +2854,8 @@ export default create({
       this.$refs.xGrid.clearRadioRow();
       this.visibleTreeCheck = false;
       this.treeTableLength = 0;
+      this.treeTableData = [];
+      this.$emit("setTreeSelectRow", this.treeTableData)
     },
 
     handlerScroll(params) {

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -612,6 +612,7 @@ export default create({
       default: () => ({
         getIsTile: '',
         selectRowObj: [],
+        selectTreeRowsObj: [],
         isInlineOperating: false,
         printNumberCache: {}
       })
@@ -719,6 +720,9 @@ export default create({
     showDownCurSelectData() {
       return this.selectRowObj.filter(item => !(GROUP_TITLE_KEY in (item || {})))?.length;
     },
+    showDownCurSelectTreeData() {
+      return this.selectTreeRowsObj.filter(item => !(GROUP_TITLE_KEY in (item || {})))?.length;
+    },
     showRowFoldBtnList() {
       return function(list, key) {
         if (key === 'rowFoldBtnList' && !this.isShowSetting('buttonAdaption')) return false;
@@ -816,6 +820,9 @@ export default create({
     selectRowObj() {
       return this?.gettersConfig?.selectRowObj || [];
     },
+    selectTreeRowsObj() {
+      return this?.gettersConfig?.selectTreeRowsObj || [];
+    },
     isInlineOperating() {
       return this?.gettersConfig?.isInlineOperating || false;
     },
@@ -1444,11 +1451,19 @@ export default create({
         return;
       }
 
+      let isLowcodeTree = this.isLowCode &&  this.$attrs.isTree != 0
+      let curSelectLen = isLowcodeTree ? this.showDownCurSelectTreeData : this.showDownCurSelectData;
+
       // 默认情况下 只展示新增&下载
       if (!this.showDownCurSelectData) {
         btn.isVisible = isAddBtn ? true : false;
         if (!isImportGuage) return;
       }
+      // 低代码树表格批量按钮特别处理一下, 单击行不选中, 所以需要特别处理批量按钮
+      if(isLowcodeTree && !isImportGuage && isBatchBtn && !curSelectLen) {
+        btn.isVisible = false;
+        return;
+      }
 
       // btn.settingObj.guage_type == "importGuage";
       // 全选状态下，只有入口类型的批量按钮展示（因当前版本仅支持入口类型的全选批量操作
@@ -1462,20 +1477,20 @@ export default create({
       if (isBatchBtn && relationBtnId) {
         btn.canHandleUniline = true;
       }
-
+  
       // 批量按钮关联的对应按钮
       if (this.showDownCurSelectData > 1 && isLineBtn) {
         btn.isVisible = false;
       } else {
         if (isBatchBtn && btn.chooseTwoData == 1) {
-          btn.isVisible = !this.batchRelationBtnIds.includes(btn.id) && this.showDownCurSelectData > 1;
+          btn.isVisible = !this.batchRelationBtnIds.includes(btn.id) && curSelectLen > 1;
         } else {
           btn.isVisible = !this.batchRelationBtnIds.includes(btn.id);
         }
       }
 
       // 未绑定了行级按钮的批量按钮，默认隐藏, 勾选展示
-      if (isBatchBtn && !relationBtnId && this.showDownCurSelectData > 1) {
+      if (isBatchBtn && !relationBtnId && curSelectLen > 1) {
         btn.isVisible = isMultiSelect;
       }
       // 量表导入按钮
@@ -1998,9 +2013,12 @@ export default create({
           print: print
         });
 
-        if (result.method !== 'sync') return;
+        let isSync = result?.method
+        if(!isSync || isSync!=='sync')  return;
         // 同步刷新列表
-        this.editTableWrapper?.$refs?.editTable?.getTableList({setNum: true, isResetCondiTionDigital: true});
+        let getTableList = this.editTableWrapper?.$refs?.editTable?.getTableList || this.editTableWrapper?.getTableList;
+        if(!getTableList || typeof getTableList !== 'function') return;
+        getTableList({setNum: true, isResetCondiTionDigital: true});
       } catch (error) {
         console.log('error', error);
       }

package/packages/table-filter/src/mixins/printNew.js

@@ -83,7 +83,7 @@ export default {
       let reqList = [];
       printNumberList.forEach((item, index) => {
         let btnItem = btnList.find(v => v.settingObj[0].trigger_id == item.id);
-        if (!~btnItem) return;
+        if (!btnItem) return;
         let cacheItem = this.printConfigCache[item.id];
         if (cacheItem) {
           reqList.push(Promise.resolve({ [item.id]: cacheItem, _id: item.id }));