vxe-table 4.3.6 → 4.3.8

package/es/input/src/input.js

@@ -1,3 +1,12 @@
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { defineComponent, h, Teleport, ref, computed, reactive, inject, nextTick, watch, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
@@ -741,17 +750,23 @@ export default defineComponent({
                 var dateMultipleValue = computeDateMultipleValue.value;
                 if (isDateTimeType) {
                     // 如果是datetime特殊类型
-                    var dateListValue = computeDateListValue.value;
+                    var dateListValue = __spreadArray([], computeDateListValue.value, true);
                     var datetimeRest_1 = [];
+                    var eqIndex = XEUtils.findIndexOf(dateListValue, function (val) { return XEUtils.isDateSame(date, val, 'yyyyMMdd'); });
+                    if (eqIndex === -1) {
+                        dateListValue.push(date);
+                    }
+                    else {
+                        dateListValue.splice(eqIndex, 1);
+                    }
                     dateListValue.forEach(function (item) {
-                        if (item && !XEUtils.isDateSame(date, item, 'yyyyMMdd')) {
+                        if (item) {
                             item.setHours(datetimePanelValue.getHours());
                             item.setMinutes(datetimePanelValue.getMinutes());
                             item.setSeconds(datetimePanelValue.getSeconds());
                             datetimeRest_1.push(item);
                         }
                     });
-                    datetimeRest_1.push(date);
                     emitModel(datetimeRest_1.map(function (date) { return XEUtils.toDateString(date, dateValueFormat); }).join(','), { type: 'update' });
                 }
                 else {
@@ -1206,10 +1221,36 @@ export default defineComponent({
         };
         var dateConfirmEvent = function () {
             var multiple = props.multiple;
+            var datetimePanelValue = reactData.datetimePanelValue;
             var dateValue = computeDateValue.value;
             var isDateTimeType = computeIsDateTimeType.value;
-            if (isDateTimeType || multiple) {
-                dateChange(dateValue || reactData.currentDate);
+            if (isDateTimeType) {
+                var dateValueFormat_1 = computeDateValueFormat.value;
+                if (multiple) {
+                    // 如果为多选
+                    var dateMultipleValue = computeDateMultipleValue.value;
+                    if (isDateTimeType) {
+                        // 如果是datetime特殊类型
+                        var dateListValue = __spreadArray([], computeDateListValue.value, true);
+                        var datetimeRest_2 = [];
+                        dateListValue.forEach(function (item) {
+                            if (item) {
+                                item.setHours(datetimePanelValue.getHours());
+                                item.setMinutes(datetimePanelValue.getMinutes());
+                                item.setSeconds(datetimePanelValue.getSeconds());
+                                datetimeRest_2.push(item);
+                            }
+                        });
+                        emitModel(datetimeRest_2.map(function (date) { return XEUtils.toDateString(date, dateValueFormat_1); }).join(','), { type: 'update' });
+                    }
+                    else {
+                        // 如果是日期类型
+                        emitModel(dateMultipleValue.join(','), { type: 'update' });
+                    }
+                }
+                else {
+                    dateChange(dateValue || reactData.currentDate);
+                }
             }
             hidePanel();
         };

package/es/loading/src/loading.js

@@ -7,7 +7,8 @@ export default defineComponent({
         icon: String,
         text: String
     },
-    setup: function (props) {
+    setup: function (props, _a) {
+        var slots = _a.slots;
         var computeLoadingIcon = computed(function () {
             return props.icon || GlobalConfig.icon.LOADING;
         });
@@ -22,7 +23,11 @@ export default defineComponent({
                 class: ['vxe-loading', {
                         'is--visible': props.modelValue
                     }]
-            }, [
+            }, slots.default ? [
+                h('div', {
+                    class: 'vxe-loading--warpper'
+                }, slots.default({}))
+            ] : [
                 h('div', {
                     class: 'vxe-loading--chunk'
                 }, [

package/es/loading/style.css

@@ -41,7 +41,7 @@
 .vxe-loading.is--visible {
   display: block;
 }
-.vxe-loading > .vxe-loading--chunk {
+.vxe-loading > .vxe-loading--chunk, .vxe-loading > .vxe-loading--warpper {
   width: 100%;
   position: absolute;
   top: 50%;