vxe-table 3.9.0-rc.11 → 3.9.0-rc.13

package/es/grid/src/grid.js

@@ -7,11 +7,15 @@ import VxeToolbarComponent from '../../toolbar/src/toolbar';
 import tableComponentProps from '../../table/src/props';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
-const { getConfig, getI18n, commands, globalEvents, globalMixins } = VxeUI;
+const { getConfig, getI18n, commands, globalEvents, globalMixins, renderEmptyElement } = VxeUI;
 const methods = {};
 const propKeys = Object.keys(tableComponentProps);
-function renderDefaultForm(h, _vm) {
-    const { $scopedSlots, proxyConfig, proxyOpts, formData, formConfig, formOpts } = _vm;
+function renderDefaultForm(h, $xeGrid) {
+    const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
+    const props = $xeGrid;
+    const slots = $xeGrid.$scopedSlots;
+    const { proxyConfig, formConfig } = props;
+    const { proxyOpts, formData, formOpts } = $xeGrid;
     if (isEnableConf(formConfig) && formOpts.items && formOpts.items.length) {
         const formSlots = {};
         if (!formOpts.inited) {
@@ -19,7 +23,7 @@ function renderDefaultForm(h, _vm) {
             const beforeItem = proxyOpts.beforeItem;
             if (proxyOpts && beforeItem) {
                 formOpts.items.forEach((item) => {
-                    beforeItem.call(_vm, { $grid: _vm, item });
+                    beforeItem.call($xeGrid, { $grid: $xeGrid, item });
                 });
             }
         }
@@ -27,39 +31,41 @@ function renderDefaultForm(h, _vm) {
         formOpts.items.forEach((item) => {
             XEUtils.each(item.slots, (func) => {
                 if (!XEUtils.isFunction(func)) {
-                    if ($scopedSlots[func]) {
-                        formSlots[func] = $scopedSlots[func];
+                    if (slots[func]) {
+                        formSlots[func] = slots[func];
                     }
                 }
             });
         });
         return [
-            h('vxe-form', {
-                props: Object.assign({}, formOpts, {
-                    data: proxyConfig && proxyOpts.form ? formData : formOpts.data
-                }),
-                on: {
-                    submit: _vm.submitEvent,
-                    reset: _vm.resetEvent,
-                    collapse: _vm.collapseEvent,
-                    'submit-invalid': _vm.submitInvalidEvent
-                },
-                scopedSlots: formSlots
-            })
+            VxeUIFormComponent
+                ? h(VxeUIFormComponent, {
+                    props: Object.assign({}, formOpts, {
+                        data: proxyConfig && proxyOpts.form ? formData : formOpts.data
+                    }),
+                    on: {
+                        submit: $xeGrid.submitEvent,
+                        reset: $xeGrid.resetEvent,
+                        collapse: $xeGrid.collapseEvent,
+                        'submit-invalid': $xeGrid.submitInvalidEvent
+                    },
+                    scopedSlots: formSlots
+                })
+                : renderEmptyElement($xeGrid)
         ];
     }
     return [];
 }
-function getFuncSlot(_vm, optSlots, slotKey) {
-    const { $scopedSlots } = _vm;
+function getFuncSlot($xeGrid, optSlots, slotKey) {
+    const slots = $xeGrid.$scopedSlots;
     const funcSlot = optSlots[slotKey];
     if (funcSlot) {
         if (XEUtils.isString(funcSlot)) {
-            if ($scopedSlots[funcSlot]) {
-                return $scopedSlots[funcSlot];
+            if (slots[funcSlot]) {
+                return slots[funcSlot];
             }
             else {
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                     errLog('vxe.error.notSlot', [funcSlot]);
                 }
             }
@@ -76,7 +82,7 @@ function getToolbarSlots(_vm) {
     let buttonsSlot;
     let toolsSlot;
     const slots = {};
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
         if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
             warnLog('vxe.error.reqProp', ['toolbar-config.slots.buttons']);
         }
@@ -240,8 +246,11 @@ function renderBottom(h, _vm) {
 /**
  * 渲染分页
  */
-function renderPager(h, _vm) {
-    const { _e, $scopedSlots, pagerConfig, proxyConfig, tablePage } = _vm;
+function renderPager(h, $xeGrid) {
+    const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
+    const props = $xeGrid;
+    const { pagerConfig, proxyConfig } = props;
+    const { $scopedSlots, tablePage } = $xeGrid;
     const pagerSlot = $scopedSlots.pager;
     const hasPager = !!(pagerSlot || isEnableConf(pagerConfig));
     if (hasPager) {
@@ -250,18 +259,20 @@ function renderPager(h, _vm) {
             ref: 'pagerWrapper',
             class: 'vxe-grid--pager-wrapper'
         }, pagerSlot
-            ? pagerSlot.call(_vm, { $grid: _vm }, h)
+            ? pagerSlot.call($xeGrid, { $grid: $xeGrid }, h)
             : [
-                h('vxe-pager', {
-                    props: Object.assign(Object.assign({}, _vm.pagerOpts), (proxyConfig ? tablePage : {})),
-                    on: {
-                        'page-change': _vm.pageChangeEvent
-                    },
-                    scopedSlots: getPagerSlots(_vm)
-                })
+                VxeUIPagerComponent
+                    ? h(VxeUIPagerComponent, {
+                        props: Object.assign(Object.assign({}, $xeGrid.pagerOpts), (proxyConfig ? tablePage : {})),
+                        on: {
+                            'page-change': $xeGrid.pageChangeEvent
+                        },
+                        scopedSlots: getPagerSlots($xeGrid)
+                    })
+                    : renderEmptyElement($xeGrid)
             ]);
     }
-    return _e();
+    return renderEmptyElement($xeGrid);
 }
 const defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager'];
 function renderLayout(h, _vm) {
@@ -296,7 +307,7 @@ function renderLayout(h, _vm) {
                 vns.push(renderPager(h, _vm));
                 break;
             default:
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                     errLog('vxe.error.notProp', [`layouts -> ${name}`]);
                 }
                 break;
@@ -322,6 +333,7 @@ export default {
         };
     },
     data() {
+        var _a;
         return {
             tableLoading: false,
             isZMax: false,
@@ -332,7 +344,7 @@ export default {
             tZindex: 0,
             tablePage: {
                 total: 0,
-                pageSize: getConfig().pager.pageSize || 10,
+                pageSize: ((_a = getConfig().pager) === null || _a === void 0 ? void 0 : _a.pageSize) || 10,
                 currentPage: 1
             }
         };
@@ -431,11 +443,13 @@ export default {
         }
     },
     created() {
+        const $xeGrid = this;
+        const props = $xeGrid;
         // const { data, formOpts, proxyOpts, proxyConfig } = this
         // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
         //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
         // }
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             if (this.toolbar) {
                 warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
             }
@@ -446,6 +460,23 @@ export default {
             //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
             // }
         }
+        if (process.env.NODE_ENV === 'development') {
+            // 使用已安装的组件，如果未安装则不渲染
+            const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
+            const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
+            $xeGrid.$nextTick(() => {
+                if (props.formConfig) {
+                    if (!VxeUIFormComponent) {
+                        errLog('vxe.error.reqComp', ['vxe-form']);
+                    }
+                }
+                if (props.pagerConfig) {
+                    if (!VxeUIPagerComponent) {
+                        errLog('vxe.error.reqComp', ['vxe-pager']);
+                    }
+                }
+            });
+        }
         this.initPages();
         globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
     },
@@ -627,8 +658,11 @@ export default {
                             }
                         }
                         if (isInited) {
-                            const { sortOpts } = $xetable;
-                            let defaultSort = sortOpts.defaultSort;
+                            let defaultSort = null;
+                            if ($xetable) {
+                                const { sortOpts } = $xetable;
+                                defaultSort = sortOpts.defaultSort;
+                            }
                             // 如果使用默认排序
                             if (defaultSort) {
                                 if (!XEUtils.isArray(defaultSort)) {
@@ -642,15 +676,19 @@ export default {
                                     };
                                 });
                             }
-                            filterList = $xetable.getCheckedFilters();
+                            if ($xetable) {
+                                filterList = $xetable.getCheckedFilters();
+                            }
                         }
                         else {
-                            if (isReload) {
-                                $xetable.clearAll();
-                            }
-                            else {
-                                sortList = $xetable.getSortColumns();
-                                filterList = $xetable.getCheckedFilters();
+                            if ($xetable) {
+                                if (isReload) {
+                                    $xetable.clearAll();
+                                }
+                                else {
+                                    sortList = $xetable.getSortColumns();
+                                    filterList = $xetable.getCheckedFilters();
+                                }
                             }
                         }
                         const commitParams = {
@@ -710,7 +748,7 @@ export default {
                         });
                     }
                     else {
-                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (process.env.NODE_ENV === 'development') {
                             errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
                         }
                     }
@@ -738,7 +776,7 @@ export default {
                                     $xetable.setPendingRow(removeRecords, false);
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                                        if (process.env.NODE_ENV === 'development') {
                                             if (!VxeUI.modal) {
                                                 errLog('vxe.error.reqModule', ['Modal']);
                                             }
@@ -760,7 +798,7 @@ export default {
                                     this.tableLoading = false;
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                                        if (process.env.NODE_ENV === 'development') {
                                             if (!VxeUI.modal) {
                                                 errLog('vxe.error.reqModule', ['Modal']);
                                             }
@@ -777,7 +815,7 @@ export default {
                         else {
                             if (isActiveMsg) {
                                 // 检测弹窗模块
-                                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                                if (process.env.NODE_ENV === 'development') {
                                     if (!VxeUI.modal) {
                                         errLog('vxe.error.reqModule', ['Modal']);
                                     }
@@ -787,7 +825,7 @@ export default {
                         }
                     }
                     else {
-                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (process.env.NODE_ENV === 'development') {
                             errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
                         }
                     }
@@ -828,7 +866,7 @@ export default {
                                     $xetable.clearPendingRow();
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                                        if (process.env.NODE_ENV === 'development') {
                                             if (!VxeUI.modal) {
                                                 errLog('vxe.error.reqModule', ['Modal']);
                                             }
@@ -850,7 +888,7 @@ export default {
                                     this.tableLoading = false;
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                                        if (process.env.NODE_ENV === 'development') {
                                             if (!VxeUI.modal) {
                                                 errLog('vxe.error.reqModule', ['Modal']);
                                             }
@@ -866,7 +904,7 @@ export default {
                             else {
                                 if (isActiveMsg) {
                                     // 检测弹窗模块
-                                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                                    if (process.env.NODE_ENV === 'development') {
                                         if (!VxeUI.modal) {
                                             errLog('vxe.error.reqModule', ['Modal']);
                                         }
@@ -877,7 +915,7 @@ export default {
                         });
                     }
                     else {
-                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (process.env.NODE_ENV === 'development') {
                             errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
                         }
                     }
@@ -890,7 +928,7 @@ export default {
                             gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args);
                         }
                         else {
-                            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                            if (process.env.NODE_ENV === 'development') {
                                 errLog('vxe.error.notCommands', [code]);
                             }
                         }
@@ -920,7 +958,7 @@ export default {
                 }
                 else {
                     // 检测弹窗模块
-                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (process.env.NODE_ENV === 'development') {
                         if (!VxeUI.modal) {
                             errLog('vxe.error.reqModule', ['Modal']);
                         }
@@ -973,7 +1011,7 @@ export default {
             else {
                 if (isActiveMsg) {
                     // 检测弹窗模块
-                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (process.env.NODE_ENV === 'development') {
                         if (!VxeUI.modal) {
                             errLog('vxe.error.reqModule', ['Modal']);
                         }
@@ -1090,7 +1128,7 @@ export default {
                 };
             }
             return null;
-        } }), (process.env.VUE_APP_VXE_TABLE_ENV === 'development'
+        } }), (process.env.NODE_ENV === 'development'
         ? {
             loadColumn(columns) {
                 const { $scopedSlots } = this;