vxe-table 3.16.0-beta.1 → 3.16.0-beta.3

package/README.md

@@ -60,6 +60,8 @@
 * [x] 虚拟滚动
 * [x] 虚拟合并
 * [x] CSS 变量主题
+* [x] ([企业版](https://vxetable.cn/pluginDocs/)) 数据汇总
+* [x] ([企业版](https://vxetable.cn/pluginDocs/)) 聚合函数
 * [x] ([企业版](https://vxetable.cn/pluginDocs/)) 单元格区域选取
 * [x] ([企业版](https://vxetable.cn/pluginDocs/)) 单元格复制/粘贴
 * [x] ([企业版](https://vxetable.cn/pluginDocs/)) 单元格查找和替换

package/es/grid/src/grid.js

@@ -176,11 +176,12 @@ export default {
             const $xeGrid = this;
             const props = $xeGrid;
             const reactData = $xeGrid.reactData;
-            const { seqConfig, pagerConfig, loading, editConfig, proxyConfig } = props;
-            const { isZMax, tableLoading, tablePage } = reactData;
+            const { seqConfig, pagerConfig, editConfig, proxyConfig } = props;
+            const { isZMax, tablePage } = reactData;
             const tableExtendProps = $xeGrid.computeTableExtendProps;
             const proxyOpts = $xeGrid.computeProxyOpts;
             const pagerOpts = $xeGrid.computePagerOpts;
+            const isLoading = $xeGrid.computeIsLoading;
             const tProps = Object.assign({}, tableExtendProps);
             if (isZMax) {
                 if (tableExtendProps.maxHeight) {
@@ -191,7 +192,7 @@ export default {
                 }
             }
             if (proxyConfig && isEnableConf(proxyOpts)) {
-                tProps.loading = loading || tableLoading;
+                tProps.loading = isLoading;
                 if (pagerConfig && proxyOpts.seq && isEnableConf(pagerOpts)) {
                     tProps.seqConfig = Object.assign({}, seqConfig, { startIndex: (tablePage.currentPage - 1) * tablePage.pageSize });
                 }
@@ -249,6 +250,16 @@ export default {
             const $xeGrid = this;
             const pagerOpts = $xeGrid.computePagerOpts;
             return pagerOpts.total;
+        },
+        computeIsLoading() {
+            const $xeGrid = this;
+            const props = $xeGrid;
+            const reactData = $xeGrid.reactData;
+            const { loading, proxyConfig } = props;
+            const { tableLoading } = reactData;
+            const proxyOpts = $xeGrid.computeProxyOpts;
+            const { showLoading } = proxyOpts;
+            return loading || (tableLoading && showLoading && proxyConfig && isEnableConf(proxyOpts));
         } }),
     watch: {
         columns(value) {
@@ -577,7 +588,7 @@ export default {
                                 reactData.formData = formData;
                             }
                             if ($xeTable) {
-                                const { internalData: tableInternalData } = $xeTable;
+                                const tableInternalData = $xeTable;
                                 const { tableFullColumn, fullColumnFieldData } = tableInternalData;
                                 const sortOpts = $xeTable.computeSortOpts;
                                 let defaultSort = sortOpts.defaultSort;
@@ -1418,6 +1429,7 @@ export default {
             const reactData = $xeGrid.reactData;
             const vSize = $xeGrid.computeSize;
             const styles = $xeGrid.computeStyles;
+            const isLoading = $xeGrid.computeIsLoading;
             return h('div', {
                 ref: 'refElem',
                 class: ['vxe-grid', {
@@ -1425,7 +1437,7 @@ export default {
                         'is--animat': !!props.animat,
                         'is--round': props.round,
                         'is--maximize': reactData.isZMax,
-                        'is--loading': props.loading || reactData.tableLoading
+                        'is--loading': isLoading
                     }],
                 style: styles
             }, $xeGrid.renderLayout(h));