vxe-table 3.8.8-beta.4 → 3.8.8-beta.6

package/lib/index.umd.js

@@ -11145,9 +11145,12 @@ var iconPrefix = 'vxe-icon-';
     //   visibleMethod () {}
     // },
     customConfig: {
+      allowVisible: true,
+      allowResizable: true,
       allowFixed: true,
       allowSort: true,
-      showFooter: true
+      showFooter: true,
+      placement: 'topRight'
       //  storage: false,
       //  checkMethod () {}
     },
@@ -11351,6 +11354,7 @@ var iconPrefix = 'vxe-icon-';
     leaveDelay: 300
   },
   pager: {
+    pageSizePlacement: 'top'
     // size: null,
     // autoHidden: false,
     // perfect: true,
@@ -11481,7 +11485,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.8-beta.4", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.8-beta.6", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13161,7 +13165,7 @@ function setIcon(options) {
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.8-beta.4",
+  version: "3.8.8-beta.6",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -13295,6 +13299,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
+      renderResizeWidth: 0,
       resizeWidth: 0,
       renderLeft: 0,
       renderArgs: [],
@@ -18458,6 +18463,7 @@ var Methods = {
       })) {
         column.visible = column.defaultVisible;
       }
+      column.renderResizeWidth = column.renderWidth;
     });
     if (opts.resizable) {
       this.saveCustomResizable(true);
@@ -18695,6 +18701,65 @@ var Methods = {
       localStorage.setItem(visibleStorageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(columnVisibleStorageMap));
     }
   },
+  getCustomStoreData: function getCustomStoreData() {
+    var id = this.id,
+      collectColumn = this.collectColumn,
+      customOpts = this.customOpts;
+    var checkMethod = customOpts.checkMethod;
+    var resizableData = {};
+    var sortData = {};
+    var visibleData = {};
+    var fixedData = {};
+    var storeData = {
+      resizableData: resizableData,
+      sortData: sortData,
+      visibleData: visibleData,
+      fixedData: fixedData
+    };
+    if (!id) {
+      errLog('vxe.error.reqProp', ['id']);
+      return storeData;
+    }
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
+      // 排序只支持一级
+      if (!parent) {
+        collectColumn.forEach(function (column) {
+          var colKey = column.getKey();
+          if (colKey) {
+            sortData[colKey] = column.renderSortNumber;
+          }
+        });
+      }
+      if (column.resizeWidth) {
+        var colKey = column.getKey();
+        if (colKey) {
+          resizableData[colKey] = column.renderWidth;
+        }
+      }
+      if (column.fixed && column.fixed !== column.defaultFixed) {
+        var _colKey2 = column.getKey();
+        if (_colKey2) {
+          fixedData[_colKey2] = column.fixed;
+        }
+      }
+      if (!checkMethod || checkMethod({
+        column: column
+      })) {
+        if (!column.visible && column.defaultVisible) {
+          var _colKey3 = column.getKey();
+          if (_colKey3) {
+            visibleData[_colKey3] = false;
+          }
+        } else if (column.visible && !column.defaultVisible) {
+          var _colKey4 = column.getKey();
+          if (_colKey4) {
+            visibleData[_colKey4] = true;
+          }
+        }
+      }
+    });
+    return storeData;
+  },
   saveCustomResizable: function saveCustomResizable(isReset) {
     var id = this.id,
       collectColumn = this.collectColumn,
@@ -18746,11 +18811,9 @@ var Methods = {
         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;
-            }
+          var colKey = column.getKey();
+          if (colKey) {
+            columnWidthStorage[colKey] = column.renderSortNumber;
           }
         });
       }
@@ -34655,6 +34718,7 @@ var Validator = VxeTableValidatorModule;
         var colid = column.getKey();
         column.renderFixed = column.fixed;
         column.renderVisible = column.visible;
+        column.renderResizeWidth = column.renderWidth;
         sortMaps[colid] = column.renderSortNumber;
         fixedMaps[colid] = column.fixed;
         visibleMaps[colid] = column.visible;
@@ -34685,20 +34749,14 @@ var Validator = VxeTableValidatorModule;
       return this.$nextTick();
     },
     calcMaxHeight: function calcMaxHeight() {
-      var $refs = this.$refs,
+      var $el = this.$el,
         customStore = this.customStore;
-      var customWrapperElem = $refs.customWrapper ? $refs.customWrapper.$el : null;
-      var headElem = $refs.tableHeader ? $refs.tableHeader.$el : null;
-      var bodyElem = $refs.tableBody ? $refs.tableBody.$el : null;
       // 判断面板不能大于表格高度
       var tableHeight = 0;
-      if (headElem) {
-        tableHeight += headElem.clientHeight;
-      }
-      if (bodyElem) {
-        tableHeight += bodyElem.clientHeight;
+      if ($el) {
+        tableHeight = $el.clientHeight - 30;
       }
-      customStore.maxHeight = Math.max(0, customWrapperElem ? Math.min(customWrapperElem.clientHeight, tableHeight - 80) : 0);
+      customStore.maxHeight = Math.max(4, tableHeight);
     },
     checkCustomStatus: function checkCustomStatus() {
       var customStore = this.customStore,
@@ -34708,12 +34766,12 @@ var Validator = VxeTableValidatorModule;
       customStore.isAll = collectColumn.every(function (column) {
         return (checkMethod ? !checkMethod({
           column: column
-        }) : false) || column.visible;
+        }) : false) || column.renderVisible;
       });
       customStore.isIndeterminate = !customStore.isAll && collectColumn.some(function (column) {
         return (!checkMethod || checkMethod({
           column: column
-        })) && (column.visible || column.halfVisible);
+        })) && (column.renderVisible || column.halfVisible);
       });
     },
     emitCustomEvent: function emitCustomEvent(type, evnt) {
@@ -34766,6 +34824,7 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
 var panel_formatText = utils.formatText;
 var panel_addClass = dom.addClass,
   panel_removeClass = dom.removeClass;
@@ -34794,9 +34853,11 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
   var maxHeight = customStore.maxHeight;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod,
+    allowVisible = customOpts.allowVisible,
     allowSort = customOpts.allowSort,
     allowFixed = customOpts.allowFixed,
-    trigger = customOpts.trigger;
+    trigger = customOpts.trigger,
+    placement = customOpts.placement;
   var colVNs = [];
   var customWrapperOns = {};
   // hover 触发
@@ -34829,7 +34890,7 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
           dragend: _vm.sortDragendEvent,
           dragover: _vm.sortDragoverEvent
         }
-      }, [h('div', {
+      }, [allowVisible ? h('div', {
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
@@ -34847,7 +34908,7 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
-      })]), allowSort && column.level === 1 ? h('div', {
+      })]) : _e(), allowSort && column.level === 1 ? h('div', {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: 'vxe-table-custom--sort-btn',
@@ -34900,14 +34961,17 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
   var isAllIndeterminate = customStore.isIndeterminate;
   return h('div', {
     key: 'simple',
-    class: ['vxe-table-custom-wrapper', {
+    class: ['vxe-table-custom-wrapper', "placement--".concat(placement), {
       'is--active': customStore.visible
-    }]
+    }],
+    style: maxHeight && !['left', 'right'].includes(placement) ? {
+      maxHeight: "".concat(maxHeight, "px")
+    } : {}
   }, customStore.visible ? [h('ul', {
     class: 'vxe-table-custom--header'
   }, [h('li', {
     class: 'vxe-table-custom--option'
-  }, [h('div', {
+  }, [allowVisible ? h('div', {
     class: ['vxe-table-custom--checkbox-option', {
       'is--checked': isAllChecked,
       'is--indeterminate': isAllIndeterminate
@@ -34922,7 +34986,9 @@ var renderSimplePanel = function renderSimplePanel(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('div', {
+  }, conf.i18n('vxe.toolbar.customAll'))]) : h('span', {
+    class: 'vxe-checkbox--label'
+  }, conf.i18n('vxe.table.customTitle'))])]), h('div', {
     ref: 'bodyElemRef',
     class: 'vxe-table-custom--list-wrapper'
   }, [h('transition-group', {
@@ -34931,9 +34997,6 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
       name: 'vxe-table-custom--list',
       tag: 'ul'
     },
-    style: maxHeight ? {
-      maxHeight: "".concat(maxHeight, "px")
-    } : {},
     on: customWrapperOns
   }, colVNs), h('div', {
     ref: 'dragHintElemRef',
@@ -34965,8 +35028,10 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     customColumnList = $xetable.customColumnList,
     columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
-  var allowSort = customOpts.allowSort,
+  var allowVisible = customOpts.allowVisible,
+    allowSort = customOpts.allowSort,
     allowFixed = customOpts.allowFixed,
+    allowResizable = customOpts.allowResizable,
     checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
   var trVNs = [];
@@ -34995,7 +35060,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           dragend: _vm.sortDragendEvent,
           dragover: _vm.sortDragoverEvent
         }
-      }, [h('td', {
+      }, [allowVisible ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--visible'
       }, [h('div', {
         class: ['vxe-table-custom--checkbox-option', {
@@ -35015,7 +35080,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
-      })])]), allowSort ? h('td', {
+      })])]) : _e(), allowSort ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--sort'
       }, [column.level === 1 ? h('span', {
         class: 'vxe-table-custom-popup--column-sort-btn',
@@ -35028,16 +35093,29 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         }
       }, [h('i', {
         class: conf.icon.TABLE_CUSTOM_SORT
-      })]) : null]) : _e(), h('td', {
+      })]) : h('span', '-')]) : _e(), h('td', {
         class: 'vxe-table-custom-popup--column-item col--name'
       }, [h('div', {
         class: 'vxe-table-custom-popup--name',
         attrs: {
           title: colTitle
         }
-      }, colTitle)]), allowFixed ? h('td', {
+      }, colTitle)]), allowResizable ? h('td', {
+        class: 'vxe-table-custom-popup--column-item col--resizable'
+      }, [!isChecked || column.children && column.children.length ? h('span', '-') : h('vxe-input', {
+        props: {
+          type: 'integer',
+          min: 40,
+          value: column.renderResizeWidth
+        },
+        on: {
+          modelValue: function modelValue(value) {
+            column.renderResizeWidth = Math.max(40, Number(value));
+          }
+        }
+      })]) : _e(), allowFixed ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--fixed'
-      }, [!parent ? h('vxe-radio-group', {
+      }, [parent ? h('span', '-') : h('vxe-radio-group', {
         props: {
           value: column.renderFixed || '',
           type: 'button',
@@ -35062,7 +35140,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           //   changePopupFixedOption(column)
           // }
         }
-      }) : null]) : _e()]));
+      })]) : _e()]));
     }
   });
   var isAllChecked = customStore.isAll;
@@ -35073,10 +35151,10 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
       value: customStore.visible,
       title: conf.i18n('vxe.custom.cstmTitle'),
-      width: '40vw',
-      minWidth: 520,
-      height: '50vh',
-      minHeight: 300,
+      width: 700,
+      minWidth: 700,
+      height: 400,
+      minHeight: 400,
       mask: true,
       lockView: true,
       showFooter: true,
@@ -35096,11 +35174,11 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           class: 'vxe-table-custom-popup--body'
         }, [h('div', {
           class: 'vxe-table-custom-popup--table-wrapper'
-        }, [h('table', {}, [h('colgroup', {}, [h('col', {
+        }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
           style: {
             width: '80px'
           }
-        }), allowSort ? h('col', {
+        }) : _e(), allowSort ? h('col', {
           style: {
             width: '80px'
           }
@@ -35108,11 +35186,15 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           style: {
             minWidth: '120px'
           }
-        }), allowFixed ? h('col', {
+        }), allowResizable ? h('col', {
+          style: {
+            width: '140px'
+          }
+        }) : _e(), allowFixed ? h('col', {
           style: {
             width: '200px'
           }
-        }) : _e()]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('div', {
+        }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
           class: ['vxe-table-custom--checkbox-option', {
             'is--checked': isAllChecked,
             'is--indeterminate': isAllIndeterminate
@@ -35127,7 +35209,7 @@ var renderPopupPanel = function renderPopupPanel(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'))])]), allowSort ? h('th', {}, [h('span', {
+        }, conf.i18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
           class: 'vxe-table-custom-popup--table-sort-help-title'
         }, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
           props: {
@@ -35141,7 +35223,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
               });
             }
           }
-        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowFixed ? h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
+        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, conf.i18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
@@ -35241,18 +35323,38 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         updateStore({
           id: id,
           type: type,
-          storeData: this.getStoreData()
+          storeData: $xetable.getCustomStoreData()
         });
       }
     },
     confirmCustomEvent: function confirmCustomEvent(evnt) {
       var $xetable = this.$xetable;
-      var customColumnList = $xetable.customColumnList;
-      customColumnList.forEach(function (column, index) {
-        var sortIndex = index + 1;
-        column.renderSortNumber = sortIndex;
-        column.fixed = column.renderFixed;
-        column.visible = column.renderVisible;
+      var customOpts = $xetable.customOpts,
+        customColumnList = $xetable.customColumnList;
+      var allowVisible = customOpts.allowVisible,
+        allowSort = customOpts.allowSort,
+        allowFixed = customOpts.allowFixed,
+        allowResizable = customOpts.allowResizable;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
+        if (!parent) {
+          if (allowSort) {
+            var sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed;
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth;
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible;
+        }
       });
       $xetable.closeCustom();
       $xetable.emitCustomEvent('confirm', evnt);
@@ -35261,19 +35363,33 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     cancelCustomEvent: function cancelCustomEvent(evnt) {
       var $xetable = this.$xetable;
       var customStore = $xetable.customStore,
+        customOpts = $xetable.customOpts,
         customColumnList = $xetable.customColumnList;
       var oldSortMaps = customStore.oldSortMaps,
         oldFixedMaps = customStore.oldFixedMaps,
         oldVisibleMaps = customStore.oldVisibleMaps;
+      var allowVisible = customOpts.allowVisible,
+        allowSort = customOpts.allowSort,
+        allowFixed = customOpts.allowFixed,
+        allowResizable = customOpts.allowResizable;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column) {
         var colid = column.getKey();
         var visible = !!oldVisibleMaps[colid];
         var fixed = oldFixedMaps[colid] || '';
-        column.renderVisible = visible;
-        column.visible = visible;
-        column.renderFixed = fixed;
-        column.fixed = fixed;
-        column.renderSortNumber = oldSortMaps[colid] || 0;
+        if (allowVisible) {
+          column.renderVisible = visible;
+          column.visible = visible;
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed;
+          column.fixed = fixed;
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0;
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth;
+        }
       }, {
         children: 'children'
       });
@@ -35285,7 +35401,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       $xetable.resetColumn(true);
       $xetable.closeCustom();
       $xetable.emitCustomEvent('reset', evnt);
-      this.handleSaveStore('confirm');
+      this.handleSaveStore('reset');
     },
     resetCustomEvent: function resetCustomEvent(evnt) {
       var _this = this;
@@ -37659,6 +37775,12 @@ var Toolbar = VxeToolbar;
       }
     },
     className: [String, Function],
+    pageSizePlacement: {
+      type: String,
+      default: function _default() {
+        return conf.pager.pageSizePlacement;
+      }
+    },
     // 自定义图标
     iconPrevPage: String,
     iconJumpPrev: String,
@@ -37883,7 +38005,7 @@ var Toolbar = VxeToolbar;
         class: 'vxe-pager--sizes',
         props: {
           value: this.pageSize,
-          placement: 'top',
+          placement: this.pageSizePlacement,
           transfer: this.transfer,
           options: this.sizeList
         },
@@ -42273,6 +42395,7 @@ var Pulldown = VxePulldown;
         colSort: '排序',
         sortHelpTip: '点击并拖动图标可以调整列的排序',
         colTitle: '标题',
+        colResizable: '列宽（像素）',
         colVisible: '是否显示',
         colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',