vxe-table 4.13.29 → 4.13.31

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "4.13.29";
+const version = exports.version = "4.13.31";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.13.29",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},rowGroupConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!1,gt:24,preSize:1,oSize:0},virtualYConfig:{enabled:!1,gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.13.31",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},rowGroupConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!1,gt:24,preSize:1,oSize:0},virtualYConfig:{enabled:!1,gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.13.29"}`;
+const version = `table v${"4.13.31"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.13.29",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.13.31",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.13.29",
+  "version": "4.13.31",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/grid/src/grid.ts

@@ -1228,32 +1228,6 @@ export default defineComponent({
       // }
     }
 
-    // 检查插槽
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      (gridMethods as any).loadColumn = (columns: any[]): Promise<any> => {
-        const $xeTable = refTable.value
-        XEUtils.eachTree(columns, (column) => {
-          if (column.slots) {
-            XEUtils.each(column.slots, (func) => {
-              if (!XEUtils.isFunction(func)) {
-                if (!slots[func]) {
-                  errLog('vxe.error.notSlot', [func])
-                }
-              }
-            })
-          }
-        })
-        if ($xeTable) {
-          return $xeTable.loadColumn(columns)
-        }
-        return nextTick()
-      }
-      (gridMethods as any).reloadColumn = (columns: any[]): Promise<any> => {
-        gridExtendTableMethods.clearAll()
-        return (gridMethods as any).loadColumn(columns)
-      }
-    }
-
     const gridPrivateMethods: GridPrivateMethods = {
       extendTableMethods,
       callSlot (slotFunc, params) {
@@ -1315,7 +1289,31 @@ export default defineComponent({
       }
     }
 
-    Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods)
+    Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods, {
+      // 检查插槽
+      loadColumn (columns: any[]) {
+        const $xeTable = refTable.value
+        XEUtils.eachTree(columns, (column) => {
+          if (column.slots) {
+            XEUtils.each(column.slots, (func) => {
+              if (!XEUtils.isFunction(func)) {
+                if (!slots[func]) {
+                  errLog('vxe.error.notSlot', [func])
+                }
+              }
+            })
+          }
+        })
+        if ($xeTable) {
+          return $xeTable.loadColumn(columns)
+        }
+        return nextTick()
+      },
+      reloadColumn (columns: any[]) {
+        $xeGrid.clearAll()
+        return $xeGrid.loadColumn(columns)
+      }
+    })
 
     const columnFlag = ref(0)
     watch(() => props.columns ? props.columns.length : -1, () => {

package/packages/table/module/edit/hook.ts

@@ -92,10 +92,8 @@ hooks.add('tableEditModule', {
           fullDataRowIdData[rowid] = rest
           fullAllDataRowIdData[rowid] = rest
         } else {
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (parentRowId) {
-              warnLog('vxe.error.unableInsert')
-            }
+          if (parentRowId) {
+            warnLog('vxe.error.unableInsert')
           }
           afterFullData[funcName](item)
           tableFullTreeData[funcName](item)
@@ -170,11 +168,9 @@ hooks.add('tableEditModule', {
               const parentLevel = parentRest ? parentRest.level : 0
               newRecords.forEach((item, i) => {
                 const rowid = getRowid($xeTable, item)
-                if (process.env.VUE_APP_VXE_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) {
@@ -203,9 +199,7 @@ hooks.add('tableEditModule', {
                 }
               }
             } else {
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                warnLog('vxe.error.unableInsert')
-              }
+              warnLog('vxe.error.unableInsert')
               insertTreeRow(newRecords, true)
             }
           } else {
@@ -698,9 +692,7 @@ hooks.add('tableEditModule', {
         return []
       },
       getActiveRecord () {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
-        }
+        warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
         return $xeTable.getEditRecord()
       },
       getEditRecord () {
@@ -726,9 +718,7 @@ hooks.add('tableEditModule', {
       },
       clearActived (row) {
         // 即将废弃
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
-        }
+        warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
         return $xeTable.clearEdit(row)
       },
       /**
@@ -749,9 +739,7 @@ hooks.add('tableEditModule', {
         return nextTick()
       },
       isActiveByRow (row) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
-        }
+        warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
         // 即将废弃
         return $xeTable.isEditByRow(row)
       },
@@ -764,9 +752,7 @@ hooks.add('tableEditModule', {
         return editStore.actived.row === row
       },
       setActiveRow (row) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
-        }
+        warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
         // 即将废弃
         return editMethods.setEditRow(row)
       },
@@ -786,9 +772,7 @@ hooks.add('tableEditModule', {
         return handleEditCell(row, column, isPos)
       },
       setActiveCell (row, fieldOrColumn) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
-        }
+        warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
         // 即将废弃
         return editMethods.setEditCell(row, fieldOrColumn)
       },

package/packages/table/module/export/hook.ts

@@ -16,8 +16,8 @@ let htmlCellElem: any
 const csvBOM = '\ufeff'
 const enterSymbol = '\r\n'
 
-function defaultFilterExportColumn (column: any) {
-  return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1
+function defaultFilterExportColumn (column: VxeTableDefines.ColumnInfo) {
+  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1
 }
 
 const getConvertColumns = (columns: any) => {
@@ -78,7 +78,7 @@ const convertToRows = (originColumns: any): any[][] => {
   return rows
 }
 
-function toTableBorder (border: any) {
+function toTableBorder (border: VxeTablePropTypes.Border | undefined) {
   if (border === true) {
     return 'full'
   }
@@ -1012,7 +1012,7 @@ hooks.add('tableExportModule', {
         }
         return false
       }
-      return exportOpts.original ? column.field : defaultFilterExportColumn(column)
+      return exportOpts.original ? !!column.field : defaultFilterExportColumn(column)
     }
 
     const handleExportAndPrint = (options: VxeTablePropTypes.ExportOpts | VxeTablePropTypes.ExportConfig, isPrint?: boolean) => {
@@ -1063,7 +1063,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)
@@ -1178,10 +1178,14 @@ hooks.add('tableExportModule', {
         if (!mode) {
           mode = selectRecords.length ? 'selected' : 'current'
         }
-        const customCols = columns && columns.length
-          ? columns
-          : XEUtils.searchTree(collectColumn, column => {
-            const isColGroup = column.children && column.children.length
+        let isCustomCol = false
+        let customCols = []
+        if (columns && columns.length) {
+          isCustomCol = true
+          customCols = columns
+        } else {
+          customCols = XEUtils.searchTree(collectColumn, column => {
+            const isColGroup = column.children && column.children.length > 0
             let isChecked = false
             if (columns && columns.length) {
               isChecked = handleFilterColumns(opts, column, columns)
@@ -1192,10 +1196,11 @@ hooks.add('tableExportModule', {
             }
             return isChecked
           }, { children: 'children', mapChildren: 'childNodes', original: true })
+        }
         const handleOptions: VxeTablePropTypes.ExportHandleOptions = Object.assign({ } as { data: any[], colgroups: any[], columns: any[] }, opts, { filename: '', sheetName: '' })
         // 如果设置源数据，则默认导出设置了字段的列
-        if (!customCols && !columnFilterMethod) {
-          handleOptions.columnFilterMethod = ({ column }) => {
+        if (!isCustomCol && !columnFilterMethod) {
+          columnFilterMethod = ({ column }) => {
             if (excludeFields) {
               if (XEUtils.includes(excludeFields, column.field)) {
                 return false
@@ -1207,8 +1212,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
@@ -1294,10 +1300,8 @@ hooks.add('tableExportModule', {
         // 检查类型，如果为自定义导出，则不需要校验类型
         if (!handleOptions.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
           errLog('vxe.error.notType', [type])
-          if (process.env.VUE_APP_VXE_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)
@@ -1317,10 +1321,8 @@ hooks.add('tableExportModule', {
               handleOptions.data = selectRecords
             }
           } else if (mode === 'all') {
-            if (process.env.VUE_APP_VXE_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) {
@@ -1334,10 +1336,8 @@ hooks.add('tableExportModule', {
               const queryAllSuccessMethods = ajax.queryAllSuccess
               const queryAllErrorMethods = ajax.queryAllError
 
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                if (!ajaxMethods) {
-                  warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll'])
-                }
+              if (!ajaxMethods) {
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll'])
               }
 
               if (ajaxMethods) {
@@ -1578,7 +1578,7 @@ hooks.add('tableExportModule', {
         if (!props.exportConfig) {
           errLog('vxe.error.reqProp', ['export-config'])
         }
-        handleExportAndPrint(defOpts)
+        return handleExportAndPrint(defOpts)
       },
       closePrint: handleCloseExport,
       openPrint (options) {
@@ -1589,7 +1589,7 @@ hooks.add('tableExportModule', {
         if (!props.printConfig) {
           errLog('vxe.error.reqProp', ['print-config'])
         }
-        handleExportAndPrint(defOpts, true)
+        return handleExportAndPrint(defOpts, true)
       }
     }
 

package/packages/table/module/validator/hook.ts

@@ -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'
@@ -43,6 +43,106 @@ class Rule {
   [key: string]: any
 }
 
+// 如果存在 pattern，判断正则
+function validREValue (pattern: string | RegExp | undefined, val: string) {
+  if (pattern && !(XEUtils.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+    return false
+  }
+  return true
+}
+
+// 如果存在 max，判断最大值
+function validMaxValue (max: string | number | undefined, num: number) {
+  if (!XEUtils.eqNull(max) && num > XEUtils.toNumber(max)) {
+    return false
+  }
+  return true
+}
+
+// 如果存在 min，判断最小值
+function validMinValue (min: string | number | undefined, num: number) {
+  if (!XEUtils.eqNull(min) && num < XEUtils.toNumber(min)) {
+    return false
+  }
+  return true
+}
+
+function validRuleValue (rule: VxeTableDefines.ValidatorRule, val: any, required: boolean | undefined) {
+  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: VxeTableDefines.ValidatorRule, val: any) {
+  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: (keyof TableValidatorMethods)[] = ['fullValidate', 'validate', 'fullValidateField', 'validateField', 'clearValidate']
 
 hooks.add('tableValidatorModule', {
@@ -258,10 +358,8 @@ hooks.add('tableValidatorModule', {
        * 完整校验行，和 validate 的区别就是会给有效数据中的每一行进行校验
        */
       fullValidate (rows, cb) {
-        if (process.env.VUE_APP_VXE_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)
       },
@@ -341,29 +439,6 @@ hooks.add('tableValidatorModule', {
       }
     }
 
-    const validErrorRuleValue = (rule: VxeTableDefines.ValidatorRule, val: any) => {
-      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 = {
       /**
        * 校验数据
@@ -391,7 +466,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 = {
@@ -414,9 +489,7 @@ hooks.add('tableValidatorModule', {
                       if (tcvMethod) {
                         customValid = tcvMethod(validParams)
                       } else {
-                        if (process.env.VUE_APP_VXE_ENV === 'development') {
-                          warnLog('vxe.error.notValidators', [validator])
-                        }
+                        errLog('vxe.error.notValidators', [validator])
                       }
                     } else {
                       errLog('vxe.error.notValidators', [validator])
@@ -439,17 +512,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/packages/table/src/table.ts

@@ -3539,7 +3539,6 @@ export default defineComponent({
         //     }
         //   }
         // }
-        // if (process.env.VUE_APP_VXE_ENV === 'development') {
         // if (props.showHeader && !props.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
         // }
@@ -3552,7 +3551,6 @@ export default defineComponent({
         if (props.footerSpanMethod) {
           warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
         }
-        // }
         if (isReset) {
           const { visibleSize } = handleVirtualXVisible()
           scrollXStore.startIndex = 0
@@ -4264,9 +4262,7 @@ export default defineComponent({
           }
           reactData.tableData = tableData.slice(0)
         } else {
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            warnLog('vxe.error.reqProp', ['keep-source'])
-          }
+          errLog('vxe.error.reqProp', ['keep-source'])
         }
         return nextTick()
       },
@@ -4447,9 +4443,7 @@ export default defineComponent({
         const { transform } = treeOpts
         const { handleGetRowId } = createHandleGetRowId($xeTable)
         if (!keepSource) {
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            errLog('vxe.error.reqProp', ['keep-source'])
-          }
+          errLog('vxe.error.reqProp', ['keep-source'])
           return nextTick()
         }
         let targetRows = rows
@@ -5990,9 +5984,7 @@ export default defineComponent({
         return nextTick()
       },
       reloadExpandContent (row) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
-        }
+        warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
         // 即将废弃
         return $xeTable.reloadRowExpand(row)
       },
@@ -6095,9 +6087,7 @@ export default defineComponent({
       },
       isExpandByRow (row) {
         // 已废弃
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
-        }
+        warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
         return tableMethods.isRowExpandByRow(row)
       },
       /**
@@ -6276,9 +6266,7 @@ export default defineComponent({
         return nextTick()
       },
       reloadTreeChilds (row) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
-        }
+        warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
         // 即将废弃
         return $xeTable.reloadTreeExpand(row)
       },
@@ -8191,10 +8179,8 @@ export default defineComponent({
         // 兼容老版本
         if (!evntList.length && type === 'event.clearEdit') {
           evntList = interceptor.get('event.clearActived')
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (evntList.length) {
-              warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
-            }
+          if (evntList.length) {
+            warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
           }
         }
         // 兼容老版本