vxe-table 3.6.8 → 3.6.10-beta.0

package/lib/index.umd.js

@@ -10572,7 +10572,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.8-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.9", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11742,7 +11742,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.8-beta.0",
+  version: "3.6.9",
   reg: reg,
   use: use,
   setup: setup,
@@ -12277,7 +12277,7 @@ function toFilters(filters) {
   }
   return filters;
 }
-function getColMinWidth(params) {
+function getColReMinWidth(params) {
   var $table = params.$table,
     column = params.column,
     cell = params.cell;
@@ -13694,7 +13694,7 @@ var cellType = 'header';
       var pos = dom.getOffsetPos(dragBtnElem, $el);
       var dragBtnWidth = dragBtnElem.clientWidth;
       var dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
-      var minInterval = getColMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
+      var minInterval = getColReMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
       var dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
       var dragPosLeft = pos.left + dragBtnOffsetWidth;
       var domMousemove = document.onmousemove;
@@ -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;
       }
     }
@@ -20407,13 +20413,17 @@ funcs.forEach(function (name) {
     }
   },
   render: function render(h) {
-    var loadingIcon = this.loadingIcon,
+    var $scopedSlots = this.$scopedSlots,
+      loadingIcon = this.loadingIcon,
       loadingText = this.loadingText;
+    var defaultSlot = $scopedSlots.default;
     return h('div', {
       class: ['vxe-loading', {
         'is--visible': this.value
       }]
-    }, [h('div', {
+    }, defaultSlot ? [h('div', {
+      class: 'vxe-loading--warpper'
+    }, defaultSlot.call(this, {}))] : [h('div', {
       class: 'vxe-loading--chunk'
     }, [loadingIcon ? h('i', {
       class: loadingIcon
@@ -21421,6 +21431,7 @@ function handleUupdateResize(_vm) {
   },
   render: function render(h) {
     var _e = this._e,
+      $scopedSlots = this.$scopedSlots,
       tId = this.tId,
       tableData = this.tableData,
       tableColumn = this.tableColumn,
@@ -21578,7 +21589,7 @@ function handleUupdateResize(_vm) {
         icon: loadingOpts.icon,
         text: loadingOpts.text
       }
-    }),
+    }, this.callSlot($scopedSlots.loading, {})),
     /**
      * 筛选
      */
@@ -24753,6 +24764,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
+
 
 
 var yearSize = 12;
@@ -26618,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();
     },
@@ -26823,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(','), {