vxe-table 3.8.6-beta.0 → 3.8.6-beta.2

package/lib/index.umd.js

@@ -11073,6 +11073,7 @@ var iconPrefix = 'vxe-icon-';
       isEsc: true
     },
     areaConfig: {
+      autoClear: true,
       selectCellByHeader: true
     },
     clipConfig: {
@@ -11346,7 +11347,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.6-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.6-beta.2", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12954,17 +12955,34 @@ var Store = /*#__PURE__*/function () {
 
 var validators = new store();
 if (false) {}
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/theme.js
+
+function setTheme(options) {
+  var theme = (options ? options.theme : null) || conf.theme || 'default';
+  if (typeof document !== 'undefined') {
+    var documentElement = document.documentElement;
+    if (documentElement) {
+      documentElement.setAttribute('data-vxe-table-theme', theme);
+    }
+  }
+}
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/config.js
 
 
 
 
+
 /**
  * 全局参数设置
  */
 function config(options) {
-  if (options && options.zIndex) {
-    index_esm.setCurrent(options.zIndex);
+  if (options) {
+    if (options.theme) {
+      setTheme(options);
+    }
+    if (options.zIndex) {
+      index_esm.setCurrent(options.zIndex);
+    }
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, options);
 }
@@ -12983,6 +13001,7 @@ function config(options) {
 
 
 
+
 var installedPlugins = [];
 function use(Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -13067,7 +13086,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.6-beta.0",
+  version: "3.8.6-beta.2",
   reg: reg,
   use: use,
   setup: setup,
@@ -13084,6 +13103,7 @@ var VXETable = {
   config: config,
   globalConfs: globalConfs
 };
+setTheme(globalStore);
 
 
 
@@ -13392,11 +13412,9 @@ var DomTools = {
     });
   },
   getAbsolutePos: function getAbsolutePos(elem) {
-    // 当主页面嵌套在iframe时，elem.getBoundingClientRect()仅计算在当前body内的边界距离，忽略了body所在的边界距离
-    var bodyBounding = document.body.getBoundingClientRect();
     var bounding = elem.getBoundingClientRect();
-    var boundingTop = bounding.top - bodyBounding.top;
-    var boundingLeft = bounding.left - bodyBounding.left;
+    var boundingTop = bounding.top;
+    var boundingLeft = bounding.left;
     var _getDomNode = getDomNode(),
       scrollTop = _getDomNode.scrollTop,
       scrollLeft = _getDomNode.scrollLeft,
@@ -13852,6 +13870,7 @@ function getSlotVNs(vns) {
 
 
 
+
 var renderType = 'body';
 
 // 滚动、拖动过程中不需要触发
@@ -13861,7 +13880,8 @@ function isVMScrollProcess($xetable) {
 function renderLine(h, _vm, $xetable, params) {
   var row = params.row,
     column = params.column;
-  var treeOpts = $xetable.treeOpts,
+  var afterFullData = $xetable.afterFullData,
+    treeOpts = $xetable.treeOpts,
     treeConfig = $xetable.treeConfig,
     fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var slots = column.slots,
@@ -13879,13 +13899,14 @@ function renderLine(h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
   }
+  var isFirstRow = $xetable.eqRow(afterFullData[0], row);
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       class: 'vxe-tree--line-wrapper'
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
-        height: "".concat(calcTreeLine(params, items, rIndex), "px"),
+        height: "".concat(isFirstRow ? 1 : calcTreeLine(params, items, rIndex), "px"),
         left: "".concat(rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16, "px")
       }
     })])];
@@ -19333,6 +19354,7 @@ var Methods = {
       editRules = this.editRules,
       editOpts = this.editOpts,
       validOpts = this.validOpts,
+      areaOpts = this.areaOpts,
       filterStore = this.filterStore,
       customStore = this.customStore,
       getRowNode = this.getRowNode;
@@ -19421,11 +19443,13 @@ var Methods = {
         if (this.clearSelected) {
           this.clearSelected();
         }
-        if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-          this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this27.clearCellAreas();
-            _this27.clearCopyCellArea();
-          });
+        if (areaOpts.autoClear) {
+          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+            this.preventEvent(evnt, 'event.clearAreas', {}, function () {
+              _this27.clearCellAreas();
+              _this27.clearCopyCellArea();
+            });
+          }
         }
       }
     }
@@ -27281,6 +27305,8 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
+
+
 
 
 
@@ -29557,6 +29583,7 @@ function renderExtraSuffixIcon(h, _vm) {
             visibleHeight = _DomTools$getAbsolute.visibleHeight,
             visibleWidth = _DomTools$getAbsolute.visibleWidth;
           var panelPlacement = 'bottom';
+          console.log(dom.getAbsolutePos(targetElem));
           if (transfer) {
             var left = boundingLeft;
             var top = boundingTop + targetHeight;
@@ -34547,6 +34574,7 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
 var panel_formatText = utils.formatText;
 var panel_addClass = dom.addClass,
   panel_removeClass = dom.removeClass;
@@ -34953,7 +34981,20 @@ function renderPopupPanel(h, _vm) {
       $xetable.emitCustomEvent('reset', evnt);
     },
     resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
-      this.resetCustomEvent(evnt);
+      var _this = this;
+      if (v_x_e_table.modal) {
+        v_x_e_table.modal.confirm({
+          content: conf.i18n('vxe.custom.cstmConfirmRestore'),
+          className: 'vxe-table--ignore-clear',
+          escClosable: true
+        }).then(function (type) {
+          if (type === 'confirm') {
+            _this.resetCustomEvent(evnt);
+          }
+        });
+      } else {
+        this.resetCustomEvent(evnt);
+      }
     },
     handleOptionCheck: function handleOptionCheck(column) {
       var $xetable = this.$xetable;
@@ -42197,6 +42238,7 @@ var Pulldown = VxePulldown;
 
 
 
+
 
 
 // 按需加载的组件
@@ -42210,6 +42252,9 @@ Icon, Column, Colgroup, Table, Grid, Toolbar, Pager, Checkbox, CheckboxGroup, Ra
 function install(Vue, options) {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(options)) {
     VXETable.config(options);
+    if (options.theme) {
+      setTheme(options);
+    }
   }
   components.map(function (component) {
     return component.install(Vue);