vxe-table 3.21.15 → 3.21.17

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

@@ -2,8 +2,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;
 function showDropTip($xeTableCustomPanel, evnt, optEl, showLine, dragPos) {
     const customPanelInternalData = $xeTableCustomPanel.internalData;

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

@@ -3,7 +3,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, getI18n } = VxeUI;
 const browseObj = XEUtils.browse();
 function getEditColumnModel(row, column) {

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

@@ -2,7 +2,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, globalMixins, renderEmptyElement } = VxeUI;
 export default {
     name: 'VxeTableExportPanel',

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

@@ -2,7 +2,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, globalMixins, renderEmptyElement } = VxeUI;
 export default {
     name: 'VxeTableImportPanel',

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

@@ -4,7 +4,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, renderer } = VxeUI;
 let htmlCellElem;
 const csvBOM = '\ufeff';
@@ -478,7 +479,7 @@ function toHtml($xeTable, opts, columns, datas) {
     const internalData = $xeTable;
     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 = $xeTable.computeTreeOpts;
     const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts;
     const allCls = 'check-all';
@@ -616,15 +617,34 @@ function toHtml($xeTable, opts, columns, datas) {
         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($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
                     const cellValue = getFooterCellValue($xeTable, 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/filter/panel.js

@@ -3,7 +3,8 @@ 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';
+const { warnLog } = createComponentLog('table');
 const { getI18n, getIcon, renderer, globalMixins, renderEmptyElement } = VxeUI;
 // 全部筛选事件
 function filterCheckAllEvent($xeFilterPanel, evnt, value) {

package/es/table/module/menu/mixin.js

@@ -2,7 +2,8 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/dom';
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils';
-import { warnLog } from '../../../ui/src/log';
+import { createComponentLog } from '../../../ui/src/log';
+const { warnLog } = createComponentLog('table');
 const { menus, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
 export default {
     methods: {

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

@@ -3,7 +3,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 } = VxeUI;
 /**
  * 校验规则

package/es/table/render/index.js

@@ -3,7 +3,8 @@ import { VxeUI } from '../../ui';
 import { getCellValue, setCellValue } from '../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 = 'value';
 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

@@ -215,6 +215,8 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
     const cellOpts = $xeTable.computeCellOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const headerCellOpts = $xeTable.computeHeaderCellOpts;
+    const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
+    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;
@@ -269,7 +271,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
             tcStyle.minHeight = `${currCellHeight}px`;
         }
         return h('th', {
-            class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+            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,
@@ -285,7 +287,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
             attrs: thAttrs
         }, [
             h('div', {
-                class: ['vxe-cell', {
+                class: ['vxe-cell', '' + (cellClassName || ''), {
                         'c--title': showTitle,
                         'c--tooltip': showTooltip,
                         'c--ellipsis': showEllipsis
@@ -330,7 +332,8 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumn
         rowVNs.push(h('tr', {
             key: 'ff',
             class: [
-                'vxe-header--row'
+                'vxe-header--row is--floating-filters',
+                '' + (floatingFilterOpts.rowClassName || '')
             ]
         }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList)));
     }

package/es/table/src/methods.js

@@ -6,8 +6,9 @@ import Cell from './cell';
 import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, 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';
+const { warnLog, errLog } = createComponentLog('table');
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
 const browseObj = XEUtils.browse();
 const supportMaxRow = 5e6;
@@ -2862,11 +2863,39 @@ function handleTooltip($xeTable, evnt, tipOpts, type, tdEl, overflowElem, tipEle
     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,

package/es/table/src/table.js

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header';
 import TableFooterComponent from './footer';
 import { tableProps } from './props';
 import { getSlotVNs } from '../../ui/src/vn';
-import { warnLog, errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import { crossTableDragRowGlobal, getCrossTableDragRowInfo } from './store';
 import TableCustomPanelComponent from '../module/custom/panel';
 import TableFilterPanelComponent from '../module/filter/panel';
@@ -23,6 +23,7 @@ import exportMixin from '../module/export/mixin';
 import keyboardMixin from '../module/keyboard/mixin';
 import validatorMixin from '../module/validator/mixin';
 import customMixin from '../module/custom/mixin';
+const { warnLog, errLog } = createComponentLog('table');
 const { getConfig, getIcon, getI18n, renderer, globalResize, globalEvents, globalMixins, renderEmptyElement } = VxeUI;
 function handleUpdateMergeBodyCells($xeTable, merges) {
     const internalData = $xeTable;
@@ -529,6 +530,9 @@ export default {
         };
     },
     inject: {
+        $xeModal: {
+            default: null
+        },
         $xeTabs: {
             default: null
         },
@@ -548,7 +552,7 @@ export default {
         const reactData = createReactData();
         return Object.assign(Object.assign({ xID }, reactData), { 
             // 私有属性
-            reScrollFlag: 0, reLayoutFlag: 0, footFlag: 0, kfFlag: 0, mergeFooteCellFlag: 0, crossTableDragRowInfo: crossTableDragRowGlobal });
+            reScrollFlag: 0, reLayoutFlag: 0, footFlag: 0, kfFlag: 0, layoutReFlag: 0, mergeFooteCellFlag: 0, crossTableDragRowInfo: crossTableDragRowGlobal });
     },
     computed: Object.assign(Object.assign({}, {}), { tableId() {
             return this.computeTableId;
@@ -1363,11 +1367,21 @@ export default {
             const props = $xeTable;
             return Object.assign({}, getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
         },
-        tabsResizeFlag() {
+        combineTabsResizeFlag() {
             const $xeTable = this;
             const $xeTabs = $xeTable.$xeTabs;
             return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
         },
+        combineModalResizeFlag() {
+            const $xeTable = this;
+            const $xeModal = $xeTable.$xeModal;
+            return $xeModal ? $xeModal.reactData.resizeFlag : null;
+        },
+        combineSplitterResizeFlag() {
+            const $xeTable = this;
+            const $xeSplitter = $xeTable.$xeSplitter;
+            return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
+        },
         computeVxeLanguage() {
             return VxeUI.getLanguage();
         },
@@ -1498,7 +1512,16 @@ export default {
                 });
             }
         },
-        tabsResizeFlag() {
+        combineTabsResizeFlag() {
+            this.layoutReFlag++;
+        },
+        combineModalResizeFlag() {
+            this.layoutReFlag++;
+        },
+        combineSplitterResizeFlag() {
+            this.layoutReFlag++;
+        },
+        layoutReFlag() {
             this.handleGlobalResizeEvent();
         },
         mergeCells(value) {

package/es/table/src/util.js

@@ -1,8 +1,9 @@
 import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isScale, isPx, queryElement } from '../../ui/src/dom';
-import { warnLog, errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import { eqEmptyValue } from '../../ui/src/utils';
+const { warnLog, errLog } = createComponentLog('table');
 export function createInternalData() {
     return {
         tZindex: 0,

package/es/toolbar/src/toolbar.js

@@ -2,7 +2,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, globalMixins, renderEmptyElement } = VxeUI;
 function createReactData() {
     return {
@@ -64,12 +65,8 @@ export default {
     data() {
         const xID = XEUtils.uniqueId();
         const reactData = createReactData();
-        const internalData = createInternalData();
-        return {
-            xID,
-            reactData,
-            internalData
-        };
+        return Object.assign(Object.assign({}, {}), { xID,
+            reactData });
     },
     computed: Object.assign(Object.assign({}, {}), { computeRefreshOpts() {
             const $xeToolbar = this;
@@ -224,7 +221,7 @@ export default {
                 $xeGGWrapper.triggerZoomEvent($event);
             }
             else {
-                warnLog('vxe.error.notProp', ['[toolbar] zoom']);
+                warnLog('vxe.error.notProp', ['zoom']);
             }
         },
         importEvent() {
@@ -352,7 +349,7 @@ export default {
                                 tCommandMethod(params);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[toolbar] ${code}`]);
+                                errLog('vxe.error.notCommands', [code]);
                             }
                         }
                         $xeToolbar.dispatchEvent('button-click', params, $event);
@@ -384,7 +381,7 @@ export default {
                                 tCommandMethod(params);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[toolbar] ${code}`]);
+                                errLog('vxe.error.notCommands', [code]);
                             }
                         }
                         $xeToolbar.dispatchEvent('tool-click', params, $event);
@@ -725,46 +722,47 @@ export default {
         const $xeGrid = $xeToolbar.$xeGrid;
         const $xeGantt = $xeToolbar.$xeGantt;
         const $xeGGWrapper = $xeGrid || $xeGantt;
+        $xeToolbar.internalData = createInternalData();
         $xeToolbar.$nextTick(() => {
             const refreshOpts = $xeToolbar.computeRefreshOpts;
             const $xeTable = $xeToolbar.fintTable();
             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={...}']);
             }
             if ($xeTable) {
                 $xeTable.connect($xeToolbar);
             }
             const customOpts = $xeToolbar.computeCustomOpts;
             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']);
             }
         });
         // 使用已安装的组件，如果未安装则不渲染

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.21.15";
+export const version = "3.21.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${"3.21.15"}`;
-export const warnLog = log.create('warn', version);
-export const errLog = log.create('error', version);
+const tableVersion = `table v${"3.21.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

@@ -15,6 +15,10 @@ var _props = 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,
@@ -110,12 +114,10 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
   data() {
     const xID = _xeUtils.default.uniqueId();
     const reactData = createReactData();
-    const internalData = createInternalData();
-    return {
+    return Object.assign(Object.assign({}, {}), {
       xID,
-      reactData,
-      internalData
-    };
+      reactData
+    });
   },
   computed: Object.assign(Object.assign({}, {}), {
     isRespMsg() {
@@ -904,7 +906,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                 };
               });
             } else {
-              (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.query']);
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
             }
             break;
           }
@@ -952,7 +954,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                 };
               });
             } else {
-              (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.queryFooter']);
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
             }
             break;
           }
@@ -1044,7 +1046,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                 }
               }
             } else {
-              (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.delete']);
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
             }
             break;
           }
@@ -1152,7 +1154,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                 }
               });
             } else {
-              (0, _log.errLog)('vxe.error.notFunc', ['[grid] proxy-config.ajax.save']);
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
             }
             break;
           }
@@ -1170,7 +1172,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                   $gantt: null
                 }, ...args);
               } else {
-                (0, _log.errLog)('vxe.error.notCommands', [`[grid] ${code}`]);
+                errLog('vxe.error.notCommands', [code]);
               }
             }
           }
@@ -1604,7 +1606,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           _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]);
               }
             }
           });
@@ -1627,7 +1629,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
             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;
@@ -1643,10 +1645,10 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
       const toolbarOptSlots = toolbarOpts.slots;
       const toolbarSlots = {};
       if (slots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
-        (0, _log.warnLog)('vxe.error.reqProp', ['[grid] toolbar-config.slots.buttons']);
+        warnLog('vxe.error.reqProp', ['[grid] toolbar-config.slots.buttons']);
       }
       if (slots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
-        (0, _log.warnLog)('vxe.error.reqProp', ['[grid] toolbar-config.slots.tools']);
+        warnLog('vxe.error.reqProp', ['[grid] toolbar-config.slots.tools']);
       }
       if (toolbarOptSlots) {
         const buttonsSlot = $xeGrid.getFuncSlot(toolbarOptSlots, 'buttons');
@@ -1685,7 +1687,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           if (slots[funcSlot]) {
             return slots[funcSlot];
           } else {
-            (0, _log.errLog)('vxe.error.notSlot', [`[grid] ${funcSlot}`]);
+            errLog('vxe.error.notSlot', [funcSlot]);
           }
         } else {
           return funcSlot;
@@ -1927,7 +1929,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
             childVNs.push($xeGrid.renderPager(h));
             break;
           default:
-            (0, _log.errLog)('vxe.error.notProp', [`[grid] layouts -> ${key}`]);
+            errLog('vxe.error.notProp', [`layouts -> ${key}`]);
             break;
         }
       });
@@ -1986,29 +1988,30 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
     const VxeUIPagerComponent = _ui.VxeUI.getComponent('VxePager');
     const $xeGrid = this;
     const props = $xeGrid;
+    $xeGrid.internalData = createInternalData();
     const proxyOpts = $xeGrid.computeProxyOpts;
     // const { data, formOpts, proxyOpts, proxyConfig } = this
     // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
     //   errLog('vxe.error.errConflicts', ['[grid] data', 'proxy-config'])
     // }
     if (props.toolbar) {
-      (0, _log.errLog)('vxe.error.delProp', ['[grid] toolbar', 'toolbar-config']);
+      errLog('vxe.error.delProp', ['toolbar', 'toolbar-config']);
     }
     if (props.toolbarConfig && !_xeUtils.default.isObject(props.toolbarConfig)) {
-      (0, _log.errLog)('vxe.error.errProp', [`[grid] toolbar-config=${props.toolbarConfig}`, 'toolbar-config={}']);
+      errLog('vxe.error.errProp', [`toolbar-config=${props.toolbarConfig}`, 'toolbar-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']);
     }
     $xeGrid.$nextTick(() => {
       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']);
         }
       }
     });