vxe-table 3.8.5 → 3.8.6-beta.1

package/lib/index.umd.js

@@ -11346,7 +11346,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.5", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.6-beta.1", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12954,17 +12954,32 @@ 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) {
+    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 +12998,7 @@ function config(options) {
 
 
 
+
 var installedPlugins = [];
 function use(Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -13067,7 +13083,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.5",
+  version: "3.8.6-beta.1",
   reg: reg,
   use: use,
   setup: setup,
@@ -13084,6 +13100,7 @@ var VXETable = {
   config: config,
   globalConfs: globalConfs
 };
+setTheme(globalStore);
 
 
 
@@ -13392,11 +13409,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,
@@ -17139,13 +17154,22 @@ var Methods = {
       return _this8.loadColumn(columns);
     });
   },
+  initColumnSort: function initColumnSort() {
+    var collectColumn = this.collectColumn;
+    collectColumn.forEach(function (column, index) {
+      var sortIndex = index + 1;
+      column.sortNumber = sortIndex;
+      column.renderSortNumber = sortIndex;
+    });
+  },
   handleColumn: function handleColumn(collectColumn) {
     var _this9 = this;
     this.collectColumn = collectColumn;
     var tableFullColumn = methods_getColumnList(collectColumn);
     this.tableFullColumn = tableFullColumn;
-    this.cacheColumnMap(true);
+    this.initColumnSort();
     this.restoreCustomStorage();
+    this.cacheColumnMap();
     this.parseColumns().then(function () {
       if (_this9.scrollXLoad) {
         _this9.loadScrollXData(true);
@@ -17320,7 +17344,7 @@ var Methods = {
    * 更新数据列的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheColumnMap: function cacheColumnMap(isInit) {
+  cacheColumnMap: function cacheColumnMap() {
     var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
@@ -17381,9 +17405,6 @@ var Methods = {
       if (fullColumnIdData[colid]) {
         errLog('vxe.error.colRepet', ['colId', colid]);
       }
-      if (isInit) {
-        column.sortNumber = index;
-      }
       fullColumnIdData[colid] = rest;
       fullColumnMap.set(column, rest);
     };
@@ -18336,6 +18357,9 @@ var Methods = {
     if (opts.resizable) {
       this.saveCustomResizable(true);
     }
+    if (opts.sort) {
+      this.saveCustomSort(true);
+    }
     if (opts.fixed) {
       this.saveCustomFixed();
     }
@@ -18353,6 +18377,7 @@ var Methods = {
       }
     }
     this.saveCustomVisible();
+    this.saveCustomSort();
     this.analyColumnWidth();
     return this.refreshColumn(true);
   },
@@ -18361,7 +18386,6 @@ var Methods = {
    */
   restoreCustomStorage: function restoreCustomStorage() {
     var id = this.id,
-      collectColumn = this.collectColumn,
       customConfig = this.customConfig,
       customOpts = this.customOpts;
     var storage = customOpts.storage;
@@ -18410,22 +18434,21 @@ var Methods = {
         }
       }
       // 自定义顺序
+      var hasCustomSort = false;
       if (isCustomSort) {
         var columnSortStorage = getCustomStorageMap(sortStorageKey)[id];
         if (columnSortStorage) {
-          var colOrderSeqs = columnSortStorage.split(',');
-          colOrderSeqs.forEach(function (orderConf) {
-            var _orderConf$split = orderConf.split('|'),
-              _orderConf$split2 = _slicedToArray(_orderConf$split, 2),
-              colKey = _orderConf$split2[0],
-              sortNumber = _orderConf$split2[1];
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(columnSortStorage, function (renderSortNumber, colKey) {
             if (customMap[colKey]) {
-              customMap[colKey].sortNumber = sortNumber;
+              customMap[colKey].renderSortNumber = renderSortNumber;
             } else {
               customMap[colKey] = {
-                sortNumber: sortNumber
+                renderSortNumber: renderSortNumber
               };
             }
+            if (!hasCustomSort) {
+              hasCustomSort = true;
+            }
           });
         }
       }
@@ -18457,6 +18480,7 @@ var Methods = {
           });
         }
       }
+      var collectColumn = this.collectColumn;
       var keyMap = {};
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
         var colKey = column.getKey();
@@ -18468,7 +18492,7 @@ var Methods = {
         var visible = _ref5.visible,
           resizeWidth = _ref5.resizeWidth,
           fixed = _ref5.fixed,
-          sortNumber = _ref5.sortNumber;
+          renderSortNumber = _ref5.renderSortNumber;
         var column = keyMap[field];
         if (column) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizeWidth)) {
@@ -18480,11 +18504,17 @@ var Methods = {
           if (fixed) {
             column.fixed = fixed;
           }
-          if (sortNumber) {
-            column.colSeq = Number(sortNumber);
+          if (renderSortNumber) {
+            column.renderSortNumber = Number(renderSortNumber);
           }
         }
       });
+      // 如果自定义了顺序
+      if (hasCustomSort) {
+        collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(collectColumn, 'renderSortNumber');
+        this.collectColumn = collectColumn;
+        this.tableFullColumn = methods_getColumnList(collectColumn);
+      }
     }
   },
   saveCustomFixed: function saveCustomFixed() {
@@ -18585,6 +18615,38 @@ var Methods = {
       localStorage.setItem(resizableStorageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(columnWidthStorageMap));
     }
   },
+  saveCustomSort: function saveCustomSort(isReset) {
+    var id = this.id,
+      collectColumn = this.collectColumn,
+      customConfig = this.customConfig,
+      customOpts = this.customOpts;
+    var storage = customOpts.storage;
+    var isAllStorage = storage === true;
+    var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
+    var isSort = isAllStorage || storageOpts.sort;
+    if (customConfig && isSort) {
+      var columnSortStorageMap = getCustomStorageMap(sortStorageKey);
+      var columnWidthStorage;
+      if (!id) {
+        errLog('vxe.error.reqProp', ['id']);
+        return;
+      }
+      if (!isReset) {
+        columnWidthStorage = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {};
+        // 排序只支持一级
+        collectColumn.forEach(function (column) {
+          if (column.sortNumber !== column.renderSortNumber) {
+            var colKey = column.getKey();
+            if (colKey) {
+              columnWidthStorage[colKey] = column.renderSortNumber;
+            }
+          }
+        });
+      }
+      columnSortStorageMap[id] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEmpty(columnWidthStorage) ? undefined : columnWidthStorage;
+      localStorage.setItem(sortStorageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(columnSortStorageMap));
+    }
+  },
   handleUpdateDataQueue: function handleUpdateDataQueue() {
     this.upDataFlag++;
   },
@@ -27234,6 +27296,8 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
+
+
 
 
 
@@ -29510,6 +29574,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;
@@ -34500,6 +34565,7 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
 var panel_formatText = utils.formatText;
 var panel_addClass = dom.addClass,
   panel_removeClass = dom.removeClass;
@@ -34906,7 +34972,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;
@@ -35050,9 +35129,7 @@ function renderPopupPanel(h, _vm) {
       panel_removeClass(trEl, 'active--drag-target');
       panel_removeClass(trEl, 'active--drag-origin');
       // 更新顺序
-      customColumnList.forEach(function (column, index) {
-        column.renderSortNumber = index;
-      });
+      this.updateColumnSort();
     },
     sortDragoverEvent: function sortDragoverEvent(evnt) {
       var $xetable = this.$xetable,
@@ -35073,6 +35150,15 @@ function renderPopupPanel(h, _vm) {
         this.prevDropTrEl = trEl;
       }
       updateDropHint(this, evnt);
+    },
+    updateColumnSort: function updateColumnSort() {
+      var $xetable = this.$xetable;
+      var customColumnList = $xetable.customColumnList;
+      // 更新顺序
+      customColumnList.forEach(function (column, index) {
+        var sortIndex = index + 1;
+        column.renderSortNumber = sortIndex;
+      });
     }
   }
 });
@@ -42143,6 +42229,7 @@ var Pulldown = VxePulldown;
 
 
 
+
 
 
 // 按需加载的组件
@@ -42156,6 +42243,7 @@ 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);
+    setTheme(options);
   }
   components.map(function (component) {
     return component.install(Vue);