vxe-table 3.14.0-beta.0 → 3.14.0-beta.10

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 {
@@ -77,6 +75,26 @@ function getFuncSlot($xeGrid, optSlots, slotKey) {
     }
     return null;
 }
+const getConfigSlot = ($xeGrid, slotConfigs) => {
+    const slots = $xeGrid.$scopedSlots;
+    const slotConf = {};
+    XEUtils.objectMap(slotConfigs, (slotFunc, slotKey) => {
+        if (slotFunc) {
+            if (XEUtils.isString(slotFunc)) {
+                if (slots[slotFunc]) {
+                    slotConf[slotKey] = slots[slotFunc];
+                }
+                else {
+                    errLog('vxe.error.notSlot', [slotFunc]);
+                }
+            }
+            else {
+                slotConf[slotKey] = slotFunc;
+            }
+        }
+    });
+    return slotConf;
+};
 function getToolbarSlots(_vm) {
     const { $scopedSlots, toolbarOpts } = _vm;
     const toolbarOptSlots = toolbarOpts.slots;
@@ -103,24 +121,6 @@ function getToolbarSlots(_vm) {
     }
     return slots;
 }
-function getPagerSlots(_vm) {
-    const { pagerOpts } = _vm;
-    const pagerOptSlots = pagerOpts.slots;
-    const slots = {};
-    let leftSlot;
-    let rightSlot;
-    if (pagerOptSlots) {
-        leftSlot = getFuncSlot(_vm, pagerOptSlots, 'left');
-        rightSlot = getFuncSlot(_vm, pagerOptSlots, 'right');
-        if (leftSlot) {
-            slots.left = leftSlot;
-        }
-        if (rightSlot) {
-            slots.right = rightSlot;
-        }
-    }
-    return slots;
-}
 function getTableOns(_vm) {
     const { $listeners, proxyConfig, proxyOpts } = _vm;
     const ons = {};
@@ -139,6 +139,22 @@ function getTableOns(_vm) {
     }
     return ons;
 }
+function pageChangeEvent($xeGrid, params) {
+    const props = $xeGrid;
+    const reactData = $xeGrid;
+    const { proxyConfig } = props;
+    const { tablePage } = reactData;
+    const { $event, currentPage, pageSize } = params;
+    const proxyOpts = $xeGrid.computeProxyOpts;
+    tablePage.currentPage = currentPage;
+    tablePage.pageSize = pageSize;
+    $xeGrid.dispatchEvent('page-change', params, $event);
+    if (proxyConfig && isEnableConf(proxyOpts)) {
+        $xeGrid.commitProxy('query').then((rest) => {
+            $xeGrid.dispatchEvent('proxy-query', rest, $event);
+        });
+    }
+}
 /**
  * 渲染表单
  */
@@ -149,7 +165,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 +181,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 +204,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 +255,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();
@@ -250,25 +266,30 @@ function renderBottom(h, _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) {
+    const slots = $xeGrid.$scopedSlots;
+    const reactData = $xeGrid;
+    const { proxyConfig, pagerConfig } = props;
+    const proxyOpts = $xeGrid.computeProxyOpts;
+    const pagerOpts = $xeGrid.computePagerOpts;
+    const pagerSlot = slots.pager;
+    if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
         return h('div', {
+            ref: 'refPagerWrapper',
             key: 'pager',
-            ref: 'pagerWrapper',
             class: 'vxe-grid--pager-wrapper'
         }, pagerSlot
-            ? pagerSlot.call($xeGrid, { $grid: $xeGrid }, h)
+            ? pagerSlot.call($xeGrid, { $grid: $xeGrid })
             : [
                 VxeUIPagerComponent
                     ? h(VxeUIPagerComponent, {
-                        props: Object.assign(Object.assign({}, $xeGrid.pagerOpts), (proxyConfig ? tablePage : {})),
+                        ref: 'refPager',
+                        props: Object.assign(Object.assign({}, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
                         on: {
-                            'page-change': $xeGrid.pageChangeEvent
+                            'page-change'(params) {
+                                pageChangeEvent($xeGrid, params);
+                            }
                         },
-                        scopedSlots: getPagerSlots($xeGrid)
+                        scopedSlots: getConfigSlot($xeGrid, pagerOpts.slots)
                     })
                     : renderEmptyElement($xeGrid)
             ]);
@@ -542,23 +563,21 @@ 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']);
-                    }
+        // 使用已安装的组件，如果未安装则不渲染
+        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);
     },
@@ -579,6 +598,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,
@@ -601,18 +621,39 @@ export default {
             }
             return [];
         },
-        getParentHeight() {
-            const { $el, isZMax } = this;
-            return (isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle($el.parentNode).height)) - this.getExcludeHeight();
+        getEl() {
+            const $xeGrid = this;
+            return $xeGrid.$refs.refElem;
         },
         /**
          * 获取需要排除的高度
          */
         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;
+            if (el) {
+                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 parentEl = el.parentElement;
+                const parentPaddingSize = isZMax ? 0 : (parentEl ? getPaddingTopBottomSize(parentEl) : 0);
+                return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+            }
+            return 0;
+        },
+        getParentHeight() {
+            const $xeGrid = this;
+            const reactData = $xeGrid;
+            const el = $xeGrid.$refs.refElem;
+            if (el) {
+                const parentEl = el.parentElement;
+                return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - $xeGrid.getExcludeHeight();
+            }
+            return 0;
         },
         initToolbar() {
             this.$nextTick(() => {
@@ -841,9 +882,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;
                 }
@@ -869,10 +908,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' });
                                     }
@@ -891,10 +928,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' });
                                     }
@@ -908,19 +943,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;
                 }
@@ -959,10 +990,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' });
                                     }
@@ -981,10 +1010,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' });
                                     }
@@ -997,10 +1024,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' });
                                 }
@@ -1008,9 +1033,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;
                 }
@@ -1021,9 +1044,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]);
                         }
                     }
                 }
@@ -1051,10 +1072,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' });
                 }
@@ -1104,27 +1123,13 @@ 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' });
                 }
             }
         },
-        pageChangeEvent(params) {
-            const { proxyConfig, tablePage } = this;
-            const { currentPage, pageSize } = params;
-            tablePage.currentPage = currentPage;
-            tablePage.pageSize = pageSize;
-            this.$emit('page-change', Object.assign({ $grid: this }, params));
-            if (proxyConfig) {
-                this.commitProxy('query').then((rest) => {
-                    this.$emit('proxy-query', Object.assign(Object.assign({}, rest), { $grid: this, $event: params.$event }));
-                });
-            }
-        },
         sortChangeEvent(params) {
             const { $table, column, sortList } = params;
             const isRemote = XEUtils.isBoolean(column.remoteSort) ? column.remoteSort : $table.sortOpts.remote;

package/es/locale/lang/ar-EG.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/de-DE.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'rechts eingefroren',
             cancelFixed: 'Spalte freigeben'
         },
+        datePicker: {
+            yearTitle: '{0} Jahre'
+        },
         input: {
             date: {
                 m1: 'Januar',

package/es/locale/lang/en-US.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'frozen on right',
             cancelFixed: 'Unfreeze column'
         },
+        datePicker: {
+            yearTitle: '{0} years'
+        },
         input: {
             date: {
                 m1: 'January',

package/es/locale/lang/es-ES.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'Freeze on the right',
             cancelFixed: 'Unfreeze column'
         },
+        datePicker: {
+            yearTitle: '{0}'
+        },
         input: {
             date: {
                 m1: 'Enero',

package/es/locale/lang/fr-FR.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/hu-HU.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'lefagyott a jobb oldalon',
             cancelFixed: 'Oldja fel az oszlopot'
         },
+        datePicker: {
+            yearTitle: '{0} év'
+        },
         input: {
             date: {
                 m1: 'január',

package/es/locale/lang/hy-AM.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/id-ID.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/it-IT.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'congelato a destra',
             cancelFixed: 'Sblocca colonna'
         },
+        datePicker: {
+            yearTitle: '{0} anni'
+        },
         input: {
             date: {
                 m1: 'Gennaio',

package/es/locale/lang/ja-JP.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '右側に固定',
             cancelFixed: '列固定を取消'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '1月',

package/es/locale/lang/ko-KR.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '오른쪽에 고정',
             cancelFixed: '고정 해제'
         },
+        datePicker: {
+            yearTitle: '{0} 년'
+        },
         input: {
             date: {
                 m1: '01 월',

package/es/locale/lang/nb-NO.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/pt-BR.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'Freeze on the right',
             cancelFixed: 'Unfreeze column'
         },
+        datePicker: {
+            yearTitle: '{0} лет'
+        },
         input: {
             date: {
                 m1: 'Janeiro',

package/es/locale/lang/ru-RU.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'замер справа',
             cancelFixed: 'Разморозить столбец'
         },
+        datePicker: {
+            yearTitle: '{0} лет'
+        },
         input: {
             date: {
                 m1: 'январь',

package/es/locale/lang/th-TH.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'แช่แข็งทางด้านขวา',
             cancelFixed: 'เลิกตรึงคอลัมน์'
         },
+        datePicker: {
+            yearTitle: '{0} ปี'
+        },
         input: {
             date: {
                 m1: 'มกราคม',

package/es/locale/lang/ug-CN.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'ئوڭ ياندا توڭلىتىش',
             cancelFixed: 'قۇر توڭلىتىشنى ئەمەلدىن قالدۇرۇش'
         },
+        datePicker: {
+            yearTitle: '{0} يىل'
+        },
         input: {
             date: {
                 m1: '01 ئاي',

package/es/locale/lang/uk-UA.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: 'Зафіксувати праворуч',
             cancelFixed: 'Скасувати фіксацію стовпця'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 місяць',

package/es/locale/lang/vi-VN.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/zh-CHT.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '凍結在右側',
             cancelFixed: '取消凍結列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',

package/es/locale/lang/zh-CN.js

@@ -237,6 +237,9 @@ export default {
             fixedRight: '冻结在右侧',
             cancelFixed: '取消冻结列'
         },
+        datePicker: {
+            yearTitle: '{0} 年'
+        },
         input: {
             date: {
                 m1: '01 月',