vxe-table 3.15.17 → 3.15.18

package/packages/table/module/custom/panel.ts

@@ -854,7 +854,7 @@ export default {
 
       const { customOpts } = $xeTable
       const { mode } = customOpts
-      if (!VxeUIModalComponent) {
+      if (!VxeUIModalComponent && (mode === 'modal')) {
         errLog('vxe.error.reqComp', ['vxe-modal'])
       }
       if (!VxeUIDrawerComponent && (mode === 'drawer')) {

package/packages/table/module/filter/mixin.ts

@@ -167,12 +167,24 @@ export default {
       $xeTable.handleFilterConfirmFilter(null)
       return $xeTable.$nextTick()
     },
+    _saveFilterPanelByEvent (evnt: Event) {
+      const $xeTable = this
+
+      $xeTable.handleFilterConfirmFilter(evnt)
+      return $xeTable.$nextTick()
+    },
     _resetFilterPanel () {
       const $xeTable = this
 
       $xeTable.handleFilterResetFilter(null)
       return $xeTable.$nextTick()
     },
+    _resetFilterPanelByEvent (evnt: Event) {
+      const $xeTable = this
+
+      $xeTable.handleFilterResetFilter(evnt)
+      return $xeTable.$nextTick()
+    },
     _getCheckedFilters () {
       const { tableFullColumn } = this
       const filterList: any[] = []

package/packages/table/src/methods.ts

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils'
-import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, getOffsetPos, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom'
+import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
 import Cell from './cell'
@@ -5128,8 +5128,9 @@ const Methods = {
     evnt.stopPropagation()
     evnt.preventDefault()
     const { column } = params
-    const { overflowX, scrollbarHeight } = reactData
+    const { columnStore, overflowX, scrollbarHeight } = reactData
     const { elemStore, visibleColumn } = internalData
+    const { leftList, rightList } = columnStore
     const resizableOpts = $xeTable.computeResizableOpts
     const osbHeight = overflowX ? scrollbarHeight : 0
     const tableEl = $xeTable.$refs.refElem as HTMLDivElement
@@ -5139,10 +5140,11 @@ const Methods = {
     if (!resizeBarElem) {
       return
     }
+    const isLeftFixed = fixedType === 'left'
+    const isRightFixed = fixedType === 'right'
     const resizeTipElem = resizeBarElem.firstElementChild as HTMLDivElement
     const scrollbarXToTop = $xeTable.computeScrollbarXToTop
     const { clientX: dragClientX } = evnt
-    const wrapperElem = $xeTable.$refs.refElem as HTMLDivElement
     const dragBtnElem = evnt.target as HTMLDivElement
     let resizeColumn = column
     if (column.children && column.children.length) {
@@ -5157,30 +5159,34 @@ 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'
+    const dragMinLeft = isRightFixed ? 0 : (cellRect.x - tableRect.x + dragBtnWidth + minInterval)
+    const dragMaxLeft = cellRect.x - tableRect.x + cell.clientWidth - minInterval
 
-    // 计算左右侧固定列偏移量
-    let fixedOffsetWidth = 0
+    let fixedLeftRemainWidth = 0
+    let fixedRightRemainWidth = 0
     if (isLeftFixed || isRightFixed) {
-      const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling'
-      let tempCellElem = cell[siblingProp] as HTMLTableCellElement
-      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] as HTMLTableCellElement
-      }
-      if (isRightFixed && rightContainerElem) {
-        dragPosLeft = rightContainerElem.offsetLeft + fixedOffsetWidth
       }
     }
 
@@ -5191,27 +5197,27 @@ 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
@@ -5222,7 +5228,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
     }
@@ -10312,7 +10318,7 @@ const Methods = {
 } as any
 
 // 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: any[]) {

package/lib/locale/lang/zh-TC.umd.js

@@ -1,23 +0,0 @@
-(function (global, factory) {
-  if (typeof define === "function" && define.amd) {
-    define("vxe-table-lang.zh-TC", ["exports", "./zh-CHT"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, require("./zh-CHT"));
-  } else {
-    var mod = {
-      exports: {}
-    };
-    factory(mod.exports, global.zhCHT);
-    global.vxeTableLangZhTC = mod.exports;
-  }
-})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _zhCHT) {
-  "use strict";
-
-  Object.defineProperty(_exports, "__esModule", {
-    value: true
-  });
-  _exports.default = void 0;
-  _zhCHT = _interopRequireDefault(_zhCHT);
-  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-  var _default = _exports.default = _zhCHT.default;
-});