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

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.10";
+const version = "3.13.0-beta.2";
 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.10"}`;
+const log_version = `table v${"3.13.0-beta.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4535,9 +4535,6 @@ const Cell = {
         'is--active': isActive
       }],
       on: {
-        mousedown(evnt) {
-          evnt.stopPropagation();
-        },
         click(evnt) {
           $table.triggerRowExpandEvent(evnt, params);
         }
@@ -5291,7 +5288,6 @@ function cacheColumnMap($xeTable) {
   const fullColumnIdData = internalData.fullColumnIdData = {};
   const fullColumnFieldData = internalData.fullColumnFieldData = {};
   const mouseOpts = $xeTable.computeMouseOpts;
-  const expandOpts = $xeTable.computeExpandOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
@@ -5397,8 +5393,10 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
-  if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
-    errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+  if (true) {
+    if (expandColumn && mouseOpts.area) {
+      errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+    }
   }
   if (false) {}
   reactData.isGroup = isGroup;
@@ -6970,7 +6968,6 @@ function handleColumn($xeTable, collectColumn) {
   const $xeToolbar = $xeTable.$refs.$xeToolbar;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const expandOpts = $xeTable.computeExpandOpts;
   internalData.collectColumn = collectColumn;
   const tableFullColumn = getColumnList(collectColumn);
   internalData.tableFullColumn = tableFullColumn;
@@ -6978,11 +6975,6 @@ function handleColumn($xeTable, collectColumn) {
   reactData.isDragColMove = false;
   initColumnSort($xeTable);
   return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
-    const {
-      scrollXLoad,
-      scrollYLoad,
-      expandColumn
-    } = reactData;
     cacheColumnMap($xeTable);
     parseColumns($xeTable, true).then(() => {
       if (reactData.scrollXLoad) {
@@ -6992,8 +6984,10 @@ function handleColumn($xeTable, collectColumn) {
     $xeTable.clearMergeCells();
     $xeTable.clearMergeFooterItems();
     $xeTable.handleTableData(true);
-    if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
-      warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+    if (true) {
+      if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
+        warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+      }
     }
     return $xeTable.$nextTick().then(() => {
       if ($xeToolbar) {
@@ -7304,17 +7298,6 @@ function updateRowExpandStyle($xeTable) {
     }
   }
 }
-function handleRowExpandScroll($xeTable) {
-  const internalData = $xeTable;
-  const {
-    elemStore
-  } = internalData;
-  const rowExpandEl = $xeTable.$refs.refRowExpandElem;
-  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-  if (rowExpandEl && bodyScrollElem) {
-    rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
-  }
-}
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
     if (slotFunc) {
@@ -11486,7 +11469,7 @@ const Methods = {
       }
       vLen++;
     });
-    const isSelected = rootList.length > 0 ? vLen > 0 ? sLen >= vLen : sLen >= rootList.length : false;
+    const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
     const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
     reactData.isAllSelected = isSelected;
     reactData.isIndeterminate = halfSelect;
@@ -13627,7 +13610,7 @@ const Methods = {
             delete rExpandLazyLoadedMaps[rowid];
           }
           reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
+          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
         });
       } else {
         resolve();
@@ -13642,13 +13625,12 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand(rows, expanded) {
-    const $xeTable = this;
     const {
       rowExpandedMaps,
       fullAllDataRowIdData,
       rowExpandLazyLoadedMaps,
       expandOpts,
-      expandColumn
+      expandColumn: column
     } = this;
     let rExpandedMaps = {
       ...rowExpandedMaps
@@ -13660,8 +13642,8 @@ const Methods = {
       toggleMethod
     } = expandOpts;
     const lazyRests = [];
-    const columnIndex = this.getColumnIndex(expandColumn);
-    const $columnIndex = this.getVMColumnIndex(expandColumn);
+    const columnIndex = this.getColumnIndex(column);
+    const $columnIndex = this.getVMColumnIndex(column);
     if (rows) {
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
         rows = [rows];
@@ -13673,7 +13655,7 @@ const Methods = {
       }
       const validRows = toggleMethod ? rows.filter(row => toggleMethod({
         expanded,
-        column: expandColumn,
+        column,
         columnIndex,
         $columnIndex,
         row,
@@ -13706,13 +13688,7 @@ const Methods = {
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
-    return Promise.all(lazyRests).then(() => $xeTable.recalculate()).then(() => {
-      if (expandColumn) {
-        updateRowExpandStyle($xeTable);
-        handleRowExpandScroll($xeTable);
-      }
-      return $xeTable.updateCellAreas();
-    });
+    return Promise.all(lazyRests).then(this.recalculate);
   },
   /**
    * 判断行是否为展开状态
@@ -13736,7 +13712,6 @@ const Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand() {
-    const $xeTable = this;
     const {
       expandOpts,
       tableFullData
@@ -13753,7 +13728,7 @@ const Methods = {
       if (expList.length) {
         this.recalculate();
       }
-    }).then(() => $xeTable.updateCellAreas());
+    });
   },
   clearRowExpandReserve() {
     this.rowExpandedReserveRowMap = {};
@@ -15252,16 +15227,10 @@ const Methods = {
     }
   },
   updateCellAreas() {
-    const $xeTable = this;
-    const props = $xeTable;
-    const {
-      mouseConfig
-    } = props;
-    const mouseOpts = $xeTable.computeMouseOpts;
-    if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
-      return $xeTable.handleRecalculateCellAreaEvent();
+    if (this.mouseConfig && this.mouseOpts.area && this.handleRecalculateCellAreas) {
+      return this.handleRecalculateCellAreas();
     }
-    return $xeTable.$nextTick();
+    return this.$nextTick();
   },
   dispatchEvent(type, params, evnt) {
     const $xeTable = this;
@@ -16090,7 +16059,6 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       tableData,
       isRowLoading,
       isColLoading,
-      overflowX,
       scrollXLoad,
       scrollYLoad,
       isAllOverflow,
@@ -16120,10 +16088,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType || !overflowX) {
-      renderColumnList = visibleColumn;
-    }
     if (fixedType) {
+      renderColumnList = visibleColumn;
       if (isOptimizeMode) {
         renderColumnList = fixedColumn || [];
       }
@@ -16440,8 +16406,8 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         'is--sortable': column.sortable,
         'col--filter': !!filters,
         'is--filter-active': hasFilter,
-        'is--drag-active': columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
-        'is--drag-disabled': columnOpts.drag && isDisabledDrag,
+        'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
+        'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
       }, getClass(headerClassName, cellParams), getClass(headerCellClassName, cellParams)],
       attrs: thAttrs,
@@ -16607,7 +16573,6 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     } = tableProps;
     const {
       isGroup,
-      overflowX,
       scrollXLoad,
       scrollYLoad,
       dragCol
@@ -16631,10 +16596,8 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
           isOptimizeMode = true;
         }
       }
-      if (fixedType || !overflowX) {
-        renderColumnList = visibleColumn;
-      }
       if (fixedType) {
+        renderColumnList = visibleColumn;
         // 如果是使用优化模式
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || [];
@@ -17107,7 +17070,6 @@ function footer_renderHeads(h, _vm, renderColumnList) {
     } = tableInternalData;
     const {
       isGroup,
-      overflowX,
       scrollXLoad,
       scrollYLoad,
       dragCol
@@ -17122,10 +17084,8 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         isOptimizeMode = true;
       }
     }
-    if (fixedType || !overflowX) {
-      renderColumnList = visibleColumn;
-    }
     if (fixedType) {
+      renderColumnList = visibleColumn;
       if (isOptimizeMode) {
         renderColumnList = fixedColumn || [];
       }
@@ -20897,7 +20857,11 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
   });
 }
 function handleClearEdit($xeTable, evnt, targetRow) {
+  const props = $xeTable;
   const reactData = $xeTable;
+  const {
+    mouseConfig
+  } = props;
   const {
     editStore
   } = reactData;
@@ -20910,6 +20874,7 @@ 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();
@@ -20937,7 +20902,11 @@ function handleClearEdit($xeTable, evnt, targetRow) {
       }
     }
   }
-  return $xeTable.$nextTick().then(() => $xeTable.updateCellAreas());
+  return $xeTable.$nextTick().then(() => {
+    if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+      return $xeTable.handleRecalculateCellAreas();
+    }
+  });
 }
 function handleEditActive($xeTable, params, evnt, isFocus) {
   const props = $xeTable;
@@ -26239,8 +26208,6 @@ function renderBody(h, $xeTable) {
   },
   watch: {
     data(value) {
-      const $xeTable = this;
-      const reactData = $xeTable;
       const {
         initStatus
       } = this;
@@ -26248,12 +26215,6 @@ function renderBody(h, $xeTable) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
       this.loadTableData(value || [], true).then(() => {
-        const {
-          scrollXLoad,
-          scrollYLoad,
-          expandColumn
-        } = reactData;
-        const expandOpts = $xeTable.computeExpandOpts;
         this.inited = true;
         this.initStatus = true;
         if (!initStatus) {
@@ -26263,9 +26224,9 @@ function renderBody(h, $xeTable) {
         // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
         // }
-        if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
-          warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
-        }
+        // if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
+        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        // }
         this.recalculate();
       });
     },
@@ -26290,12 +26251,6 @@ function renderBody(h, $xeTable) {
     showFooter() {
       this.reScrollFlag++;
     },
-    overflowX() {
-      this.reScrollFlag++;
-    },
-    overflowY() {
-      this.reScrollFlag++;
-    },
     reScrollFlag() {
       const $xeTable = this;
       $xeTable.$nextTick(() => {
@@ -30311,11 +30266,6 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
-  formatOption: {
-    renderTableDefault(h, renderOpts, params) {
-      return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
-    }
-  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -30332,11 +30282,6 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
-  formatTree: {
-    renderTableDefault(h, renderOpts, params) {
-      return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
-    }
-  },
   VxeColorPicker: {
     tableAutoFocus: 'input',
     renderTableEdit(h, renderOpts, params) {