vxe-table 3.13.14 → 3.14.0-beta.0

package/es/table/src/table.js

@@ -1216,7 +1216,9 @@ export default {
     },
     created() {
         const $xeTable = this;
-        const { scrollXStore, sYOpts, scrollYStore, data, editOpts, treeOpts, treeConfig, showOverflow, rowOpts } = Object.assign(this, {
+        const props = $xeTable;
+        const internalData = $xeTable;
+        Object.assign($xeTable, {
             tZindex: 0,
             elemStore: {},
             // 存放横向 X 虚拟滚动相关的信息
@@ -1282,162 +1284,164 @@ export default {
             swYInterval: 0,
             swYTotal: 0
         });
-        if (process.env.NODE_ENV === 'development') {
-            if (this.rowId) {
-                warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
-            }
-            if (this.rowKey) {
-                warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
-            }
-            if (this.columnKey) {
-                warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
-            }
-            if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
-                warnLog('vxe.error.reqProp', ['row-config.keyField']);
-            }
-            if (this.editConfig && editOpts.showStatus && !this.keepSource) {
-                warnLog('vxe.error.reqProp', ['keep-source']);
-            }
-            if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
-                warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
-            }
-            if (treeConfig && !treeOpts.transform && this.stripe) {
-                warnLog('vxe.error.noTree', ['stripe']);
-            }
-            if (this.showFooter && !(this.footerMethod || this.footerData)) {
-                warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
-            }
-            if (rowOpts.height) {
-                warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
-            }
-            if (this.tooltipOpts.enabled) {
-                warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
-            }
-            // if (this.highlightCurrentRow) {
-            //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
-            // }
-            // if (this.highlightHoverRow) {
-            //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
-            // }
-            // if (this.highlightCurrentColumn) {
-            //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
-            // }
-            // if (this.highlightHoverColumn) {
-            //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
-            // }
-            // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-            const { exportConfig, exportOpts, importConfig, importOpts } = this;
-            if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
-                warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
-            }
-            if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
-                warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')]);
-            }
+        const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
+        const { scrollXStore, scrollYStore } = internalData;
+        const sYOpts = $xeTable.computeSYOpts;
+        const editOpts = $xeTable.computeEditOpts;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const radioOpts = $xeTable.computeRadioOpts;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
+        const expandOpts = $xeTable.computeExpandOpts;
+        const rowOpts = $xeTable.computeRowOpts;
+        const customOpts = $xeTable.computeCustomOpts;
+        const mouseOpts = $xeTable.computeMouseOpts;
+        const exportOpts = $xeTable.computeExportOpts;
+        const importOpts = $xeTable.computeImportOpts;
+        if (props.rowId) {
+            warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
-        if (process.env.NODE_ENV === 'development') {
-            const customOpts = this.customOpts;
-            if (!this.id) {
-                if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
-                    errLog('vxe.error.reqProp', ['id']);
-                }
-            }
-            if (this.treeConfig && this.checkboxOpts.range) {
-                errLog('vxe.error.noTree', ['checkbox-config.range']);
-            }
-            if (this.rowOpts.height && !this.showOverflow) {
-                warnLog('vxe.error.notProp', ['table.show-overflow']);
-            }
-            if (!this.handleMousedownCellAreaEvent) {
-                if (this.areaConfig) {
-                    warnLog('vxe.error.notProp', ['area-config']);
-                }
-                if (this.clipConfig) {
-                    warnLog('vxe.error.notProp', ['clip-config']);
-                }
-                if (this.fnrConfig) {
-                    warnLog('vxe.error.notProp', ['fnr-config']);
-                }
-                if (this.mouseOpts.area) {
-                    errLog('vxe.error.notProp', ['mouse-config.area']);
-                    return;
-                }
-            }
-            if (this.dragConfig) {
-                warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
-            }
-            if (this.treeConfig && treeOpts.children) {
-                warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
-            }
-            if (this.treeConfig && treeOpts.line) {
-                warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
-            }
-            if (this.mouseOpts.area && this.mouseOpts.selected) {
-                warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
-            }
-            // if (this.mouseOpts.area && this.checkboxOpts.range) {
-            //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
-            // }
-            if (this.mouseOpts.area && (this.treeConfig && !treeOpts.transform)) {
-                errLog('vxe.error.noTree', ['mouse-config.area']);
-            }
+        if (props.rowKey) {
+            warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
         }
-        // v4 中只支持对象类型
-        if (process.env.NODE_ENV === 'development') {
-            // 在 v3.0 中废弃 context-menu
-            if (this.contextMenu) {
-                warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
-                if (!XEUtils.isObject(this.contextMenu)) {
-                    warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
-                }
-            }
-            if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
-                warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
-            }
-            if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
-                warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
-            }
-            if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
-                warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
-            }
-            if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
-                warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
-            }
-            if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
-                warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
-            }
-            if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
-                warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+        if (props.columnKey) {
+            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)) {
+            warnLog('vxe.error.reqProp', ['row-config.keyField']);
+        }
+        if (props.editConfig && editOpts.showStatus && !props.keepSource) {
+            warnLog('vxe.error.reqProp', ['keep-source']);
+        }
+        if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
+            warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+        }
+        if (treeConfig && !treeOpts.transform && props.stripe) {
+            warnLog('vxe.error.noTree', ['stripe']);
+        }
+        if (props.showFooter && !(props.footerMethod || props.footerData)) {
+            warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
+        }
+        if (rowOpts.height) {
+            warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
+        }
+        if (this.tooltipOpts.enabled) {
+            warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
+        }
+        if (this.highlightCurrentRow) {
+            warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
+        }
+        if (this.highlightHoverRow) {
+            warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
+        }
+        if (this.highlightCurrentColumn) {
+            warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
+        }
+        if (this.highlightHoverColumn) {
+            warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
+        }
+        // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
+        if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
+            warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
+        }
+        if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
+            warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')]);
+        }
+        if (!props.id) {
+            if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+                errLog('vxe.error.reqProp', ['id']);
             }
-            if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
-                warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+        }
+        if (treeConfig && checkboxOpts.range) {
+            errLog('vxe.error.noTree', ['checkbox-config.range']);
+        }
+        if (rowOpts.height && !this.showOverflow) {
+            warnLog('vxe.error.notProp', ['table.show-overflow']);
+        }
+        if (!$xeTable.handleMousedownCellAreaEvent) {
+            if (props.areaConfig) {
+                warnLog('vxe.error.notProp', ['area-config']);
             }
-            if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
-                warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+            if (props.clipConfig) {
+                warnLog('vxe.error.notProp', ['clip-config']);
             }
-            if (this.editConfig && this.editOpts.activeMethod) {
-                warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod']);
+            if (props.fnrConfig) {
+                warnLog('vxe.error.notProp', ['fnr-config']);
             }
-            if (this.treeConfig && this.checkboxOpts.isShiftKey) {
-                errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+            if (mouseOpts.area) {
+                errLog('vxe.error.notProp', ['mouse-config.area']);
+                return;
             }
-            if (this.checkboxOpts.halfField) {
-                warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+        }
+        if (treeConfig && rowOpts.drag && !treeOpts.transform) {
+            warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+        }
+        if (props.dragConfig) {
+            warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
+        }
+        if (props.treeConfig && treeOpts.children) {
+            warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
+        }
+        if (props.treeConfig && treeOpts.line) {
+            warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
+        }
+        if (mouseOpts.area && mouseOpts.selected) {
+            warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+        }
+        if (mouseOpts.area && (props.treeConfig && !treeOpts.transform)) {
+            errLog('vxe.error.noTree', ['mouse-config.area']);
+        }
+        if (props.editConfig && editOpts.activeMethod) {
+            warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod']);
+        }
+        if (props.treeConfig && checkboxOpts.isShiftKey) {
+            errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+        }
+        if (checkboxOpts.halfField) {
+            warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+        }
+        // 在 v3.0 中废弃 context-menu
+        if (this.contextMenu) {
+            warnLog('vxe.error.delProp', ['context-menu', 'menu-config']);
+            if (!XEUtils.isObject(this.contextMenu)) {
+                warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
             }
         }
+        if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
+            warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
+        }
+        if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
+            warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
+        }
+        if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
+            warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
+        }
+        if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
+            warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
+        }
+        if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
+            warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
+        }
+        if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
+            warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+        }
+        if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
+            warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+        }
+        if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
+            warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+        }
         // 检查是否有安装需要的模块
-        if (process.env.NODE_ENV === 'development') {
-            if (this.editConfig && !this._insert) {
-                errLog('vxe.error.reqModule', ['Edit']);
-            }
-            if (this.editRules && !this._validate) {
-                errLog('vxe.error.reqModule', ['Validator']);
-            }
-            if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.handleCellMousedownEvent) {
-                errLog('vxe.error.reqModule', ['Keyboard']);
-            }
-            if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
-                errLog('vxe.error.reqModule', ['Export']);
-            }
+        if (props.editConfig && !$xeTable.insert) {
+            errLog('vxe.error.reqModule', ['Edit']);
+        }
+        if (props.editRules && !$xeTable.validate) {
+            errLog('vxe.error.reqModule', ['Validator']);
+        }
+        if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
+            errLog('vxe.error.reqModule', ['Keyboard']);
+        }
+        if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
+            errLog('vxe.error.reqModule', ['Export']);
         }
         Object.assign(scrollYStore, {
             startIndex: 0,
@@ -1459,15 +1463,15 @@ export default {
             this.handleInitDefaults();
             this.updateStyle();
         });
-        globalEvents.on(this, 'paste', this.handleGlobalPasteEvent);
-        globalEvents.on(this, 'copy', this.handleGlobalCopyEvent);
-        globalEvents.on(this, 'cut', this.handleGlobalCutEvent);
-        globalEvents.on(this, 'mousedown', this.handleGlobalMousedownEvent);
-        globalEvents.on(this, 'blur', this.handleGlobalBlurEvent);
-        globalEvents.on(this, 'mousewheel', this.handleGlobalMousewheelEvent);
-        globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
-        globalEvents.on(this, 'resize', this.handleGlobalResizeEvent);
-        globalEvents.on(this, 'contextmenu', this.handleGlobalContextmenuEvent);
+        globalEvents.on($xeTable, 'paste', this.handleGlobalPasteEvent);
+        globalEvents.on($xeTable, 'copy', this.handleGlobalCopyEvent);
+        globalEvents.on($xeTable, 'cut', this.handleGlobalCutEvent);
+        globalEvents.on($xeTable, 'mousedown', this.handleGlobalMousedownEvent);
+        globalEvents.on($xeTable, 'blur', this.handleGlobalBlurEvent);
+        globalEvents.on($xeTable, 'mousewheel', this.handleGlobalMousewheelEvent);
+        globalEvents.on($xeTable, 'keydown', this.handleGlobalKeydownEvent);
+        globalEvents.on($xeTable, 'resize', this.handleGlobalResizeEvent);
+        globalEvents.on($xeTable, 'contextmenu', this.handleGlobalContextmenuEvent);
         $xeTable.preventEvent(null, 'created');
     },
     mounted() {
@@ -1545,15 +1549,16 @@ export default {
         this.preventEvent(null, 'beforeDestroy');
     },
     destroyed() {
-        globalEvents.off(this, 'paste');
-        globalEvents.off(this, 'copy');
-        globalEvents.off(this, 'cut');
-        globalEvents.off(this, 'mousedown');
-        globalEvents.off(this, 'blur');
-        globalEvents.off(this, 'mousewheel');
-        globalEvents.off(this, 'keydown');
-        globalEvents.off(this, 'resize');
-        globalEvents.off(this, 'contextmenu');
+        const $xeTable = this;
+        globalEvents.off($xeTable, 'paste');
+        globalEvents.off($xeTable, 'copy');
+        globalEvents.off($xeTable, 'cut');
+        globalEvents.off($xeTable, 'mousedown');
+        globalEvents.off($xeTable, 'blur');
+        globalEvents.off($xeTable, 'mousewheel');
+        globalEvents.off($xeTable, 'keydown');
+        globalEvents.off($xeTable, 'resize');
+        globalEvents.off($xeTable, 'contextmenu');
         this.preventEvent(null, 'destroyed');
     },
     render(h) {

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.13.14"}`;
+const version = `table v${"3.14.0-beta.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -503,7 +503,7 @@ var _default = exports.default = {
       });
       return rest;
     },
-    tableProps() {
+    computeTableProps() {
       const {
         isZMax,
         seqConfig,
@@ -514,30 +514,31 @@ var _default = exports.default = {
         proxyOpts,
         tableExtendProps,
         tableLoading,
-        tablePage,
-        tableData
+        tablePage
       } = this;
-      const tableProps = Object.assign({}, tableExtendProps);
+      const tProps = Object.assign({}, tableExtendProps);
       if (isZMax) {
         if (tableExtendProps.maxHeight) {
-          tableProps.maxHeight = '100%';
+          tProps.maxHeight = '100%';
         } else {
-          tableProps.height = '100%';
+          tProps.height = '100%';
         }
       }
       if (proxyConfig) {
-        tableProps.loading = loading || tableLoading;
-        tableProps.data = tableData;
+        tProps.loading = loading || tableLoading;
         if (proxyOpts.seq && (0, _utils.isEnableConf)(pagerConfig)) {
-          tableProps.seqConfig = Object.assign({}, seqConfig, {
+          tProps.seqConfig = Object.assign({}, seqConfig, {
             startIndex: (tablePage.currentPage - 1) * tablePage.pageSize
           });
         }
       }
       if (editConfig) {
-        tableProps.editConfig = Object.assign({}, editConfig);
+        tProps.editConfig = Object.assign({}, editConfig);
       }
-      return tableProps;
+      return tProps;
+    },
+    tableProps() {
+      return this.computeTableProps;
     },
     computeCurrLayoutConf() {
       const $xeGrid = this;
@@ -815,7 +816,7 @@ var _default = exports.default = {
         ajax = {}
       } = proxyOpts;
       const resConfigs = proxyOpts.response || proxyOpts.props || {};
-      const $xetable = $refs.xTable;
+      const $xeTable = $refs.xTable;
       const formData = this.getFormData();
       let button;
       let code;
@@ -886,10 +887,10 @@ var _default = exports.default = {
               }
               if (isInited) {
                 let defaultSort = null;
-                if ($xetable) {
+                if ($xeTable) {
                   const {
                     sortOpts
-                  } = $xetable;
+                  } = $xeTable;
                   defaultSort = sortOpts.defaultSort;
                 }
                 // 如果使用默认排序
@@ -905,16 +906,16 @@ var _default = exports.default = {
                     };
                   });
                 }
-                if ($xetable) {
-                  filterList = $xetable.getCheckedFilters();
+                if ($xeTable) {
+                  filterList = $xeTable.getCheckedFilters();
                 }
               } else {
-                if ($xetable) {
+                if ($xeTable) {
                   if (isReload) {
-                    $xetable.clearAll();
+                    $xeTable.clearAll();
                   } else {
-                    sortList = $xetable.getSortColumns();
-                    filterList = $xetable.getCheckedFilters();
+                    sortList = $xeTable.getSortColumns();
+                    filterList = $xeTable.getCheckedFilters();
                   }
                 }
               }
@@ -936,6 +937,7 @@ var _default = exports.default = {
               this.tableLoading = true;
               const applyArgs = [commitParams].concat(args);
               return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
+                let tableData = [];
                 this.tableLoading = false;
                 if (rest) {
                   if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
@@ -946,7 +948,7 @@ var _default = exports.default = {
                     }) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
                     tablePage.total = _xeUtils.default.toNumber(total);
                     const resultProp = resConfigs.result;
-                    this.tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp({
+                    tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp({
                       data: rest,
                       $grid: this
                     }) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
@@ -957,13 +959,20 @@ var _default = exports.default = {
                     }
                   } else {
                     const listProp = resConfigs.list;
-                    this.tableData = (listProp ? _xeUtils.default.isFunction(listProp) ? listProp({
+                    tableData = (listProp ? _xeUtils.default.isFunction(listProp) ? listProp({
                       data: rest,
                       $grid: this
                     }) : _xeUtils.default.get(rest, listProp) : rest) || [];
                   }
+                }
+                if ($xeTable) {
+                  $xeTable.loadData(tableData);
                 } else {
-                  this.tableData = [];
+                  $xeTable.$nextTick(() => {
+                    if ($xeTable) {
+                      $xeTable.loadData(tableData);
+                    }
+                  });
                 }
                 if (afterQuery) {
                   afterQuery(...applyArgs);
@@ -1000,8 +1009,8 @@ var _default = exports.default = {
             const deleteSuccessMethods = ajax.deleteSuccess;
             const deleteErrorMethods = ajax.deleteError;
             if (ajaxMethods) {
-              const selectRecords = $xetable.getCheckboxRecords();
-              const removeRecords = selectRecords.filter(row => !$xetable.isInsertByRow(row));
+              const selectRecords = $xeTable.getCheckboxRecords();
+              const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
               const body = {
                 removeRecords
               };
@@ -1017,12 +1026,12 @@ var _default = exports.default = {
               if (selectRecords.length) {
                 return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                   if (!removeRecords.length) {
-                    return $xetable.remove(selectRecords);
+                    return $xeTable.remove(selectRecords);
                   }
                   this.tableLoading = true;
                   return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs)).then(rest => {
                     this.tableLoading = false;
-                    $xetable.setPendingRow(removeRecords, false);
+                    $xeTable.setPendingRow(removeRecords, false);
                     if (isRespMsg) {
                       // 检测弹窗模块
                       if (process.env.NODE_ENV === 'development') {
@@ -1139,7 +1148,7 @@ var _default = exports.default = {
                   this.tableLoading = true;
                   return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
                     this.tableLoading = false;
-                    $xetable.clearPendingRow();
+                    $xeTable.clearPendingRow();
                     if (isRespMsg) {
                       // 检测弹窗模块
                       if (process.env.NODE_ENV === 'development') {
@@ -1221,7 +1230,7 @@ var _default = exports.default = {
                   code,
                   button,
                   $grid: this,
-                  $table: $xetable
+                  $table: $xeTable
                 }, ...args);
               } else {
                 if (process.env.NODE_ENV === 'development') {
@@ -1515,16 +1524,16 @@ var _default = exports.default = {
         sortData,
         proxyConfig
       } = this;
-      const $xetable = $refs.xTable;
+      const $xeTable = $refs.xTable;
       if (proxyConfig) {
         return {
-          data: this.tableData,
+          data: $xeTable ? $xeTable.getFullData() : [],
           filter: this.filterData,
           form: this.getFormData(),
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,
-          pendingRecords: $xetable ? $xetable.getPendingRecords() : []
+          pendingRecords: $xeTable ? $xeTable.getPendingRecords() : []
         };
       }
       return null;