vxe-table 3.15.28 → 3.15.30

package/es/table/module/validator/mixin.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
-import { getFuncText, eqEmptyValue } from '../../../ui/src/utils';
+import { getFuncText } from '../../../ui/src/utils';
 import { scrollToView } from '../../../ui/src/dom';
 import { handleFieldOrColumn, getRowid } from '../../src/util';
 import { warnLog, errLog } from '../../../ui/src/log';
@@ -39,27 +39,103 @@ class Rule {
         return this.content;
     }
 }
-function validErrorRuleValue(rule, val) {
+// 如果存在 pattern，判断正则
+function validREValue(pattern, val) {
+    if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+        return false;
+    }
+    return true;
+}
+// 如果存在 max，判断最大值
+function validMaxValue(max, num) {
+    if (!XEUtils.eqNull(max) && num > XEUtils.toNumber(max)) {
+        return false;
+    }
+    return true;
+}
+// 如果存在 min，判断最小值
+function validMinValue(min, num) {
+    if (!XEUtils.eqNull(min) && num < XEUtils.toNumber(min)) {
+        return false;
+    }
+    return true;
+}
+function validRuleValue(rule, val, required) {
     const { type, min, max, pattern } = rule;
+    const isArrType = type === 'array';
     const isNumType = type === 'number';
-    const numVal = isNumType ? XEUtils.toNumber(val) : XEUtils.getSize(val);
-    // 判断数值
-    if (isNumType && isNaN(val)) {
-        return true;
+    const isStrType = type === 'string';
+    const strVal = `${val}`;
+    if (!validREValue(pattern, strVal)) {
+        return false;
     }
-    // 如果存在 min，判断最小值
-    if (!XEUtils.eqNull(min) && numVal < XEUtils.toNumber(min)) {
-        return true;
+    if (isArrType) {
+        if (!XEUtils.isArray(val)) {
+            return false;
+        }
+        if (required) {
+            if (!val.length) {
+                return false;
+            }
+        }
+        if (!validMinValue(min, val.length)) {
+            return false;
+        }
+        if (!validMaxValue(max, val.length)) {
+            return false;
+        }
     }
-    // 如果存在 max，判断最大值
-    if (!XEUtils.eqNull(max) && numVal > XEUtils.toNumber(max)) {
-        return true;
+    else if (isNumType) {
+        const numVal = Number(val);
+        if (isNaN(numVal)) {
+            return false;
+        }
+        if (!validMinValue(min, numVal)) {
+            return false;
+        }
+        if (!validMaxValue(max, numVal)) {
+            return false;
+        }
     }
-    // 如果存在 pattern，正则校验
-    if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
-        return true;
+    else {
+        if (isStrType) {
+            if (!XEUtils.isString(val)) {
+                return false;
+            }
+        }
+        if (required) {
+            if (!strVal) {
+                return false;
+            }
+        }
+        if (!validMinValue(min, strVal.length)) {
+            return false;
+        }
+        if (!validMaxValue(max, strVal.length)) {
+            return false;
+        }
+    }
+    return true;
+}
+function checkRuleStatus(rule, val) {
+    const { required } = rule;
+    const isEmptyVal = XEUtils.eqNull(val);
+    if (required) {
+        if (isEmptyVal) {
+            return false;
+        }
+        if (!validRuleValue(rule, val, required)) {
+            return false;
+        }
+    }
+    else {
+        if (!isEmptyVal) {
+            if (!validRuleValue(rule, val, required)) {
+                return false;
+            }
+        }
     }
-    return false;
+    return true;
 }
 export default {
     methods: {
@@ -67,10 +143,8 @@ export default {
          * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
          */
         _fullValidate(rows, cb) {
-            if (process.env.NODE_ENV === 'development') {
-                if (XEUtils.isFunction(cb)) {
-                    warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
-                }
+            if (XEUtils.isFunction(cb)) {
+                warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
             }
             return this.beginValidate(rows, null, cb, true);
         },
@@ -78,10 +152,8 @@ export default {
          * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
          */
         _validate(rows, cb) {
-            if (process.env.NODE_ENV === 'development') {
-                if (XEUtils.isFunction(cb)) {
-                    warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
-                }
+            if (XEUtils.isFunction(cb)) {
+                warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
             }
             return this.beginValidate(rows, null, cb);
         },
@@ -323,7 +395,7 @@ export default {
                 if (rules) {
                     const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, property) : val;
                     rules.forEach((rule) => {
-                        const { type, trigger, required, validator } = rule;
+                        const { trigger, validator } = rule;
                         if (validType === 'all' || !trigger || validType === trigger) {
                             if (validator) {
                                 const validParams = {
@@ -346,9 +418,7 @@ export default {
                                             customValid = tcvMethod(validParams);
                                         }
                                         else {
-                                            if (process.env.NODE_ENV === 'development') {
-                                                warnLog('vxe.error.notValidators', [validator]);
-                                            }
+                                            errLog('vxe.error.notValidators', [validator]);
                                         }
                                     }
                                     else {
@@ -373,19 +443,7 @@ export default {
                                 }
                             }
                             else {
-                                const isArrType = type === 'array';
-                                const isArrVal = XEUtils.isArray(cellValue);
-                                let hasEmpty = true;
-                                if (isArrType || isArrVal) {
-                                    hasEmpty = !isArrVal || !cellValue.length;
-                                }
-                                else if (XEUtils.isString(cellValue)) {
-                                    hasEmpty = eqEmptyValue(cellValue.trim());
-                                }
-                                else {
-                                    hasEmpty = eqEmptyValue(cellValue);
-                                }
-                                if (required ? (hasEmpty || validErrorRuleValue(rule, cellValue)) : (!hasEmpty && validErrorRuleValue(rule, cellValue))) {
+                                if (!checkRuleStatus(rule, cellValue)) {
                                     this.validRuleErr = true;
                                     errorRules.push(new Rule(rule));
                                 }

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTarge
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util';
+import { getRowUniqueId, clearTableAllStatus, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
@@ -23,8 +23,9 @@ function eqCellValue(row1, row2, field) {
     }
     return XEUtils.isEqual(val1, val2);
 }
-function getNextSortOrder(_vm, column) {
-    const orders = _vm.sortOpts.orders;
+function getNextSortOrder($xeTable, column) {
+    const sortOpts = $xeTable.computeSortOpts;
+    const { orders = [] } = sortOpts;
     const currOrder = column.order || null;
     const oIndex = orders.indexOf(currOrder) + 1;
     return orders[oIndex < orders.length ? oIndex : 0];
@@ -1949,8 +1950,57 @@ function removeFooterMerges($xeTable, merges) {
     }
     return rest;
 }
-function clearAllSort(_vm) {
-    _vm.tableFullColumn.forEach((column) => {
+function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+    const sortOpts = $xeTable.computeSortOpts;
+    const { multiple, remote, orders } = sortOpts;
+    if (!XEUtils.isArray(sortConfs)) {
+        sortConfs = [sortConfs];
+    }
+    if (sortConfs && sortConfs.length) {
+        if (!multiple) {
+            sortConfs = [sortConfs[0]];
+            clearAllSort($xeTable);
+        }
+        let firstColumn = null;
+        sortConfs.forEach((confs, index) => {
+            let { field, order } = confs;
+            let column = field;
+            if (XEUtils.isString(field)) {
+                column = $xeTable.getColumnByField(field);
+            }
+            if (!firstColumn) {
+                firstColumn = column;
+            }
+            if (column && column.sortable) {
+                if (orders && orders.indexOf(order) === -1) {
+                    order = getNextSortOrder($xeTable, column);
+                }
+                if (column.order !== order) {
+                    column.order = order;
+                }
+                column.sortTime = Date.now() + index;
+            }
+        });
+        if (isUpdate) {
+            if (!remote) {
+                $xeTable.handleTableData(true);
+            }
+        }
+        if (evnt) {
+            $xeTable.handleColumnSortEvent(evnt, firstColumn);
+        }
+        return $xeTable.$nextTick().then(() => {
+            updateRowOffsetTop($xeTable);
+            $xeTable.updateCellAreas();
+            return updateStyle($xeTable);
+        });
+    }
+    return $xeTable.$nextTick();
+}
+function clearAllSort($xeTable) {
+    const internalData = $xeTable;
+    const { tableFullColumn } = internalData;
+    tableFullColumn.forEach((column) => {
         column.order = null;
     });
 }
@@ -2969,7 +3019,6 @@ function parseColumns($xeTable, isReset) {
         //     }
         //   }
         // }
-        // if (process.env.NODE_ENV === 'development') {
         // if (props.showHeader && !props.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
         // }
@@ -2982,7 +3031,6 @@ function parseColumns($xeTable, isReset) {
         if (props.footerSpanMethod) {
             warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
         }
-        // }
         if (isReset) {
             const { visibleSize } = handleVirtualXVisible($xeTable);
             scrollXStore.startIndex = 0;
@@ -3162,7 +3210,7 @@ function lazyScrollYData($xeTable) {
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { scrollXLoad, scrollYLoad } = reactData;
+    const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
     const { lcsTimeout } = internalData;
     if (lcsTimeout) {
         clearTimeout(lcsTimeout);
@@ -3177,13 +3225,19 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
         internalData.inBodyScroll = false;
         internalData.inFooterScroll = false;
         internalData.scrollRenderType = '';
-        calcCellHeight($xeTable);
+        if (!isAllOverflow) {
+            calcCellHeight($xeTable);
+            updateRowOffsetTop($xeTable);
+        }
         if (isRollX && scrollXLoad) {
             $xeTable.updateScrollXData();
         }
         if (isRollY && scrollYLoad) {
             $xeTable.updateScrollYData().then(() => {
-                calcCellHeight($xeTable);
+                if (!isAllOverflow) {
+                    calcCellHeight($xeTable);
+                    updateRowOffsetTop($xeTable);
+                }
                 $xeTable.updateScrollYSpace();
             });
         }
@@ -3630,9 +3684,7 @@ const Methods = {
             this.tableData = tableData.slice(0);
         }
         else {
-            if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.reqProp', ['keep-source']);
-            }
+            errLog('vxe.error.reqProp', ['keep-source']);
         }
         return this.$nextTick();
     },
@@ -3866,16 +3918,12 @@ const Methods = {
     getVMRowIndex: createGetRowCacheProp('$index'),
     // 在 v3 中废弃
     _getRowIndex(row) {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
-        }
+        warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
         return this.getVTRowIndex(row);
     },
     // 在 v3 中废弃
     $getRowIndex(row) {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex']);
-        }
+        warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex']);
         return this.getVMRowIndex(row);
     },
     /**
@@ -3895,16 +3943,12 @@ const Methods = {
     getVMColumnIndex: createGetColumnCacheProp('$index'),
     // 在 v3 中废弃
     _getColumnIndex(column) {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
-        }
+        warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
         return this.getVTColumnIndex(column);
     },
     // 在 v3 中废弃
     $getColumnIndex(column) {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex']);
-        }
+        warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex']);
         return this.getVMColumnIndex(column);
     },
     /**
@@ -4007,9 +4051,7 @@ const Methods = {
         const { transform } = treeOpts;
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         if (!keepSource) {
-            if (process.env.NODE_ENV === 'development') {
-                errLog('vxe.error.reqProp', ['keep-source']);
-            }
+            errLog('vxe.error.reqProp', ['keep-source']);
             return $xeTable.$nextTick();
         }
         let targetRows = rows;
@@ -4624,6 +4666,7 @@ const Methods = {
                 }
                 XEUtils.eachTree([targetColumn], (column) => {
                     column.fixed = fixed;
+                    column.renderFixed = fixed;
                 });
                 $xeTable.saveCustomStore('update:fixed');
                 if (!status) {
@@ -4649,6 +4692,7 @@ const Methods = {
             if (targetColumn && targetColumn.fixed) {
                 XEUtils.eachTree([targetColumn], (column) => {
                     column.fixed = null;
+                    column.renderFixed = null;
                 });
                 $xeTable.saveCustomStore('update:fixed');
                 if (!status) {
@@ -5544,10 +5588,8 @@ const Methods = {
         // 兼容老版本
         if (!evntList.length && type === 'event.clearEdit') {
             evntList = interceptor.get('event.clearActived');
-            if (process.env.NODE_ENV === 'development') {
-                if (evntList.length) {
-                    warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
-                }
+            if (evntList.length) {
+                warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
             }
         }
         // 兼容老版本
@@ -6233,10 +6275,14 @@ const Methods = {
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
             const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
             let ovEl = null;
+            let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
             if (column.treeNode) {
                 ovEl = tdEl.querySelector('.vxe-tree-cell');
             }
-            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+            if (!tipEl) {
+                tipEl = ctEl;
+            }
+            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
         }
     },
     /**
@@ -6250,7 +6296,16 @@ const Methods = {
         const tdEl = evnt.currentTarget;
         handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+            const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
+            let ovEl = null;
+            let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
+            if (column.type === 'html') {
+                ovEl = tdEl.querySelector('.vxe-cell--html');
+            }
+            if (!tipEl) {
+                tipEl = ctEl;
+            }
+            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
         }
     },
     openTooltip(target, content) {
@@ -8267,49 +8322,12 @@ const Methods = {
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
-        const sortOpts = $xeTable.computeSortOpts;
-        const { multiple, remote, orders } = sortOpts;
-        if (!XEUtils.isArray(sortConfs)) {
-            sortConfs = [sortConfs];
-        }
-        if (sortConfs && sortConfs.length) {
-            if (!multiple) {
-                sortConfs = [sortConfs[0]];
-                clearAllSort($xeTable);
-            }
-            let firstColumn = null;
-            sortConfs.forEach((confs, index) => {
-                let { field, order } = confs;
-                let column = field;
-                if (XEUtils.isString(field)) {
-                    column = $xeTable.getColumnByField(field);
-                }
-                if (!firstColumn) {
-                    firstColumn = column;
-                }
-                if (column && column.sortable) {
-                    if (orders && orders.indexOf(order) === -1) {
-                        order = getNextSortOrder($xeTable, column);
-                    }
-                    if (column.order !== order) {
-                        column.order = order;
-                    }
-                    column.sortTime = Date.now() + index;
-                }
-            });
-            if (isUpdate) {
-                if (!remote) {
-                    $xeTable.handleTableData(true);
-                }
-                $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
-            }
-            return $xeTable.$nextTick().then(() => {
-                updateRowOffsetTop($xeTable);
-                $xeTable.updateCellAreas();
-                return updateStyle($xeTable);
-            });
-        }
-        return $xeTable.$nextTick();
+        // 已废弃，即将去掉事件触发 new Event('click') -> null
+        return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    },
+    setSortByEvent(evnt, sortConfs, isUpdate) {
+        const $xeTable = this;
+        return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
     },
     /**
      * 清空指定列的排序条件
@@ -8376,9 +8394,7 @@ const Methods = {
     },
     // 在 v3 中废弃
     getSortColumn() {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns']);
-        }
+        warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns']);
         return XEUtils.find(this.tableFullColumn, column => (column.sortable || column.remoteSort) && column.order);
     },
     isSort(fieldOrColumn) {
@@ -8402,6 +8418,17 @@ const Methods = {
         }
         return sortList;
     },
+    setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+        const $xeTable = this;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (column && column.filters) {
+            column.filters = toFilters(options || []);
+            if (isUpdate) {
+                return $xeTable.handleColumnConfirmFilter(column, evnt);
+            }
+        }
+        return $xeTable.$nextTick();
+    },
     /**
      * 关闭筛选
      * @param {Event} evnt 事件
@@ -8531,9 +8558,7 @@ const Methods = {
         return $xeTable.$nextTick();
     },
     reloadExpandContent(row) {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
-        }
+        warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
         // 即将废弃
         return this.reloadRowExpand(row);
     },
@@ -8676,9 +8701,7 @@ const Methods = {
         return !!rowExpandedFlag && !!rowExpandedMaps[rowid];
     },
     isExpandByRow(row) {
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
-        }
+        warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
         // 即将废弃
         return this.isRowExpandByRow(row);
     },
@@ -8906,9 +8929,7 @@ const Methods = {
     },
     reloadTreeChilds(row) {
         const $xeTable = this;
-        if (process.env.NODE_ENV === 'development') {
-            warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
-        }
+        warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
         // 即将废弃
         return $xeTable.reloadTreeExpand(row);
     },

package/es/table/src/table.js

@@ -1686,14 +1686,12 @@ export default {
         if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
             initTpImg();
         }
-        if (process.env.NODE_ENV === 'development') {
-            const { $listeners } = this;
-            if (!this.menuConfig && ($listeners['menu-click'] || $listeners['cell-menu'] || $listeners['header-cell-menu'] || $listeners['footer-cell-menu'])) {
-                warnLog('vxe.error.reqProp', ['menu-config']);
-            }
-            if (!this.tooltipConfig && ($listeners['cell-mouseenter'] || $listeners['cell-mouseleave'])) {
-                warnLog('vxe.error.reqProp', ['tooltip-config']);
-            }
+        const { $listeners } = this;
+        if (!this.menuConfig && ($listeners['menu-click'] || $listeners['cell-menu'] || $listeners['header-cell-menu'] || $listeners['footer-cell-menu'])) {
+            warnLog('vxe.error.reqProp', ['menu-config']);
+        }
+        if (!this.tooltipConfig && ($listeners['cell-mouseenter'] || $listeners['cell-mouseleave'])) {
+            warnLog('vxe.error.reqProp', ['tooltip-config']);
         }
         // 使用已安装的组件，如果未安装则不渲染
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');

package/es/table/style.css

@@ -2550,6 +2550,12 @@
 .vxe-table--render-default .vxe-footer--column.col--right > .vxe-cell {
   justify-content: right;
 }
+.vxe-table--render-default .vxe-header--column.col--ellipsis.col--center .vxe-cell--wrapper {
+  justify-content: center;
+}
+.vxe-table--render-default .vxe-header--column.col--ellipsis.col--right .vxe-cell--wrapper {
+  justify-content: right;
+}
 .vxe-table--render-default .vxe-header--column.col--ellipsis.col--center .vxe-cell,
 .vxe-table--render-default .vxe-footer--column.col--ellipsis.col--center .vxe-cell {
   justify-content: center;