vxe-table 3.6.14-beta.3 → 3.6.14-beta.5

package/lib/index.umd.js

@@ -11033,7 +11033,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.14-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.14-beta.5", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12220,7 +12220,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.14-beta.2",
+  version: "3.6.14-beta.5",
   reg: reg,
   use: use,
   setup: setup,
@@ -12409,6 +12409,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       // 内部属性（一旦被使用，将导致不可升级版本）
       halfVisible: false,
       defaultVisible: visible,
+      defaultFixed: _vm.fixed,
       checked: false,
       halfChecked: false,
       disabled: false,
@@ -14490,6 +14491,58 @@ if (browse.isDoc) {
     trailing: false
   }), false);
 }
+;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
+
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js
+
+
+
+
+
+
+
+
+function _iterableToArrayLimit(arr, i) {
+  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+  if (_i == null) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _s, _e;
+  try {
+    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+  return _arr;
+}
+;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js
+
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js
+
+
+
+
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.parse-int.js
 var es_parse_int = __webpack_require__(1058);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.reduce.js
@@ -14574,7 +14627,7 @@ function renderTitleContent(h, params, content) {
   }) : h('span', {
     "class": 'vxe-cell--title',
     on: ons
-  }, content)];
+  }, getSlotVNs(content))];
 }
 function getFooterContent(h, params) {
   var $table = params.$table,
@@ -15363,6 +15416,7 @@ var Cell = {
 
 
 
+
 
 
 var setCellValue = utils.setCellValue,
@@ -15378,6 +15432,8 @@ var isWebkit = browse["-webkit"] && !browse.edge;
 var debounceScrollYDuration = browse.msie ? 80 : 20;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
 var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
+var fixedStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_FIXED';
+var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
 
 /**
  * 生成行的唯一主键
@@ -16981,25 +17037,55 @@ var Methods = {
       this.handleDefaultSort();
     }
   },
+  /**
+   * 设置为固定列
+   */
+  setColumnFixed: function setColumnFixed(fieldOrColumn, fixed) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    if (column && column.fixed !== fixed) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (column) {
+        column.fixed = fixed;
+      });
+      this.saveCustomFixed();
+      return this.refreshColumn();
+    }
+    return this.$nextTick();
+  },
+  /**
+   * 取消指定固定列
+   */
+  clearColumnFixed: function clearColumnFixed(fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    if (column && column.fixed) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (column) {
+        column.fixed = null;
+      });
+      this.saveCustomFixed();
+      return this.refreshColumn();
+    }
+    return this.$nextTick();
+  },
   /**
    * 隐藏指定列
    */
   hideColumn: function hideColumn(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column) {
+    if (column && column.visible) {
       column.visible = false;
+      return this.handleCustom();
     }
-    return this.handleCustom();
+    return this.$nextTick();
   },
   /**
    * 显示指定列
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column) {
+    if (column & !column.visible) {
       column.visible = true;
+      return this.handleCustom();
     }
-    return this.handleCustom();
+    return this.$nextTick();
   },
   setColumnWidth: function setColumnWidth(fieldOrColumn, width) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
@@ -17065,15 +17151,17 @@ var Methods = {
       customOpts = this.customOpts;
     var storage = customOpts.storage;
     var isAllStorage = customOpts.storage === true;
-    var isResizable = isAllStorage || storage && storage.resizable;
-    var isVisible = isAllStorage || storage && storage.visible;
-    if (customConfig && (isResizable || isVisible)) {
+    var isCustomResizable = isAllStorage || storage && storage.resizable;
+    var isCustomVisible = isAllStorage || storage && storage.visible;
+    var isCustomFixed = storage === true || storage && storage.fixed;
+    var isCustomOrder = storage === true || storage && storage.order;
+    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomOrder)) {
       var customMap = {};
       if (!id) {
         errLog('vxe.error.reqProp', ['id']);
         return;
       }
-      if (isResizable) {
+      if (isCustomResizable) {
         var columnWidthStorage = getCustomStorageMap(resizableStorageKey)[id];
         if (columnWidthStorage) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(columnWidthStorage, function (resizeWidth, field) {
@@ -17084,7 +17172,35 @@ var Methods = {
           });
         }
       }
-      if (isVisible) {
+      // 自定义固定列
+      if (isCustomFixed) {
+        var columnFixedStorage = getCustomStorageMap(fixedStorageKey)[id];
+        if (columnFixedStorage) {
+          var colFixeds = columnFixedStorage.split(',');
+          colFixeds.forEach(function (fixConf) {
+            var _fixConf$split = fixConf.split('|'),
+              _fixConf$split2 = _slicedToArray(_fixConf$split, 2),
+              field = _fixConf$split2[0],
+              fixed = _fixConf$split2[1];
+            if (customMap[field]) {
+              customMap[field].fixed = fixed;
+            } else {
+              customMap[field] = {
+                field: field,
+                fixed: fixed
+              };
+            }
+          });
+        }
+      }
+      // 自定义顺序
+      if (isCustomOrder) {
+        var columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
+        if (columnOrderStorage) {
+          // 开发中...
+        }
+      }
+      if (isCustomVisible) {
         var columnVisibleStorage = getCustomStorageMap(visibleStorageKey)[id];
         if (columnVisibleStorage) {
           var colVisibles = columnVisibleStorage.split('|');
@@ -17121,7 +17237,8 @@ var Methods = {
       });
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(customMap, function (_ref5, field) {
         var visible = _ref5.visible,
-          resizeWidth = _ref5.resizeWidth;
+          resizeWidth = _ref5.resizeWidth,
+          fixed = _ref5.fixed;
         var column = keyMap[field];
         if (column) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizeWidth)) {
@@ -17130,10 +17247,40 @@ var Methods = {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visible)) {
             column.visible = visible;
           }
+          if (fixed) {
+            column.fixed = fixed;
+          }
         }
       });
     }
   },
+  saveCustomFixed: function saveCustomFixed() {
+    var id = this.id,
+      collectColumn = this.collectColumn,
+      customConfig = this.customConfig,
+      customOpts = this.customOpts;
+    var storage = customOpts.storage;
+    var isAllStorage = customOpts.storage === true;
+    var isCustomFixed = isAllStorage || storage && storage.fixed;
+    if (customConfig && isCustomFixed) {
+      var columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
+      var colFixeds = [];
+      if (!id) {
+        errLog('vxe.error.reqProp', ['id']);
+        return;
+      }
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
+        if (column.fixed && column.fixed !== column.defaultFixed) {
+          var colKey = column.getKey();
+          if (colKey) {
+            colFixeds.push("".concat(colKey, "|").concat(column.fixed));
+          }
+        }
+      });
+      columnFixedStorageMap[id] = colFixeds.join(',') || undefined;
+      localStorage.setItem(fixedStorageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(columnFixedStorageMap));
+    }
+  },
   saveCustomVisible: function saveCustomVisible() {
     var id = this.id,
       collectColumn = this.collectColumn,
@@ -17142,8 +17289,8 @@ var Methods = {
     var checkMethod = customOpts.checkMethod,
       storage = customOpts.storage;
     var isAllStorage = customOpts.storage === true;
-    var isVisible = isAllStorage || storage && storage.visible;
-    if (customConfig && isVisible) {
+    var isCustomVisible = isAllStorage || storage && storage.visible;
+    if (customConfig && isCustomVisible) {
       var columnVisibleStorageMap = getCustomStorageMap(visibleStorageKey);
       var colHides = [];
       var colShows = [];
@@ -17663,7 +17810,7 @@ var Methods = {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
           if (methods_isNodeElement(wrapperElem)) {
             if (customMaxHeight) {
-              wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
+              wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
             } else {
               if (customHeight > 0) {
                 wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
@@ -24143,58 +24290,6 @@ var Edit = {
   }
 };
 /* harmony default export */ const edit = ((/* unused pure expression or super */ null && (Edit)));
-;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
-
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js
-
-
-
-
-
-
-
-
-function _iterableToArrayLimit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i == null) return;
-  var _arr = [];
-  var _n = true;
-  var _d = false;
-  var _s, _e;
-  try {
-    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
-      _arr.push(_s.value);
-      if (i && _arr.length === i) break;
-    }
-  } catch (err) {
-    _d = true;
-    _e = err;
-  } finally {
-    try {
-      if (!_n && _i["return"] != null) _i["return"]();
-    } finally {
-      if (_d) throw _e;
-    }
-  }
-  return _arr;
-}
-;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js
-
-
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js
-
-
-
-
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
 ;// CONCATENATED MODULE: ./packages/modal/src/modal.js