vxe-table 4.19.15 → 4.19.17

package/es/table/module/custom/panel.js

@@ -3,8 +3,9 @@ import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
 import { formatText } from '../../../ui/src/utils';
 import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom';
-import { errLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
 import XEUtils from 'xe-utils';
+const { errLog } = createComponentLog('table');
 const { getI18n, getIcon, renderEmptyElement } = VxeUI;
 export function createInternalData() {
     return {

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

@@ -4,7 +4,8 @@ import { VxeUI } from '../../../ui';
 import { isEnableConf } from '../../../ui/src/utils';
 import { getCellValue, setCellValue, getRowid } from '../../src/util';
 import { removeClass, addClass } from '../../../ui/src/dom';
-import { warnLog, errLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
+const { warnLog, errLog } = createComponentLog('table');
 const { getConfig, renderer, hooks, getI18n } = VxeUI;
 const tableEditMethodKeys = ['insert', 'insertAt', 'insertNextAt', 'insertChild', 'insertChildAt', 'insertChildNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getEditCell', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
 hooks.add('tableEditModule', {

package/es/table/module/export/export-panel.js

@@ -3,7 +3,8 @@ import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
 import { formatText } from '../../../ui/src/utils';
-import { errLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
+const { errLog } = createComponentLog('table');
 const { getI18n, getIcon, renderEmptyElement } = VxeUI;
 export default defineVxeComponent({
     name: 'VxeTableExportPanel',

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

@@ -5,7 +5,8 @@ import { isColumnInfo, getCellValue, createHandleGetRowId } from '../../src/util
 import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils';
 import { hasClass } from '../../../ui/src/dom';
 import { createHtmlPage, getExportBlobByContent } from './util';
-import { warnLog, errLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
+const { warnLog, errLog } = createComponentLog('table');
 const { getI18n, hooks, renderer } = VxeUI;
 let htmlCellElem;
 const csvBOM = '\ufeff';
@@ -668,7 +669,7 @@ hooks.add('tableExportModule', {
         const toHtml = (opts, columns, datas) => {
             const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props;
             const { isAllSelected, isIndeterminate } = reactData;
-            const { mergeBodyCellMaps } = internalData;
+            const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts;
             const allCls = 'check-all';
@@ -806,15 +807,34 @@ hooks.add('tableExportModule', {
                 const footers = getFooterData($xeTable, opts, footerTableData);
                 if (footers.length) {
                     tables.push('<tfoot>');
-                    footers.forEach((row) => {
+                    footers.forEach((row, rIndex) => {
                         tables.push(`<tr>${columns.map((column) => {
                             const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
                             const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
                             const cellValue = getFooterCellValue(opts, row, column);
+                            let rowSpan = 1;
+                            let colSpan = 1;
+                            if (isMerge) {
+                                const _rowIndex = rIndex;
+                                const _columnIndex = $xeTable.getVTColumnIndex(column);
+                                const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
+                                if (spanRest) {
+                                    const { rowspan, colspan } = spanRest;
+                                    if (!rowspan || !colspan) {
+                                        return '';
+                                    }
+                                    if (rowspan > 1) {
+                                        rowSpan = rowspan;
+                                    }
+                                    if (colspan > 1) {
+                                        colSpan = colspan;
+                                    }
+                                }
+                            }
                             if (footAlign) {
                                 classNames.push(`col--${footAlign}`);
                             }
-                            return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
+                            return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
                         }).join('')}</tr>`);
                     });
                     tables.push('</tfoot>');

package/es/table/module/export/import-panel.js

@@ -3,7 +3,8 @@ import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
 import { parseFile } from '../../../ui/src/utils';
-import { errLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
+const { errLog } = createComponentLog('table');
 const { getI18n, getIcon, renderEmptyElement } = VxeUI;
 export default defineVxeComponent({
     name: 'VxeTableImportPanel',

package/es/table/module/filter/panel.js

@@ -4,8 +4,9 @@ import { VxeUI } from '../../../ui';
 import { formatText, isEnableConf } from '../../../ui/src/utils';
 import { getPropClass, toCssUnit } from '../../../ui/src/dom';
 import { getSlotVNs } from '../../../ui/src/vn';
-import { warnLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
 import XEUtils from 'xe-utils';
+const { warnLog } = createComponentLog('table');
 const { getI18n, getIcon, renderer, renderEmptyElement } = VxeUI;
 export default defineVxeComponent({
     name: 'VxeTableFilterPanel',

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

@@ -4,7 +4,8 @@ import { VxeUI } from '../../../ui';
 import { eqEmptyValue, getFuncText } from '../../../ui/src/utils';
 import { scrollToView } from '../../../ui/src/dom';
 import { handleFieldOrColumn, getRowid } from '../../src/util';
-import { warnLog, errLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
+const { warnLog, errLog } = createComponentLog('table');
 const { getConfig, validators, hooks } = VxeUI;
 /**
  * 校验规则

package/es/table/render/index.js

@@ -4,7 +4,8 @@ import { VxeUI } from '../../ui';
 import { getCellValue, setCellValue } from '../../table/src/util';
 import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils';
 import { getOnName, getModelEvent, getChangeEvent, hasInputType } from '../../ui/src/vn';
-import { errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
+const { errLog } = createComponentLog('table');
 const { getConfig, renderer, getI18n, getComponent } = VxeUI;
 const componentDefaultModelProp = 'modelValue';
 const defaultCompProps = {};

package/es/table/src/columnInfo.js

@@ -3,7 +3,8 @@ import { VxeUI } from '../../ui';
 import { toFilters } from './util';
 import { isEnableConf, getFuncText } from '../../ui/src/utils';
 import { isPx } from '../../ui/src/dom';
-import { warnLog, errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
+const { warnLog, errLog } = createComponentLog('table');
 const { getI18n, formats, renderer } = VxeUI;
 export class ColumnInfo {
     /* eslint-disable @typescript-eslint/no-use-before-define */

package/es/table/src/header.js

@@ -238,6 +238,8 @@ export default defineVxeComponent({
             const cellOpts = computeCellOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const headerCellOpts = computeHeaderCellOpts.value;
+            const floatingFilterOpts = computeFloatingFilterOpts.value;
+            const { cellClassName } = floatingFilterOpts;
             const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
             return cols.map((column, $columnIndex) => {
                 const { type, showHeaderOverflow, headerAlign, align, filters, editRender, cellRender, floatingFilters, filterRender, slots } = column;
@@ -291,7 +293,7 @@ export default defineVxeComponent({
                 else {
                     tcStyle.minHeight = `${currCellHeight}px`;
                 }
-                return h('th', Object.assign({ class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+                return h('th', Object.assign({ class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
                             [`col--${headAlign}`]: headAlign,
                             [`col--${type}`]: type,
                             'col--last': isLastColumn,
@@ -304,7 +306,7 @@ export default defineVxeComponent({
                         }
                     ], key: colid }, thAttrs), [
                     h('div', {
-                        class: ['vxe-cell', {
+                        class: ['vxe-cell', '' + (cellClassName || ''), {
                                 'c--title': showTitle,
                                 'c--tooltip': showTooltip,
                                 'c--ellipsis': showEllipsis
@@ -344,7 +346,8 @@ export default defineVxeComponent({
                 rowVNs.push(h('tr', {
                     key: 'ff',
                     class: [
-                        'vxe-header--row'
+                        'vxe-header--row is--floating-filters',
+                        '' + (floatingFilterOpts.rowClassName || '')
                     ]
                 }, renderFilterRows(isOptimizeMode, renderColumnList)));
             }

package/es/table/src/table.js

@@ -7,7 +7,7 @@ import { VxeUI } from '../../ui';
 import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn, getRowMaxHeight } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
-import { warnLog, errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import { getCrossTableDragRowInfo } from './store';
 import Cell from './cell';
 import TableBodyComponent from './body';
@@ -28,6 +28,7 @@ import '../module/keyboard/hook';
 import '../module/validator/hook';
 import '../module/custom/hook';
 import '../render';
+const { warnLog, errLog } = createComponentLog('table');
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI;
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
@@ -46,8 +47,10 @@ export default defineVxeComponent({
         // 使用已安装的组件，如果未安装则不渲染
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
+        const $xeModal = inject('$xeModal', null);
         const $xeTabs = inject('$xeTabs', null);
         const $xeParentTable = inject('$xeTable', null);
+        const $xeSplitter = inject('$xeSplitter', null);
         const $xeGrid = inject('$xeGrid', null);
         const $xeGantt = inject('$xeGantt', null);
         const $xeGGWrapper = $xeGrid || $xeGantt;
@@ -677,6 +680,15 @@ export default defineVxeComponent({
             }
             return [];
         });
+        const combineTabsResizeFlag = computed(() => {
+            return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
+        });
+        const combineModalResizeFlag = computed(() => {
+            return $xeModal ? $xeModal.reactData.resizeFlag : null;
+        });
+        const combineSplitterResizeFlag = computed(() => {
+            return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
+        });
         const refMaps = {
             refElem,
             refTooltip,
@@ -9086,11 +9098,39 @@ export default defineVxeComponent({
             const { tooltipStore } = reactData;
             const { column, row } = params;
             const { showAll, contentMethod } = tipOpts;
-            const customContent = contentMethod ? contentMethod(params) : null;
-            const useCustom = contentMethod && !XEUtils.eqNull(customContent);
-            const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+            const cellText = XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
             const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
-            if (content && (showAll || useCustom || isOver)) {
+            let isShow = false;
+            let customContent = null;
+            let content = '';
+            if (contentMethod) {
+                customContent = contentMethod(params);
+            }
+            // 是否全部展示
+            if (showAll) {
+                // 如果为 null 默认显示
+                if (XEUtils.eqNull(customContent)) {
+                    isShow = true;
+                    content = cellText;
+                }
+                else if (customContent !== '' && customContent !== false) {
+                    // 如果为 '' | false 则不显示
+                    isShow = true;
+                    content = '' + customContent;
+                }
+            }
+            else {
+                // 如果为 null 使用默认逻辑
+                if (XEUtils.eqNull(customContent)) {
+                    isShow = isOver;
+                }
+                else if (customContent !== '' && customContent !== false) {
+                    // 如果为 '' | false 则不显示
+                    isShow = true;
+                }
+                content = cellText;
+            }
+            if (isShow && content) {
                 const tipContent = formatText(content);
                 Object.assign(tooltipStore, {
                     row,
@@ -14158,11 +14198,19 @@ export default defineVxeComponent({
                 loadTableData(internalData.tableSynchData, false, true);
             }
         });
-        if ($xeTabs) {
-            watch(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
-                handleGlobalResizeEvent();
-            });
-        }
+        const layoutReFlag = ref(0);
+        watch(combineTabsResizeFlag, () => {
+            layoutReFlag.value++;
+        });
+        watch(combineModalResizeFlag, () => {
+            layoutReFlag.value++;
+        });
+        watch(combineSplitterResizeFlag, () => {
+            layoutReFlag.value++;
+        });
+        watch(layoutReFlag, () => {
+            handleGlobalResizeEvent();
+        });
         handleKeyField();
         hooks.forEach((options) => {
             const { setupTable } = options;

package/es/toolbar/src/toolbar.js

@@ -3,7 +3,8 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
-import { warnLog, errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
+const { warnLog, errLog } = createComponentLog('toolbar');
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = VxeUI;
 function createReactData() {
     return {
@@ -178,7 +179,7 @@ export default defineVxeComponent({
                 $xeGGWrapper.triggerZoomEvent($event);
             }
             else {
-                warnLog('vxe.error.notProp', ['[toolbar] zoom']);
+                warnLog('vxe.error.notProp', ['zoom']);
             }
         };
         const importEvent = () => {
@@ -288,7 +289,7 @@ export default defineVxeComponent({
                                 tCommandMethod(params);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[toolbar] ${code}`]);
+                                errLog('vxe.error.notCommands', [code]);
                             }
                         }
                         $xeToolbar.dispatchEvent('button-click', params, $event);
@@ -315,7 +316,7 @@ export default defineVxeComponent({
                                 tCommandMethod(params);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[toolbar] ${code}`]);
+                                errLog('vxe.error.notCommands', [code]);
                             }
                         }
                         $xeToolbar.dispatchEvent('tool-click', params, $event);
@@ -570,38 +571,38 @@ export default defineVxeComponent({
             const refreshOpts = computeRefreshOpts.value;
             const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
             if (props.refresh && !$xeGGWrapper && !queryMethod) {
-                warnLog('vxe.error.notFunc', ['[toolbar] queryMethod']);
+                warnLog('vxe.error.notFunc', ['queryMethod']);
             }
             if (XEUtils.isPlainObject(props.custom)) {
-                warnLog('vxe.error.delProp', ['[toolbar] custom={...}', 'custom=boolean & custom-options={...}']);
+                warnLog('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}']);
             }
             if (XEUtils.isPlainObject(props.print)) {
-                warnLog('vxe.error.delProp', ['[toolbar] print={...}', 'print=boolean & print-options={...}']);
+                warnLog('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}']);
             }
             if (XEUtils.isPlainObject(props.export)) {
-                warnLog('vxe.error.delProp', ['[toolbar] export={...}', 'export=boolean & export-options={...}']);
+                warnLog('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}']);
             }
             if (XEUtils.isPlainObject(props.import)) {
-                warnLog('vxe.error.delProp', ['[toolbar] import={...}', 'import=boolean & import-options={...}']);
+                warnLog('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}']);
             }
             if (XEUtils.isPlainObject(props.refresh)) {
-                warnLog('vxe.error.delProp', ['[toolbar] refresh={...}', 'refresh=boolean & refresh-options={...}']);
+                warnLog('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}']);
             }
             if (XEUtils.isPlainObject(props.refresh)) {
-                warnLog('vxe.error.delProp', ['[toolbar] zoom={...}', 'zoom=boolean & zoom-options={...}']);
+                warnLog('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}']);
             }
             const customOpts = computeCustomOpts.value;
             if (customOpts.isFooter) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.isFooter', 'table.custom-config.showFooter']);
+                warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
             }
             if (customOpts.showFooter) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+                warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
             }
             if (customOpts.immediate) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.immediate', 'table.custom-config.immediate']);
+                warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
             }
             if (customOpts.trigger) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.trigger', 'table.custom-config.trigger']);
+                warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
             }
             if (props.refresh || props.import || props.export || props.print || props.zoom) {
                 if (!VxeUIButtonComponent) {

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,5 +1,14 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.19.15"}`;
-export const warnLog = log.create('warn', version);
-export const errLog = log.create('error', version);
+const tableVersion = `table v${"4.19.17"}`;
+export function createComponentLog(name) {
+    const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
+    const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
+    const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : '';
+    return {
+        warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
+        errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
+    };
+}
+export const warnLog = log.create('warn', tableVersion);
+export const errLog = log.create('error', tableVersion);

package/lib/grid/src/grid.js

@@ -19,6 +19,10 @@ var _props2 = require("../../table/src/props");
 var _table = _interopRequireDefault(require("../../table/src/table"));
 var _toolbar = _interopRequireDefault(require("../../toolbar/src/toolbar"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const {
+  warnLog,
+  errLog
+} = (0, _log.createComponentLog)('grid');
 const {
   getConfig,
   getI18n,
@@ -582,7 +586,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           if (slots[funcSlot]) {
             return slots[funcSlot];
           } else {
-            (0, _log.errLog)('vxe.error.notSlot', [`[grid] ${funcSlot}`]);
+            errLog('vxe.error.notSlot', [funcSlot]);
           }
         } else {
           return funcSlot;
@@ -598,7 +602,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             if (slots[slotFunc]) {
               slotConf[slotKey] = slots[slotFunc];
             } else {
-              (0, _log.errLog)('vxe.error.notSlot', [`[grid] ${slotFunc}`]);
+              errLog('vxe.error.notSlot', [slotFunc]);
             }
           } else {
             slotConf[slotKey] = slotFunc;
@@ -899,7 +903,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             childVNs.push(renderPager());
             break;
           default:
-            (0, _log.errLog)('vxe.error.notProp', [`[grid] layouts -> ${key}`]);
+            errLog('vxe.error.notProp', [`layouts -> ${key}`]);
             break;
         }
       });
@@ -1286,7 +1290,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   };
                 });
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.query']);
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
               }
               break;
             }
@@ -1334,7 +1338,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   };
                 });
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.queryFooter']);
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
               }
               break;
             }
@@ -1425,7 +1429,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   }
                 }
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.delete']);
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
               }
               break;
             }
@@ -1532,7 +1536,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   }
                 });
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.save']);
+                errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
               }
               break;
             }
@@ -1550,7 +1554,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                     $gantt: null
                   }, ...args);
                 } else {
-                  (0, _log.errLog)('vxe.error.notCommands', [`[grid] ${code}`]);
+                  errLog('vxe.error.notCommands', [code]);
                 }
               }
             }
@@ -1824,7 +1828,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             _xeUtils.default.each(column.slots, func => {
               if (!_xeUtils.default.isFunction(func)) {
                 if (!slots[func]) {
-                  (0, _log.errLog)('vxe.error.notSlot', [`[grid] ${func}`]);
+                  errLog('vxe.error.notSlot', [func]);
                 }
               }
             });
@@ -1901,12 +1905,12 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         const proxyOpts = computeProxyOpts.value;
         if (props.formConfig) {
           if (!VxeUIFormComponent) {
-            (0, _log.errLog)('vxe.error.reqComp', ['vxe-form']);
+            errLog('vxe.error.reqComp', ['vxe-form']);
           }
         }
         if (props.pagerConfig) {
           if (!VxeUIPagerComponent) {
-            (0, _log.errLog)('vxe.error.reqComp', ['vxe-pager']);
+            errLog('vxe.error.reqComp', ['vxe-pager']);
           }
         }
         // const { data, columns, proxyConfig } = props
@@ -1915,7 +1919,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         //   errLog('vxe.error.errConflicts', ['[grid] data', 'proxy-config'])
         // }
         if (proxyOpts.props) {
-          (0, _log.warnLog)('vxe.error.delProp', ['[grid] proxy-config.props', 'proxy-config.response']);
+          warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response']);
         }
         if (columns && columns.length) {
           $xeGrid.loadColumn(columns);