vxe-table 3.6.9 → 3.6.10-beta.0

package/lib/index.umd.js

@@ -17813,8 +17813,14 @@ var Methods = {
       column = params.column;
     var cell = evnt.currentTarget;
     this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
-    if (isEnableConf(editConfig)) {
-      if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
+    // 单元格处于编辑状态时不触发提示框
+    if (column.editRender && isEnableConf(editConfig)) {
+      // 如果是行编辑模式
+      if (editOpts.mode === 'row' && actived.row === row) {
+        return;
+      }
+      // 如果是单元格编辑模式
+      if (actived.row === row && actived.column === column) {
         return;
       }
     }
@@ -24758,6 +24764,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
+
 
 
 var yearSize = 12;
@@ -26623,8 +26630,39 @@ function renderExtraSuffixIcon(h, _vm) {
       this.dateTimeChangeEvent(evnt);
     },
     dateConfirmEvent: function dateConfirmEvent() {
-      if (this.isDateTimeType || this.multiple) {
-        this.dateChange(this.dateValue || this.currentDate);
+      var datetimePanelValue = this.datetimePanelValue,
+        isDateTimeType = this.isDateTimeType,
+        dateValueFormat = this.dateValueFormat,
+        dateMultipleValue = this.dateMultipleValue;
+      if (this.isDateTimeType) {
+        if (this.multiple) {
+          // 如果为多选
+          if (isDateTimeType) {
+            // 如果是datetime特殊类型
+            var dateListValue = this.dateListValue;
+            var datetimeRest = [];
+            dateListValue.forEach(function (item) {
+              if (item) {
+                item.setHours(datetimePanelValue.getHours());
+                item.setMinutes(datetimePanelValue.getMinutes());
+                item.setSeconds(datetimePanelValue.getSeconds());
+                datetimeRest.push(item);
+              }
+            });
+            this.emitModel(datetimeRest.map(function (date) {
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(date, dateValueFormat);
+            }).join(','), {
+              type: 'update'
+            });
+          } else {
+            // 如果是日期类型
+            this.emitModel(dateMultipleValue.join(','), {
+              type: 'update'
+            });
+          }
+        } else {
+          this.dateChange(this.dateValue || this.currentDate);
+        }
       }
       this.hidePanel();
     },
@@ -26828,15 +26866,22 @@ function renderExtraSuffixIcon(h, _vm) {
           // 如果是datetime特殊类型
           var dateListValue = this.dateListValue;
           var datetimeRest = [];
+          var eqIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(dateListValue, function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, val, 'yyyyMMdd');
+          });
+          if (eqIndex === -1) {
+            dateListValue.push(date);
+          } else {
+            dateListValue.splice(eqIndex, 1);
+          }
           dateListValue.forEach(function (item) {
-            if (item && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, item, 'yyyyMMdd')) {
+            if (item) {
               item.setHours(datetimePanelValue.getHours());
               item.setMinutes(datetimePanelValue.getMinutes());
               item.setSeconds(datetimePanelValue.getSeconds());
               datetimeRest.push(item);
             }
           });
-          datetimeRest.push(date);
           this.emitModel(datetimeRest.map(function (date) {
             return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(date, dateValueFormat);
           }).join(','), {