vxe-table 4.2.2 → 4.2.4-beta.0

package/es/table/src/body.js

@@ -454,8 +454,10 @@ export default defineComponent({
             var bodyElem = tableBody.$el;
             var leftElem = leftBody ? leftBody.$el : null;
             var rightElem = rightBody ? rightBody.$el : null;
-            var bodyYElem = elemStore['main-body-ySpace'];
-            var bodyXElem = elemStore['main-body-xSpace'];
+            var bodyYRef = elemStore['main-body-ySpace'];
+            var bodyYElem = bodyYRef ? bodyYRef.value : null;
+            var bodyXRef = elemStore['main-body-xSpace'];
+            var bodyXElem = bodyXRef ? bodyXRef.value : null;
             var bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
             var bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
             var scrollTop = scrollBodyElem.scrollTop;
@@ -528,8 +530,10 @@ export default defineComponent({
             var leftElem = leftBody ? leftBody.$el : null;
             var rightElem = rightBody ? rightBody.$el : null;
             var bodyElem = tableBody.$el;
-            var bodyYElem = elemStore['main-body-ySpace'];
-            var bodyXElem = elemStore['main-body-xSpace'];
+            var bodyYRef = elemStore['main-body-ySpace'];
+            var bodyYElem = bodyYRef ? bodyYRef.value : null;
+            var bodyXRef = elemStore['main-body-xSpace'];
+            var bodyXElem = bodyXRef ? bodyXRef.value : null;
             var bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight;
             var bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth;
             var remainSize = isPrevWheelTop === isTopWheel ? Math.max(0, wheelYSize - wheelYTotal) : 0;
@@ -618,13 +622,13 @@ export default defineComponent({
                 var elemStore = tableInternalData.elemStore;
                 var prefix = (fixedType || 'main') + "-body-";
                 var el = refElem.value;
-                elemStore[prefix + "wrapper"] = refElem.value;
-                elemStore[prefix + "table"] = refBodyTable.value;
-                elemStore[prefix + "colgroup"] = refBodyColgroup.value;
-                elemStore[prefix + "list"] = refBodyTBody.value;
-                elemStore[prefix + "xSpace"] = refBodyXSpace.value;
-                elemStore[prefix + "ySpace"] = refBodyYSpace.value;
-                elemStore[prefix + "emptyBlock"] = refBodyEmptyBlock.value;
+                elemStore[prefix + "wrapper"] = refElem;
+                elemStore[prefix + "table"] = refBodyTable;
+                elemStore[prefix + "colgroup"] = refBodyColgroup;
+                elemStore[prefix + "list"] = refBodyTBody;
+                elemStore[prefix + "xSpace"] = refBodyXSpace;
+                elemStore[prefix + "ySpace"] = refBodyYSpace;
+                elemStore[prefix + "emptyBlock"] = refBodyEmptyBlock;
                 el.onscroll = scrollEvent;
                 el._onscroll = scrollEvent;
             });

package/es/table/src/table.js

@@ -932,12 +932,17 @@ export default defineComponent({
          * 支持 px、%、固定 混合分配
          * 支持动态列表调整分配
          * 支持自动分配偏移量
-         * @param {Element} headerElem
-         * @param {Element} bodyElem
-         * @param {Element} footerElem
-         * @param {Number} bodyWidth
          */
-        var autoCellWidth = function (headerElem, bodyElem, footerElem) {
+        var autoCellWidth = function () {
+            var tableHeader = refTableHeader.value;
+            var tableBody = refTableBody.value;
+            var tableFooter = refTableFooter.value;
+            var bodyElem = tableBody ? tableBody.$el : null;
+            var headerElem = tableHeader ? tableHeader.$el : null;
+            var footerElem = tableFooter ? tableFooter.$el : null;
+            if (!bodyElem) {
+                return;
+            }
             var tableWidth = 0;
             var minCellWidth = 40; // 列宽最少限制 40px
             var bodyWidth = bodyElem.clientWidth - 1;
@@ -1290,7 +1295,8 @@ export default defineComponent({
             var cellOffsetWidth = computeCellOffsetWidth.value;
             var mouseOpts = computeMouseOpts.value;
             var keyboardOpts = computeKeyboardOpts.value;
-            var bodyWrapperElem = elemStore['main-body-wrapper'];
+            var bodyWrapperRef = elemStore['main-body-wrapper'];
+            var bodyWrapperElem = bodyWrapperRef ? bodyWrapperRef.value : null;
             if (emptyPlaceholderElem) {
                 emptyPlaceholderElem.style.top = headerHeight + "px";
                 emptyPlaceholderElem.style.height = bodyWrapperElem ? bodyWrapperElem.offsetHeight - scrollbarHeight + "px" : '';
@@ -1311,8 +1317,10 @@ export default defineComponent({
                     fixedWrapperElem = isFixedLeft ? refLeftContainer.value : refRightContainer.value;
                 }
                 layoutList.forEach(function (layout) {
-                    var wrapperElem = elemStore[name + "-" + layout + "-wrapper"];
-                    var tableElem = elemStore[name + "-" + layout + "-table"];
+                    var wrapperRef = elemStore[name + "-" + layout + "-wrapper"];
+                    var wrapperElem = wrapperRef ? wrapperRef.value : null;
+                    var tableRef = elemStore[name + "-" + layout + "-table"];
+                    var tableElem = tableRef ? tableRef.value : null;
                     if (layout === 'header') {
                         // 表头体样式处理
                         // 横向滚动渲染
@@ -1339,11 +1347,13 @@ export default defineComponent({
                                 });
                             }
                         }
-                        var repairElem = elemStore[name + "-" + layout + "-repair"];
+                        var repairRef = elemStore[name + "-" + layout + "-repair"];
+                        var repairElem = repairRef ? repairRef.value : null;
                         if (repairElem) {
                             repairElem.style.width = tableWidth + "px";
                         }
-                        var listElem = elemStore[name + "-" + layout + "-list"];
+                        var listRef = elemStore[name + "-" + layout + "-list"];
+                        var listElem = listRef ? listRef.value : null;
                         if (isGroup && listElem) {
                             XEUtils.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
                                 var colNode = tableMethods.getColumnNode(thElem);
@@ -1371,7 +1381,8 @@ export default defineComponent({
                         }
                     }
                     else if (layout === 'body') {
-                        var emptyBlockElem = elemStore[name + "-" + layout + "-emptyBlock"];
+                        var emptyBlockRef = elemStore[name + "-" + layout + "-emptyBlock"];
+                        var emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null;
                         if (isNodeElement(wrapperElem)) {
                             if (customMaxHeight) {
                                 wrapperElem.style.maxHeight = (fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight) + "px";
@@ -1446,7 +1457,8 @@ export default defineComponent({
                             tableElem.style.width = tWidth ? tWidth + scrollbarWidth + "px" : '';
                         }
                     }
-                    var colgroupElem = elemStore[name + "-" + layout + "-colgroup"];
+                    var colgroupRef = elemStore[name + "-" + layout + "-colgroup"];
+                    var colgroupElem = colgroupRef ? colgroupRef.value : null;
                     if (colgroupElem) {
                         XEUtils.arrayEach(colgroupElem.children, function (colElem) {
                             var colid = colElem.getAttribute('name');
@@ -1471,7 +1483,8 @@ export default defineComponent({
                                 var showTitle = cellOverflow === 'title';
                                 var showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
                                 var hasEllipsis_1 = showTitle || showTooltip || showEllipsis;
-                                var listElem = elemStore[name + "-" + layout + "-list"];
+                                var listRef = elemStore[name + "-" + layout + "-list"];
+                                var listElem = listRef ? listRef.value : null;
                                 // 纵向虚拟滚动不支持动态行高
                                 if (scrollYLoad && !hasEllipsis_1) {
                                     hasEllipsis_1 = true;
@@ -1724,7 +1737,7 @@ export default defineComponent({
                             childRecords = [];
                         }
                         if (childRecords) {
-                            tableMethods.loadTreeChildren(row, childRecords).then(function (childRows) {
+                            return tableMethods.loadTreeChildren(row, childRecords).then(function (childRows) {
                                 if (childRows.length && $xetable.findRowIndexOf(treeExpandeds, row) === -1) {
                                     treeExpandeds.push(row);
                                 }
@@ -1732,18 +1745,18 @@ export default defineComponent({
                                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
                                     tableMethods.setCheckboxRow(childRows, true);
                                 }
-                                nextTick().then(function () {
+                                return nextTick().then(function () {
                                     if (transform) {
                                         return tablePrivateMethods.handleTableData();
                                     }
-                                }).then(function () {
-                                    return tableMethods.recalculate();
-                                }).then(function () { return resolve(); });
+                                });
                             });
                         }
-                        else {
-                            nextTick().then(function () { return tableMethods.recalculate(); }).then(function () { return resolve(); });
-                        }
+                    }).catch(function () {
+                        rest.treeLoaded = false;
+                        XEUtils.remove(treeLazyLoadeds, function (item) { return $xetable.eqRow(item, row); });
+                    }).finally(function () {
+                        nextTick().then(function () { return tableMethods.recalculate(); }).then(function () { return resolve(); });
                     });
                 }
                 else {
@@ -1765,18 +1778,20 @@ export default defineComponent({
             }
         };
         var handleAsyncRowExpand = function (row) {
-            var rowExpandeds = reactData.rowExpandeds, expandLazyLoadeds = reactData.expandLazyLoadeds;
             var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-            var rest = fullAllDataRowIdData[getRowid($xetable, row)];
             return new Promise(function (resolve) {
                 var expandOpts = computeExpandOpts.value;
                 var loadMethod = expandOpts.loadMethod;
                 if (loadMethod) {
-                    expandLazyLoadeds.push(row);
-                    loadMethod({ $table: $xetable, row: row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).catch(function (e) { return e; }).then(function () {
-                        rest.expandLoaded = true;
-                        XEUtils.remove(expandLazyLoadeds, function (item) { return $xetable.eqRow(item, row); });
-                        rowExpandeds.push(row);
+                    var rest_1 = fullAllDataRowIdData[getRowid($xetable, row)];
+                    reactData.expandLazyLoadeds.push(row);
+                    loadMethod({ $table: $xetable, row: row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(function () {
+                        rest_1.expandLoaded = true;
+                        reactData.rowExpandeds.push(row);
+                    }).catch(function () {
+                        rest_1.expandLoaded = false;
+                    }).finally(function () {
+                        XEUtils.remove(reactData.expandLazyLoadeds, function (item) { return $xetable.eqRow(item, row); });
                         resolve(nextTick().then(function () { return tableMethods.recalculate(); }));
                     });
                 }
@@ -2907,21 +2922,13 @@ export default defineComponent({
              * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
              */
             recalculate: function (refull) {
-                var tableHeader = refTableHeader.value;
-                var tableBody = refTableBody.value;
-                var tableFooter = refTableFooter.value;
-                var bodyElem = tableBody ? tableBody.$el : null;
-                var headerElem = tableHeader ? tableHeader.$el : null;
-                var footerElem = tableFooter ? tableFooter.$el : null;
-                if (bodyElem) {
-                    autoCellWidth(headerElem, bodyElem, footerElem);
-                    if (refull === true) {
-                        // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-                        return computeScrollLoad().then(function () {
-                            autoCellWidth(headerElem, bodyElem, footerElem);
-                            return computeScrollLoad();
-                        });
-                    }
+                autoCellWidth();
+                if (refull === true) {
+                    // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
+                    return computeScrollLoad().then(function () {
+                        autoCellWidth();
+                        return computeScrollLoad();
+                    });
                 }
                 return computeScrollLoad();
             },
@@ -5367,7 +5374,8 @@ export default defineComponent({
                     containerList.forEach(function (name) {
                         var layoutList = ['header', 'body', 'footer'];
                         layoutList.forEach(function (layout) {
-                            var xSpaceElem = elemStore[name + "-" + layout + "-xSpace"];
+                            var xSpaceRef = elemStore[name + "-" + layout + "-xSpace"];
+                            var xSpaceElem = xSpaceRef ? xSpaceRef.value : null;
                             if (xSpaceElem) {
                                 xSpaceElem.style.width = scrollXLoad ? tableWidth + (layout === 'header' ? scrollbarWidth : 0) + "px" : '';
                             }
@@ -5392,12 +5400,14 @@ export default defineComponent({
                 }
                 containerList.forEach(function (name) {
                     var layoutList = ['header', 'body', 'footer'];
-                    var tableElem = elemStore[name + "-body-table"];
+                    var tableRef = elemStore[name + "-body-table"];
+                    var tableElem = tableRef ? tableRef.value : null;
                     if (tableElem) {
                         tableElem.style.marginTop = marginTop;
                     }
                     layoutList.forEach(function (layout) {
-                        var ySpaceElem = elemStore[name + "-" + layout + "-ySpace"];
+                        var ySpaceRef = elemStore[name + "-" + layout + "-ySpace"];
+                        var ySpaceElem = ySpaceRef ? ySpaceRef.value : null;
                         if (ySpaceElem) {
                             ySpaceElem.style.height = ySpaceHeight;
                         }
@@ -5406,14 +5416,14 @@ export default defineComponent({
                 nextTick(updateStyle);
             },
             updateScrollXData: function () {
-                reactData.tableColumn = [];
+                // reactData.tableColumn = []
                 nextTick(function () {
                     handleTableColumn();
                     tablePrivateMethods.updateScrollXSpace();
                 });
             },
             updateScrollYData: function () {
-                reactData.tableData = [];
+                // reactData.tableData = []
                 nextTick(function () {
                     tablePrivateMethods.handleTableData();
                     tablePrivateMethods.updateScrollYSpace();

package/es/table/src/util.js

@@ -1,4 +1,4 @@
-import { watch } from 'vue';
+import { watch, reactive } from 'vue';
 import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isPx, isScale } from '../../tools/dom';
@@ -146,7 +146,7 @@ export function isColumnInfo(column) {
     return column && (column.constructor === ColumnInfo || column instanceof ColumnInfo);
 }
 export function createColumn($xetable, options, renderOptions) {
-    return isColumnInfo(options) ? options : new ColumnInfo($xetable, options, renderOptions);
+    return isColumnInfo(options) ? options : reactive(new ColumnInfo($xetable, options, renderOptions));
 }
 export function watchColumn(props, column) {
     Object.keys(props).forEach(function (name) {

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.2-beta.1" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.4-beta.0" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.2-beta.1",
+    version: "4.2.4-beta.0",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/helper/vetur/attributes.json

@@ -25,7 +25,7 @@
   },
   "vxe-table/resizable": {
     "type": "boolean",
-    "description": "所有的列是否允许拖动列宽调整大小，被 column-config.resizable 替换"
+    "description": "已废弃，被 column-config.resizable 替换"
   },
   "vxe-table/stripe": {
     "type": "boolean",
@@ -65,19 +65,19 @@
   },
   "vxe-table/highlight-current-row": {
     "type": "boolean",
-    "description": "是否要高亮当前行，被 row-config.isCurrent 替换"
+    "description": "已废弃，被 row-config.isCurrent 替换"
   },
   "vxe-table/highlight-hover-row": {
     "type": "boolean",
-    "description": "鼠标移到行是否要高亮显示，被 row-config.isHover 替换"
+    "description": "已废弃，被 row-config.isHover 替换"
   },
   "vxe-table/highlight-current-column": {
     "type": "boolean",
-    "description": "是否要高亮当前列，被 column-config.isCurrent 替换"
+    "description": "已废弃，被 column-config.isCurrent 替换"
   },
   "vxe-table/highlight-hover-column": {
     "type": "boolean",
-    "description": "鼠标移到列是否要高亮显，被 column-config.isHover 替换示"
+    "description": "已废弃，被 column-config.isHover 替换"
   },
   "vxe-table/row-class-name": {
     "type": "string | (({ row, rowindex, $rowindex }) => any)",
@@ -165,15 +165,15 @@
   },
   "vxe-table/column-key": {
     "type": "boolean",
-    "description": "是否需要为每一列的 VNode 设置 key 属性（非特殊情况下不需要使用）"
+    "description": "已废弃，被 column-config.useKey 替换"
   },
   "vxe-table/row-key": {
     "type": "boolean",
-    "description": "是否需要为每一行的 VNode 设置 key 属性（非特殊情况下没必要设置）"
+    "description": "已废弃，被 row-config.useKey 替换"
   },
   "vxe-table/row-id": {
     "type": "string",
-    "description": "自定义行数据唯一主键的字段名（行数据必须要有唯一主键，默认自动生成）"
+    "description": "已废弃，被 row-config.keyField 替换"
   },
   "vxe-table/keep-source": {
     "type": "boolean",
@@ -461,7 +461,11 @@
   },
   "vxe-column/title-help": {
     "type": "any",
-    "description": "标题帮助图标配置项"
+    "description": "即将废弃，请使用 title.prefix"
+  },
+  "vxe-column/title-prefix": {
+    "type": "any",
+    "description": "标题前缀图标配置项"
   },
   "vxe-column/cell-type": {
     "type": "string",
@@ -521,7 +525,7 @@
   },
   "vxe-grid/resizable": {
     "type": "boolean",
-    "description": "所有的列是否允许拖动列宽调整大小，被 column-config.resizable 替换"
+    "description": "已废弃，被 column-config.resizable 替换"
   },
   "vxe-grid/stripe": {
     "type": "boolean",
@@ -561,19 +565,19 @@
   },
   "vxe-grid/highlight-current-row": {
     "type": "boolean",
-    "description": "是否要高亮当前行，被 row-config.isCurrent 替换"
+    "description": "已废弃，被 row-config.isCurrent 替换"
   },
   "vxe-grid/highlight-hover-row": {
     "type": "boolean",
-    "description": "鼠标移到行是否要高亮显示，被 row-config.isHover 替换"
+    "description": "已废弃，被 row-config.isHover 替换"
   },
   "vxe-grid/highlight-current-column": {
     "type": "boolean",
-    "description": "是否要高亮当前列，被 column-config.isCurrent 替换"
+    "description": "已废弃，被 column-config.isCurrent 替换"
   },
   "vxe-grid/highlight-hover-column": {
     "type": "boolean",
-    "description": "鼠标移到列是否要高亮显，被 column-config.isHover 替换示"
+    "description": "已废弃，被 column-config.isHover 替换"
   },
   "vxe-grid/row-class-name": {
     "type": "string | (({ row, rowindex, $rowindex }) => any)",
@@ -661,15 +665,15 @@
   },
   "vxe-grid/column-key": {
     "type": "boolean",
-    "description": "是否需要为每一列的 VNode 设置 key 属性（非特殊情况下不需要使用）"
+    "description": "已废弃，被 column-config.useKey 替换"
   },
   "vxe-grid/row-key": {
     "type": "boolean",
-    "description": "是否需要为每一行的 VNode 设置 key 属性（非特殊情况下没必要设置）"
+    "description": "已废弃，被 row-config.useKey 替换"
   },
   "vxe-grid/row-id": {
     "type": "string",
-    "description": "自定义行数据唯一主键的字段名（行数据必须要有唯一主键，默认自动生成）"
+    "description": "已废弃，被 row-config.keyField 替换"
   },
   "vxe-grid/keep-source": {
     "type": "boolean",
@@ -1115,6 +1119,10 @@
     "type": "string | number",
     "description": "原生 maxlength 属性"
   },
+  "vxe-input/multiple": {
+    "type": "boolean",
+    "description": "只对 type=date|week|month|quarter|year 有效，是否启用多选"
+  },
   "vxe-input/readonly": {
     "type": "boolean",
     "description": "是否只读"
@@ -1267,13 +1275,17 @@
     "type": "any",
     "description": "下拉分组选项属性参数配置"
   },
+  "vxe-select/option-config": {
+    "type": "any",
+    "description": "选项配置信息"
+  },
   "vxe-select/option-id": {
     "type": "string",
-    "description": "自定义选项唯一主键的字段名（选项必须要有唯一主键，默认自动生成）"
+    "description": "已废弃，被 option-config.keyField 替换"
   },
   "vxe-select/option-key": {
     "type": "boolean",
-    "description": "是否需要为每一行的 VNode 设置 key 属性（非特殊情况下没必要设置）"
+    "description": "已废弃，被 option-config.useKey 替换"
   },
   "vxe-select/transfer": {
     "type": "boolean",

package/helper/vetur/tags.json

@@ -134,6 +134,7 @@
       "export-method",
       "footer-export-method",
       "title-help",
+      "title-prefix",
       "cell-type",
       "cell-render",
       "edit-render",
@@ -354,6 +355,7 @@
       "placeholder",
       "autocomplete",
       "maxlength",
+      "multiple",
       "readonly",
       "disabled",
       "class-name",
@@ -397,6 +399,7 @@
       "option-props",
       "option-groups",
       "option-group-props",
+      "option-config",
       "option-id",
       "option-key",
       "transfer"

package/lib/filter/src/hook.js

@@ -276,7 +276,8 @@ var tableFilterHook = {
           var elemStore_1 = internalData.elemStore;
           var fixed_1 = column.fixed;
           return $xetable.scrollToColumn(column).then(function () {
-            var headerWrapperElem = elemStore_1[(fixed_1 || 'main') + "-header-wrapper"] || elemStore_1['main-header-wrapper'];
+            var headerWrapperRef = elemStore_1[(fixed_1 || 'main') + "-header-wrapper"] || elemStore_1['main-header-wrapper'];
+            var headerWrapperElem = headerWrapperRef ? headerWrapperRef.value : null;
 
             if (headerWrapperElem) {
               var filterBtnElem = headerWrapperElem.querySelector(".vxe-header--column." + column.id + " .vxe-filter--btn");

package/lib/filter/src/hook.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,r=arguments.length;l<r;l++)for(var i in t=arguments[l])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},tableFilterMethodKeys=["setFilter","clearFilter","getCheckedFilters"],tableFilterHook={setupTable:function(f){var s=f.reactData,a=f.internalData,e=f.getRefMaps(),_=e.refTableBody,b=e.refTableFilter,c=f.getComputeMaps().computeFilterOpts,n={checkFilterOptions:function(){var e=s.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,d,t){var h,p,v,l,r,i,n,o=s.initStore,m=s.filterStore;m.column===d&&m.visible?m.visible=!1:(h=e.target,p=e.pageX,v=(0,_dom.getDomNode)().visibleWidth,l=d.filters,r=d.filterMultiple,i=(i=d.filterRender)?_vXETable.VXETable.renderer.get(i.name):null,n=d.filterRecoverMethod||(i?i.filterRecoverMethod:null),a._currFilterParams=t,Object.assign(m,{multiple:r,options:l,column:d,style:null}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||n&&n({option:e,column:d,$table:f})}),this.checkFilterOptions(),m.visible=!0,o.filter=!0,(0,_vue.nextTick)(function(){var e=_.value.$el,t=b.value,l=t?t.$el:null,r=0,i=0,n=null,o=null;l&&(r=l.offsetWidth,i=l.offsetHeight,n=l.querySelector(".vxe-table--filter-header"),o=l.querySelector(".vxe-table--filter-footer"));var a,u,f,s=r/2,c=e.clientWidth-r-10,t={top:h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8+"px"},l=null;i>=e.clientHeight&&(l=Math.max(60,e.clientHeight-(o?o.offsetHeight:0)-(n?n.offsetHeight:0))),"left"===d.fixed?a=h.offsetLeft+h.offsetParent.offsetLeft-s:"right"===d.fixed?u=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-d.renderWidth-s:a=h.offsetLeft+h.offsetParent.offsetLeft-s-e.scrollLeft,a?(0<(f=p+r-s+10-v)&&(a-=f),t.left=Math.min(c,Math.max(10,a))+"px"):u&&(0<(f=p+r-s+10-v)&&(u+=f),t.right=Math.max(10,u)+"px"),m.style=t,m.maxHeight=l})),f.dispatchEvent("filter-visible",{column:d,property:d.property,filterList:f.getCheckedFilters(),visible:m.visible},e)},handleClearFilter:function(e){var t,l,r;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.VXETable.renderer.get(l.name):null,r=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,r||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),r&&r({options:t,column:e,$table:f})))},confirmFilterEvent:function(e){var t=s.filterStore,l=s.scrollXLoad,r=s.scrollYLoad,i=c.value,n=t.column,o=n.property,a=[],u=[];n.filters.forEach(function(e){e.checked&&(a.push(e.value),u.push(e.data))});t=f.getCheckedFilters();i.remote||(f.handleTableData(!0),f.checkSelectionStatus()),f.dispatchEvent("filter-change",{column:n,property:o,values:a,datas:u,filters:t,filterList:t},e),f.closeFilter(),f.updateFooter().then(function(){var e=s.scrollXLoad,t=s.scrollYLoad;if(l||e||r||t)return(l||e)&&f.updateScrollXSpace(),(r||t)&&f.updateScrollYSpace(),f.refreshScroll()}).then(function(){return f.updateCellAreas(),f.recalculate(!0)}).then(function(){setTimeout(function(){return f.recalculate()},50)})}};return __assign(__assign({},{openFilter:function(e){var t=(0,_util.handleFieldOrColumn)(f,e);if(t&&t.filters){var l=a.elemStore,r=t.fixed;return f.scrollToColumn(t).then(function(){var e=l[(r||"main")+"-header-wrapper"]||l["main-header-wrapper"];e&&(e=e.querySelector(".vxe-header--column."+t.id+" .vxe-filter--btn"),(0,_dom.triggerEvent)(e,"click"))})}return(0,_vue.nextTick)()},setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(f,e);return e&&e.filters&&t&&(e.filters=(0,_util.toFilters)(t)),(0,_vue.nextTick)()},clearFilter:function(e){var t,l=s.filterStore,r=a.tableFullColumn,i=c.value;return e?(t=(0,_util.handleFieldOrColumn)(f,e))&&n.handleClearFilter(t):r.forEach(n.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),i.remote?(0,_vue.nextTick)():f.updateData()},getCheckedFilters:function(){var e=a.tableFullColumn,n=[];return e.filter(function(e){var t=e.property,l=e.filters,r=[],i=[];l&&l.length&&(l.forEach(function(e){e.checked&&(r.push(e.value),i.push(e.data))}),r.length&&n.push({column:e,property:t,values:r,datas:i}))}),n}}),n)},setupGrid:function(e){return e.extendTableMethods(tableFilterMethodKeys)}},_default=tableFilterHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,r=arguments.length;l<r;l++)for(var i in t=arguments[l])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},tableFilterMethodKeys=["setFilter","clearFilter","getCheckedFilters"],tableFilterHook={setupTable:function(f){var s=f.reactData,a=f.internalData,e=f.getRefMaps(),_=e.refTableBody,b=e.refTableFilter,c=f.getComputeMaps().computeFilterOpts,n={checkFilterOptions:function(){var e=s.filterStore;e.isAllSelected=e.options.every(function(e){return e._checked}),e.isIndeterminate=!e.isAllSelected&&e.options.some(function(e){return e._checked})},triggerFilterEvent:function(e,d,t){var h,p,v,l,r,i,n,o=s.initStore,m=s.filterStore;m.column===d&&m.visible?m.visible=!1:(h=e.target,p=e.pageX,v=(0,_dom.getDomNode)().visibleWidth,l=d.filters,r=d.filterMultiple,i=(i=d.filterRender)?_vXETable.VXETable.renderer.get(i.name):null,n=d.filterRecoverMethod||(i?i.filterRecoverMethod:null),a._currFilterParams=t,Object.assign(m,{multiple:r,options:l,column:d,style:null}),m.options.forEach(function(e){var t=e._checked,l=e.checked;(e._checked=l)||t===l||n&&n({option:e,column:d,$table:f})}),this.checkFilterOptions(),m.visible=!0,o.filter=!0,(0,_vue.nextTick)(function(){var e=_.value.$el,t=b.value,l=t?t.$el:null,r=0,i=0,n=null,o=null;l&&(r=l.offsetWidth,i=l.offsetHeight,n=l.querySelector(".vxe-table--filter-header"),o=l.querySelector(".vxe-table--filter-footer"));var a,u,f,s=r/2,c=e.clientWidth-r-10,t={top:h.offsetTop+h.offsetParent.offsetTop+h.offsetHeight+8+"px"},l=null;i>=e.clientHeight&&(l=Math.max(60,e.clientHeight-(o?o.offsetHeight:0)-(n?n.offsetHeight:0))),"left"===d.fixed?a=h.offsetLeft+h.offsetParent.offsetLeft-s:"right"===d.fixed?u=h.offsetParent.offsetWidth-h.offsetLeft+(h.offsetParent.offsetParent.offsetWidth-h.offsetParent.offsetLeft)-d.renderWidth-s:a=h.offsetLeft+h.offsetParent.offsetLeft-s-e.scrollLeft,a?(0<(f=p+r-s+10-v)&&(a-=f),t.left=Math.min(c,Math.max(10,a))+"px"):u&&(0<(f=p+r-s+10-v)&&(u+=f),t.right=Math.max(10,u)+"px"),m.style=t,m.maxHeight=l})),f.dispatchEvent("filter-visible",{column:d,property:d.property,filterList:f.getCheckedFilters(),visible:m.visible},e)},handleClearFilter:function(e){var t,l,r;e&&(t=e.filters,l=e.filterRender,t&&(l=l?_vXETable.VXETable.renderer.get(l.name):null,r=e.filterResetMethod||(l?l.filterResetMethod:null),t.forEach(function(e){e._checked=!1,e.checked=!1,r||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),r&&r({options:t,column:e,$table:f})))},confirmFilterEvent:function(e){var t=s.filterStore,l=s.scrollXLoad,r=s.scrollYLoad,i=c.value,n=t.column,o=n.property,a=[],u=[];n.filters.forEach(function(e){e.checked&&(a.push(e.value),u.push(e.data))});t=f.getCheckedFilters();i.remote||(f.handleTableData(!0),f.checkSelectionStatus()),f.dispatchEvent("filter-change",{column:n,property:o,values:a,datas:u,filters:t,filterList:t},e),f.closeFilter(),f.updateFooter().then(function(){var e=s.scrollXLoad,t=s.scrollYLoad;if(l||e||r||t)return(l||e)&&f.updateScrollXSpace(),(r||t)&&f.updateScrollYSpace(),f.refreshScroll()}).then(function(){return f.updateCellAreas(),f.recalculate(!0)}).then(function(){setTimeout(function(){return f.recalculate()},50)})}};return __assign(__assign({},{openFilter:function(e){var t=(0,_util.handleFieldOrColumn)(f,e);if(t&&t.filters){var l=a.elemStore,r=t.fixed;return f.scrollToColumn(t).then(function(){var e=l[(r||"main")+"-header-wrapper"]||l["main-header-wrapper"],e=e?e.value:null;e&&(e=e.querySelector(".vxe-header--column."+t.id+" .vxe-filter--btn"),(0,_dom.triggerEvent)(e,"click"))})}return(0,_vue.nextTick)()},setFilter:function(e,t){e=(0,_util.handleFieldOrColumn)(f,e);return e&&e.filters&&t&&(e.filters=(0,_util.toFilters)(t)),(0,_vue.nextTick)()},clearFilter:function(e){var t,l=s.filterStore,r=a.tableFullColumn,i=c.value;return e?(t=(0,_util.handleFieldOrColumn)(f,e))&&n.handleClearFilter(t):r.forEach(n.handleClearFilter),e&&t===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),i.remote?(0,_vue.nextTick)():f.updateData()},getCheckedFilters:function(){var e=a.tableFullColumn,n=[];return e.filter(function(e){var t=e.property,l=e.filters,r=[],i=[];l&&l.length&&(l.forEach(function(e){e.checked&&(r.push(e.value),i.push(e.data))}),r.length&&n.push({column:e,property:t,values:r,datas:i}))}),n}}),n)},setupGrid:function(e){return e.extendTableMethods(tableFilterMethodKeys)}},_default=tableFilterHook;exports.default=_default;

package/lib/footer/src/footer.js

@@ -158,11 +158,11 @@ var _default2 = (0, _vue.defineComponent)({
         var fixedType = props.fixedType;
         var elemStore = tableInternalData.elemStore;
         var prefix = (fixedType || 'main') + "-footer-";
-        elemStore[prefix + "wrapper"] = refElem.value;
-        elemStore[prefix + "table"] = refFooterTable.value;
-        elemStore[prefix + "colgroup"] = refFooterColgroup.value;
-        elemStore[prefix + "list"] = refFooterTFoot.value;
-        elemStore[prefix + "xSpace"] = refFooterXSpace.value;
+        elemStore[prefix + "wrapper"] = refElem;
+        elemStore[prefix + "table"] = refFooterTable;
+        elemStore[prefix + "colgroup"] = refFooterColgroup;
+        elemStore[prefix + "list"] = refFooterTFoot;
+        elemStore[prefix + "xSpace"] = refFooterXSpace;
       });
     });
     (0, _vue.onUnmounted)(function () {

package/lib/footer/src/footer.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,l,t){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,a=r.col,u=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&u&&r){if(n===l&&a===t)return{rowspan:u,colspan:r};if(n<=l&&l<n+u&&a<=t&&t<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(i){function n(e){var l=i.fixedType,t=s.scrollXLoad,o=c.lastScrollLeft,r=p.value,n=f.value,a=d.value,u=n?n.$el:null,n=x.value,a=a.$el,o=(n=n.scrollLeft)!==o;c.lastScrollLeft=n,c.lastScrollTime=Date.now(),u&&(u.scrollLeft=n),a&&(a.scrollLeft=n),t&&o&&E.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),E.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:a.scrollTop,scrollLeft:n,isX:o,isY:!1},e)}var E=(0,_vue.inject)("$xetable",{}),a=E.xID,u=E.props,s=E.reactData,c=E.internalData,e=E.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=E.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),g=(0,_vue.ref)(),m=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=i.fixedType,l=c.elemStore,e=(e||"main")+"-footer-";l[e+"wrapper"]=x.value,l[e+"table"]=g.value,l[e+"colgroup"]=m.value,l[e+"list"]=y.value,l[e+"xSpace"]=h.value})}),(0,_vue.onUnmounted)(function(){var e=i.fixedType,l=c.elemStore,e=(e||"main")+"-footer-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null});return function(){var w=i.fixedType,e=i.fixedColumn,T=i.tableColumn,C=i.footerTableData,l=u.footerRowClassName,I=u.footerCellClassName,t=u.footerRowStyle,S=u.footerCellStyle,F=u.footerAlign,D=u.footerSpanMethod,L=u.align,M=u.columnKey,O=u.showFooterOverflow,o=c.visibleColumn,$=s.scrollYLoad,U=s.overflowX,r=s.scrollbarWidth,k=s.currentColumn,j=s.mergeFooterList,q=v.value,A=_.value;return w&&(T=!$&&!O||j.length&&D?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",w?"fixed-"+w+"--wrapper":"body--wrapper"],xid:a,onScroll:n},[w?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:g,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:m},T.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},C.map(function(y,h){var b=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",l?_xeUtils.default.isFunction(l)?l({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):l:""],style:t?_xeUtils.default.isFunction(t)?t({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):t:null},T.map(function(l,e){var t=l.type,o=l.showFooterOverflow,r=l.footerAlign,n=l.align,a=l.footerClassName,u=q.showAll,i=l.children&&l.children.length,s=w?l.fixed!==w&&!i:l.fixed&&U,c=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?O:o,f=r||n||F||L,d="ellipsis"===c,p="title"===c,v=!0===c||"tooltip"===c,i=p||v||d,o={colid:l.id},r={},n=E.getColumnIndex(l),c=E.getVTColumnIndex(l),_={$table:E,_rowIndex:h,$rowIndex:b,column:l,columnIndex:n,$columnIndex:e,_columnIndex:c,itemIndex:c,items:y,fixed:w,type:renderType,data:C};if($&&!i&&(d=i=!0),(p||v||u)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,l):(v||u)&&E.triggerFooterTooltipEvent(e,_)}),(v||u)&&(r.onMouseleave=function(e){(v||u)&&E.handleTargetLeaveEvent(e)}),r.onClick=function(e){E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,c);if(x){var g=x.rowspan,m=x.colspan;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}}else if(D){var c=D(_)||{},x=c.rowspan,g=void 0===x?1:x,c=c.colspan,m=void 0===c?1:c;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",l.id,((m={})["col--"+f]=f,m["col--"+t]=t,m["col--last"]=e===T.length-1,m["fixed--hidden"]=s,m["col--ellipsis"]=i,m["col--current"]=k===l,m),(0,_util.getPropClass)(a,_),(0,_util.getPropClass)(I,_)]},o),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M||A.useKey?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},l.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,o=arguments.length;l<o;l++)for(var r in t=arguments[l])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,t,l){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,a=r.col,i=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&i&&r){if(n===t&&a===l)return{rowspan:i,colspan:r};if(n<=t&&t<n+i&&a<=l&&l<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(u){function n(e){var t=u.fixedType,l=s.scrollXLoad,o=c.lastScrollLeft,r=p.value,n=f.value,a=d.value,i=n?n.$el:null,n=x.value,a=a.$el,o=(n=n.scrollLeft)!==o;c.lastScrollLeft=n,c.lastScrollTime=Date.now(),i&&(i.scrollLeft=n),a&&(a.scrollLeft=n),l&&o&&E.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),E.dispatchEvent("scroll",{type:renderType,fixed:t,scrollTop:a.scrollTop,scrollLeft:n,isX:o,isY:!1},e)}var E=(0,_vue.inject)("$xetable",{}),a=E.xID,i=E.props,s=E.reactData,c=E.internalData,e=E.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=E.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),g=(0,_vue.ref)(),m=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=u.fixedType,t=c.elemStore,e=(e||"main")+"-footer-";t[e+"wrapper"]=x,t[e+"table"]=g,t[e+"colgroup"]=m,t[e+"list"]=y,t[e+"xSpace"]=h})}),(0,_vue.onUnmounted)(function(){var e=u.fixedType,t=c.elemStore,e=(e||"main")+"-footer-";t[e+"wrapper"]=null,t[e+"table"]=null,t[e+"colgroup"]=null,t[e+"list"]=null,t[e+"xSpace"]=null});return function(){var w=u.fixedType,e=u.fixedColumn,T=u.tableColumn,C=u.footerTableData,t=i.footerRowClassName,I=i.footerCellClassName,l=i.footerRowStyle,S=i.footerCellStyle,F=i.footerAlign,D=i.footerSpanMethod,L=i.align,M=i.columnKey,O=i.showFooterOverflow,o=c.visibleColumn,$=s.scrollYLoad,U=s.overflowX,r=s.scrollbarWidth,k=s.currentColumn,j=s.mergeFooterList,q=v.value,A=_.value;return w&&(T=!$&&!O||j.length&&D?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",w?"fixed-"+w+"--wrapper":"body--wrapper"],xid:a,onScroll:n},[w?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:g,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:m},T.map(function(e,t){return(0,_vue.h)("col",{name:e.id,key:t})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},C.map(function(y,h){var b=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",t?_xeUtils.default.isFunction(t)?t({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):t:""],style:l?_xeUtils.default.isFunction(l)?l({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):l:null},T.map(function(t,e){var l=t.type,o=t.showFooterOverflow,r=t.footerAlign,n=t.align,a=t.footerClassName,i=q.showAll,u=t.children&&t.children.length,s=w?t.fixed!==w&&!u:t.fixed&&U,c=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?O:o,f=r||n||F||L,d="ellipsis"===c,p="title"===c,v=!0===c||"tooltip"===c,u=p||v||d,o={colid:t.id},r={},n=E.getColumnIndex(t),c=E.getVTColumnIndex(t),_={$table:E,_rowIndex:h,$rowIndex:b,column:t,columnIndex:n,$columnIndex:e,_columnIndex:c,itemIndex:c,items:y,fixed:w,type:renderType,data:C};if($&&!u&&(d=u=!0),(p||v||i)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,t):(v||i)&&E.triggerFooterTooltipEvent(e,_)}),(v||i)&&(r.onMouseleave=function(e){(v||i)&&E.handleTargetLeaveEvent(e)}),r.onClick=function(e){E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,c);if(x){var g=x.rowspan,m=x.colspan;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}}else if(D){var c=D(_)||{},x=c.rowspan,g=void 0===x?1:x,c=c.colspan,m=void 0===c?1:c;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",t.id,((m={})["col--"+f]=f,m["col--"+l]=l,m["col--last"]=e===T.length-1,m["fixed--hidden"]=s,m["col--ellipsis"]=u,m["col--current"]=k===t,m),(0,_util.getPropClass)(a,_),(0,_util.getPropClass)(I,_)]},o),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M||A.useKey?t.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},t.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;

package/lib/header/src/header.js

@@ -182,12 +182,12 @@ var _default = (0, _vue.defineComponent)({
         var internalData = $xetable.internalData;
         var elemStore = internalData.elemStore;
         var prefix = (fixedType || 'main') + "-header-";
-        elemStore[prefix + "wrapper"] = refElem.value;
-        elemStore[prefix + "table"] = refHeaderTable.value;
-        elemStore[prefix + "colgroup"] = refHeaderColgroup.value;
-        elemStore[prefix + "list"] = refHeaderTHead.value;
-        elemStore[prefix + "xSpace"] = refHeaderXSpace.value;
-        elemStore[prefix + "repair"] = refHeaderBorderRepair.value;
+        elemStore[prefix + "wrapper"] = refElem;
+        elemStore[prefix + "table"] = refHeaderTable;
+        elemStore[prefix + "colgroup"] = refHeaderColgroup;
+        elemStore[prefix + "list"] = refHeaderTHead;
+        elemStore[prefix + "xSpace"] = refHeaderXSpace;
+        elemStore[prefix + "repair"] = refHeaderBorderRepair;
         uploadColumn();
       });
     });

package/lib/header/src/header.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_util2=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,n=arguments.length;t<n;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="header",_default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(W){function t(){var e=s.isGroup;c.value=e?(0,_util.convertToRows)(W.tableGroupColumn):[]}var k=(0,_vue.inject)("$xetable",{}),o=k.xID,u=k.props,s=k.reactData,I=k.internalData,e=k.getRefMaps(),$=e.refElem,H=e.refTableBody,O=e.refLeftContainer,q=e.refRightContainer,A=e.refCellResizeBar,d=k.getComputeMaps().computeColumnOpts,c=(0,_vue.ref)([]),E=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.watch)(function(){return W.tableColumn},t),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=E.value,l[e+"table"]=f.value,l[e+"colgroup"]=p.value,l[e+"list"]=v.value,l[e+"xSpace"]=m.value,l[e+"repair"]=h.value,t()})}),(0,_vue.onUnmounted)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return function(){var _=W.fixedType,e=W.fixedColumn,l=W.tableColumn,x=u.resizable,g=u.border,b=u.columnKey,t=u.headerRowClassName,y=u.headerCellClassName,n=u.headerRowStyle,C=u.headerCellStyle,w=u.showHeaderOverflow,M=u.headerAlign,T=u.align,z=u.mouseConfig,r=s.isGroup,S=s.currentColumn,D=s.scrollXLoad,R=s.overflowX,a=s.scrollbarWidth,U=d.value,i=c.value;return r||(i=[l=_&&(D||w)?e:l]),(0,_vue.h)("div",{ref:E,class:["vxe-table--header-wrapper",_?"fixed-"+_+"--wrapper":"body--wrapper"],xid:o},[_?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:m,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:f,class:"vxe-table--header",xid:o,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:p},l.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(a?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:v},i.map(function(m,h){return(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:_,type:renderType}):t:""],style:n?_xeUtils.default.isFunction(n)?n({$table:k,$rowIndex:h,fixed:_,type:renderType}):n:null},m.map(function(e,l){var t=e.type,n=e.showHeaderOverflow,r=e.headerAlign,a=e.align,i=e.headerClassName,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:!!e.fixed&&R,s=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?w:n,d=r||a||M||T,c="ellipsis"===s,f="title"===s,p=!0===s||"tooltip"===s,n=f||p||c,r=e.filters&&e.filters.some(function(e){return e.checked}),a=k.getColumnIndex(e),s=k.getVTColumnIndex(e),v={$table:k,$rowIndex:h,column:e,columnIndex:a,$columnIndex:l,_columnIndex:s,fixed:_,type:renderType,isHidden:u,hasFilter:r},a={onClick:function(e){return k.triggerHeaderCellClickEvent(e,v)},onDblclick:function(e){return k.triggerHeaderCellDblclickEvent(e,v)}};return D&&!n&&(c=n=!0),z&&(a.onMousedown=function(e){return k.triggerHeaderCellMousedownEvent(e,v)}),(0,_vue.h)("th",__assign(__assign({class:["vxe-header--column",e.id,((s={})["col--"+d]=d,s["col--"+t]=t,s["col--last"]=l===m.length-1,s["col--fixed"]=e.fixed,s["col--group"]=o,s["col--ellipsis"]=n,s["fixed--hidden"]=u,s["is--sortable"]=e.sortable,s["col--filter"]=!!e.filters,s["is--filter-active"]=r,s["col--current"]=S===e,s),i?_xeUtils.default.isFunction(i)?i(v):i:"",y?_xeUtils.default.isFunction(y)?y(v):y:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:C?_xeUtils.default.isFunction(C)?C(v):C:null},a),{key:b||U.useKey||o?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(v)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||x)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:function(e){return function(e,l){var t=l.column,n=W.fixedType,r=H.value,a=O.value,i=q.value,o=A.value,u=e.clientX,s=E.value,d=e.target,c=l.cell=d.parentNode,f=0,p=r.$el,r=(0,_dom.getOffsetPos)(d,s),s=d.clientWidth,d=Math.floor(s/2),v=(0,_util2.getColMinWidth)(l)-d,m=r.left-c.clientWidth+s+v,h=r.left+d,_=document.onmousemove,x=document.onmouseup,g="left"===n,b="right"===n,y=$.value,C=0;if(g||b){for(var w=g?"nextElementSibling":"previousElementSibling",M=c[w];M&&!(0,_dom.hasClass)(M,"fixed--hidden");)(0,_dom.hasClass)(M,"col--group")||(C+=M.offsetWidth),M=M[w];b&&i&&(h=i.offsetLeft+C)}d=function(e){e.stopPropagation(),e.preventDefault();var l=e.clientX-u,e=h+l,l=n?0:p.scrollLeft;g?e=Math.min(e,(i?i.offsetLeft:p.clientWidth)-C-v):b?(m=(a?a.clientWidth:0)+C+v,e=Math.min(e,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(e,m),o.style.left=f-l+"px"};I._isResize=!0,(0,_dom.addClass)(y,"drag--resize"),o.style.display="block",document.onmousemove=d,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=x,t.resizeWidth=t.renderWidth+(b?h-f:f-h),o.style.display="none",I._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(function(){k.saveCustomResizable(),k.updateCellAreas(),k.dispatchEvent("resizable-change",l,e)}),(0,_dom.removeClass)(y,"drag--resize")},d(e),k.closeMenu&&k.closeMenu()}(e,v)}})])}).concat(a?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),(0,_vue.h)("div",{ref:h,class:"vxe-table--header-border-line"})])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_util2=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,n=arguments.length;t<n;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="header",_default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(W){function t(){var e=s.isGroup;c.value=e?(0,_util.convertToRows)(W.tableGroupColumn):[]}var k=(0,_vue.inject)("$xetable",{}),o=k.xID,u=k.props,s=k.reactData,I=k.internalData,e=k.getRefMaps(),$=e.refElem,H=e.refTableBody,O=e.refLeftContainer,q=e.refRightContainer,A=e.refCellResizeBar,d=k.getComputeMaps().computeColumnOpts,c=(0,_vue.ref)([]),E=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.watch)(function(){return W.tableColumn},t),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=E,l[e+"table"]=f,l[e+"colgroup"]=p,l[e+"list"]=v,l[e+"xSpace"]=m,l[e+"repair"]=h,t()})}),(0,_vue.onUnmounted)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return function(){var _=W.fixedType,e=W.fixedColumn,l=W.tableColumn,x=u.resizable,g=u.border,b=u.columnKey,t=u.headerRowClassName,y=u.headerCellClassName,n=u.headerRowStyle,C=u.headerCellStyle,w=u.showHeaderOverflow,M=u.headerAlign,T=u.align,z=u.mouseConfig,r=s.isGroup,S=s.currentColumn,D=s.scrollXLoad,R=s.overflowX,a=s.scrollbarWidth,U=d.value,i=c.value;return r||(i=[l=_&&(D||w)?e:l]),(0,_vue.h)("div",{ref:E,class:["vxe-table--header-wrapper",_?"fixed-"+_+"--wrapper":"body--wrapper"],xid:o},[_?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:m,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:f,class:"vxe-table--header",xid:o,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:p},l.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(a?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:v},i.map(function(m,h){return(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:_,type:renderType}):t:""],style:n?_xeUtils.default.isFunction(n)?n({$table:k,$rowIndex:h,fixed:_,type:renderType}):n:null},m.map(function(e,l){var t=e.type,n=e.showHeaderOverflow,r=e.headerAlign,a=e.align,i=e.headerClassName,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:!!e.fixed&&R,s=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?w:n,d=r||a||M||T,c="ellipsis"===s,f="title"===s,p=!0===s||"tooltip"===s,n=f||p||c,r=e.filters&&e.filters.some(function(e){return e.checked}),a=k.getColumnIndex(e),s=k.getVTColumnIndex(e),v={$table:k,$rowIndex:h,column:e,columnIndex:a,$columnIndex:l,_columnIndex:s,fixed:_,type:renderType,isHidden:u,hasFilter:r},a={onClick:function(e){return k.triggerHeaderCellClickEvent(e,v)},onDblclick:function(e){return k.triggerHeaderCellDblclickEvent(e,v)}};return D&&!n&&(c=n=!0),z&&(a.onMousedown=function(e){return k.triggerHeaderCellMousedownEvent(e,v)}),(0,_vue.h)("th",__assign(__assign({class:["vxe-header--column",e.id,((s={})["col--"+d]=d,s["col--"+t]=t,s["col--last"]=l===m.length-1,s["col--fixed"]=e.fixed,s["col--group"]=o,s["col--ellipsis"]=n,s["fixed--hidden"]=u,s["is--sortable"]=e.sortable,s["col--filter"]=!!e.filters,s["is--filter-active"]=r,s["col--current"]=S===e,s),i?_xeUtils.default.isFunction(i)?i(v):i:"",y?_xeUtils.default.isFunction(y)?y(v):y:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:C?_xeUtils.default.isFunction(C)?C(v):C:null},a),{key:b||U.useKey||o?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(v)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||x)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:function(e){return function(e,l){var t=l.column,n=W.fixedType,r=H.value,a=O.value,i=q.value,o=A.value,u=e.clientX,s=E.value,d=e.target,c=l.cell=d.parentNode,f=0,p=r.$el,r=(0,_dom.getOffsetPos)(d,s),s=d.clientWidth,d=Math.floor(s/2),v=(0,_util2.getColMinWidth)(l)-d,m=r.left-c.clientWidth+s+v,h=r.left+d,_=document.onmousemove,x=document.onmouseup,g="left"===n,b="right"===n,y=$.value,C=0;if(g||b){for(var w=g?"nextElementSibling":"previousElementSibling",M=c[w];M&&!(0,_dom.hasClass)(M,"fixed--hidden");)(0,_dom.hasClass)(M,"col--group")||(C+=M.offsetWidth),M=M[w];b&&i&&(h=i.offsetLeft+C)}d=function(e){e.stopPropagation(),e.preventDefault();var l=e.clientX-u,e=h+l,l=n?0:p.scrollLeft;g?e=Math.min(e,(i?i.offsetLeft:p.clientWidth)-C-v):b?(m=(a?a.clientWidth:0)+C+v,e=Math.min(e,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(e,m),o.style.left=f-l+"px"};I._isResize=!0,(0,_dom.addClass)(y,"drag--resize"),o.style.display="block",document.onmousemove=d,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=x,t.resizeWidth=t.renderWidth+(b?h-f:f-h),o.style.display="none",I._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(function(){k.saveCustomResizable(),k.updateCellAreas(),k.dispatchEvent("resizable-change",l,e)}),(0,_dom.removeClass)(y,"drag--resize")},d(e),k.closeMenu&&k.closeMenu()}(e,v)}})])}).concat(a?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),(0,_vue.h)("div",{ref:h,class:"vxe-table--header-border-line"})])}}});exports.default=_default;