vxe-table 3.13.16 → 3.13.18

package/es/grid/src/grid.js

@@ -66,9 +66,7 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
                 return slots[funcSlot];
             }
             else {
-                if (process.env.NODE_ENV === 'development') {
-                    errLog('vxe.error.notSlot', [funcSlot]);
-                }
+                errLog('vxe.error.notSlot', [funcSlot]);
             }
         }
         else {
@@ -149,7 +147,7 @@ function renderForm(h, _vm) {
     if (hasForm) {
         return h('div', {
             key: 'form',
-            ref: 'formWrapper',
+            ref: 'refFormWrapper',
             class: 'vxe-grid--form-wrapper'
         }, formSlot ? formSlot.call(_vm, { $grid: _vm }, h) : renderDefaultForm(h, _vm));
     }
@@ -165,7 +163,7 @@ function renderToolbar(h, _vm) {
     if (hasToolbar) {
         return h('div', {
             key: 'toolbar',
-            ref: 'toolbarWrapper',
+            ref: 'refToolbarWrapper',
             class: 'vxe-grid--toolbar-wrapper'
         }, toolbarSlot
             ? toolbarSlot.call(_vm, { $grid: _vm }, h)
@@ -188,7 +186,7 @@ function renderTop(h, _vm) {
     return topSlot
         ? h('div', {
             key: 'top',
-            ref: 'topWrapper',
+            ref: 'refTopWrapper',
             class: 'vxe-grid--top-wrapper'
         }, topSlot.call(_vm, { $grid: _vm }, h))
         : _e();
@@ -239,7 +237,7 @@ function renderBottom(h, _vm) {
     return bottomSlot
         ? h('div', {
             key: 'bottom',
-            ref: 'bottomWrapper',
+            ref: 'refBottomWrapper',
             class: 'vxe-grid--bottom-wrapper'
         }, bottomSlot.call(_vm, { $grid: _vm }, h))
         : _e();
@@ -257,7 +255,7 @@ function renderPager(h, $xeGrid) {
     if (hasPager) {
         return h('div', {
             key: 'pager',
-            ref: 'pagerWrapper',
+            ref: 'refPagerWrapper',
             class: 'vxe-grid--pager-wrapper'
         }, pagerSlot
             ? pagerSlot.call($xeGrid, { $grid: $xeGrid }, h)
@@ -529,34 +527,30 @@ export default {
         // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
         //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
         // }
-        if (process.env.NODE_ENV === 'development') {
-            if (this.toolbar) {
-                warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
-            }
-            if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
-                warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
-            }
-            // if (proxyOpts.props) {
-            //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
-            // }
+        if (this.toolbar) {
+            warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
         }
-        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 (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
+            warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
+        }
+        // if (proxyOpts.props) {
+        //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
+        // }
+        // 使用已安装的组件，如果未安装则不渲染
+        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']);
-                    }
+            }
+            if (props.pagerConfig) {
+                if (!VxeUIPagerComponent) {
+                    errLog('vxe.error.reqComp', ['vxe-pager']);
                 }
-            });
-        }
+            }
+        });
         this.initPages();
         globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
     },
@@ -577,6 +571,7 @@ export default {
         const vSize = $xeGrid.computeSize;
         const styles = $xeGrid.computeStyles;
         return h('div', {
+            ref: 'refElem',
             class: ['vxe-grid', {
                     [`size--${vSize}`]: vSize,
                     'is--animat': !!this.animat,
@@ -599,18 +594,30 @@ export default {
             }
             return [];
         },
-        getParentHeight() {
-            const { $el, isZMax } = this;
-            return (isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle($el.parentNode).height)) - this.getExcludeHeight();
-        },
         /**
          * 获取需要排除的高度
          */
         getExcludeHeight() {
-            const { $refs, $el, isZMax, height } = this;
-            const { formWrapper, toolbarWrapper, topWrapper, bottomWrapper, pagerWrapper } = $refs;
-            const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : getPaddingTopBottomSize($el.parentNode);
-            return parentPaddingSize + getPaddingTopBottomSize($el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+            const $xeGrid = this;
+            const reactData = $xeGrid;
+            const { isZMax } = reactData;
+            const el = $xeGrid.$refs.refElem;
+            const formWrapper = $xeGrid.$refs.refFormWrapper;
+            const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper;
+            const topWrapper = $xeGrid.$refs.refTopWrapper;
+            const bottomWrapper = $xeGrid.$refs.refBottomWrapper;
+            const pagerWrapper = $xeGrid.$refs.refPagerWrapper;
+            const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode);
+            return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+        },
+        getParentHeight() {
+            const $xeGrid = this;
+            const reactData = $xeGrid;
+            const el = $xeGrid.$refs.refElem;
+            if (el) {
+                return (reactData.isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle(el.parentNode).height)) - $xeGrid.getExcludeHeight();
+            }
+            return 0;
         },
         initToolbar() {
             this.$nextTick(() => {
@@ -831,9 +838,7 @@ export default {
                         });
                     }
                     else {
-                        if (process.env.NODE_ENV === 'development') {
-                            errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
-                        }
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
                     }
                     break;
                 }
@@ -859,10 +864,8 @@ export default {
                                     $xetable.setPendingRow(removeRecords, false);
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.NODE_ENV === 'development') {
-                                            if (!VxeUI.modal) {
-                                                errLog('vxe.error.reqModule', ['Modal']);
-                                            }
+                                        if (!VxeUI.modal) {
+                                            errLog('vxe.error.reqModule', ['Modal']);
                                         }
                                         VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
                                     }
@@ -881,10 +884,8 @@ export default {
                                     this.tableLoading = false;
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.NODE_ENV === 'development') {
-                                            if (!VxeUI.modal) {
-                                                errLog('vxe.error.reqModule', ['Modal']);
-                                            }
+                                        if (!VxeUI.modal) {
+                                            errLog('vxe.error.reqModule', ['Modal']);
                                         }
                                         VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
                                     }
@@ -898,19 +899,15 @@ export default {
                         else {
                             if (isActiveMsg) {
                                 // 检测弹窗模块
-                                if (process.env.NODE_ENV === 'development') {
-                                    if (!VxeUI.modal) {
-                                        errLog('vxe.error.reqModule', ['Modal']);
-                                    }
+                                if (!VxeUI.modal) {
+                                    errLog('vxe.error.reqModule', ['Modal']);
                                 }
                                 VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
                             }
                         }
                     }
                     else {
-                        if (process.env.NODE_ENV === 'development') {
-                            errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
-                        }
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
                     }
                     break;
                 }
@@ -949,10 +946,8 @@ export default {
                                     $xetable.clearPendingRow();
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.NODE_ENV === 'development') {
-                                            if (!VxeUI.modal) {
-                                                errLog('vxe.error.reqModule', ['Modal']);
-                                            }
+                                        if (!VxeUI.modal) {
+                                            errLog('vxe.error.reqModule', ['Modal']);
                                         }
                                         VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
                                     }
@@ -971,10 +966,8 @@ export default {
                                     this.tableLoading = false;
                                     if (isRespMsg) {
                                         // 检测弹窗模块
-                                        if (process.env.NODE_ENV === 'development') {
-                                            if (!VxeUI.modal) {
-                                                errLog('vxe.error.reqModule', ['Modal']);
-                                            }
+                                        if (!VxeUI.modal) {
+                                            errLog('vxe.error.reqModule', ['Modal']);
                                         }
                                         VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
                                     }
@@ -987,10 +980,8 @@ export default {
                             else {
                                 if (isActiveMsg) {
                                     // 检测弹窗模块
-                                    if (process.env.NODE_ENV === 'development') {
-                                        if (!VxeUI.modal) {
-                                            errLog('vxe.error.reqModule', ['Modal']);
-                                        }
+                                    if (!VxeUI.modal) {
+                                        errLog('vxe.error.reqModule', ['Modal']);
                                     }
                                     VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' });
                                 }
@@ -998,9 +989,7 @@ export default {
                         });
                     }
                     else {
-                        if (process.env.NODE_ENV === 'development') {
-                            errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
-                        }
+                        errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
                     }
                     break;
                 }
@@ -1011,9 +1000,7 @@ export default {
                             gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args);
                         }
                         else {
-                            if (process.env.NODE_ENV === 'development') {
-                                errLog('vxe.error.notCommands', [code]);
-                            }
+                            errLog('vxe.error.notCommands', [code]);
                         }
                     }
                 }
@@ -1041,10 +1028,8 @@ export default {
                 }
                 else {
                     // 检测弹窗模块
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                            errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                    if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                     }
                     VxeUI.modal.message({ id: `msg_${code}`, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
                 }
@@ -1094,10 +1079,8 @@ export default {
             else {
                 if (isActiveMsg) {
                     // 检测弹窗模块
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                            errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                    if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                     }
                     VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' });
                 }