vxe-table 3.21.15 → 3.21.17

package/es/grid/src/grid.js

@@ -4,10 +4,11 @@ import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
 import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit } from '../../ui/src/dom';
 import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
-import { warnLog, errLog } from '../../ui/src/log';
+import { createComponentLog } from '../../ui/src/log';
 import { tableProps } from '../../table/src/props';
 import VxeTableComponent from '../../table/src/table';
 import VxeToolbarComponent from '../../toolbar/src/toolbar';
+const { warnLog, errLog } = createComponentLog('grid');
 const { getConfig, getI18n, commands, globalEvents, globalMixins, createEvent, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableMethods = {};
 const propKeys = Object.keys(tableProps);
@@ -83,12 +84,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({}, {}), { isRespMsg() {
             const $xeGrid = this;
@@ -768,7 +765,7 @@ export default {
                         });
                     }
                     else {
-                        errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.query']);
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
                     }
                     break;
                 }
@@ -808,7 +805,7 @@ export default {
                         });
                     }
                     else {
-                        errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.queryFooter']);
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
                     }
                     break;
                 }
@@ -883,7 +880,7 @@ export default {
                         }
                     }
                     else {
-                        errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.delete']);
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
                     }
                     break;
                 }
@@ -971,7 +968,7 @@ export default {
                         });
                     }
                     else {
-                        errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.save']);
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
                     }
                     break;
                 }
@@ -983,7 +980,7 @@ export default {
                             tCommandMethod({ code, button, $grid: $xeGrid, $table: $xeTable, $gantt: null }, ...args);
                         }
                         else {
-                            errLog('vxe.error.notCommands', [`[grid] ${code}`]);
+                            errLog('vxe.error.notCommands', [code]);
                         }
                     }
                 }
@@ -1359,7 +1356,7 @@ export default {
                     XEUtils.each(column.slots, (func) => {
                         if (!XEUtils.isFunction(func)) {
                             if (!slots[func]) {
-                                errLog('vxe.error.notSlot', [`[grid] ${func}`]);
+                                errLog('vxe.error.notSlot', [func]);
                             }
                         }
                     });
@@ -1383,7 +1380,7 @@ export default {
                             slotConf[slotKey] = slots[slotFunc];
                         }
                         else {
-                            errLog('vxe.error.notSlot', [`[grid] ${slotFunc}`]);
+                            errLog('vxe.error.notSlot', [slotFunc]);
                         }
                     }
                     else {
@@ -1443,7 +1440,7 @@ export default {
                         return slots[funcSlot];
                     }
                     else {
-                        errLog('vxe.error.notSlot', [`[grid] ${funcSlot}`]);
+                        errLog('vxe.error.notSlot', [funcSlot]);
                     }
                 }
                 else {
@@ -1671,7 +1668,7 @@ export default {
                         childVNs.push($xeGrid.renderPager(h));
                         break;
                     default:
-                        errLog('vxe.error.notProp', [`[grid] layouts -> ${key}`]);
+                        errLog('vxe.error.notProp', [`layouts -> ${key}`]);
                         break;
                 }
             });
@@ -1738,19 +1735,20 @@ export default {
         const VxeUIPagerComponent = 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) {
-            errLog('vxe.error.delProp', ['[grid] toolbar', 'toolbar-config']);
+            errLog('vxe.error.delProp', ['toolbar', 'toolbar-config']);
         }
         if (props.toolbarConfig && !XEUtils.isObject(props.toolbarConfig)) {
-            errLog('vxe.error.errProp', [`[grid] toolbar-config=${props.toolbarConfig}`, 'toolbar-config={}']);
+            errLog('vxe.error.errProp', [`toolbar-config=${props.toolbarConfig}`, 'toolbar-config={}']);
         }
         if (proxyOpts.props) {
-            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) {