vxe-table 3.13.0-beta.2 → 3.13.0-beta.4

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.13.0-beta.2";
+const version = "3.13.0-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.0-beta.2"}`;
+const log_version = `table v${"3.13.0-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4535,6 +4535,9 @@ const Cell = {
         'is--active': isActive
       }],
       on: {
+        mousedown(evnt) {
+          evnt.stopPropagation();
+        },
         click(evnt) {
           $table.triggerRowExpandEvent(evnt, params);
         }
@@ -5287,7 +5290,7 @@ function cacheColumnMap($xeTable) {
   } = internalData;
   const fullColumnIdData = internalData.fullColumnIdData = {};
   const fullColumnFieldData = internalData.fullColumnFieldData = {};
-  const mouseOpts = $xeTable.computeMouseOpts;
+  // const mouseOpts = $xeTable.computeMouseOpts
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
@@ -5393,11 +5396,11 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
-  if (true) {
-    if (expandColumn && mouseOpts.area) {
-      errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
-    }
-  }
+  // if (process.env.VUE_APP_VXE_ENV === 'development') {
+  //   if (expandColumn && mouseOpts.area) {
+  //     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+  //   }
+  // }
   if (false) {}
   reactData.isGroup = isGroup;
   reactData.treeNodeColumn = treeNodeColumn;
@@ -13610,7 +13613,7 @@ const Methods = {
             delete rExpandLazyLoadedMaps[rowid];
           }
           reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
+          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
         });
       } else {
         resolve();
@@ -13625,6 +13628,7 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand(rows, expanded) {
+    const $xeTable = this;
     const {
       rowExpandedMaps,
       fullAllDataRowIdData,
@@ -13688,7 +13692,7 @@ const Methods = {
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
-    return Promise.all(lazyRests).then(this.recalculate);
+    return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas());
   },
   /**
    * 判断行是否为展开状态
@@ -13712,6 +13716,7 @@ const Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand() {
+    const $xeTable = this;
     const {
       expandOpts,
       tableFullData
@@ -13728,7 +13733,7 @@ const Methods = {
       if (expList.length) {
         this.recalculate();
       }
-    });
+    }).then(() => $xeTable.updateCellAreas());
   },
   clearRowExpandReserve() {
     this.rowExpandedReserveRowMap = {};
@@ -15227,10 +15232,16 @@ const Methods = {
     }
   },
   updateCellAreas() {
-    if (this.mouseConfig && this.mouseOpts.area && this.handleRecalculateCellAreas) {
-      return this.handleRecalculateCellAreas();
+    const $xeTable = this;
+    const props = $xeTable;
+    const {
+      mouseConfig
+    } = props;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
+      return $xeTable.handleRecalculateCellAreaEvent();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   dispatchEvent(type, params, evnt) {
     const $xeTable = this;
@@ -16059,6 +16070,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       tableData,
       isRowLoading,
       isColLoading,
+      overflowX,
       scrollXLoad,
       scrollYLoad,
       isAllOverflow,
@@ -16088,8 +16100,10 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType) {
+    if (fixedType || !overflowX) {
       renderColumnList = visibleColumn;
+    }
+    if (fixedType) {
       if (isOptimizeMode) {
         renderColumnList = fixedColumn || [];
       }
@@ -16573,6 +16587,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     } = tableProps;
     const {
       isGroup,
+      overflowX,
       scrollXLoad,
       scrollYLoad,
       dragCol
@@ -16596,8 +16611,10 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType) {
+      if (fixedType || !overflowX) {
         renderColumnList = visibleColumn;
+      }
+      if (fixedType) {
         // 如果是使用优化模式
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
@@ -17070,6 +17087,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
     } = tableInternalData;
     const {
       isGroup,
+      overflowX,
       scrollXLoad,
       scrollYLoad,
       dragCol
@@ -17084,8 +17102,10 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType) {
+    if (fixedType || !overflowX) {
       renderColumnList = visibleColumn;
+    }
+    if (fixedType) {
       if (isOptimizeMode) {
         renderColumnList = fixedColumn || [];
       }
@@ -20857,11 +20877,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
   });
 }
 function handleClearEdit($xeTable, evnt, targetRow) {
-  const props = $xeTable;
   const reactData = $xeTable;
-  const {
-    mouseConfig
-  } = props;
   const {
     editStore
   } = reactData;
@@ -20874,7 +20890,6 @@ function handleClearEdit($xeTable, evnt, targetRow) {
     column
   } = actived;
   const validOpts = $xeTable.computeValidOpts;
-  const mouseOpts = $xeTable.computeMouseOpts;
   if (row || column) {
     if (targetRow && getRowid($xeTable, targetRow) !== getRowid($xeTable, row)) {
       return $xeTable.$nextTick();
@@ -20902,11 +20917,7 @@ function handleClearEdit($xeTable, evnt, targetRow) {
       }
     }
   }
-  return $xeTable.$nextTick().then(() => {
-    if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-      return $xeTable.handleRecalculateCellAreas();
-    }
-  });
+  return $xeTable.$nextTick().then(() => $xeTable.updateCellAreas());
 }
 function handleEditActive($xeTable, params, evnt, isFocus) {
   const props = $xeTable;
@@ -26251,6 +26262,12 @@ function renderBody(h, $xeTable) {
     showFooter() {
       this.reScrollFlag++;
     },
+    overflowX() {
+      this.reScrollFlag++;
+    },
+    overflowY() {
+      this.reScrollFlag++;
+    },
     reScrollFlag() {
       const $xeTable = this;
       $xeTable.$nextTick(() => {