vxe-table 3.8.0-beta.6 → 3.8.0-beta.7

package/lib/index.umd.js

@@ -7418,6 +7418,57 @@ setToStringTag(PromiseConstructor, PROMISE, false, true);
 setSpecies(PROMISE);
 
 
+/***/ }),
+
+/***/ 9391:
+/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var $ = __webpack_require__(6518);
+var IS_PURE = __webpack_require__(6395);
+var NativePromiseConstructor = __webpack_require__(550);
+var fails = __webpack_require__(9039);
+var getBuiltIn = __webpack_require__(7751);
+var isCallable = __webpack_require__(4901);
+var speciesConstructor = __webpack_require__(2293);
+var promiseResolve = __webpack_require__(3438);
+var defineBuiltIn = __webpack_require__(6840);
+
+var NativePromisePrototype = NativePromiseConstructor && NativePromiseConstructor.prototype;
+
+// Safari bug https://bugs.webkit.org/show_bug.cgi?id=200829
+var NON_GENERIC = !!NativePromiseConstructor && fails(function () {
+  // eslint-disable-next-line unicorn/no-thenable -- required for testing
+  NativePromisePrototype['finally'].call({ then: function () { /* empty */ } }, function () { /* empty */ });
+});
+
+// `Promise.prototype.finally` method
+// https://tc39.es/ecma262/#sec-promise.prototype.finally
+$({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, {
+  'finally': function (onFinally) {
+    var C = speciesConstructor(this, getBuiltIn('Promise'));
+    var isFunction = isCallable(onFinally);
+    return this.then(
+      isFunction ? function (x) {
+        return promiseResolve(C, onFinally()).then(function () { return x; });
+      } : onFinally,
+      isFunction ? function (e) {
+        return promiseResolve(C, onFinally()).then(function () { throw e; });
+      } : onFinally
+    );
+  }
+});
+
+// makes sure that native promise-based APIs `Promise#finally` properly works with patched `Promise#then`
+if (!IS_PURE && isCallable(NativePromiseConstructor)) {
+  var method = getBuiltIn('Promise').prototype['finally'];
+  if (NativePromisePrototype['finally'] !== method) {
+    defineBuiltIn(NativePromisePrototype, 'finally', method, { unsafe: true });
+  }
+}
+
+
 /***/ }),
 
 /***/ 3362:
@@ -11295,7 +11346,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.0-beta.6", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.0-beta.7", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13016,7 +13067,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.0-beta.6",
+  version: "3.8.0-beta.7",
   reg: reg,
   use: use,
   setup: setup,
@@ -13040,8 +13091,12 @@ var VXETable = {
 
 
 /* harmony default export */ var v_x_e_table = (VXETable);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.iterator.js
+var es_array_iterator = __webpack_require__(3792);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__(6033);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
+var es_object_assign = __webpack_require__(9085);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__(4298);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.js
@@ -15585,6 +15640,10 @@ function _slicedToArray(arr, i) {
 }
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
 var es_array_sort = __webpack_require__(6910);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
+var es_promise = __webpack_require__(3362);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
+var es_promise_finally = __webpack_require__(9391);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
 var es_string_trim = __webpack_require__(2762);
 ;// CONCATENATED MODULE: ./packages/table/src/cell.js
@@ -16471,6 +16530,10 @@ var Cell = {
 
 
 
+
+
+
+
 
 
 
@@ -19681,12 +19744,13 @@ var Methods = {
     if (tipContent) {
       var $refs = this.$refs,
         tooltipStore = this.tooltipStore;
+      var column = params.column;
       var content = getFuncText(tipContent);
       this.handleTargetEnterEvent(true);
+      tooltipStore.row = null;
+      tooltipStore.column = column;
       tooltipStore.visible = true;
-      tooltipStore.currOpts = _objectSpread2(_objectSpread2({}, params), {}, {
-        content: null
-      });
+      // tooltipStore.currOpts = { content: null }
       this.$nextTick(function () {
         var $tooltip = $refs.tooltip;
         if ($tooltip) {
@@ -19781,8 +19845,7 @@ var Methods = {
       Object.assign(tooltipStore, {
         row: row,
         column: column,
-        visible: true,
-        currOpts: null
+        visible: true
       });
       this.$nextTick(function () {
         var $tooltip = $refs.tooltip;
@@ -19814,8 +19877,7 @@ var Methods = {
         row: null,
         column: null,
         content: null,
-        visible: false,
-        currOpts: null
+        visible: false
       });
       if (tooltip) {
         tooltip.close();
@@ -22704,6 +22766,8 @@ var Loading = (/* unused pure expression or super */ null && (VxeLoading));
 
 
 
+
+
 
 
 
@@ -23239,8 +23303,7 @@ function handleUupdateResize(_vm) {
       tooltipStore: {
         row: null,
         column: null,
-        visible: false,
-        currOpts: null
+        visible: false
       },
       // 存放数据校验相关信息
       validStore: {
@@ -23339,7 +23402,7 @@ function handleUupdateResize(_vm) {
       return Object.assign({}, conf.tooltip, conf.table.tooltipConfig, this.tooltipConfig);
     },
     tipConfig: function tipConfig() {
-      return _objectSpread2(_objectSpread2({}, this.tooltipOpts), this.tooltipStore.currOpts);
+      return _objectSpread2({}, this.tooltipOpts);
     },
     validTipOpts: function validTipOpts() {
       return Object.assign({
@@ -34364,6 +34427,7 @@ function renderSimplePanel(h, _vm) {
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var maxHeight = customStore.maxHeight;
   var checkMethod = customOpts.checkMethod,
+    visibleMethod = customOpts.visibleMethod,
     trigger = customOpts.trigger;
   var colVNs = [];
   var customWrapperOns = {};
@@ -34373,16 +34437,19 @@ function renderSimplePanel(h, _vm) {
     customWrapperOns.onMouseleave = _vm.handleWrapperMouseleaveEvent;
   }
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
-    var colTitle = utils.formatText(column.getTitle(), 1);
-    var colKey = column.getKey();
-    var isColGroup = column.children && column.children.length;
-    var isDisabled = checkMethod ? !checkMethod({
+    var isVisible = visibleMethod ? visibleMethod({
       column: column
-    }) : false;
-    if (isColGroup || colKey) {
+    }) : true;
+    if (isVisible) {
       var isChecked = column.visible;
       var isIndeterminate = column.halfVisible;
+      var colTitle = utils.formatText(column.getTitle(), 1);
+      var isColGroup = column.children && column.children.length;
+      var isDisabled = checkMethod ? !checkMethod({
+        column: column
+      }) : false;
       colVNs.push(h('li', {
+        key: column.id,
         class: ['vxe-table-custom--option', "level--".concat(column.level), {
           'is--group': isColGroup
         }]
@@ -34488,20 +34555,26 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
   var customOpts = $xetable.customOpts,
     collectColumn = $xetable.collectColumn,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
-  var checkMethod = customOpts.checkMethod;
+  var checkMethod = customOpts.checkMethod,
+    visibleMethod = customOpts.visibleMethod;
   var trVNs = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
-    var colTitle = utils.formatText(column.getTitle(), 1);
-    var colKey = column.getKey();
-    var isColGroup = column.children && column.children.length;
-    var isDisabled = checkMethod ? !checkMethod({
+    var isVisible = visibleMethod ? visibleMethod({
       column: column
-    }) : false;
-    if (isColGroup || colKey) {
+    }) : true;
+    if (isVisible) {
       var isChecked = column.visible;
       var isIndeterminate = column.halfVisible;
+      var colTitle = utils.formatText(column.getTitle(), 1);
+      var isColGroup = column.children && column.children.length;
+      var isDisabled = checkMethod ? !checkMethod({
+        column: column
+      }) : false;
       trVNs.push(h('tr', {
-        class: ["vxe-table-custom-popup--row-level".concat(column.level)]
+        key: column.id,
+        class: ["vxe-table-custom-popup--row-level".concat(column.level), {
+          'is--group': isColGroup
+        }]
       }, [h('td', {
         class: 'vxe-table-custom-popup--column-name'
       }, [h('div', {
@@ -36223,10 +36296,6 @@ var VxeGrid = Object.assign(grid, {
 });
 var Grid = VxeGrid;
 /* harmony default export */ var packages_grid = ((/* unused pure expression or super */ null && (VxeGrid)));
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
-var es_object_assign = __webpack_require__(9085);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
-var es_promise = __webpack_require__(3362);
 ;// CONCATENATED MODULE: ./packages/toolbar/src/toolbar.js
 
 
@@ -38570,6 +38639,7 @@ var Modal = VxeModal;
 
 
 
+
 function updateTipStyle(_vm) {
   var wrapperElem = _vm.$el,
     tipTarget = _vm.tipTarget,
@@ -38768,9 +38838,6 @@ function renderContent(h, _vm) {
       target = this.target,
       trigger = this.trigger;
     var parentNode = $el.parentNode;
-    if (parentNode) {
-      parentNode.removeChild($el);
-    }
     if (target) {
       if (trigger === 'hover') {
         target.onmouseenter = null;
@@ -38779,6 +38846,9 @@ function renderContent(h, _vm) {
         target.onclick = null;
       }
     }
+    if (parentNode) {
+      parentNode.removeChild($el);
+    }
   },
   render: function render(h) {
     var $scopedSlots = this.$scopedSlots,