vxe-table 3.6.17 → 3.7.0-beta.0

package/lib/index.umd.js

@@ -10712,6 +10712,9 @@ var iconPrefix = 'vxe-icon-';
       showMessage: true,
       message: 'default'
     },
+    columnConfig: {
+      maxFixedSize: 4
+    },
     // menuConfig: {
     //   visibleMethod () {}
     // },
@@ -10853,6 +10856,10 @@ var iconPrefix = 'vxe-icon-';
     TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
     TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
     TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
+    TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
+    TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED: iconPrefix + 'fixed-left-fill',
+    TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
+    TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED: iconPrefix + 'fixed-right-fill',
     // form
     FORM_PREFIX: iconPrefix + 'question-circle-fill',
     FORM_SUFFIX: iconPrefix + 'question-circle-fill',
@@ -10963,11 +10970,13 @@ var iconPrefix = 'vxe-icon-';
     // export: {
     //   types: ['csv', 'html', 'xml', 'txt']
     // },
-    // custom: {
-    //   isFooter: true
-    // },
+    custom: {
+      allowFixed: true,
+      showFooter: true
+    }
     // buttons: []
   },
+
   button: {
     // size: null,
     // transfer: false
@@ -11033,7 +11042,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.17", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12220,7 +12229,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.17",
+  version: "3.7.0-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -12320,6 +12329,8 @@ function _objectSpread2(target) {
 }
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__(9653);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
+var es_string_fixed = __webpack_require__(9253);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.every.js
 var es_array_every = __webpack_require__(6541);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.timers.js
@@ -12328,8 +12339,6 @@ var web_timers = __webpack_require__(2564);
 var es_map = __webpack_require__(1532);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.date.now.js
 var es_date_now = __webpack_require__(3843);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
-var es_string_fixed = __webpack_require__(9253);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
 var es_promise = __webpack_require__(8674);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.js
@@ -12419,6 +12428,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       colSpan: 1,
       order: null,
       sortTime: 0,
+      customOrder: 0,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -12747,6 +12757,21 @@ function handleFieldOrColumn(_vm, fieldOrColumn) {
   }
   return null;
 }
+function getRootColumn($xetable, column) {
+  var fullColumnIdData = $xetable.fullColumnIdData;
+  if (!column) {
+    return null;
+  }
+  var parentColId = column.parentId;
+  while (fullColumnIdData[parentColId]) {
+    var _column = fullColumnIdData[parentColId].column;
+    parentColId = _column.parentId;
+    if (!parentColId) {
+      return _column;
+    }
+  }
+  return column;
+}
 function queryCellElement(cell, selector) {
   return cell.querySelector('.vxe-cell' + selector);
 }
@@ -16526,7 +16551,7 @@ var Methods = {
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
     var _this16 = this;
-    var visibleColumn = this.visibleColumn,
+    var tableFullColumn = this.tableFullColumn,
       keepSource = this.keepSource,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -16556,8 +16581,8 @@ var Methods = {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
-        for (var index = 0, len = visibleColumn.length; index < len; index++) {
-          property = visibleColumn[index].field;
+        for (var index = 0, len = tableFullColumn.length; index < len; index++) {
+          property = tableFullColumn[index].field;
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
           }
@@ -17049,8 +17074,9 @@ var Methods = {
    */
   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) {
+    var targetColumn = getRootColumn(this, column);
+    if (targetColumn && targetColumn.fixed !== fixed) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], function (column) {
         column.fixed = fixed;
       });
       this.saveCustomFixed();
@@ -17063,8 +17089,9 @@ var Methods = {
    */
   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) {
+    var targetColumn = getRootColumn(this, column);
+    if (targetColumn && targetColumn.fixed) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], function (column) {
         column.fixed = null;
       });
       this.saveCustomFixed();
@@ -17122,14 +17149,15 @@ var Methods = {
    * 如果已关联工具栏，则会同步更新
    */
   resetColumn: function resetColumn(options) {
-    var customOpts = this.customOpts;
+    var collectColumn = this.collectColumn,
+      customOpts = this.customOpts;
     var checkMethod = customOpts.checkMethod;
     var opts = Object.assign({
       visible: true,
       resizable: options === true,
       fixed: options === true
     }, options);
-    this.tableFullColumn.forEach(function (column) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
       if (opts.resizable) {
         column.resizeWidth = 0;
       }
@@ -17211,7 +17239,15 @@ var Methods = {
       if (isCustomOrder) {
         var columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
         if (columnOrderStorage) {
-          // 开发中...
+          // const colOrderSeqs = columnOrderStorage.split(',')
+          // colOrderSeqs.forEach((orderConf) => {
+          //   const [colKey, order] = orderConf.split('|')
+          //   if (customMap[colKey]) {
+          //     customMap[colKey].order = order
+          //   } else {
+          //     customMap[colKey] = { order }
+          //   }
+          // })
         }
       }
       if (isCustomVisible) {
@@ -17252,7 +17288,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,
-          fixed = _ref5.fixed;
+          fixed = _ref5.fixed,
+          order = _ref5.order;
         var column = keyMap[field];
         if (column) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizeWidth)) {
@@ -17264,6 +17301,9 @@ var Methods = {
           if (fixed) {
             column.fixed = fixed;
           }
+          if (order) {
+            column.colSeq = order;
+          }
         }
       });
     }
@@ -21223,6 +21263,7 @@ var Loading = Object.assign(loading, {
 
 
 
+
 
 
 /**
@@ -21931,6 +21972,23 @@ function handleUupdateResize(_vm) {
     customOpts: function customOpts() {
       return Object.assign({}, conf.table.customConfig, this.customConfig);
     },
+    fixedColumnSize: function fixedColumnSize() {
+      var tableFullColumn = this.tableFullColumn;
+      var fixedSize = 0;
+      tableFullColumn.forEach(function (column) {
+        if (column.fixed) {
+          fixedSize++;
+        }
+      });
+      return fixedSize;
+    },
+    isMaxFixedColumn: function isMaxFixedColumn() {
+      var maxFixedSize = this.columnOpts.maxFixedSize;
+      if (maxFixedSize) {
+        return this.fixedColumnSize >= maxFixedSize;
+      }
+      return false;
+    },
     tableBorder: function tableBorder() {
       var border = this.border;
       if (border === true) {
@@ -34265,6 +34323,7 @@ var Grid = Object.assign(grid, {
 
 
 
+
 
 
 var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
@@ -34430,6 +34489,7 @@ function renderCustoms(h, _vm) {
     customStore = _vm.customStore,
     customOpts = _vm.customOpts,
     columns = _vm.columns;
+  var isMaxFixedColumn = $xetable ? $xetable.isMaxFixedColumn : true;
   var cols = [];
   var customBtnOns = {};
   var customWrapperOns = {};
@@ -34446,7 +34506,7 @@ function renderCustoms(h, _vm) {
     // 点击触发
     customBtnOns.click = _vm.handleClickSettingEvent;
   }
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, function (column) {
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, function (column, index, items, path, parent) {
     var colTitle = utils.formatText(column.getTitle(), 1);
     var colKey = column.getKey();
     var isColGroup = column.children && column.children.length;
@@ -34458,7 +34518,11 @@ function renderCustoms(h, _vm) {
       var isIndeterminate = column.halfVisible;
       cols.push(h('li', {
         "class": ['vxe-custom--option', "level--".concat(column.level), {
-          'is--group': isColGroup,
+          'is--group': isColGroup
+        }]
+      }, [h('div', {
+        title: colTitle,
+        "class": ['vxe-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
@@ -34477,7 +34541,35 @@ function renderCustoms(h, _vm) {
         "class": ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         "class": 'vxe-checkbox--label'
-      }, colTitle)]));
+      }, colTitle)]), !parent && customOpts.allowFixed ? h('div', {
+        "class": 'vxe-custom--fixed-option'
+      }, [h('span', {
+        "class": ['vxe-custom--fixed-left-option', column.fixed === 'left' ? conf.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED : conf.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
+          'is--checked': column.fixed === 'left',
+          'is--disabled': isMaxFixedColumn && !column.fixed
+        }],
+        attrs: {
+          title: conf.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedLeft')
+        },
+        on: {
+          click: function click() {
+            _vm.changeFixedOption(column, 'left');
+          }
+        }
+      }), h('span', {
+        "class": ['vxe-custom--fixed-right-option', column.fixed === 'right' ? conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED : conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
+          'is--checked': column.fixed === 'right',
+          'is--disabled': isMaxFixedColumn && !column.fixed
+        }],
+        attrs: {
+          title: conf.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedRight')
+        },
+        on: {
+          click: function click() {
+            _vm.changeFixedOption(column, 'right');
+          }
+        }
+      })]) : null]));
     }
   });
   var isAllChecked = customStore.isAll;
@@ -34501,7 +34593,9 @@ function renderCustoms(h, _vm) {
   }, [h('ul', {
     "class": 'vxe-custom--header'
   }, [h('li', {
-    "class": ['vxe-custom--option', {
+    "class": 'vxe-custom--option'
+  }, [h('div', {
+    "class": ['vxe-custom--checkbox-option', {
       'is--checked': isAllChecked,
       'is--indeterminate': isAllIndeterminate
     }],
@@ -34515,22 +34609,22 @@ function renderCustoms(h, _vm) {
     "class": ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     "class": 'vxe-checkbox--label'
-  }, conf.i18n('vxe.toolbar.customAll'))])]), h('ul', {
+  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('ul', {
     "class": 'vxe-custom--body',
     on: customWrapperOns
-  }, cols), customOpts.isFooter === false ? null : h('div', {
+  }, cols), customOpts.showFooter || customOpts.isFooter ? h('div', {
     "class": 'vxe-custom--footer'
   }, [h('button', {
-    "class": 'btn--confirm',
-    on: {
-      click: _vm.confirmCustomEvent
-    }
-  }, conf.i18n('vxe.toolbar.customConfirm')), h('button', {
     "class": 'btn--reset',
     on: {
       click: _vm.resetCustomEvent
     }
-  }, conf.i18n('vxe.toolbar.customRestore'))])])]);
+  }, customOpts.resetButtonText || conf.i18n('vxe.toolbar.customRestore')), h('button', {
+    "class": 'btn--confirm',
+    on: {
+      click: _vm.confirmCustomEvent
+    }
+  }, customOpts.confirmButtonText || conf.i18n('vxe.toolbar.customConfirm'))]) : null])]);
 }
 /* harmony default export */ const toolbar = ({
   name: 'VxeToolbar',
@@ -34793,6 +34887,16 @@ function renderCustoms(h, _vm) {
       }
       this.checkCustomStatus();
     },
+    changeFixedOption: function changeFixedOption(column, colFixed) {
+      var $xetable = this.$xetable;
+      if (column.fixed === colFixed) {
+        $xetable.clearColumnFixed(column);
+      } else {
+        if (!$xetable.isMaxFixedColumn || column.fixed) {
+          $xetable.setColumnFixed(column, colFixed);
+        }
+      }
+    },
     handleOptionCheck: function handleOptionCheck(column) {
       var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(this.columns, function (item) {
         return item === column;
@@ -39392,7 +39496,8 @@ var Pulldown = Object.assign(pulldown, {
       customTitle: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '重置'
+      customRestore: '重置',
+      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',
@@ -39501,7 +39606,10 @@ var Pulldown = Object.assign(pulldown, {
       custom: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '还原'
+      customRestore: '重置',
+      fixedLeft: '固定在左侧',
+      fixedRight: '固定在右侧',
+      cancelfixed: '取消固定'
     },
     input: {
       date: {