vxe-table 3.15.17 → 3.15.19

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.17";
+const version = "3.15.19";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.17"}`;
+const log_version = `table v${"3.15.19"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11037,6 +11037,7 @@ const Methods = {
       column
     } = params;
     const {
+      columnStore,
       overflowX,
       scrollbarHeight
     } = reactData;
@@ -11044,6 +11045,10 @@ const Methods = {
       elemStore,
       visibleColumn
     } = internalData;
+    const {
+      leftList,
+      rightList
+    } = columnStore;
     const resizableOpts = $xeTable.computeResizableOpts;
     const osbHeight = overflowX ? scrollbarHeight : 0;
     const tableEl = $xeTable.$refs.refElem;
@@ -11053,12 +11058,13 @@ const Methods = {
     if (!resizeBarElem) {
       return;
     }
+    const isLeftFixed = fixedType === 'left';
+    const isRightFixed = fixedType === 'right';
     const resizeTipElem = resizeBarElem.firstElementChild;
     const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
     const {
       clientX: dragClientX
     } = evnt;
-    const wrapperElem = $xeTable.$refs.refElem;
     const dragBtnElem = evnt.target;
     let resizeColumn = column;
     if (column.children && column.children.length) {
@@ -11075,29 +11081,31 @@ const Methods = {
     if (!bodyScrollElem) {
       return;
     }
-    const pos = getOffsetPos(dragBtnElem, wrapperElem);
+    const tableRect = tableEl.getBoundingClientRect();
+    const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null;
+    const cellRect = cell.getBoundingClientRect();
+    const dragBtnRect = dragBtnElem.getBoundingClientRect();
     const dragBtnWidth = dragBtnElem.clientWidth;
     const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
+    const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth;
     const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
-    let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
-    let dragPosLeft = pos.left + dragBtnOffsetWidth;
-    const isLeftFixed = fixedType === 'left';
-    const isRightFixed = fixedType === 'right';
-    // 计算左右侧固定列偏移量
-    let fixedOffsetWidth = 0;
+    const dragMinLeft = isRightFixed ? 0 : cellRect.x - tableRect.x + dragBtnWidth + minInterval;
+    const dragMaxLeft = cellRect.x - tableRect.x + cell.clientWidth - minInterval;
+    let fixedLeftRemainWidth = 0;
+    let fixedRightRemainWidth = 0;
     if (isLeftFixed || isRightFixed) {
-      const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling';
-      let tempCellElem = cell[siblingProp];
-      while (tempCellElem) {
-        if (hasClass(tempCellElem, 'fixed--hidden')) {
-          break;
-        } else if (!hasClass(tempCellElem, 'col--group')) {
-          fixedOffsetWidth += tempCellElem.offsetWidth;
+      let isMach = false;
+      const fixedColumn = isLeftFixed ? leftList : rightList;
+      for (let i = 0; i < fixedColumn.length; i++) {
+        const item = fixedColumn[i];
+        if (isMach) {
+          fixedLeftRemainWidth += item.renderWidth;
+        } else {
+          isMach = item.id === resizeColumn.id;
+          if (!isMach) {
+            fixedRightRemainWidth += item.renderWidth;
+          }
         }
-        tempCellElem = tempCellElem[siblingProp];
-      }
-      if (isRightFixed && rightContainerElem) {
-        dragPosLeft = rightContainerElem.offsetLeft + fixedOffsetWidth;
       }
     }
     // 处理拖动事件
@@ -11107,27 +11115,24 @@ const Methods = {
       const tableHeight = tableEl.clientHeight;
       const offsetX = evnt.clientX - dragClientX;
       let left = dragPosLeft + offsetX;
-      const scrollLeft = fixedType ? 0 : bodyScrollElem.scrollLeft;
       if (isLeftFixed) {
-        // 左固定列（不允许超过右侧固定列、不允许超过右边距）
-        left = Math.min(left, (rightContainerElem ? rightContainerElem.offsetLeft : bodyScrollElem.clientWidth) - fixedOffsetWidth - minInterval);
+        if (rightContainerRect) {
+          left = Math.min(left, rightContainerRect.x - tableRect.x - fixedLeftRemainWidth - minInterval);
+        }
       } else if (isRightFixed) {
-        // 右侧固定列（不允许超过左侧固定列、不允许超过左边距）
-        dragMinLeft = (leftContainerElem ? leftContainerElem.clientWidth : 0) + fixedOffsetWidth + minInterval;
-        left = Math.min(left, dragPosLeft + cell.clientWidth - minInterval);
-      } else {
-        dragMinLeft = Math.max(bodyScrollElem.scrollLeft, dragMinLeft);
-        // left = Math.min(left, bodyScrollElem.clientWidth + bodyScrollElem.scrollLeft - 40)
+        if (leftContainerElem) {
+          left = Math.max(left, leftContainerElem.clientWidth + fixedRightRemainWidth + minInterval);
+        }
+        left = Math.min(left, dragMaxLeft);
       }
       dragLeft = Math.max(left, dragMinLeft);
-      const resizeBarLeft = Math.max(1, dragLeft - scrollLeft);
+      const resizeBarLeft = Math.max(1, dragLeft);
       resizeBarElem.style.left = `${resizeBarLeft}px`;
       resizeBarElem.style.top = `${scrollbarXToTop ? osbHeight : 0}px`;
       resizeBarElem.style.height = `${scrollbarXToTop ? tableHeight - osbHeight : tableHeight}px`;
       if (resizableOpts.showDragTip && resizeTipElem) {
-        resizeTipElem.textContent = methods_getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
+        resizeTipElem.textContent = methods_getI18n('vxe.table.resizeColTip', [Math.floor(resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft))]);
         const tableWrapperWidth = tableEl.clientWidth;
-        const wrapperRect = wrapperElem.getBoundingClientRect();
         const resizeBarWidth = resizeBarElem.clientWidth;
         const resizeTipWidth = resizeTipElem.clientWidth;
         const resizeTipHeight = resizeTipElem.clientHeight;
@@ -11138,7 +11143,7 @@ const Methods = {
           resizeTipLeft += tableWrapperWidth - resizeBarLeft;
         }
         resizeTipElem.style.left = `${resizeTipLeft}px`;
-        resizeTipElem.style.top = `${Math.min(tableHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
+        resizeTipElem.style.top = `${Math.min(tableHeight - resizeTipHeight, Math.max(0, evnt.clientY - tableRect.y - resizeTipHeight / 2))}px`;
       }
       reactData.isDragResize = true;
     };
@@ -13302,30 +13307,36 @@ const Methods = {
     } = params;
     const radioOpts = $xeTable.computeRadioOpts;
     const {
-      trigger
+      trigger,
+      checkMethod
     } = radioOpts;
     if (trigger === 'manual') {
       return;
     }
     evnt.stopPropagation();
-    let newValue = row;
-    let isChange = oldValue !== newValue;
-    if (isChange) {
-      handleCheckedRadioRow($xeTable, newValue);
-    } else if (!radioOpts.strict) {
-      isChange = oldValue === newValue;
+    if (!checkMethod || checkMethod({
+      $table: $xeTable,
+      row
+    })) {
+      let newValue = row;
+      let isChange = oldValue !== newValue;
+      if (isChange) {
+        handleCheckedRadioRow($xeTable, newValue);
+      } else if (!radioOpts.strict) {
+        isChange = oldValue === newValue;
+        if (isChange) {
+          newValue = null;
+          $xeTable.clearRadioRow();
+        }
+      }
       if (isChange) {
-        newValue = null;
-        $xeTable.clearRadioRow();
+        $xeTable.dispatchEvent('radio-change', {
+          oldValue,
+          newValue,
+          ...params
+        }, evnt);
       }
     }
-    if (isChange) {
-      $xeTable.dispatchEvent('radio-change', {
-        oldValue,
-        newValue,
-        ...params
-      }, evnt);
-    }
   },
   triggerCurrentColumnEvent(evnt, params) {
     const $xeTable = this;
@@ -15395,7 +15406,9 @@ const Methods = {
     return rest;
   },
   /**
-   * 获取树表格状态
+   * 内部方法、获取树表格状态
+   * @deprecated
+   * @private
    */
   getTreeStatus() {
     if (this.treeConfig) {
@@ -16929,7 +16942,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (!this[`_${name}`]) {
@@ -17875,7 +17888,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -18350,7 +18364,8 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -18824,7 +18839,8 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
         xid: xID,
         cellspacing: 0,
         cellpadding: 0,
-        border: 0
+        border: 0,
+        xvm: isOptimizeMode ? '1' : null
       }
     }, [
     /**
@@ -19852,7 +19868,7 @@ const renderPopupPanel = (h, _vm) => {
       const {
         mode
       } = customOpts;
-      if (!VxeUIModalComponent) {
+      if (!VxeUIModalComponent && mode === 'modal') {
         errLog('vxe.error.reqComp', ['vxe-modal']);
       }
       if (!VxeUIDrawerComponent && mode === 'drawer') {
@@ -21650,11 +21666,21 @@ const {
       $xeTable.handleFilterConfirmFilter(null);
       return $xeTable.$nextTick();
     },
+    _saveFilterPanelByEvent(evnt) {
+      const $xeTable = this;
+      $xeTable.handleFilterConfirmFilter(evnt);
+      return $xeTable.$nextTick();
+    },
     _resetFilterPanel() {
       const $xeTable = this;
       $xeTable.handleFilterResetFilter(null);
       return $xeTable.$nextTick();
     },
+    _resetFilterPanelByEvent(evnt) {
+      const $xeTable = this;
+      $xeTable.handleFilterResetFilter(evnt);
+      return $xeTable.$nextTick();
+    },
     _getCheckedFilters() {
       const {
         tableFullColumn
@@ -28474,8 +28500,8 @@ function renderBody(h, $xeTable) {
     if (props.editConfig && editOpts.showStatus && !props.keepSource) {
       warnLog('vxe.error.reqProp', ['keep-source']);
     }
-    if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-      warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+    if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
+      warnLog('vxe.error.reqProp', ['show-overflow']);
     }
     if (treeConfig && !treeOpts.transform && props.stripe) {
       warnLog('vxe.error.noTree', ['stripe']);
@@ -31874,14 +31900,17 @@ function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
   } = renderOpts;
   const groupOptions = optionGroupProps.options || 'options';
   const groupLabel = optionGroupProps.label || 'label';
-  return optionGroups.map((group, gIndex) => {
-    return h('optgroup', {
-      key: gIndex,
-      attrs: {
-        label: group[groupLabel]
-      }
-    }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
-  });
+  if (optionGroups) {
+    return optionGroups.map((group, gIndex) => {
+      return h('optgroup', {
+        key: gIndex,
+        attrs: {
+          label: group[groupLabel]
+        }
+      }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
+    });
+  }
+  return [];
 }
 /**
  * 渲染原生的 option 标签
@@ -31898,19 +31927,22 @@ function renderNativeOptions(h, options, renderOpts, params) {
   const valueProp = optionProps.value || 'value';
   const disabledProp = optionProps.disabled || 'disabled';
   const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-  return options.map((option, oIndex) => {
-    return h('option', {
-      key: oIndex,
-      attrs: {
-        value: option[valueProp],
-        disabled: option[disabledProp]
-      },
-      domProps: {
-        /* eslint-disable eqeqeq */
-        selected: option[valueProp] == cellValue
-      }
-    }, option[labelProp]);
-  });
+  if (options) {
+    return options.map((option, oIndex) => {
+      return h('option', {
+        key: oIndex,
+        attrs: {
+          value: option[valueProp],
+          disabled: option[disabledProp]
+        },
+        domProps: {
+          /* eslint-disable eqeqeq */
+          selected: option[valueProp] == cellValue
+        }
+      }, option[labelProp]);
+    });
+  }
+  return [];
 }
 function nativeFilterRender(h, renderOpts, params) {
   const {
@@ -33033,7 +33065,7 @@ const Toolbar = VxeToolbar;
           year: 'yyyy'
         },
         weeks: {
-          w: '周',
+          w: '',
           w0: '周日',
           w1: '周一',
           w2: '周二',