vxe-table 3.8.6 → 3.8.7-beta.0

package/lib/index.umd.js

@@ -11349,7 +11349,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.6", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.7-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13089,7 +13089,7 @@ var setup = setConfig;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.6",
+  version: "3.8.7-beta.0",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -22624,7 +22624,8 @@ var Methods = {
     }
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this58.updateCellAreas();
+      _this58.updateCellAreas();
+      return _this58.updateStyle();
     });
   },
   /**
@@ -22639,6 +22640,7 @@ var Methods = {
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
       _this59.updateCellAreas();
+      _this59.updateStyle();
       return rest;
     });
   },
@@ -22652,30 +22654,35 @@ var Methods = {
    * 清除所有单元格合并
    */
   clearMergeCells: function clearMergeCells() {
+    var _this60 = this;
     this.mergeList = [];
-    return this.$nextTick();
+    return this.$nextTick().then(function () {
+      return _this60.updateStyle();
+    });
   },
   handleDefaultMergeFooterItems: function handleDefaultMergeFooterItems() {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this60 = this;
+    var _this61 = this;
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this60.updateCellAreas();
+      _this61.updateCellAreas();
+      return _this61.updateStyle();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this61 = this;
+    var _this62 = this;
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this61.updateCellAreas();
+      _this62.updateCellAreas();
+      _this62.updateStyle();
       return rest;
     });
   },
@@ -22689,8 +22696,11 @@ var Methods = {
    * 清除所有表尾合并
    */
   clearMergeFooterItems: function clearMergeFooterItems() {
+    var _this63 = this;
     this.mergeFooterList = [];
-    return this.$nextTick();
+    return this.$nextTick().then(function () {
+      return _this63.updateStyle();
+    });
   },
   updateZindex: function updateZindex() {
     if (this.zIndex) {
@@ -22795,9 +22805,9 @@ var Methods = {
     return cellLabel;
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
-    var _this62 = this;
+    var _this64 = this;
     return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(list, function (item) {
-      return _this62.eqRow(item, row);
+      return _this64.eqRow(item, row);
     }) : -1;
   },
   eqRow: function eqRow(row1, row2) {
@@ -34657,7 +34667,7 @@ function renderSimplePanel(h, _vm) {
           'is--disabled': isMaxFixedColumn && !column.fixed
         }],
         attrs: {
-          title: conf.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedLeft')
+          title: conf.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
           click: function click() {
@@ -34670,7 +34680,7 @@ function renderSimplePanel(h, _vm) {
           'is--disabled': isMaxFixedColumn && !column.fixed
         }],
         attrs: {
-          title: conf.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedRight')
+          title: conf.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
           click: function click() {
@@ -34885,7 +34895,7 @@ function renderPopupPanel(h, _vm) {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
-            name: 'vxe-table-custom--flip'
+            name: 'vxe-table-custom--list'
           }
         }, trVNs)])]), h('div', {
           ref: 'dragHintElemRef',
@@ -39167,13 +39177,13 @@ function renderContent(h, _vm) {
     trigger: {
       type: String,
       default: function _default() {
-        return conf.tooltip.trigger;
+        return conf.tooltip.trigger || 'hover';
       }
     },
     theme: {
       type: String,
       default: function _default() {
-        return conf.tooltip.theme;
+        return conf.tooltip.theme || 'dark';
       }
     },
     content: {
@@ -41957,7 +41967,7 @@ var Pulldown = VxePulldown;
       customRestore: '重置',
       fixedLeft: '冻结在左侧',
       fixedRight: '冻结在右侧',
-      cancelfixed: '取消冻结列'
+      cancelFixed: '取消冻结列'
     },
     input: {
       date: {