vxe-table 3.15.17 → 3.15.19

package/lib/table/src/methods.js

@@ -5769,6 +5769,7 @@ const Methods = {
       column
     } = params;
     const {
+      columnStore,
       overflowX,
       scrollbarHeight
     } = reactData;
@@ -5776,6 +5777,10 @@ const Methods = {
       elemStore,
       visibleColumn
     } = internalData;
+    const {
+      leftList,
+      rightList
+    } = columnStore;
     const resizableOpts = $xeTable.computeResizableOpts;
     const osbHeight = overflowX ? scrollbarHeight : 0;
     const tableEl = $xeTable.$refs.refElem;
@@ -5785,12 +5790,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) {
@@ -5807,29 +5813,31 @@ const Methods = {
     if (!bodyScrollElem) {
       return;
     }
-    const pos = (0, _dom.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 = (0, _util.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 ((0, _dom.hasClass)(tempCellElem, 'fixed--hidden')) {
-          break;
-        } else if (!(0, _dom.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;
       }
     }
     // 处理拖动事件
@@ -5839,27 +5847,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 = getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
+        resizeTipElem.textContent = 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;
@@ -5870,7 +5875,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;
     };
@@ -8029,28 +8034,34 @@ 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) {
-        newValue = null;
-        $xeTable.clearRadioRow();
+        handleCheckedRadioRow($xeTable, newValue);
+      } else if (!radioOpts.strict) {
+        isChange = oldValue === newValue;
+        if (isChange) {
+          newValue = null;
+          $xeTable.clearRadioRow();
+        }
+      }
+      if (isChange) {
+        $xeTable.dispatchEvent('radio-change', Object.assign({
+          oldValue,
+          newValue
+        }, params), evnt);
       }
-    }
-    if (isChange) {
-      $xeTable.dispatchEvent('radio-change', Object.assign({
-        oldValue,
-        newValue
-      }, params), evnt);
     }
   },
   triggerCurrentColumnEvent(evnt, params) {
@@ -10120,7 +10131,9 @@ const Methods = {
     return rest;
   },
   /**
-   * 获取树表格状态
+   * 内部方法、获取树表格状态
+   * @deprecated
+   * @private
    */
   getTreeStatus() {
     if (this.treeConfig) {
@@ -11653,7 +11666,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}`]) {