vxe-table 4.2.6-beta.0 → 4.2.6-beta.3

package/es/edit/src/hook.js

@@ -607,17 +607,18 @@ var editHook = {
                 var editConfig = props.editConfig, mouseConfig = props.mouseConfig;
                 var editStore = reactData.editStore, tableColumn = reactData.tableColumn;
                 var editOpts = computeEditOpts.value;
-                var mode = editOpts.mode, activeMethod = editOpts.activeMethod;
+                var mode = editOpts.mode;
                 var actived = editStore.actived;
                 var row = params.row, column = params.column;
                 var editRender = column.editRender;
                 var cell = (params.cell || $xetable.getCell(row, column));
+                var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
                 params.cell = cell;
                 if (isEnableConf(editConfig) && isEnableConf(editRender) && cell) {
                     if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
                         // 判断是否禁用编辑
                         var type = 'edit-disabled';
-                        if (!activeMethod || activeMethod(__assign(__assign({}, params), { $table: $xetable }))) {
+                        if (!beforeEditMethod || beforeEditMethod(__assign(__assign({}, params), { $table: $xetable }))) {
                             if (mouseConfig) {
                                 editMethods.clearSelected();
                                 if ($xetable.clearCellAreas) {

package/es/form/src/form.js

@@ -19,6 +19,7 @@ import { scrollToView } from '../../tools/dom';
 import { createItem, handleFieldOrItem } from './util';
 import { useSize } from '../../hooks/size';
 import VxeFormConfigItem from './form-config-item';
+import VxeLoading from '../../loading/index';
 var Rule = /** @class */ (function () {
     function Rule(rule) {
         Object.assign(this, {
@@ -567,15 +568,13 @@ export default defineComponent({
                     class: 'vxe-form-slots',
                     ref: 'hideItem'
                 }, customLayout ? [] : (defaultSlot ? defaultSlot({}) : [])),
-                h('div', {
-                    class: ['vxe-loading', {
-                            'is--visible': loading
-                        }]
-                }, [
-                    h('div', {
-                        class: 'vxe-loading--spinner'
-                    })
-                ]),
+                /**
+                 * 加载中
+                 */
+                h(VxeLoading, {
+                    class: 'vxe-form--loading',
+                    loading: loading
+                }),
                 /**
                  * 工具提示
                  */

package/es/form/style.css

@@ -162,7 +162,8 @@
     flex-shrink: 0; }
   .vxe-form--item .vxe-form--item-inner .vxe-form--item-content {
     position: relative;
-    flex-grow: 1; }
+    flex-grow: 1;
+    word-break: break-all; }
 
 .vxe-form--item .vxe-default-input,
 .vxe-form--item .vxe-default-textarea,

package/es/grid/src/grid.js

@@ -59,7 +59,7 @@ export default defineComponent({
             tZindex: 0,
             tablePage: {
                 total: 0,
-                pageSize: 10,
+                pageSize: GlobalConfig.pager.pageSize || 10,
                 currentPage: 1
             }
         });
@@ -162,12 +162,15 @@ export default defineComponent({
             clss.push(rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : '');
             return clss;
         };
-        var handleActiveMethod = function (params) {
+        var handleBeforeEditMethod = function (params) {
             var editConfig = props.editConfig;
             var pendingRecords = reactData.pendingRecords;
             var $xetable = refTable.value;
-            var activeMethod = editConfig ? editConfig.activeMethod : null;
-            return $xetable.findRowIndexOf(pendingRecords, params.row) === -1 && (!activeMethod || activeMethod(__assign(__assign({}, params), { $grid: $xegrid })));
+            var beforeEditMethod = editConfig ? (editConfig.beforeEditMethod || editConfig.activeMethod) : null;
+            if ($xetable.findRowIndexOf(pendingRecords, params.row) === -1) {
+                return !beforeEditMethod || beforeEditMethod(__assign(__assign({}, params), { $grid: $xegrid }));
+            }
+            return false;
         };
         var computeTableProps = computed(function () {
             var seqConfig = props.seqConfig, pagerConfig = props.pagerConfig, loading = props.loading, editConfig = props.editConfig, proxyConfig = props.proxyConfig;
@@ -192,7 +195,7 @@ export default defineComponent({
                 }
             }
             if (editConfig) {
-                tableProps.editConfig = Object.assign({}, editConfig, { activeMethod: handleActiveMethod });
+                tableProps.editConfig = Object.assign({}, editConfig, { beforeEditMethod: handleBeforeEditMethod });
             }
             return tableProps;
         });

package/es/list/src/list.js

@@ -5,6 +5,7 @@ import { useSize } from '../../hooks/size';
 import { createResizeEvent } from '../../tools/resize';
 import { browse } from '../../tools/dom';
 import { GlobalEvent } from '../../tools/event';
+import VxeLoading from '../../loading/index';
 export default defineComponent({
     name: 'VxeList',
     props: {
@@ -305,15 +306,13 @@ export default defineComponent({
                         }
                     }, slots.default ? slots.default({ items: items, $list: $xelist }) : [])
                 ]),
-                h('div', {
-                    class: ['vxe-list--loading vxe-loading', {
-                            'is--visible': loading
-                        }]
-                }, [
-                    h('div', {
-                        class: 'vxe-loading--spinner'
-                    })
-                ])
+                /**
+                 * 加载中
+                 */
+                h(VxeLoading, {
+                    class: 'vxe-list--loading',
+                    loading: loading
+                })
             ]);
         };
         $xelist.renderVN = renderVN;

package/es/loading/index.js

@@ -0,0 +1,7 @@
+import VxeLoading from './src/loading';
+export var Loading = Object.assign(VxeLoading, {
+    install: function (app) {
+        app.component(VxeLoading.name, VxeLoading);
+    }
+});
+export default VxeLoading;

package/es/loading/src/loading.js

@@ -0,0 +1,31 @@
+import { defineComponent, h } from 'vue';
+import GlobalConfig from '../../v-x-e-table/src/conf';
+export default defineComponent({
+    name: 'VxeLoading',
+    props: {
+        loading: Boolean
+    },
+    render: function () {
+        var icon = GlobalConfig.icon.LOADING;
+        var loadingText = GlobalConfig.loadingText;
+        var text = loadingText === null ? loadingText : GlobalConfig.i18n('vxe.loading.text');
+        return h('div', {
+            class: ['vxe-loading', {
+                    'is--visible': this.loading
+                }]
+        }, [
+            h('div', {
+                class: 'vxe-loading--chunk'
+            }, [
+                icon ? h('i', {
+                    class: icon
+                }) : h('div', {
+                    class: 'vxe-loading--spinner'
+                }),
+                text ? h('div', {
+                    class: 'vxe-loading--text'
+                }, "" + text) : null
+            ])
+        ]);
+    }
+});

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

@@ -1,5 +1,8 @@
 export default {
     vxe: {
+        loading: {
+            text: 'Loading'
+        },
         error: {
             groupFixed: 'If you use group headers, the fixed columns must be set by group.',
             groupMouseRange: 'Grouping headers and "{0}" cannot be used at the same time, which may cause errors.',

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

@@ -1,5 +1,8 @@
 export default {
     vxe: {
+        loading: {
+            text: 'Loading'
+        },
         error: {
             groupFixed: 'グループのヘッダを使用すると、固定列はグループで設定しなければなりません',
             groupMouseRange: 'グループ化ヘッダーと「{0}」は同時に使用できません。これによりエラーが発生する可能性があります',

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

@@ -1,5 +1,8 @@
 export default {
     vxe: {
+        loading: {
+            text: '加载中'
+        },
         error: {
             groupFixed: '如果使用分组表头，固定列必须按组设置',
             groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',

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

@@ -1,5 +1,8 @@
 export default {
     vxe: {
+        loading: {
+            text: '加載中'
+        },
         error: {
             groupFixed: '如果使用分組表頭，固定列必須按組設定',
             groupMouseRange: '分组表頭與 "{0}" 不能同時使用，這可能會出現錯誤',

package/es/modal/src/modal.js

@@ -18,6 +18,7 @@ import { errLog } from '../../tools/log';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import VxeButtonConstructor from '../../button/src/button';
+import VxeLoading from '../../loading/index';
 export var allActivedModals = [];
 export var msgQueue = [];
 export default defineComponent({
@@ -89,7 +90,7 @@ export default defineComponent({
             modalTop: 0,
             modalZindex: 0,
             zoomLocat: null,
-            firstOpen: false
+            firstOpen: true
         });
         var refElem = ref();
         var refModalBox = ref();
@@ -347,13 +348,13 @@ export default defineComponent({
                     nextTick(function () {
                         var fullscreen = props.fullscreen;
                         var firstOpen = reactData.firstOpen;
-                        if (!remember || !firstOpen) {
+                        if (!remember || firstOpen) {
                             updatePosition().then(function () {
                                 setTimeout(function () { return updatePosition(); }, 20);
                             });
                         }
-                        if (!firstOpen) {
-                            reactData.firstOpen = true;
+                        if (firstOpen) {
+                            reactData.firstOpen = false;
                             if (hasPosStorage()) {
                                 restorePosStorage();
                             }
@@ -361,6 +362,11 @@ export default defineComponent({
                                 nextTick(function () { return maximize(); });
                             }
                         }
+                        else {
+                            if (fullscreen) {
+                                nextTick(function () { return maximize(); });
+                            }
+                        }
                     });
                 }
             }
@@ -717,15 +723,13 @@ export default defineComponent({
                 class: 'vxe-modal--content'
             }, defaultSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : defaultSlot({ $modal: $xemodal })) : getFuncText(content)));
             if (!isMsg) {
-                contVNs.push(h('div', {
-                    class: ['vxe-loading', {
-                            'is--visible': props.loading
-                        }]
-                }, [
-                    h('div', {
-                        class: 'vxe-loading--spinner'
-                    })
-                ]));
+                /**
+                 * 加载中
+                 */
+                contVNs.push(h(VxeLoading, {
+                    class: 'vxe-modal--loading',
+                    loading: props.loading
+                }));
             }
             return [
                 h('div', {

package/es/select/style.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /*font*/
 /*size*/
 /*icon*/
@@ -24,69 +23,6 @@
 /*select*/
 /*switch*/
 /*pulldown*/
-/*加载中*/
-.vxe-loading {
-  display: none;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  z-index: 99;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  background-color: rgba(0, 0, 0, 0.2); }
-  .vxe-loading.is--visible {
-    display: block; }
-  .vxe-loading .vxe-loading--spinner {
-    width: 56px;
-    height: 56px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%); }
-    .vxe-loading .vxe-loading--spinner:before, .vxe-loading .vxe-loading--spinner:after {
-      content: "";
-      width: 100%;
-      height: 100%;
-      border-radius: 50%;
-      background-color: #409eff;
-      opacity: 0.6;
-      position: absolute;
-      top: 0;
-      left: 0;
-      -webkit-animation: bounce 2.0s infinite ease-in-out;
-              animation: bounce 2.0s infinite ease-in-out; }
-    .vxe-loading .vxe-loading--spinner:after {
-      -webkit-animation-delay: -1.0s;
-              animation-delay: -1.0s; }
-
-@-webkit-keyframes bounce {
-  0%, 100% {
-    transform: scale(0); }
-  50% {
-    transform: scale(1); } }
-
-@keyframes bounce {
-  0%, 100% {
-    transform: scale(0); }
-  50% {
-    transform: scale(1); } }
-
-.size--mini .vxe-loading .vxe-loading--spinner {
-  width: 38px;
-  height: 38px; }
-
-.size--small .vxe-loading .vxe-loading--spinner {
-  width: 44px;
-  height: 44px; }
-
-.size--medium .vxe-loading .vxe-loading--spinner {
-  width: 50px;
-  height: 50px; }
-
 .vxe-select {
   position: relative;
   display: inline-block;