vxe-table 4.13.29 → 4.13.30

package/es/table/module/edit/hook.js

@@ -82,10 +82,8 @@ hooks.add('tableEditModule', {
                     fullAllDataRowIdData[rowid] = rest;
                 }
                 else {
-                    if (process.env.NODE_ENV === 'development') {
-                        if (parentRowId) {
-                            warnLog('vxe.error.unableInsert');
-                        }
+                    if (parentRowId) {
+                        warnLog('vxe.error.unableInsert');
                     }
                     afterFullData[funcName](item);
                     tableFullTreeData[funcName](item);
@@ -163,11 +161,9 @@ hooks.add('tableEditModule', {
                             const parentLevel = parentRest ? parentRest.level : 0;
                             newRecords.forEach((item, i) => {
                                 const rowid = getRowid($xeTable, item);
-                                if (process.env.NODE_ENV === 'development') {
-                                    if (item[treeOpts.parentField]) {
-                                        if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                                            errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                                        }
+                                if (item[treeOpts.parentField]) {
+                                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                                        errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
                                     }
                                 }
                                 if (parentRow) {
@@ -196,9 +192,7 @@ hooks.add('tableEditModule', {
                             }
                         }
                         else {
-                            if (process.env.NODE_ENV === 'development') {
-                                warnLog('vxe.error.unableInsert');
-                            }
+                            warnLog('vxe.error.unableInsert');
                             insertTreeRow(newRecords, true);
                         }
                     }
@@ -695,9 +689,7 @@ hooks.add('tableEditModule', {
                 return [];
             },
             getActiveRecord() {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
-                }
+                warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
                 return $xeTable.getEditRecord();
             },
             getEditRecord() {
@@ -723,9 +715,7 @@ hooks.add('tableEditModule', {
             },
             clearActived(row) {
                 // 即将废弃
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
-                }
+                warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
                 return $xeTable.clearEdit(row);
             },
             /**
@@ -746,9 +736,7 @@ hooks.add('tableEditModule', {
                 return nextTick();
             },
             isActiveByRow(row) {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
-                }
+                warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
                 // 即将废弃
                 return $xeTable.isEditByRow(row);
             },
@@ -761,9 +749,7 @@ hooks.add('tableEditModule', {
                 return editStore.actived.row === row;
             },
             setActiveRow(row) {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
-                }
+                warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
                 // 即将废弃
                 return editMethods.setEditRow(row);
             },
@@ -783,9 +769,7 @@ hooks.add('tableEditModule', {
                 return handleEditCell(row, column, isPos);
             },
             setActiveCell(row, fieldOrColumn) {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
-                }
+                warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
                 // 即将废弃
                 return editMethods.setEditCell(row, fieldOrColumn);
             },

package/es/table/module/export/hook.js

@@ -11,7 +11,7 @@ let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function defaultFilterExportColumn(column) {
-    return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
+    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
 }
 const getConvertColumns = (columns) => {
     const result = [];
@@ -951,7 +951,7 @@ hooks.add('tableExportModule', {
                 }
                 return false;
             }
-            return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+            return exportOpts.original ? !!column.field : defaultFilterExportColumn(column);
         };
         const handleExportAndPrint = (options, isPrint) => {
             const { treeConfig, showHeader, showFooter } = props;
@@ -1001,7 +1001,7 @@ hooks.add('tableExportModule', {
             });
             // 默认选中
             XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
-                const isColGroup = column.children && column.children.length;
+                const isColGroup = column.children && column.children.length > 0;
                 let isChecked = false;
                 if (columns && columns.length) {
                     isChecked = handleFilterColumns(defOpts, column, columns);
@@ -1121,7 +1121,7 @@ hooks.add('tableExportModule', {
                 const customCols = columns && columns.length
                     ? columns
                     : XEUtils.searchTree(collectColumn, column => {
-                        const isColGroup = column.children && column.children.length;
+                        const isColGroup = column.children && column.children.length > 0;
                         let isChecked = false;
                         if (columns && columns.length) {
                             isChecked = handleFilterColumns(opts, column, columns);
@@ -1137,7 +1137,7 @@ hooks.add('tableExportModule', {
                 const handleOptions = Object.assign({}, opts, { filename: '', sheetName: '' });
                 // 如果设置源数据，则默认导出设置了字段的列
                 if (!customCols && !columnFilterMethod) {
-                    handleOptions.columnFilterMethod = ({ column }) => {
+                    columnFilterMethod = ({ column }) => {
                         if (excludeFields) {
                             if (XEUtils.includes(excludeFields, column.field)) {
                                 return false;
@@ -1149,8 +1149,9 @@ hooks.add('tableExportModule', {
                             }
                             return false;
                         }
-                        return original ? column.field : defaultFilterExportColumn(column);
+                        return original ? !!column.field : defaultFilterExportColumn(column);
                     };
+                    handleOptions.columnFilterMethod = columnFilterMethod;
                 }
                 if (customCols) {
                     handleOptions._isCustomColumn = true;
@@ -1238,10 +1239,8 @@ hooks.add('tableExportModule', {
                 // 检查类型，如果为自定义导出，则不需要校验类型
                 if (!handleOptions.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
                     errLog('vxe.error.notType', [type]);
-                    if (process.env.NODE_ENV === 'development') {
-                        if (['xlsx', 'pdf'].includes(type)) {
-                            warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
-                        }
+                    if (['xlsx', 'pdf'].includes(type)) {
+                        warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
                     }
                     const params = { status: false };
                     return Promise.reject(params);
@@ -1262,10 +1261,8 @@ hooks.add('tableExportModule', {
                         }
                     }
                     else if (mode === 'all') {
-                        if (process.env.NODE_ENV === 'development') {
-                            if (!$xeGrid) {
-                                warnLog('vxe.error.errProp', ['all', 'mode=current,selected']);
-                            }
+                        if (!$xeGrid) {
+                            errLog('vxe.error.errProp', ['all', 'mode=current,selected']);
                         }
                         if ($xeGrid && !handleOptions.remote) {
                             const gridReactData = $xeGrid.reactData;
@@ -1277,10 +1274,8 @@ hooks.add('tableExportModule', {
                             const ajaxMethods = ajax.queryAll;
                             const queryAllSuccessMethods = ajax.queryAllSuccess;
                             const queryAllErrorMethods = ajax.queryAllError;
-                            if (process.env.NODE_ENV === 'development') {
-                                if (!ajaxMethods) {
-                                    warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
-                                }
+                            if (!ajaxMethods) {
+                                errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
                             }
                             if (ajaxMethods) {
                                 const params = {
@@ -1518,7 +1513,7 @@ hooks.add('tableExportModule', {
                 if (!props.exportConfig) {
                     errLog('vxe.error.reqProp', ['export-config']);
                 }
-                handleExportAndPrint(defOpts);
+                return handleExportAndPrint(defOpts);
             },
             closePrint: handleCloseExport,
             openPrint(options) {
@@ -1529,7 +1524,7 @@ hooks.add('tableExportModule', {
                 if (!props.printConfig) {
                     errLog('vxe.error.reqProp', ['print-config']);
                 }
-                handleExportAndPrint(defOpts, true);
+                return handleExportAndPrint(defOpts, true);
             }
         };
         return exportMethods;

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

@@ -1,7 +1,7 @@
 import { nextTick } from 'vue';
 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';
@@ -34,6 +34,104 @@ class Rule {
         return this.content;
     }
 }
+// 如果存在 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 isStrType = type === 'string';
+    const strVal = `${val}`;
+    if (!validREValue(pattern, strVal)) {
+        return false;
+    }
+    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;
+        }
+    }
+    else if (isNumType) {
+        const numVal = Number(val);
+        if (isNaN(numVal)) {
+            return false;
+        }
+        if (!validMinValue(min, numVal)) {
+            return false;
+        }
+        if (!validMaxValue(max, numVal)) {
+            return false;
+        }
+    }
+    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 true;
+}
 const tableValidatorMethodKeys = ['fullValidate', 'validate', 'fullValidateField', 'validateField', 'clearValidate'];
 hooks.add('tableValidatorModule', {
     setupTable($xeTable) {
@@ -234,10 +332,8 @@ hooks.add('tableValidatorModule', {
              * 完整校验行，和 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 beginValidate(rows, null, cb, true);
             },
@@ -313,28 +409,6 @@ hooks.add('tableValidatorModule', {
                 return nextTick();
             }
         };
-        const validErrorRuleValue = (rule, val) => {
-            const { type, min, max, pattern } = rule;
-            const isNumType = type === 'number';
-            const numVal = isNumType ? XEUtils.toNumber(val) : XEUtils.getSize(val);
-            // 判断数值
-            if (isNumType && isNaN(val)) {
-                return true;
-            }
-            // 如果存在 min，判断最小值
-            if (!XEUtils.eqNull(min) && numVal < XEUtils.toNumber(min)) {
-                return true;
-            }
-            // 如果存在 max，判断最大值
-            if (!XEUtils.eqNull(max) && numVal > XEUtils.toNumber(max)) {
-                return true;
-            }
-            // 如果存在 pattern，正则校验
-            if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
-                return true;
-            }
-            return false;
-        };
         validatorPrivateMethods = {
             /**
              * 校验数据
@@ -361,7 +435,7 @@ hooks.add('tableValidatorModule', {
                     if (rules) {
                         const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, field) : val;
                         rules.forEach((rule) => {
-                            const { type, trigger, required, validator } = rule;
+                            const { trigger, validator } = rule;
                             if (validType === 'all' || !trigger || validType === trigger) {
                                 if (validator) {
                                     const validParams = {
@@ -385,9 +459,7 @@ hooks.add('tableValidatorModule', {
                                                 customValid = tcvMethod(validParams);
                                             }
                                             else {
-                                                if (process.env.NODE_ENV === 'development') {
-                                                    warnLog('vxe.error.notValidators', [validator]);
-                                                }
+                                                errLog('vxe.error.notValidators', [validator]);
                                             }
                                         }
                                         else {
@@ -412,19 +484,7 @@ hooks.add('tableValidatorModule', {
                                     }
                                 }
                                 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)) {
                                         validRuleErr = true;
                                         errorRules.push(new Rule(rule));
                                     }

package/es/table/src/table.js

@@ -3396,7 +3396,6 @@ export default defineComponent({
                 //     }
                 //   }
                 // }
-                // if (process.env.NODE_ENV === 'development') {
                 // if (props.showHeader && !props.showHeaderOverflow) {
                 //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
                 // }
@@ -3409,7 +3408,6 @@ export default defineComponent({
                 if (props.footerSpanMethod) {
                     warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
                 }
-                // }
                 if (isReset) {
                     const { visibleSize } = handleVirtualXVisible();
                     scrollXStore.startIndex = 0;
@@ -4100,9 +4098,7 @@ export default defineComponent({
                     reactData.tableData = tableData.slice(0);
                 }
                 else {
-                    if (process.env.NODE_ENV === 'development') {
-                        warnLog('vxe.error.reqProp', ['keep-source']);
-                    }
+                    errLog('vxe.error.reqProp', ['keep-source']);
                 }
                 return nextTick();
             },
@@ -4283,9 +4279,7 @@ export default defineComponent({
                 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 nextTick();
                 }
                 let targetRows = rows;
@@ -5846,9 +5840,7 @@ export default defineComponent({
                 return nextTick();
             },
             reloadExpandContent(row) {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
-                }
+                warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
                 // 即将废弃
                 return $xeTable.reloadRowExpand(row);
             },
@@ -5954,9 +5946,7 @@ export default defineComponent({
             },
             isExpandByRow(row) {
                 // 已废弃
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
-                }
+                warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
                 return tableMethods.isRowExpandByRow(row);
             },
             /**
@@ -6136,9 +6126,7 @@ export default defineComponent({
                 return nextTick();
             },
             reloadTreeChilds(row) {
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
-                }
+                warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
                 // 即将废弃
                 return $xeTable.reloadTreeExpand(row);
             },
@@ -8064,10 +8052,8 @@ export default defineComponent({
                 // 兼容老版本
                 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']);
                     }
                 }
                 // 兼容老版本

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.13.29";
+export const version = "4.13.30";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.13.29"}`;
+const version = `table v${"4.13.30"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -1367,31 +1367,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       //   return nextTick()
       // }
     };
-    // 检查插槽
-    if (process.env.NODE_ENV === 'development') {
-      gridMethods.loadColumn = columns => {
-        const $xeTable = refTable.value;
-        _xeUtils.default.eachTree(columns, column => {
-          if (column.slots) {
-            _xeUtils.default.each(column.slots, func => {
-              if (!_xeUtils.default.isFunction(func)) {
-                if (!slots[func]) {
-                  (0, _log.errLog)('vxe.error.notSlot', [func]);
-                }
-              }
-            });
-          }
-        });
-        if ($xeTable) {
-          return $xeTable.loadColumn(columns);
-        }
-        return (0, _vue.nextTick)();
-      };
-      gridMethods.reloadColumn = columns => {
-        gridExtendTableMethods.clearAll();
-        return gridMethods.loadColumn(columns);
-      };
-    }
     const gridPrivateMethods = {
       extendTableMethods,
       callSlot(slotFunc, params) {
@@ -1466,7 +1441,31 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }, evnt);
       }
     };
-    Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods);
+    Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods, {
+      // 检查插槽
+      loadColumn(columns) {
+        const $xeTable = refTable.value;
+        _xeUtils.default.eachTree(columns, column => {
+          if (column.slots) {
+            _xeUtils.default.each(column.slots, func => {
+              if (!_xeUtils.default.isFunction(func)) {
+                if (!slots[func]) {
+                  (0, _log.errLog)('vxe.error.notSlot', [func]);
+                }
+              }
+            });
+          }
+        });
+        if ($xeTable) {
+          return $xeTable.loadColumn(columns);
+        }
+        return (0, _vue.nextTick)();
+      },
+      reloadColumn(columns) {
+        $xeGrid.clearAll();
+        return $xeGrid.loadColumn(columns);
+      }
+    });
     const columnFlag = (0, _vue.ref)(0);
     (0, _vue.watch)(() => props.columns ? props.columns.length : -1, () => {
       columnFlag.value++;