vxe-table 4.2.6-beta.3 → 4.2.6

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) {

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/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

@@ -209,8 +209,8 @@ export default defineComponent({
             });
         };
         var initPages = function () {
-            var pagerConfig = props.pagerConfig;
             var tablePage = reactData.tablePage;
+            var pagerConfig = props.pagerConfig;
             var pagerOpts = computePagerOpts.value;
             var currentPage = pagerOpts.currentPage, pageSize = pagerOpts.pageSize;
             if (pagerConfig) {
@@ -595,9 +595,11 @@ export default defineComponent({
                     });
                     reactData.formData = formData_1;
                 }
-                if (!proxyInited && proxyOpts.autoLoad !== false) {
+                if (!proxyInited) {
                     reactData.proxyInited = true;
-                    nextTick(function () { return gridMethods.commitProxy('_init'); });
+                    if (proxyOpts.autoLoad !== false) {
+                        nextTick(function () { return gridMethods.commitProxy('_init'); });
+                    }
                 }
             }
         };
@@ -1036,12 +1038,12 @@ export default defineComponent({
                 initToolbar();
             }
         });
-        watch(function () { return props.proxyConfig; }, function () {
-            initProxy();
-        });
         watch(function () { return props.pagerConfig; }, function () {
             initPages();
         });
+        watch(function () { return props.proxyConfig; }, function () {
+            initProxy();
+        });
         var handleGlobalKeydownEvent = function (evnt) {
             var zoomOpts = computeZoomOpts.value;
             var isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE);
@@ -1058,6 +1060,7 @@ export default defineComponent({
                 }
             }
         });
+        initPages();
         onMounted(function () {
             nextTick(function () {
                 var data = props.data, columns = props.columns, proxyConfig = props.proxyConfig;
@@ -1070,14 +1073,15 @@ export default defineComponent({
                     $xegrid.loadColumn(columns);
                 }
                 initToolbar();
-                initPages();
-                initProxy();
             });
             GlobalEvent.on($xegrid, 'keydown', handleGlobalKeydownEvent);
         });
         onUnmounted(function () {
             GlobalEvent.off($xegrid, 'keydown');
         });
+        nextTick(function () {
+            initProxy();
+        });
         var renderVN = function () {
             var _a;
             var vSize = computeSize.value;

package/es/input/src/input.js

@@ -38,8 +38,10 @@ export default defineComponent({
         // float
         digits: { type: [String, Number], default: function () { return GlobalConfig.input.digits; } },
         // date、week、month、quarter、year
-        minDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.minDate; } },
-        maxDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.maxDate; } },
+        startDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.startDate; } },
+        endDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.endDate; } },
+        minDate: [String, Number, Date],
+        maxDate: [String, Number, Date],
         // 已废弃 startWeek，被 startDay 替换
         startWeek: Number,
         startDay: { type: [String, Number], default: function () { return GlobalConfig.input.startDay; } },
@@ -161,11 +163,11 @@ export default defineComponent({
             var isPawdType = computeIsPawdType.value;
             return props.clearable && (isPawdType || isNumType || isDatePickerType || type === 'text' || type === 'search');
         });
-        var computeDateMinTime = computed(function () {
-            return props.minDate ? XEUtils.toStringDate(props.minDate) : null;
+        var computeDateStartTime = computed(function () {
+            return props.startDate ? XEUtils.toStringDate(props.startDate) : null;
         });
-        var computeDateMaxTime = computed(function () {
-            return props.maxDate ? XEUtils.toStringDate(props.maxDate) : null;
+        var computeDateEndTime = computed(function () {
+            return props.endDate ? XEUtils.toStringDate(props.endDate) : null;
         });
         var computeSupportMultiples = computed(function () {
             return ['date', 'week', 'month', 'quarter', 'year'].includes(props.type);
@@ -213,18 +215,18 @@ export default defineComponent({
             return val;
         });
         var computeIsDisabledPrevDateBtn = computed(function () {
-            var dateMinTime = computeDateMinTime.value;
+            var dateStartTime = computeDateStartTime.value;
             var selectMonth = reactData.selectMonth;
-            if (selectMonth && dateMinTime) {
-                return selectMonth <= dateMinTime;
+            if (selectMonth && dateStartTime) {
+                return selectMonth <= dateStartTime;
             }
             return false;
         });
         var computeIsDisabledNextDateBtn = computed(function () {
-            var dateMaxTime = computeDateMaxTime.value;
+            var dateEndTime = computeDateEndTime.value;
             var selectMonth = reactData.selectMonth;
-            if (selectMonth && dateMaxTime) {
-                return selectMonth >= dateMaxTime;
+            if (selectMonth && dateEndTime) {
+                return selectMonth >= dateEndTime;
             }
             return false;
         });
@@ -410,9 +412,9 @@ export default defineComponent({
                 var selMonth = selectMonth.getMonth();
                 var selDay = selectMonth.getDay();
                 var prevOffsetDate = -weekDatas.indexOf(selDay);
-                var startDate = new Date(XEUtils.getWhatDay(selectMonth, prevOffsetDate).getTime() + dateHMSTime);
+                var startDayDate = new Date(XEUtils.getWhatDay(selectMonth, prevOffsetDate).getTime() + dateHMSTime);
                 for (var index = 0; index < 42; index++) {
-                    var date = XEUtils.getWhatDay(startDate, index);
+                    var date = XEUtils.getWhatDay(startDayDate, index);
                     var itemFullYear = date.getFullYear();
                     var itemMonth = date.getMonth();
                     var itemDate = date.getDate();
@@ -1203,9 +1205,10 @@ export default defineComponent({
             dateTimeChangeEvent(evnt);
         };
         var dateConfirmEvent = function () {
-            var type = props.type;
+            var multiple = props.multiple;
             var dateValue = computeDateValue.value;
-            if (type === 'datetime') {
+            var isDateTimeType = computeIsDateTimeType.value;
+            if (isDateTimeType || multiple) {
                 dateChange(dateValue || reactData.currentDate);
             }
             hidePanel();

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

@@ -149,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

@@ -149,6 +149,8 @@ export default {
             operError: 'エラーが発生しました。操作が失敗しました'
         },
         select: {
+            search: 'Search',
+            loadingText: 'Loading',
             emptyText: 'データがありません'
         },
         pager: {

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

@@ -149,6 +149,8 @@ export default {
             operError: '发生错误，操作失败！'
         },
         select: {
+            search: '搜索',
+            loadingText: '加载中',
             emptyText: '暂无数据'
         },
         pager: {

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

@@ -149,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;