vxe-table 4.19.0 → 4.19.2

package/lib/index.umd.js

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.19.0";
+const version = "4.19.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3478,6 +3478,7 @@ core_.VxeUI.setConfig({
     },
     aggregateConfig: {
       padding: true,
+      placement: 'left',
       rowField: 'id',
       parentField: '_X_ROW_PARENT_KEY',
       childrenField: '_X_ROW_CHILDREN',
@@ -3847,7 +3848,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.19.0"}`;
+const log_version = `table v${"4.19.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3971,6 +3972,7 @@ class ColumnInfo {
       filterRecoverMethod: _vm.filterRecoverMethod,
       filterRender: filterRender,
       floatingFilters: _vm.floatingFilters,
+      rules: _vm.rules,
       rowGroupNode: _vm.rowGroupNode,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
@@ -6912,7 +6914,7 @@ const Cell = {
     const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
     let isRequired = false;
     if (editRules) {
-      const columnRules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, column.field);
+      const columnRules = column.rules ? column.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, column.field);
       if (columnRules) {
         isRequired = columnRules.some(rule => rule.required);
       }
@@ -7160,6 +7162,8 @@ const columnProps = {
   filterRender: Object,
   // 是否显示浮动筛选
   floatingFilters: Object,
+  // 列的校验规则
+  rules: Array,
   // 设置为分组节点
   rowGroupNode: Boolean,
   // 设置为树节点
@@ -9832,7 +9836,8 @@ function panel_createInternalData() {
       computeColumnDragOpts,
       computeColumnOpts,
       computeIsMaxFixedColumn,
-      computeResizableOpts
+      computeResizableOpts,
+      computeAggregateOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refBodyWrapperElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -10346,6 +10351,8 @@ function panel_createInternalData() {
     const sortDragoverEvent = evnt => {
       const customOpts = computeCustomOpts.value;
       const {
+        showSortDragButton,
+        allowSort,
         immediate
       } = customOpts;
       const columnDragOpts = computeColumnDragOpts.value;
@@ -10367,7 +10374,7 @@ function panel_createInternalData() {
         evnt.preventDefault();
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y;
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom';
-        if (!dragCol || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1) {
+        if (!dragCol || !(showSortDragButton && allowSort) || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1 || !isCrossDrag && dragCol.level > 1 || !immediate && dragCol.level > 1) {
           showDropTip(evnt, optEl, false, dragPos);
           return;
         }
@@ -10520,19 +10527,19 @@ function panel_createInternalData() {
         isCustomDragStatus
       } = tableReactData;
       const customOpts = computeCustomOpts.value;
-      const {
-        immediate
-      } = customOpts;
       const columnDragOpts = computeColumnDragOpts.value;
       const {
         popupStyle
       } = customStore;
       const {
+        immediate,
         checkMethod,
         visibleMethod,
         allowVisible,
         allowSort,
         allowFixed,
+        allowGroup,
+        allowValues,
         trigger,
         placement,
         showSortDragButton,
@@ -10610,7 +10617,7 @@ function panel_createInternalData() {
             class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
           })]) : panel_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom--name-option'
-          }, [allowSort && showSortDragButton && showSortBtn ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, [allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom--sort-option'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-table-custom--sort-btn', {
@@ -10623,7 +10630,7 @@ function panel_createInternalData() {
             })
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
             class: panel_getIcon().TABLE_CUSTOM_SORT
-          })])]) : panel_renderEmptyElement($xeTable), column.type === 'html' ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })])]) : panel_renderEmptyElement($xeTable) : panel_renderEmptyElement($xeTable), column.type === 'html' ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             key: '1',
             class: 'vxe-table-custom--checkbox-label',
             innerHTML: colTitle
@@ -10782,21 +10789,25 @@ function panel_createInternalData() {
         customColumnList
       } = tableReactData;
       const customOpts = computeCustomOpts.value;
+      const columnDragOpts = computeColumnDragOpts.value;
+      const aggregateOpts = computeAggregateOpts.value;
+      const {
+        placement: aggPlacement
+      } = aggregateOpts;
       const {
+        mode,
         immediate,
         showSortDragButton,
         showSortMoveButton,
-        showSortPutButton
-      } = customOpts;
-      const columnDragOpts = computeColumnDragOpts.value;
-      const {
-        mode,
+        showSortPutButton,
         modalOptions,
         drawerOptions,
         allowVisible,
         allowSort,
         allowFixed,
         allowResizable,
+        allowGroup,
+        allowValues,
         checkMethod,
         visibleMethod
       } = customOpts;
@@ -10824,6 +10835,7 @@ function panel_createInternalData() {
       const trVNs = [];
       const isAllChecked = customStore.isAll;
       const isAllIndeterminate = customStore.isIndeterminate;
+      const isAggRtBmLayout = aggPlacement === 'right' || aggPlacement === 'bottom';
       const params = {
         $table: $xeTable,
         $grid: $xeGrid,
@@ -10896,7 +10908,7 @@ function panel_createInternalData() {
             class: 'vxe-table-custom-popup--column-item col--name'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--name'
-          }, [allowSort ? showSortDragButton && (showSortBtn ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, [allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-table-custom-popup--column-sort-btn', {
               'is--disabled': isHidden
             }],
@@ -10909,7 +10921,7 @@ function panel_createInternalData() {
             class: panel_getIcon().TABLE_CUSTOM_SORT
           })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--column-sort-placeholder'
-          })) : panel_renderEmptyElement($xeTable), column.type === 'html' ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }) : panel_renderEmptyElement($xeTable), column.type === 'html' ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             key: '1',
             class: 'vxe-table-custom-popup--title',
             innerHTML: colTitle
@@ -11000,8 +11012,8 @@ function panel_createInternalData() {
         default: () => {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: refBodyWrapperElem,
-            class: 'vxe-table-custom-popup--body-wrapper'
-          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)($xeTable.getPivotTableAggregatePopupPanel(), {
+            class: ['vxe-table-custom-popup--body-wrapper', `agg-layout--${aggPlacement}`]
+          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [!isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)($xeTable.getPivotTableAggregatePopupPanel(), {
             customStore
           }) : panel_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: refCustomBodyElem,
@@ -11037,7 +11049,9 @@ function panel_createInternalData() {
             default: () => trVNs
           })])]), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--table-bottom'
-          }, $xeTable.callSlot(bottomSlot, params)) : panel_renderEmptyElement($xeTable), renderDragTip()])]);
+          }, $xeTable.callSlot(bottomSlot, params)) : panel_renderEmptyElement($xeTable), renderDragTip()]), isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)($xeTable.getPivotTableAggregatePopupPanel(), {
+            customStore
+          }) : panel_renderEmptyElement($xeTable)]);
         },
         footer: () => {
           if (footerSlot) {
@@ -17653,7 +17667,7 @@ validator_hook_hooks.add('tableValidatorModule', {
         const errorRules = [];
         const syncValidList = [];
         if (field && editRules) {
-          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
+          const rules = column.rules ? column.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
           if (rules) {
             const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, field) : val;
             rules.forEach(rule => {
@@ -17742,7 +17756,7 @@ validator_hook_hooks.add('tableValidatorModule', {
           field
         } = column;
         if (field && editRules) {
-          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
+          const rules = column.rules ? column.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
           return rules && !!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(rules, rule => type === 'all' || !rule.trigger || type === rule.trigger);
         }
         return false;
@@ -20982,7 +20996,7 @@ if(props.aggregateConfig&&props.rowGroupConfig){warnLog('vxe.error.notSupportPro
 //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
 // }
 // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-if(importConfig&&importOpts.types&&!importOpts.importMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),importOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${importOpts.types.join(',')}`,importOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);}if(exportConfig&&exportOpts.types&&!exportOpts.exportMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),exportOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${exportOpts.types.join(',')}`,exportOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);}if(!props.id){if((props.customConfig?isEnableConf(customOpts):customOpts.enabled)&&customOpts.storage){errLog('vxe.error.reqProp',['id']);}}if(props.treeConfig&&checkboxOpts.range){errLog('vxe.error.noTree',['checkbox-config.range']);}if(rowOpts.height&&!props.showOverflow){warnLog('vxe.error.notProp',['table.show-overflow']);}if(!$xeTable.triggerCelllAreaMnEvent){if(props.areaConfig){warnLog('vxe.error.notProp',['area-config']);}if(props.clipConfig){warnLog('vxe.error.notProp',['clip-config']);}if(props.fnrConfig){warnLog('vxe.error.notProp',['fnr-config']);}if(mouseOpts.area){errLog('vxe.error.notProp',['mouse-config.area']);return;}if(mouseOpts.area&&areaOpts.selectCellByHeader&&columnOpts.drag&&columnDragOpts.trigger==='cell'){errLog('vxe.error.notSupportProp',['area-config.selectCellByHeader & column-config.drag','column-drag-config.trigger=cell','column-drag-config.trigger=default | area-config.selectCellByHeader=false']);}}if(!$xeTable.handlePivotTableAggData){if(customOpts.allowGroup){errLog('vxe.error.notProp',['custom-config.allowGroup']);return;}if(customOpts.allowValues){errLog('vxe.error.notProp',['custom-config.allowValues']);return;}}if(treeConfig&&rowOpts.drag&&!treeOpts.transform){errLog('vxe.error.notSupportProp',['row-config.drag','tree-config.transform=false','tree-config.transform=true']);}if(treeConfig&&rowDragOpts.isCrossTableDrag&&!rowDragOpts.isCrossDrag){errLog('vxe.error.reqSupportProp',['tree-config & row-drag-config.isCrossTableDrag','row-drag-config.isCrossDrag']);}if(props.dragConfig){warnLog('vxe.error.delProp',['drag-config','row-drag-config']);}if(props.rowGroupConfig){warnLog('vxe.error.delProp',['row-group-config','aggregate-config']);}if(aggregateOpts.countFields){warnLog('vxe.error.delProp',['row-group-config.countFields','column.agg-func']);}if(aggregateOpts.aggregateMethod){warnLog('vxe.error.delProp',['row-group-config.aggregateMethod','aggregate-config.calcValuesMethod']);}if(aggregateOpts.countMethod){warnLog('vxe.error.delProp',['aggregate-config.countMethod','aggregate-config.calcValuesMethod']);}if(props.treeConfig&&treeOpts.children){warnLog('vxe.error.delProp',['tree-config.children','tree-config.childrenField']);}if(props.treeConfig&&treeOpts.line){warnLog('vxe.error.delProp',['tree-config.line','tree-config.showLine']);}if(mouseOpts.area&&mouseOpts.selected){warnLog('vxe.error.errConflicts',['mouse-config.area','mouse-config.selected']);}if(mouseOpts.area&&props.treeConfig&&!treeOpts.transform){errLog('vxe.error.noTree',['mouse-config.area']);}if(props.editConfig&&editOpts.activeMethod){warnLog('vxe.error.delProp',['edit-config.activeMethod','edit-config.beforeEditMethod']);}if(props.treeConfig&&checkboxOpts.isShiftKey){errLog('vxe.error.errConflicts',['tree-config','checkbox-config.isShiftKey']);}if(checkboxOpts.halfField){warnLog('vxe.error.delProp',['checkbox-config.halfField','checkbox-config.indeterminateField']);}if(props.editConfig&&isEnableConf(editOpts)&&props.editRules&&(minHeight===0||minHeight==='0')){warnLog('vxe.error.reqSupportProp',['edit-config & edit-rules','min-height']);}if(treeConfig){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(['rowField','parentField','childrenField','hasChildField','mapChildrenField'],key=>{const val=treeOpts[key];if(val&&val.indexOf('.')>-1){errLog('vxe.error.errProp',[`${key}=${val}`,`${key}=${val.split('.')[0]}`]);}});}if(rowOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-row-config.beforeSelectMethod']);}if(columnOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-column-config.beforeSelectMethod']);}// if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+if(importConfig&&importOpts.types&&!importOpts.importMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),importOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${importOpts.types.join(',')}`,importOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);}if(exportConfig&&exportOpts.types&&!exportOpts.exportMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),exportOpts.types)){warnLog('vxe.error.errProp',[`export-config.types=${exportOpts.types.join(',')}`,exportOpts.types.filter(type=>external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps),type)).join(',')||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);}if(!props.id){if((props.customConfig?isEnableConf(customOpts):customOpts.enabled)&&customOpts.storage){errLog('vxe.error.reqProp',['id']);}}if(props.treeConfig&&checkboxOpts.range){errLog('vxe.error.noTree',['checkbox-config.range']);}if(rowOpts.height&&!props.showOverflow){warnLog('vxe.error.notProp',['table.show-overflow']);}if(!$xeTable.triggerCelllAreaMnEvent){if(props.areaConfig){warnLog('vxe.error.notProp',['area-config']);}if(props.clipConfig){warnLog('vxe.error.notProp',['clip-config']);}if(props.fnrConfig){warnLog('vxe.error.notProp',['fnr-config']);}if(mouseOpts.area){errLog('vxe.error.notProp',['mouse-config.area']);return;}if(mouseOpts.area&&areaOpts.selectCellByHeader&&columnOpts.drag&&columnDragOpts.trigger==='cell'){errLog('vxe.error.notSupportProp',['area-config.selectCellByHeader & column-config.drag','column-drag-config.trigger=cell','column-drag-config.trigger=default | area-config.selectCellByHeader=false']);}}if(!$xeTable.handlePivotTableAggData){if(customOpts.allowGroup){errLog('vxe.error.notProp',['custom-config.allowGroup']);return;}if(customOpts.allowValues){errLog('vxe.error.notProp',['custom-config.allowValues']);return;}}if(treeConfig&&rowOpts.drag&&!treeOpts.transform){errLog('vxe.error.notSupportProp',['row-config.drag','tree-config.transform=false','tree-config.transform=true']);}if(treeConfig&&rowDragOpts.isCrossTableDrag&&!rowDragOpts.isCrossDrag){errLog('vxe.error.reqSupportProp',['tree-config & row-drag-config.isCrossTableDrag','row-drag-config.isCrossDrag']);}if(props.dragConfig){warnLog('vxe.error.delProp',['drag-config','row-drag-config']);}if(props.rowGroupConfig){warnLog('vxe.error.delProp',['row-group-config','aggregate-config']);}if(aggregateOpts.countFields){warnLog('vxe.error.delProp',['row-group-config.countFields','column.agg-func']);}if(aggregateOpts.aggregateMethod){warnLog('vxe.error.delProp',['row-group-config.aggregateMethod','aggregate-config.calcValuesMethod']);}if(aggregateOpts.countMethod){warnLog('vxe.error.delProp',['aggregate-config.countMethod','aggregate-config.calcValuesMethod']);}if(props.treeConfig&&treeOpts.children){warnLog('vxe.error.delProp',['tree-config.children','tree-config.childrenField']);}if(props.treeConfig&&treeOpts.line){warnLog('vxe.error.delProp',['tree-config.line','tree-config.showLine']);}if(mouseOpts.area&&mouseOpts.selected){warnLog('vxe.error.errConflicts',['mouse-config.area','mouse-config.selected']);}if(mouseOpts.area&&props.treeConfig&&!treeOpts.transform){errLog('vxe.error.notSupportProp',['mouse-config.area','tree-config.transform=false','tree-config.transform=true']);}if(props.editConfig&&editOpts.activeMethod){warnLog('vxe.error.delProp',['edit-config.activeMethod','edit-config.beforeEditMethod']);}if(props.treeConfig&&checkboxOpts.isShiftKey){errLog('vxe.error.errConflicts',['tree-config','checkbox-config.isShiftKey']);}if(checkboxOpts.halfField){warnLog('vxe.error.delProp',['checkbox-config.halfField','checkbox-config.indeterminateField']);}if(props.editConfig&&isEnableConf(editOpts)&&props.editRules&&(minHeight===0||minHeight==='0')){warnLog('vxe.error.reqSupportProp',['edit-config & edit-rules','min-height']);}if(treeConfig){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(['rowField','parentField','childrenField','hasChildField','mapChildrenField'],key=>{const val=treeOpts[key];if(val&&val.indexOf('.')>-1){errLog('vxe.error.errProp',[`${key}=${val}`,`${key}=${val.split('.')[0]}`]);}});}if(rowOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-row-config.beforeSelectMethod']);}if(columnOpts.currentMethod){warnLog('vxe.error.delProp',['row-config.currentMethod','current-column-config.beforeSelectMethod']);}// if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
 //   warnLog('vxe.error.notConflictProp', ['row-config.isCurrent & keyboard-config.isArrow', 'current-row-config.isFollowSelected'])
 // }
 // if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
@@ -23919,7 +23933,8 @@ const Toolbar = VxeToolbar;
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       loadingText: '加载中...',
       emptyText: '暂无数据',
@@ -23936,7 +23951,8 @@ const Toolbar = VxeToolbar;
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },
@@ -23979,7 +23995,7 @@ const Toolbar = VxeToolbar;
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整顺序',
+        sortHelpTip: '点击图标开始拖动',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -24465,7 +24481,7 @@ const Toolbar = VxeToolbar;
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
           dragExistCol: '该列已存在',
-          sortHelpTip: '点击并拖动图标可以调整顺序'
+          sortHelpTip: '点击图标开始拖动'
         },
         aggFuncs: {
           sum: '求和',