vxe-table 3.13.17 → 3.14.0-beta.1

package/es/grid/src/grid.js

@@ -442,28 +442,30 @@ export default {
             });
             return rest;
         },
-        tableProps() {
-            const { isZMax, seqConfig, pagerConfig, loading, editConfig, proxyConfig, proxyOpts, tableExtendProps, tableLoading, tablePage, tableData } = this;
-            const tableProps = Object.assign({}, tableExtendProps);
+        computeTableProps() {
+            const { isZMax, seqConfig, pagerConfig, loading, editConfig, proxyConfig, proxyOpts, tableExtendProps, tableLoading, tablePage } = this;
+            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 && isEnableConf(pagerConfig)) {
-                    tableProps.seqConfig = Object.assign({}, seqConfig, { startIndex: (tablePage.currentPage - 1) * tablePage.pageSize });
+                    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;
@@ -690,7 +692,7 @@ export default {
             const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, isRespMsg, isActiveMsg, validConfig, pagerOpts } = this;
             const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts;
             const resConfigs = proxyOpts.response || proxyOpts.props || {};
-            const $xetable = $refs.xTable;
+            const $xeTable = $refs.xTable;
             const formData = this.getFormData();
             let button;
             let code;
@@ -755,8 +757,8 @@ export default {
                         }
                         if (isInited) {
                             let defaultSort = null;
-                            if ($xetable) {
-                                const { sortOpts } = $xetable;
+                            if ($xeTable) {
+                                const { sortOpts } = $xeTable;
                                 defaultSort = sortOpts.defaultSort;
                             }
                             // 如果使用默认排序
@@ -772,18 +774,18 @@ export 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();
                                 }
                             }
                         }
@@ -806,6 +808,7 @@ export default {
                         const applyArgs = [commitParams].concat(args);
                         return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs))
                             .then(rest => {
+                            let tableData = [];
                             this.tableLoading = false;
                             if (rest) {
                                 if (pagerConfig && isEnableConf(pagerOpts)) {
@@ -813,7 +816,7 @@ export default {
                                     const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $grid: this }) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
                                     tablePage.total = XEUtils.toNumber(total);
                                     const resultProp = resConfigs.result;
-                                    this.tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: this }) : XEUtils.get(rest, resultProp || 'result')) || [];
+                                    tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: this }) : XEUtils.get(rest, resultProp || 'result')) || [];
                                     // 检验当前页码，不能超出当前最大页数
                                     const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
                                     if (tablePage.currentPage > pageCount) {
@@ -822,11 +825,18 @@ export default {
                                 }
                                 else {
                                     const listProp = resConfigs.list;
-                                    this.tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: this }) : XEUtils.get(rest, listProp)) : rest) || [];
+                                    tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: this }) : XEUtils.get(rest, listProp)) : rest) || [];
                                 }
                             }
+                            if ($xeTable) {
+                                $xeTable.loadData(tableData);
+                            }
                             else {
-                                this.tableData = [];
+                                $xeTable.$nextTick(() => {
+                                    if ($xeTable) {
+                                        $xeTable.loadData(tableData);
+                                    }
+                                });
                             }
                             if (afterQuery) {
                                 afterQuery(...applyArgs);
@@ -855,21 +865,21 @@ export 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 };
                         const commitParams = { $grid: this, code, button, body, form: formData, options: ajaxMethods };
                         const applyArgs = [commitParams].concat(args);
                         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') {
@@ -959,7 +969,7 @@ export default {
                                 return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs))
                                     .then(rest => {
                                     this.tableLoading = false;
-                                    $xetable.clearPendingRow();
+                                    $xeTable.clearPendingRow();
                                     if (isRespMsg) {
                                         // 检测弹窗模块
                                         if (process.env.NODE_ENV === 'development') {
@@ -1021,7 +1031,7 @@ export default {
                     const gCommandOpts = commands.get(code);
                     if (gCommandOpts) {
                         if (gCommandOpts.commandMethod) {
-                            gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args);
+                            gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xeTable }, ...args);
                         }
                         else {
                             if (process.env.NODE_ENV === 'development') {
@@ -1218,16 +1228,16 @@ export default {
         },
         getProxyInfo() {
             const { $refs, 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;