vxe-table 4.7.6 → 4.7.7

package/lib/index.umd.js

@@ -1791,8 +1791,8 @@ var external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_ =
 var external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_default = /*#__PURE__*/__webpack_require__.n(external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.version = "4.7.6";
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.tableVersion = "4.7.6";
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.version = "4.7.7";
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.tableVersion = "4.7.7";
 external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -1847,9 +1847,12 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
     //   visibleMethod () {}
     // },
     customConfig: {
+      allowVisible: true,
+      allowResizable: true,
       allowFixed: true,
       allowSort: true,
-      showFooter: true
+      showFooter: true,
+      placement: 'topRight'
       //  storage: false,
       //  checkMethod () {}
     },
@@ -2233,15 +2236,23 @@ function formatText(value, placeholder) {
 function eqEmptyValue(cellValue) {
   return cellValue === '' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue);
 }
+;// CONCATENATED MODULE: ./packages/ui/src/log.ts
+
+const {
+  log: log_log
+} = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
+const version = `table v${"4.7.7"}`;
+const warnLog = log_log.create('warn', version);
+const errLog = log_log.create('error', version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
 
 
 
 
+
 const {
   getI18n: columnInfo_getI18n,
-  formats: columnInfo_formats,
-  log: columnInfo_log
+  formats: columnInfo_formats
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 class ColumnInfo {
   /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -2257,16 +2268,16 @@ class ColumnInfo {
     if (true) {
       const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
       if (_vm.type && types.indexOf(_vm.type) === -1) {
-        columnInfo_log.warn('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+        warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
       }
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
-        columnInfo_log.warn('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+        warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
       }
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
-        columnInfo_log.warn('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
       }
       if (_vm.cellRender && _vm.editRender) {
-        columnInfo_log.warn('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
+        warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
       }
       if (_vm.type === 'expand') {
         const {
@@ -2280,19 +2291,19 @@ class ColumnInfo {
         } = $xeTable.getComputeMaps();
         const treeOpts = computeTreeOpts.value;
         if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
-          columnInfo_log.err('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
+          errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
         }
       }
       if (formatter) {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
           const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
           if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.cellFormatMethod)) {
-            columnInfo_log.err('vxe.error.notFormats', [formatter]);
+            errLog('vxe.error.notFormats', [formatter]);
           }
         } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
           const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
           if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.cellFormatMethod)) {
-            columnInfo_log.err('vxe.error.notFormats', [formatter[0]]);
+            errLog('vxe.error.notFormats', [formatter[0]]);
           }
         }
       }
@@ -2367,6 +2378,7 @@ class ColumnInfo {
       renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
+      renderResizeWidth: 0,
       resizeWidth: 0,
       renderLeft: 0,
       renderArgs: [],
@@ -6434,9 +6446,6 @@ const {
         }
       }, 300);
     };
-    const getStoreData = () => {
-      return {};
-    };
     const handleSaveStore = type => {
       const {
         id
@@ -6450,7 +6459,7 @@ const {
         updateStore({
           id,
           type,
-          storeData: getStoreData()
+          storeData: $xeTable.getCustomStoreData()
         });
       }
     };
@@ -6458,11 +6467,33 @@ const {
       const {
         customColumnList
       } = reactData;
-      customColumnList.forEach((column, index) => {
-        const sortIndex = index + 1;
-        column.renderSortNumber = sortIndex;
-        column.fixed = column.renderFixed;
-        column.visible = column.renderVisible;
+      const customOpts = computeCustomOpts.value;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
+        if (!parent) {
+          if (allowSort) {
+            const sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed;
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth;
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible;
+        }
       });
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', evnt);
@@ -6480,15 +6511,31 @@ const {
         oldFixedMaps,
         oldVisibleMaps
       } = customStore;
+      const customOpts = computeCustomOpts.value;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
         const colid = column.getKey();
         const visible = !!oldVisibleMaps[colid];
         const fixed = oldFixedMaps[colid] || '';
-        column.renderVisible = visible;
-        column.visible = visible;
-        column.renderFixed = fixed;
-        column.fixed = fixed;
-        column.renderSortNumber = oldSortMaps[colid] || 0;
+        if (allowVisible) {
+          column.renderVisible = visible;
+          column.visible = visible;
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed;
+          column.fixed = fixed;
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0;
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth;
+        }
       }, {
         children: 'children'
       });
@@ -6499,7 +6546,7 @@ const {
       $xeTable.resetColumn(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
-      handleSaveStore('confirm');
+      handleSaveStore('reset');
     };
     const resetCustomEvent = evnt => {
       if (external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.modal) {
@@ -6700,9 +6747,11 @@ const {
       const {
         checkMethod,
         visibleMethod,
+        allowVisible,
         allowSort,
         allowFixed,
-        trigger
+        trigger,
+        placement
       } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
       const colVNs = [];
@@ -6733,7 +6782,7 @@ const {
             onDragstart: sortDragstartEvent,
             onDragend: sortDragendEvent,
             onDragover: sortDragoverEvent
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-table-custom--checkbox-option', {
               'is--checked': isChecked,
               'is--indeterminate': isIndeterminate,
@@ -6747,7 +6796,7 @@ const {
             }
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-          })]), allowSort && column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort && column.level === 1 ? (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',
@@ -6787,14 +6836,17 @@ const {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         key: 'simple',
-        class: ['vxe-table-custom-wrapper', {
+        class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
           'is--active': customStore.visible
-        }]
+        }],
+        style: maxHeight && !['left', 'right'].includes(placement) ? {
+          maxHeight: `${maxHeight}px`
+        } : {}
       }, customStore.visible ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
         class: 'vxe-table-custom--header'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
         class: 'vxe-table-custom--option'
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isAllChecked,
           'is--indeterminate': isAllIndeterminate
@@ -6805,16 +6857,15 @@ const {
         class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'
-      }, panel_getI18n('vxe.toolbar.customAll'))])])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, panel_getI18n('vxe.toolbar.customAll'))]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-checkbox--label'
+      }, panel_getI18n('vxe.table.customTitle'))])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: bodyElemRef,
         class: 'vxe-table-custom--list-wrapper'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
         class: 'vxe-table-custom--body',
         name: 'vxe-table-custom--list',
         tag: 'ul',
-        style: maxHeight ? {
-          maxHeight: `${maxHeight}px`
-        } : {},
         ...customWrapperOns
       }, {
         default: () => colVNs
@@ -6843,8 +6894,10 @@ const {
       } = reactData;
       const customOpts = computeCustomOpts.value;
       const {
+        allowVisible,
         allowSort,
         allowFixed,
+        allowResizable,
         checkMethod,
         visibleMethod
       } = customOpts;
@@ -6872,7 +6925,7 @@ const {
             onDragstart: sortDragstartEvent,
             onDragend: sortDragendEvent,
             onDragover: sortDragoverEvent
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+          }, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--visible'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-table-custom--checkbox-option', {
@@ -6888,7 +6941,7 @@ const {
             }
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-          })])]), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+          })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--sort'
           }, [column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-table-custom-popup--column-sort-btn',
@@ -6897,14 +6950,23 @@ const {
             onMouseup: sortMouseupEvent
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
             class: panel_getIcon().TABLE_CUSTOM_SORT
-          })]) : null]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-')]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             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',
             title: colTitle
-          }, colTitle)]), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+          }, colTitle)]), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+            class: 'vxe-table-custom-popup--column-item col--resizable'
+          }, [!isChecked || column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-input'), {
+            type: 'integer',
+            min: 40,
+            modelValue: column.renderResizeWidth,
+            'onUpdate:modelValue'(value) {
+              column.renderResizeWidth = Math.max(40, Number(value));
+            }
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--fixed'
-          }, [!parent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-radio-group'), {
+          }, [parent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-radio-group'), {
             modelValue: column.renderFixed || '',
             type: 'button',
             size: 'mini',
@@ -6926,7 +6988,7 @@ const {
             // onChange () {
             //   changePopupFixedOption(column)
             // }
-          }) : null]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
       const isAllChecked = customStore.isAll;
@@ -6936,10 +6998,10 @@ const {
         className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
         modelValue: customStore.visible,
         title: panel_getI18n('vxe.custom.cstmTitle'),
-        width: '40vw',
-        minWidth: 520,
-        height: '50vh',
-        minHeight: 300,
+        width: 700,
+        minWidth: 700,
+        height: 400,
+        minHeight: 400,
         mask: true,
         lockView: true,
         showFooter: true,
@@ -6956,11 +7018,11 @@ const {
             class: 'vxe-table-custom-popup--body'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--table-wrapper'
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('table', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('colgroup', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('table', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('colgroup', {}, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
             style: {
               width: '80px'
             }
-          }), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
             style: {
               width: '80px'
             }
@@ -6968,11 +7030,15 @@ const {
             style: {
               minWidth: '120px'
             }
-          }), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+          }), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+            style: {
+              width: '140px'
+            }
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
             style: {
               width: '200px'
             }
-          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {}, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-table-custom--checkbox-option', {
               'is--checked': isAllChecked,
               'is--indeterminate': isAllIndeterminate
@@ -6983,7 +7049,7 @@ const {
             class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
           }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-checkbox--label'
-          }, panel_getI18n('vxe.toolbar.customAll'))])]), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          }, panel_getI18n('vxe.toolbar.customAll'))])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-table-custom-popup--table-sort-help-title'
           }, panel_getI18n('vxe.custom.setting.colSort')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-tooltip'), {
             enterable: true,
@@ -6994,7 +7060,7 @@ const {
                 class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
               });
             }
-          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             class: 'vxe-table-custom--body',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
@@ -7940,6 +8006,7 @@ const {
 
 
 
+
 const {
   getConfig: table_getConfig,
   getI18n: table_getI18n,
@@ -7951,7 +8018,6 @@ const {
   hooks: table_hooks,
   globalEvents: table_globalEvents,
   GLOBAL_EVENT_KEYS,
-  log: table_log,
   useFns
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 const isWebkit = browse['-webkit'] && !browse.edge;
@@ -8716,7 +8782,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           merges = [merges];
         }
         if (treeConfig && merges.length) {
-          table_log.err('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+          errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
         }
         merges.forEach(item => {
           let {
@@ -8774,7 +8840,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           merges = [merges];
         }
         if (treeConfig && merges.length) {
-          table_log.err('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+          errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
         }
         merges.forEach(item => {
           let {
@@ -8852,7 +8918,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
         const customMap = {};
         if (!id) {
-          table_log.err('vxe.error.reqProp', ['id']);
+          errLog('vxe.error.reqProp', ['id']);
           return;
         }
         // 自定义列宽
@@ -9009,7 +9075,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         if (field) {
           if (true) {
             if (fullColumnFieldData[field]) {
-              table_log.warn('vxe.error.colRepet', ['field', field]);
+              warnLog('vxe.error.colRepet', ['field', field]);
             }
           }
           fullColumnFieldData[field] = rest;
@@ -9023,7 +9089,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         if (treeNode) {
           if (true) {
             if (treeNodeColumn) {
-              table_log.warn('vxe.error.colRepet', ['tree-node', treeNode]);
+              warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
             }
           }
           if (!treeNodeColumn) {
@@ -9032,7 +9098,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         } else if (type === 'expand') {
           if (true) {
             if (expandColumn) {
-              table_log.warn('vxe.error.colRepet', ['type', type]);
+              warnLog('vxe.error.colRepet', ['type', type]);
             }
           }
           if (!expandColumn) {
@@ -9042,14 +9108,14 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         if (true) {
           if (type === 'checkbox') {
             if (checkboxColumn) {
-              table_log.warn('vxe.error.colRepet', ['type', type]);
+              warnLog('vxe.error.colRepet', ['type', type]);
             }
             if (!checkboxColumn) {
               checkboxColumn = column;
             }
           } else if (type === 'radio') {
             if (radioColumn) {
-              table_log.warn('vxe.error.colRepet', ['type', type]);
+              warnLog('vxe.error.colRepet', ['type', type]);
             }
             if (!radioColumn) {
               radioColumn = column;
@@ -9060,7 +9126,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           isAllOverflow = false;
         }
         if (fullColumnIdData[colid]) {
-          table_log.err('vxe.error.colRepet', ['colId', colid]);
+          errLog('vxe.error.colRepet', ['colId', colid]);
         }
         fullColumnIdData[colid] = rest;
       };
@@ -9074,16 +9140,16 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       }
       if (true) {
         if (expandColumn && mouseOpts.area) {
-          table_log.err('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+          errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
         }
       }
       if (true) {
         if (htmlColumn) {
           if (!columnOpts.useKey) {
-            table_log.err('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
+            errLog('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
           }
           if (!rowOpts.useKey) {
-            table_log.err('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
+            errLog('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
           }
         }
       }
@@ -10510,23 +10576,23 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           // 树结构自动转换
           if (true) {
             if (!treeOpts.rowField) {
-              table_log.err('vxe.error.reqProp', ['tree-config.rowField']);
+              errLog('vxe.error.reqProp', ['tree-config.rowField']);
             }
             if (!treeOpts.parentField) {
-              table_log.err('vxe.error.reqProp', ['tree-config.parentField']);
+              errLog('vxe.error.reqProp', ['tree-config.parentField']);
             }
             if (!childrenField) {
-              table_log.err('vxe.error.reqProp', ['tree-config.childrenField']);
+              errLog('vxe.error.reqProp', ['tree-config.childrenField']);
             }
             if (!treeOpts.mapChildrenField) {
-              table_log.err('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+              errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
             }
             if (childrenField === treeOpts.mapChildrenField) {
-              table_log.err('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+              errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
             }
             // fullData.forEach(row => {
             //   if (row[treeOpts.children] && row[treeOpts.children].length) {
-            //     log.warn('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+            //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
             //   }
             // })
           }
@@ -10564,13 +10630,13 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       if (true) {
         if (sYLoad) {
           if (!(props.height || props.maxHeight)) {
-            table_log.err('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
           }
           if (!props.showOverflow) {
-            table_log.warn('vxe.error.reqProp', ['table.show-overflow']);
+            warnLog('vxe.error.reqProp', ['table.show-overflow']);
           }
           if (props.spanMethod) {
-            table_log.warn('vxe.error.scrollErrProp', ['table.span-method']);
+            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
       }
@@ -10726,7 +10792,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
             column.fixed = parent.fixed;
           }
           if (parent && column.fixed !== parent.fixed) {
-            table_log.err('vxe.error.groupFixed');
+            errLog('vxe.error.groupFixed');
           }
           if (isColGroup) {
             column.visible = !!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(column.children, subColumn => hasChildrenList(subColumn) ? false : subColumn.visible);
@@ -10778,16 +10844,16 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       if (scrollXLoad) {
         if (true) {
           // if (props.showHeader && !props.showHeaderOverflow) {
-          //   log.warn('vxe.error.reqProp', ['show-header-overflow'])
+          //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
           // }
           // if (props.showFooter && !props.showFooterOverflow) {
-          //   log.warn('vxe.error.reqProp', ['show-footer-overflow'])
+          //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
           // }
           if (props.spanMethod) {
-            table_log.warn('vxe.error.scrollErrProp', ['span-method']);
+            warnLog('vxe.error.scrollErrProp', ['span-method']);
           }
           if (props.footerSpanMethod) {
-            table_log.warn('vxe.error.scrollErrProp', ['footer-span-method']);
+            warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
           }
         }
         const {
@@ -10847,7 +10913,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       tablePrivateMethods.handleTableData(true);
       if (true) {
         if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
-          table_log.warn('vxe.error.scrollErrProp', ['column.type=expand']);
+          warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
         }
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
@@ -11067,7 +11133,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
        * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
        */
       syncData() {
-        table_log.warn('vxe.error.delFunc', ['syncData', 'getData']);
+        warnLog('vxe.error.delFunc', ['syncData', 'getData']);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           reactData.tableData = [];
           emit('update:data', internalData.tableFullData);
@@ -11191,7 +11257,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           reactData.tableData = tableData.slice(0);
         } else {
           if (true) {
-            table_log.warn('vxe.error.reqProp', ['keep-source']);
+            warnLog('vxe.error.reqProp', ['keep-source']);
           }
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -11401,7 +11467,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         } = internalData;
         if (!keepSource) {
           if (true) {
-            table_log.warn('vxe.error.reqProp', ['keep-source']);
+            warnLog('vxe.error.reqProp', ['keep-source']);
           }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
         }
@@ -11805,6 +11871,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           })) {
             column.visible = column.defaultVisible;
           }
+          column.renderResizeWidth = column.renderWidth;
         });
         if (opts.resizable) {
           tablePrivateMethods.saveCustomResizable(true);
@@ -12532,7 +12599,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       },
       reloadExpandContent(row) {
         if (true) {
-          table_log.warn('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+          warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
         }
         // 即将废弃
         return tableMethods.reloadRowExpand(row);
@@ -12656,7 +12723,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       isExpandByRow(row) {
         // 已废弃
         if (true) {
-          table_log.warn('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
+          warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
         }
         return tableMethods.isRowExpandByRow(row);
       },
@@ -12772,7 +12839,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       },
       reloadTreeChilds(row) {
         if (true) {
-          table_log.warn('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+          warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
         }
         // 即将废弃
         return tableMethods.reloadTreeExpand(row);
@@ -13075,7 +13142,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
        */
       setMergeCells(merges) {
         if (props.spanMethod) {
-          table_log.err('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+          errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
         setMerges(merges, reactData.mergeList, internalData.afterFullData);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
@@ -13089,7 +13156,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
        */
       removeMergeCells(merges) {
         if (props.spanMethod) {
-          table_log.err('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+          errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
         const rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
@@ -13115,7 +13182,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       },
       setMergeFooterItems(merges) {
         if (props.footerSpanMethod) {
-          table_log.err('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+          errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
         setMerges(merges, reactData.mergeFooterList);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
@@ -13125,7 +13192,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       },
       removeMergeFooterItems(merges) {
         if (props.footerSpanMethod) {
-          table_log.err('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+          errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
         const rest = removeMerges(merges, reactData.mergeFooterList);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
@@ -13159,6 +13226,71 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
+      getCustomStoreData() {
+        const {
+          id
+        } = props;
+        const customOpts = computeCustomOpts.value;
+        const {
+          collectColumn
+        } = internalData;
+        const {
+          checkMethod
+        } = customOpts;
+        const resizableData = {};
+        const sortData = {};
+        const visibleData = {};
+        const fixedData = {};
+        const storeData = {
+          resizableData,
+          sortData,
+          visibleData,
+          fixedData
+        };
+        if (!id) {
+          errLog('vxe.error.reqProp', ['id']);
+          return storeData;
+        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+          // 排序只支持一级
+          if (!parent) {
+            collectColumn.forEach(column => {
+              const colKey = column.getKey();
+              if (colKey) {
+                sortData[colKey] = column.renderSortNumber;
+              }
+            });
+          }
+          if (column.resizeWidth) {
+            const colKey = column.getKey();
+            if (colKey) {
+              resizableData[colKey] = column.renderWidth;
+            }
+          }
+          if (column.fixed && column.fixed !== column.defaultFixed) {
+            const colKey = column.getKey();
+            if (colKey) {
+              fixedData[colKey] = column.fixed;
+            }
+          }
+          if (!checkMethod || checkMethod({
+            column
+          })) {
+            if (!column.visible && column.defaultVisible) {
+              const colKey = column.getKey();
+              if (colKey) {
+                visibleData[colKey] = false;
+              }
+            } else if (column.visible && !column.defaultVisible) {
+              const colKey = column.getKey();
+              if (colKey) {
+                visibleData[colKey] = true;
+              }
+            }
+          }
+        });
+        return storeData;
+      },
       focus() {
         internalData.isActivated = true;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -13179,7 +13311,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
             $table: $xeTable
           });
         } else {
-          table_log.err('vxe.error.barUnableLink');
+          errLog('vxe.error.barUnableLink');
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
@@ -14080,7 +14212,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           const columnWidthStorageMap = getCustomStorageMap(resizableStorageKey);
           let columnWidthStorage;
           if (!id) {
-            table_log.err('vxe.error.reqProp', ['id']);
+            errLog('vxe.error.reqProp', ['id']);
             return;
           }
           if (!isReset) {
@@ -14117,7 +14249,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           const columnSortStorageMap = getCustomStorageMap(sortStorageKey);
           let columnWidthStorage;
           if (!id) {
-            table_log.err('vxe.error.reqProp', ['id']);
+            errLog('vxe.error.reqProp', ['id']);
             return;
           }
           if (!isReset) {
@@ -14153,7 +14285,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           const columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
           const colFixeds = [];
           if (!id) {
-            table_log.err('vxe.error.reqProp', ['id']);
+            errLog('vxe.error.reqProp', ['id']);
             return;
           }
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
@@ -14189,7 +14321,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           const colHides = [];
           const colShows = [];
           if (!id) {
-            table_log.err('vxe.error.reqProp', ['id']);
+            errLog('vxe.error.reqProp', ['id']);
             return;
           }
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
@@ -14244,7 +14376,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           evntList = table_interceptor.get('event.clearActived');
           if (true) {
             if (evntList.length) {
-              table_log.warn('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
+              warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
             }
           }
         }
@@ -15364,12 +15496,12 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
     if (true) {
       'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
         $xeTable[name] = function () {
-          table_log.err('vxe.error.reqModule', ['VxeTableExportModule']);
+          errLog('vxe.error.reqModule', ['VxeTableExportModule']);
         };
       });
       'clearValidate,fullValidate,validate'.split(',').forEach(name => {
         $xeTable[name] = function () {
-          table_log.err('vxe.error.reqModule', ['VxeTableValidatorModule']);
+          errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
         };
       });
     }
@@ -15470,10 +15602,10 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           // const checkboxOpts = computeCheckboxOpts.value
           // const checkboxColumn = internalData.tableFullColumn.find(column => column.type === 'checkbox')
           // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
-          //   log.warn('vxe.error.checkProp', ['checkbox-config.checkField'])
+          //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
           // }
           if ((scrollXLoad || scrollYLoad) && expandColumn) {
-            table_log.warn('vxe.error.scrollErrProp', ['column.type=expand']);
+            warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
           }
         }
         tableMethods.recalculate();
@@ -15621,40 +15753,40 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         const rowOpts = computeRowOpts.value;
         if (true) {
           if (props.rowId) {
-            table_log.warn('vxe.error.delProp', ['row-id', 'row-config.keyField']);
+            warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
           }
           if (props.rowKey) {
-            table_log.warn('vxe.error.delProp', ['row-key', 'row-config.useKey']);
+            warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
           }
           if (props.columnKey) {
-            table_log.warn('vxe.error.delProp', ['column-id', 'column-config.useKey']);
+            warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
           }
           if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
-            table_log.warn('vxe.error.reqProp', ['row-config.keyField']);
+            warnLog('vxe.error.reqProp', ['row-config.keyField']);
           }
           if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
-            table_log.warn('vxe.error.reqProp', ['keep-source']);
+            warnLog('vxe.error.reqProp', ['keep-source']);
           }
           if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-            table_log.warn('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+            warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
           }
           if (treeConfig && props.stripe) {
-            table_log.warn('vxe.error.noTree', ['stripe']);
+            warnLog('vxe.error.noTree', ['stripe']);
           }
           if (props.showFooter && !(props.footerMethod || props.footerData)) {
-            table_log.warn('vxe.error.reqProp', ['footer-data | footer-method']);
+            warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
           }
           // if (props.highlightCurrentRow) {
-          //   log.warn('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+          //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
           // }
           // if (props.highlightHoverRow) {
-          //   log.warn('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+          //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
           // }
           // if (props.highlightCurrentColumn) {
-          //   log.warn('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+          //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
           // }
           // if (props.highlightHoverColumn) {
-          //   log.warn('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+          //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
           // }
           // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
           const {
@@ -15664,10 +15796,10 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           const exportOpts = computeExportOpts.value;
           const importOpts = computeImportOpts.value;
           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)) {
-            table_log.warn('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(',')]);
+            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)) {
-            table_log.warn('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(',')]);
+            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 (true) {
@@ -15675,64 +15807,64 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           const mouseOpts = computeMouseOpts.value;
           const rowOpts = computeRowOpts.value;
           if (!props.id && props.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
-            table_log.err('vxe.error.reqProp', ['id']);
+            errLog('vxe.error.reqProp', ['id']);
           }
           if (props.treeConfig && checkboxOpts.range) {
-            table_log.err('vxe.error.noTree', ['checkbox-config.range']);
+            errLog('vxe.error.noTree', ['checkbox-config.range']);
           }
           if (rowOpts.height && !props.showOverflow) {
-            table_log.warn('vxe.error.notProp', ['table.show-overflow']);
+            warnLog('vxe.error.notProp', ['table.show-overflow']);
           }
           if (!$xeTable.handleUpdateCellAreas) {
             if (props.clipConfig) {
-              table_log.warn('vxe.error.notProp', ['clip-config']);
+              warnLog('vxe.error.notProp', ['clip-config']);
             }
             if (props.fnrConfig) {
-              table_log.warn('vxe.error.notProp', ['fnr-config']);
+              warnLog('vxe.error.notProp', ['fnr-config']);
             }
             if (mouseOpts.area) {
-              table_log.err('vxe.error.notProp', ['mouse-config.area']);
+              errLog('vxe.error.notProp', ['mouse-config.area']);
               return;
             }
           }
           if (props.treeConfig && treeOpts.children) {
-            table_log.warn('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
+            warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
           }
           if (props.treeConfig && treeOpts.line) {
-            table_log.warn('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
+            warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
           }
           if (mouseOpts.area && mouseOpts.selected) {
-            table_log.warn('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+            warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
           }
           if (mouseOpts.area && checkboxOpts.range) {
-            table_log.warn('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
+            warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
           }
           if (props.treeConfig && mouseOpts.area) {
-            table_log.err('vxe.error.noTree', ['mouse-config.area']);
+            errLog('vxe.error.noTree', ['mouse-config.area']);
           }
           if (props.editConfig && editOpts.activeMethod) {
-            table_log.warn('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
+            warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
           }
           if (props.treeConfig && checkboxOpts.isShiftKey) {
-            table_log.err('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+            errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
           }
           if (checkboxOpts.halfField) {
-            table_log.warn('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+            warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
           }
         }
         // 检查是否有安装需要的模块
         if (true) {
           if (props.editConfig && !$xeTable.insert) {
-            table_log.err('vxe.error.reqModule', ['Edit']);
+            errLog('vxe.error.reqModule', ['Edit']);
           }
           if (props.editRules && !$xeTable.validate) {
-            table_log.err('vxe.error.reqModule', ['Validator']);
+            errLog('vxe.error.reqModule', ['Validator']);
           }
           if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.triggerCellMousedownEvent) {
-            table_log.err('vxe.error.reqModule', ['Keyboard']);
+            errLog('vxe.error.reqModule', ['Keyboard']);
           }
           if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
-            table_log.err('vxe.error.reqModule', ['Export']);
+            errLog('vxe.error.reqModule', ['Export']);
           }
         }
         Object.assign(scrollYStore, {
@@ -16803,11 +16935,11 @@ menu_hook_hooks.add('tableMenuModule', {
 
 
 
+
 const {
   getConfig: hook_getConfig,
   renderer: edit_hook_renderer,
   hooks: edit_hook_hooks,
-  log: hook_log,
   getI18n: hook_getI18n
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 const tableEditMethodKeys = ['insert', 'insertAt', 'insertNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
@@ -16933,7 +17065,7 @@ edit_hook_hooks.add('tableEditModule', {
         } else {
           if (true) {
             if (parentRowId) {
-              hook_log.warn('vxe.error.unableInsert');
+              warnLog('vxe.error.unableInsert');
             }
           }
           afterFullData[funcName](item);
@@ -17037,7 +17169,7 @@ edit_hook_hooks.add('tableEditModule', {
                 if (true) {
                   if (item[treeOpts.parentField]) {
                     if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                      hook_log.err('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
+                      errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
                     }
                   }
                 }
@@ -17079,7 +17211,7 @@ edit_hook_hooks.add('tableEditModule', {
               }
             } else {
               if (true) {
-                hook_log.warn('vxe.error.unableInsert');
+                warnLog('vxe.error.unableInsert');
               }
               insertTreeRow(newRecords, true);
             }
@@ -17101,7 +17233,7 @@ edit_hook_hooks.add('tableEditModule', {
               afIndex = Math.min(afterFullData.length, afIndex + 1);
             }
             if (afIndex === -1) {
-              throw new Error(hook_log.err('vxe.error.unableInsert'));
+              throw new Error(hook_getI18n('vxe.error.unableInsert'));
             }
             afterFullData.splice(afIndex, 0, ...newRecords);
             tableFullData.splice($xeTable.findRowIndexOf(tableFullData, row), 0, ...newRecords);
@@ -17420,7 +17552,7 @@ edit_hook_hooks.add('tableEditModule', {
       },
       getActiveRecord() {
         if (true) {
-          hook_log.warn('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
+          warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
         }
         return this.getEditRecord();
       },
@@ -17460,7 +17592,7 @@ edit_hook_hooks.add('tableEditModule', {
       clearActived(evnt) {
         // 即将废弃
         if (true) {
-          hook_log.warn('vxe.error.delFunc', ['clearActived', 'clearEdit']);
+          warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
         }
         return this.clearEdit(evnt);
       },
@@ -17520,7 +17652,7 @@ edit_hook_hooks.add('tableEditModule', {
       },
       isActiveByRow(row) {
         if (true) {
-          hook_log.warn('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
+          warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
         }
         // 即将废弃
         return this.isEditByRow(row);
@@ -17537,7 +17669,7 @@ edit_hook_hooks.add('tableEditModule', {
       },
       setActiveRow(row) {
         if (true) {
-          hook_log.warn('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
+          warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
         }
         // 即将废弃
         return editMethods.setEditRow(row);
@@ -17557,7 +17689,7 @@ edit_hook_hooks.add('tableEditModule', {
       },
       setActiveCell(row, fieldOrColumn) {
         if (true) {
-          hook_log.warn('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
+          warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
         }
         // 即将废弃
         return editMethods.setEditCell(row, fieldOrColumn);
@@ -17893,11 +18025,11 @@ function createHtmlPage(opts, content) {
 
 
 
+
 const {
   getI18n: export_hook_getI18n,
   hooks: export_hook_hooks,
-  renderer: export_hook_renderer,
-  log: export_hook_log
+  renderer: export_hook_renderer
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 let htmlCellElem;
 const csvBOM = '\ufeff';
@@ -18904,7 +19036,7 @@ export_hook_hooks.add('tableExportModule', {
             }, () => {
               const reader = new FileReader();
               reader.onerror = () => {
-                export_hook_log.err('vxe.error.notType', [type]);
+                errLog('vxe.error.notType', [type]);
                 _importReject({
                   status: false
                 });
@@ -18918,7 +19050,7 @@ export_hook_hooks.add('tableExportModule', {
         } else {
           // 不支持的浏览器
           if (true) {
-            export_hook_log.err('vxe.error.notExp');
+            errLog('vxe.error.notExp');
           }
           _importResolve({
             status: true
@@ -19179,7 +19311,7 @@ export_hook_hooks.add('tableExportModule', {
         // 检查类型，如果为自定义导出，则不需要校验类型
         if (!opts.exportMethod && !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)) {
           if (true) {
-            export_hook_log.err('vxe.error.notType', [type]);
+            errLog('vxe.error.notType', [type]);
           }
           const params = {
             status: false
@@ -19209,7 +19341,7 @@ export_hook_hooks.add('tableExportModule', {
           } else if (mode === 'all') {
             if (true) {
               if (!$xeGrid) {
-                export_hook_log.warn('vxe.error.errProp', ['all', 'mode=current,selected']);
+                warnLog('vxe.error.errProp', ['all', 'mode=current,selected']);
               }
             }
             if ($xeGrid && !opts.remote) {
@@ -19229,7 +19361,7 @@ export_hook_hooks.add('tableExportModule', {
               const ajaxMethods = ajax.queryAll;
               if (true) {
                 if (!ajaxMethods) {
-                  export_hook_log.warn('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
+                  warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
                 }
               }
               if (ajaxMethods) {
@@ -19325,14 +19457,16 @@ export_hook_hooks.add('tableExportModule', {
           if (external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.print) {
             if (opts.content) {
               resolve(external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.print({
-                content: opts.content
+                title: opts.sheetName,
+                html: opts.content
               }));
             } else {
               resolve(exportMethods.exportData(opts).then(({
                 content
               }) => {
                 return external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.print({
-                  content
+                  title: opts.sheetName,
+                  html: content
                 });
               }));
             }
@@ -19395,7 +19529,7 @@ export_hook_hooks.add('tableExportModule', {
           return;
         }
         if (!importConfig) {
-          export_hook_log.err('vxe.error.reqProp', ['import-config']);
+          errLog('vxe.error.reqProp', ['import-config']);
         }
         // 处理类型
         const typeList = types.map(value => {
@@ -19425,7 +19559,7 @@ export_hook_hooks.add('tableExportModule', {
         const exportOpts = computeExportOpts.value;
         if (true) {
           if (!props.exportConfig) {
-            export_hook_log.err('vxe.error.reqProp', ['export-config']);
+            errLog('vxe.error.reqProp', ['export-config']);
           }
         }
         handleExportAndPrint(Object.assign({}, exportOpts, options));
@@ -19434,7 +19568,7 @@ export_hook_hooks.add('tableExportModule', {
         const printOpts = computePrintOpts.value;
         if (true) {
           if (!props.printConfig) {
-            export_hook_log.err('vxe.error.reqProp', ['print-config']);
+            errLog('vxe.error.reqProp', ['print-config']);
           }
         }
         handleExportAndPrint(Object.assign({}, printOpts, options), true);
@@ -19912,11 +20046,11 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
 
 
 
+
 const {
   getConfig: validator_hook_getConfig,
   validators: hook_validators,
-  hooks: validator_hook_hooks,
-  log: validator_hook_log
+  hooks: validator_hook_hooks
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 /**
  * 校验规则
@@ -20156,7 +20290,7 @@ validator_hook_hooks.add('tableValidatorModule', {
       fullValidate(rows, cb) {
         if (true) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cb)) {
-            validator_hook_log.warn('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
+            warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
           }
         }
         return beginValidate(rows, cb, true);
@@ -20167,7 +20301,7 @@ validator_hook_hooks.add('tableValidatorModule', {
       validate(rows, cb) {
         if (true) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cb)) {
-            validator_hook_log.warn('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
+            warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
           }
         }
         return beginValidate(rows, cb);
@@ -20302,12 +20436,12 @@ validator_hook_hooks.add('tableValidatorModule', {
                         customValid = gvItem.cellValidatorMethod(validParams);
                       } else {
                         if (true) {
-                          validator_hook_log.warn('vxe.error.notValidators', [validator]);
+                          warnLog('vxe.error.notValidators', [validator]);
                         }
                       }
                     } else {
                       if (true) {
-                        validator_hook_log.err('vxe.error.notValidators', [validator]);
+                        errLog('vxe.error.notValidators', [validator]);
                       }
                     }
                   } else {
@@ -20504,30 +20638,20 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
       computeCustomOpts
     } = $xeTable.getComputeMaps();
     const {
-      refTableHeader,
-      refTableBody,
-      refTableCustom
+      refElem
     } = $xeTable.getRefMaps();
     const $xeGrid = $xeTable.xegrid;
     const calcMaxHeight = () => {
       const {
         customStore
       } = reactData;
-      const tableHeader = refTableHeader.value;
-      const tableBody = refTableBody.value;
-      const tableCustom = refTableCustom.value;
-      const customWrapperElem = tableCustom ? tableCustom.$el : null;
-      const headElem = tableHeader.$el;
-      const bodyElem = tableBody.$el;
+      const el = refElem.value;
       // 判断面板不能大于表格高度
       let tableHeight = 0;
-      if (headElem) {
-        tableHeight += headElem.clientHeight;
-      }
-      if (bodyElem) {
-        tableHeight += bodyElem.clientHeight;
+      if (el) {
+        tableHeight = el.clientHeight - 60;
       }
-      customStore.maxHeight = Math.max(0, customWrapperElem ? Math.min(customWrapperElem.clientHeight, tableHeight - 80) : 0);
+      customStore.maxHeight = Math.max(4, tableHeight);
     };
     const openCustom = () => {
       const {
@@ -20544,6 +20668,7 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
         const colid = column.getKey();
         column.renderFixed = column.fixed;
         column.renderVisible = column.visible;
+        column.renderResizeWidth = column.renderWidth;
         sortMaps[colid] = column.renderSortNumber;
         fixedMaps[colid] = column.fixed;
         visibleMaps[colid] = column.visible;
@@ -20590,10 +20715,10 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
       } = customOpts;
       customStore.isAll = collectColumn.every(column => (checkMethod ? !checkMethod({
         column
-      }) : false) || column.visible);
+      }) : false) || column.renderVisible);
       customStore.isIndeterminate = !customStore.isAll && collectColumn.some(column => (!checkMethod || checkMethod({
         column
-      })) && (column.visible || column.halfVisible));
+      })) && (column.renderVisible || column.halfVisible));
     };
     const emitCustomEvent = (type, evnt) => {
       const comp = $xeGrid || $xeTable;
@@ -20655,11 +20780,11 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
 
 
 
+
 const {
   getConfig: render_getConfig,
   renderer: render_renderer,
-  getI18n: render_getI18n,
-  log: render_log
+  getI18n: render_getI18n
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 const componentDefaultModelProp = 'modelValue';
 const defaultCompProps = {
@@ -20842,7 +20967,7 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
     ons[getOnName(key)] = function (...args) {
       if (true) {
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
-          render_log.err('vxe.error.errFunc', [func]);
+          errLog('vxe.error.errFunc', [func]);
         }
       }
       func(params, ...args);
@@ -21449,13 +21574,13 @@ const Table = VxeTable;
 
 
 
+
 const {
   getConfig: toolbar_getConfig,
   getIcon: toolbar_getIcon,
   getI18n: toolbar_getI18n,
   renderer: toolbar_renderer,
   commands: toolbar_commands,
-  log: toolbar_log,
   createEvent: toolbar_createEvent,
   useFns: toolbar_useFns
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
@@ -21553,7 +21678,7 @@ const {
       if ($xeTable) {
         return true;
       }
-      toolbar_log.err('vxe.error.barUnableLink');
+      errLog('vxe.error.barUnableLink');
     };
     const handleClickSettingEvent = ({
       $event
@@ -21562,7 +21687,7 @@ const {
         if ($xeTable.triggerCustomEvent) {
           $xeTable.triggerCustomEvent($event);
         } else {
-          toolbar_log.err('vxe.error.reqModule', ['VxeTableCustomModule']);
+          errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
         }
       }
     };
@@ -21572,7 +21697,7 @@ const {
       if ($xeTable) {
         $xeTable.customOpenEvent($event);
       } else {
-        toolbar_log.err('vxe.error.reqModule', ['VxeTableCustomModule']);
+        errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
       }
     };
     const handleMouseleaveSettingEvent = ({
@@ -21640,7 +21765,7 @@ const {
               gCommandOpts.commandMethod(params);
             } else {
               if (true) {
-                toolbar_log.err('vxe.error.notCommands', [code]);
+                errLog('vxe.error.notCommands', [code]);
               }
             }
           }
@@ -21669,7 +21794,7 @@ const {
               gCommandOpts.commandMethod(params);
             } else {
               if (true) {
-                toolbar_log.err('vxe.error.notCommands', [code]);
+                errLog('vxe.error.notCommands', [code]);
               }
             }
           }
@@ -21929,21 +22054,21 @@ const {
       const refreshOpts = computeRefreshOpts.value;
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
       if (refresh && !$xeGrid && !queryMethod) {
-        toolbar_log.warn('vxe.error.notFunc', ['queryMethod']);
+        warnLog('vxe.error.notFunc', ['queryMethod']);
       }
       const customOpts = computeCustomOpts.value;
       if (true) {
         if (customOpts.isFooter) {
-          toolbar_log.warn('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
         }
         if (customOpts.showFooter) {
-          toolbar_log.warn('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
         }
         if (customOpts.immediate) {
-          toolbar_log.warn('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
         }
         if (customOpts.trigger) {
-          toolbar_log.warn('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
+          warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
         }
       }
     });
@@ -22006,12 +22131,12 @@ const Toolbar = VxeToolbar;
 
 
 
+
 const {
   getConfig: grid_getConfig,
   getI18n: grid_getI18n,
   commands: grid_commands,
   hooks: grid_hooks,
-  log: grid_log,
   useFns: grid_useFns,
   createEvent: grid_createEvent,
   globalEvents: grid_globalEvents,
@@ -22412,7 +22537,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             return slots[funcSlot];
           } else {
             if (true) {
-              grid_log.err('vxe.error.notSlot', [funcSlot]);
+              errLog('vxe.error.notSlot', [funcSlot]);
             }
           }
         } else {
@@ -22696,7 +22821,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             break;
           default:
             if (true) {
-              grid_log.err('vxe.error.notProp', [`layouts -> ${name}`]);
+              errLog('vxe.error.notProp', [`layouts -> ${name}`]);
             }
             break;
         }
@@ -22952,7 +23077,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 });
               } else {
                 if (true) {
-                  grid_log.err('vxe.error.notFunc', ['proxy-config.ajax.query']);
+                  errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
                 }
               }
               break;
@@ -23029,7 +23154,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 }
               } else {
                 if (true) {
-                  grid_log.err('vxe.error.notFunc', ['proxy-config.ajax.delete']);
+                  errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
                 }
               }
               break;
@@ -23122,7 +23247,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 });
               } else {
                 if (true) {
-                  grid_log.err('vxe.error.notFunc', ['proxy-config.ajax.save']);
+                  errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
                 }
               }
               break;
@@ -23140,7 +23265,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   }, ...args);
                 } else {
                   if (true) {
-                    grid_log.err('vxe.error.notCommands', [code]);
+                    errLog('vxe.error.notCommands', [code]);
                   }
                 }
               }
@@ -23225,7 +23350,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(column.slots, func => {
               if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
                 if (!slots[func]) {
-                  grid_log.err('vxe.error.notSlot', [func]);
+                  errLog('vxe.error.notSlot', [func]);
                 }
               }
             });
@@ -23363,7 +23488,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         const proxyOpts = computeProxyOpts.value;
         const formOpts = computeFormOpts.value;
         if (isEnableConf(proxyConfig) && (data || proxyOpts.form && formOpts.data)) {
-          grid_log.err('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
+          errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
         }
         // if (process.env.VUE_APP_VXE_ENV === 'development') {
         //   if (proxyOpts.props) {