vxe-table 4.2.6-beta.1 → 4.2.6-beta.4

package/README.md

@@ -28,7 +28,7 @@
 
 ## QQ 交流群
 
-![qq](https://gitee.com/xuliangzhan_admin/vxe-table/raw/master/public/static/donation/qq.png)
+![qq](https://vxetable.cn/static/donation/qq.png)
 
 ## 浏览器支持
 

package/README.zh-TW.md

@@ -25,10 +25,6 @@
   * [x] v3.0 基於 vue2.6+，支持現代瀏覽器並保留相容IE11，提升渲染效能
   * [x] v4.0 基于 vue3.0+，只支持現代瀏覽器，不支持IE
 
-## QQ 交流群
-
-![qq](https://gitee.com/xuliangzhan_admin/vxe-table/raw/master/public/static/donation/qq.png)
-
 ## 瀏覽器支持
 
 ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png)

package/es/edit/src/hook.js

@@ -267,7 +267,7 @@ var editHook = {
                 var treeOpts = computeTreeOpts.value;
                 var transform = treeOpts.transform;
                 var actived = editStore.actived, removeList = editStore.removeList, insertList = editStore.insertList;
-                var property = checkboxOpts.checkField;
+                var checkField = checkboxOpts.checkField;
                 var rest = [];
                 if (!rows) {
                     rows = tableFullData;
@@ -282,7 +282,7 @@ var editHook = {
                     }
                 });
                 // 如果绑定了多选属性，则更新状态
-                if (!property) {
+                if (!checkField) {
                     rows.forEach(function (row) {
                         var sIndex = $xetable.findRowIndexOf(selection, row);
                         if (sIndex > -1) {
@@ -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/export/src/export-panel.js

@@ -2,11 +2,11 @@ import { defineComponent, h, createCommentVNode, ref, computed, reactive, inject
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { formatText } from '../../tools/utils';
-import VxeModalConstructor from '../../modal/src/modal';
-import VxeInputConstructor from '../../input/src/input';
-import VxeCheckboxConstructor from '../../checkbox/src/checkbox';
-import VxeSelectConstructor from '../../select/src/select';
-import VxeButtonConstructor from '../../button/src/button';
+import VxeModalComponent from '../../modal/src/modal';
+import VxeInputComponent from '../../input/src/input';
+import VxeCheckboxComponent from '../../checkbox/src/checkbox';
+import VxeSelectComponent from '../../select/src/select';
+import VxeButtonComponent from '../../button/src/button';
 export default defineComponent({
     name: 'VxeExportPanel',
     props: {
@@ -173,7 +173,7 @@ export default defineComponent({
                     }, colTitle)
                 ]));
             });
-            return h(VxeModalConstructor, {
+            return h(VxeModalComponent, {
                 modelValue: storeData.visible,
                 title: GlobalConfig.i18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
                 width: 660,
@@ -202,7 +202,7 @@ export default defineComponent({
                                     isPrint ? createCommentVNode() : h('tr', [
                                         h('td', GlobalConfig.i18n('vxe.export.expName')),
                                         h('td', [
-                                            h(VxeInputConstructor, {
+                                            h(VxeInputComponent, {
                                                 ref: xInputFilename,
                                                 modelValue: defaultOptions.filename,
                                                 type: 'text',
@@ -217,7 +217,7 @@ export default defineComponent({
                                     isPrint ? createCommentVNode() : h('tr', [
                                         h('td', GlobalConfig.i18n('vxe.export.expType')),
                                         h('td', [
-                                            h(VxeSelectConstructor, {
+                                            h(VxeSelectComponent, {
                                                 modelValue: defaultOptions.type,
                                                 options: storeData.typeList.map(function (item) {
                                                     return {
@@ -234,7 +234,7 @@ export default defineComponent({
                                     isPrint || showSheet ? h('tr', [
                                         h('td', GlobalConfig.i18n('vxe.export.expSheetName')),
                                         h('td', [
-                                            h(VxeInputConstructor, {
+                                            h(VxeInputComponent, {
                                                 ref: xInputSheetname,
                                                 modelValue: defaultOptions.sheetName,
                                                 type: 'text',
@@ -249,7 +249,7 @@ export default defineComponent({
                                     h('tr', [
                                         h('td', GlobalConfig.i18n('vxe.export.expMode')),
                                         h('td', [
-                                            h(VxeSelectConstructor, {
+                                            h(VxeSelectComponent, {
                                                 modelValue: defaultOptions.mode,
                                                 options: storeData.modeList.map(function (item) {
                                                     return {
@@ -306,7 +306,7 @@ export default defineComponent({
                                             h('div', {
                                                 class: 'vxe-export--panel-option-row'
                                             }, [
-                                                h(VxeCheckboxConstructor, {
+                                                h(VxeCheckboxComponent, {
                                                     modelValue: defaultOptions.isHeader,
                                                     title: GlobalConfig.i18n('vxe.export.expHeaderTitle'),
                                                     content: GlobalConfig.i18n('vxe.export.expOptHeader'),
@@ -314,7 +314,7 @@ export default defineComponent({
                                                         defaultOptions.isHeader = value;
                                                     }
                                                 }),
-                                                h(VxeCheckboxConstructor, {
+                                                h(VxeCheckboxComponent, {
                                                     modelValue: defaultOptions.isFooter,
                                                     disabled: !storeData.hasFooter,
                                                     title: GlobalConfig.i18n('vxe.export.expFooterTitle'),
@@ -323,7 +323,7 @@ export default defineComponent({
                                                         defaultOptions.isFooter = value;
                                                     }
                                                 }),
-                                                h(VxeCheckboxConstructor, {
+                                                h(VxeCheckboxComponent, {
                                                     modelValue: defaultOptions.original,
                                                     title: GlobalConfig.i18n('vxe.export.expOriginalTitle'),
                                                     content: GlobalConfig.i18n('vxe.export.expOptOriginal'),
@@ -335,7 +335,7 @@ export default defineComponent({
                                             h('div', {
                                                 class: 'vxe-export--panel-option-row'
                                             }, [
-                                                h(VxeCheckboxConstructor, {
+                                                h(VxeCheckboxComponent, {
                                                     modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
                                                     title: GlobalConfig.i18n('vxe.export.expColgroupTitle'),
                                                     disabled: !isHeader || !hasColgroup || !supportMerge,
@@ -344,7 +344,7 @@ export default defineComponent({
                                                         defaultOptions.isColgroup = value;
                                                     }
                                                 }),
-                                                h(VxeCheckboxConstructor, {
+                                                h(VxeCheckboxComponent, {
                                                     modelValue: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
                                                     title: GlobalConfig.i18n('vxe.export.expMergeTitle'),
                                                     disabled: !hasMerge || !supportMerge || !checkedAll,
@@ -353,7 +353,7 @@ export default defineComponent({
                                                         defaultOptions.isMerge = value;
                                                     }
                                                 }),
-                                                isPrint ? createCommentVNode() : h(VxeCheckboxConstructor, {
+                                                isPrint ? createCommentVNode() : h(VxeCheckboxComponent, {
                                                     modelValue: supportStyle ? defaultOptions.useStyle : false,
                                                     disabled: !supportStyle,
                                                     title: GlobalConfig.i18n('vxe.export.expUseStyleTitle'),
@@ -362,7 +362,7 @@ export default defineComponent({
                                                         defaultOptions.useStyle = value;
                                                     }
                                                 }),
-                                                h(VxeCheckboxConstructor, {
+                                                h(VxeCheckboxComponent, {
                                                     modelValue: hasTree ? defaultOptions.isAllExpand : false,
                                                     disabled: !hasTree,
                                                     title: GlobalConfig.i18n('vxe.export.expAllExpandTitle'),
@@ -380,11 +380,11 @@ export default defineComponent({
                         h('div', {
                             class: 'vxe-export--panel-btns'
                         }, [
-                            h(VxeButtonConstructor, {
+                            h(VxeButtonComponent, {
                                 content: GlobalConfig.i18n('vxe.export.expCancel'),
                                 onClick: cancelEvent
                             }),
-                            h(VxeButtonConstructor, {
+                            h(VxeButtonComponent, {
                                 ref: xButtonConfirm,
                                 status: 'primary',
                                 content: GlobalConfig.i18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm'),

package/es/export/src/import-panel.js

@@ -1,10 +1,10 @@
 import { defineComponent, h, ref, computed, inject, reactive, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
-import VxeModalConstructor from '../../modal/src/modal';
-import VxeRadioGroupConstructor from '../../radio/src/group';
-import VxeRadioConstructor from '../../radio/src/radio';
-import VxeButtonConstructor from '../../button/src/button';
+import VxeModalComponent from '../../modal/src/modal';
+import VxeRadioGroupComponent from '../../radio/src/group';
+import VxeRadioComponent from '../../radio/src/radio';
+import VxeButtonComponent from '../../button/src/button';
 import { parseFile } from '../../tools/utils';
 export default defineComponent({
     name: 'VxeImportPanel',
@@ -79,7 +79,7 @@ export default defineComponent({
             var selectName = computeSelectName.value;
             var hasFile = computeHasFile.value;
             var parseTypeLabel = computeParseTypeLabel.value;
-            return h(VxeModalConstructor, {
+            return h(VxeModalComponent, {
                 modelValue: storeData.visible,
                 title: GlobalConfig.i18n('vxe.import.impTitle'),
                 width: 440,
@@ -130,13 +130,13 @@ export default defineComponent({
                                 h('tr', [
                                     h('td', GlobalConfig.i18n('vxe.import.impOpts')),
                                     h('td', [
-                                        h(VxeRadioGroupConstructor, {
+                                        h(VxeRadioGroupComponent, {
                                             modelValue: defaultOptions.mode,
                                             'onUpdate:modelValue': function (value) {
                                                 defaultOptions.mode = value;
                                             }
                                         }, {
-                                            default: function () { return storeData.modeList.map(function (item) { return h(VxeRadioConstructor, { label: item.value, content: GlobalConfig.i18n(item.label) }); }); }
+                                            default: function () { return storeData.modeList.map(function (item) { return h(VxeRadioComponent, { label: item.value, content: GlobalConfig.i18n(item.label) }); }); }
                                         })
                                     ])
                                 ])
@@ -145,11 +145,11 @@ export default defineComponent({
                         h('div', {
                             class: 'vxe-export--panel-btns'
                         }, [
-                            h(VxeButtonConstructor, {
+                            h(VxeButtonComponent, {
                                 content: GlobalConfig.i18n('vxe.import.impCancel'),
                                 onClick: cancelEvent
                             }),
-                            h(VxeButtonConstructor, {
+                            h(VxeButtonComponent, {
                                 status: 'primary',
                                 disabled: !hasFile,
                                 content: GlobalConfig.i18n('vxe.import.impConfirm'),

package/es/filter/src/hook.js

@@ -120,7 +120,7 @@ var tableFilterHook = {
                         filterStore.maxHeight = maxHeight;
                     });
                 }
-                $xetable.dispatchEvent('filter-visible', { column: column, property: column.property, filterList: $xetable.getCheckedFilters(), visible: filterStore.visible }, evnt);
+                $xetable.dispatchEvent('filter-visible', { column: column, field: column.field, property: column.field, filterList: $xetable.getCheckedFilters(), visible: filterStore.visible }, evnt);
             },
             handleClearFilter: function (column) {
                 if (column) {
@@ -150,7 +150,7 @@ var tableFilterHook = {
                 var filterStore = reactData.filterStore, oldScrollXLoad = reactData.scrollXLoad, oldScrollYLoad = reactData.scrollYLoad;
                 var filterOpts = computeFilterOpts.value;
                 var column = filterStore.column;
-                var property = column.property;
+                var field = column.field;
                 var values = [];
                 var datas = [];
                 column.filters.forEach(function (item) {
@@ -165,7 +165,7 @@ var tableFilterHook = {
                     $xetable.handleTableData(true);
                     $xetable.checkSelectionStatus();
                 }
-                $xetable.dispatchEvent('filter-change', { column: column, property: property, values: values, datas: datas, filters: filterList, filterList: filterList }, evnt);
+                $xetable.dispatchEvent('filter-change', { column: column, field: field, property: field, values: values, datas: datas, filters: filterList, filterList: filterList }, evnt);
                 $xetable.closeFilter();
                 $xetable.updateFooter().then(function () {
                     var scrollXLoad = reactData.scrollXLoad, scrollYLoad = reactData.scrollYLoad;
@@ -259,7 +259,7 @@ var tableFilterHook = {
                 var tableFullColumn = internalData.tableFullColumn;
                 var filterList = [];
                 tableFullColumn.filter(function (column) {
-                    var property = column.property, filters = column.filters;
+                    var field = column.field, filters = column.filters;
                     var valueList = [];
                     var dataList = [];
                     if (filters && filters.length) {
@@ -270,7 +270,7 @@ var tableFilterHook = {
                             }
                         });
                         if (valueList.length) {
-                            filterList.push({ column: column, property: property, values: valueList, datas: dataList });
+                            filterList.push({ column: column, field: field, property: field, values: valueList, datas: dataList });
                         }
                     }
                 });

package/es/form/src/form-item.js

@@ -84,7 +84,7 @@ export default defineComponent({
             var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
             var hasEllipsis = showTitle || showTooltip || showEllipsis;
             var itemVisibleMethod = visibleMethod;
-            var params = { data: data, property: field, item: item, $form: $xeform };
+            var params = { data: data, field: field, property: field, item: item, $form: $xeform };
             var isRequired = false;
             if (rules) {
                 var itemRules = rules[field];

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/src/render.js

@@ -37,7 +37,7 @@ export function renderTitle($xeform, item) {
     var slots = item.slots, field = item.field, itemRender = item.itemRender, titlePrefix = item.titlePrefix, titleSuffix = item.titleSuffix;
     var tooltipOpts = computeTooltipOpts.value;
     var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
-    var params = { data: data, property: field, item: item, $form: $xeform };
+    var params = { data: data, field: field, property: field, item: item, $form: $xeform };
     var titleSlot = slots ? slots.title : null;
     var contVNs = [];
     var titVNs = [];

package/es/grid/src/grid.js

@@ -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.',
@@ -146,6 +149,8 @@ export default {
             operError: 'Error occurred, operation failed!'
         },
         select: {
+            search: 'Search',
+            loadingText: 'Loading',
             emptyText: 'No Data'
         },
         pager: {

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

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

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

@@ -1,5 +1,8 @@
 export default {
     vxe: {
+        loading: {
+            text: '加载中'
+        },
         error: {
             groupFixed: '如果使用分组表头，固定列必须按组设置',
             groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
@@ -146,6 +149,8 @@ export default {
             operError: '发生错误，操作失败！'
         },
         select: {
+            search: '搜索',
+            loadingText: '加载中',
             emptyText: '暂无数据'
         },
         pager: {

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

@@ -1,5 +1,8 @@
 export default {
     vxe: {
+        loading: {
+            text: '加載中'
+        },
         error: {
             groupFixed: '如果使用分組表頭，固定列必須按組設定',
             groupMouseRange: '分组表頭與 "{0}" 不能同時使用，這可能會出現錯誤',
@@ -146,6 +149,8 @@ export default {
             operError: '發生錯誤，操作失敗！'
         },
         select: {
+            search: '蒐索',
+            loadingText: '加載中',
             emptyText: '暫無資料'
         },
         pager: {

package/es/menu/src/hooks.js

@@ -117,12 +117,6 @@ var tableMenuHook = {
         menuPrivateMethods = {
             /**
              * 处理菜单的移动
-             * @param evnt
-             * @param ctxMenuStore
-             * @param property
-             * @param hasOper
-             * @param operRest
-             * @param menuList
              */
             moveCtxMenu: function (evnt, ctxMenuStore, property, hasOper, operRest, menuList) {
                 var selectItem;

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({
@@ -722,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', {