vxe-table 4.2.2-beta.0 → 4.2.3-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;
@@ -1033,6 +1038,7 @@ export default defineComponent({
                     }
                 });
             }
+            console.log(headerHeight);
             internalData.headerHeight = headerHeight;
             var overflowX = false;
             var footerHeight = 0;
@@ -1290,7 +1296,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 +1318,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 +1348,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 +1382,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 +1458,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 +1484,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 +1738,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 +1746,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 +1779,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 +2923,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 +5375,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 +5401,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 +5417,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/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.0" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.3-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.0",
+    version: "4.2.3-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/edit/src/hook.js

@@ -686,9 +686,7 @@ var editHook = {
           }, evnt || null);
         }
 
-        return ($xetable.clearValidate ? $xetable.clearValidate() : (0, _vue.nextTick)()).then(function () {
-          return $xetable.recalculate();
-        });
+        return $xetable.clearValidate ? $xetable.clearValidate() : (0, _vue.nextTick)();
       },
 
       /**
@@ -817,7 +815,11 @@ var editHook = {
               }
 
               $xetable.closeTooltip();
-              editMethods.clearActived(evnt);
+
+              if (actived.column) {
+                editMethods.clearActived(evnt);
+              }
+
               type = 'edit-actived';
               column.renderHeight = cell.offsetHeight;
               actived.args = params;

package/lib/edit/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"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(_){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var R=_.props,C=_.reactData,b=_.internalData,o=_.getRefMaps().refElem,e=_.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,I=e.computeTreeOpts,g={},m={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function A(e,t){var a=b.tableFullTreeData,i=b.afterFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,r=I.value,d=r.rowField,s=r.parentField,f=r.children,v=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[s],n=(0,_util.getRowid)(_,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d]},{children:v}):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(_,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_log.warnLog)("vxe.error.unableInsert"),i[p](e),a[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=R.treeConfig,l=C.mergeList,n=C.editStore,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,d=I.value,s=d.transform,f=d.rowField,v=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return _.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?A(p,!0):(a.push.apply(a,p),i.push.apply(i,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+p.length)}));else if(r&&s){var w,g,m,h=_xeUtils.default.findTree(o,function(e){return t[f]===e[f]},{children:v});h?(w=h.parent,g=h.items,v=c[(0,_util.getRowid)(_,w)],m=v?v.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(_,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&w&&e[d.parentField]!==w[f]&&(0,_log.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+w[f]]),w&&(e[d.parentField]=w[f]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),A(p,!0))}else{if(r)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var x=-1;if(_xeUtils.default.isNumber(t)?t<a.length&&(x=t):x=_.findRowIndexOf(a,t),-1===x)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([x,0],p)),i.splice.apply(i,__spreadArray([_.findRowIndexOf(i,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+p.length:x<t+r&&(e.rowspan=r+p.length)})}else r&&s?A(p,!1):(a.unshift.apply(a,p),i.unshift.apply(i,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),_.updateFooter(),_.cacheRowMap(),_.handleTableData(r&&s),r&&s||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=R.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=w.value,c=I.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){_.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=_.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),b.tableFullData=[],b.afterFullData=[],_.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(_,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(_,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=_.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=_.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=_.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<_.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=_.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),_.updateFooter(),_.cacheRowMap(),_.handleTableData(t&&d),t&&d||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(_.getCheckboxRecords()).then(function(e){return _.clearCheckboxRow(),e})},removeRadioRow:function(){var e=_.getRadioRecord();return g.remove(e||[]).then(function(e){return _.clearRadioRow(),e})},removeCurrentRow:function(){var e=_.getCurrentRecord();return g.remove(e||[]).then(function(e){return _.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=R.treeConfig,t=C.editStore,r=b.tableFullTreeData,l=b.tableFullData,n=I.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(_,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(_,e)},n)&&o.push(e)}):t.forEach(function(e){-1<_.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=R.keepSource,t=R.treeConfig,r=b.tableFullData,l=I.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return _.isUpdateByRow(e)},l):r.filter(function(e){return _.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=b.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<_.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,_.updateFooter(),_.dispatchEvent("edit-closed",{row:r,rowIndex:_.getRowIndex(r),$rowIndex:_.getVMRowIndex(r),column:l,columnIndex:_.getColumnIndex(l),$columnIndex:_.getVMColumnIndex(l)},e||null)),(_.clearValidate?_.clearValidate():(0,_vue.nextTick)()).then(function(){return _.recalculate()})},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){var t=b.visibleColumn;return _.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=R.editConfig,l=_xeUtils.default.isString(e)?_.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?_.scrollToRow(t,l).then(function(){var e=_.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:_.getRowIndex(t),column:l,columnIndex:_.getColumnIndex(l),cell:e,$table:_}),b._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=b.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?_.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=_.findRowIndexOf(r,e))&&t&&(r=_.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},_.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=R.editConfig,n=R.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=i.activeMethod,d=o.actived,s=e.row,f=e.column,i=f.editRender,o=e.cell||_.getCell(s,f);return e.cell=o,(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(__assign(__assign({},e),{$table:_}))||(n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),_.closeTooltip(),g.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===u?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),_.dispatchEvent(r,{row:s,rowIndex:_.getRowIndex(s),$rowIndex:_.getVMRowIndex(s),column:f,columnIndex:_.getColumnIndex(f),$columnIndex:_.getVMColumnIndex(f)},t)):(r=d.column,n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),_.clearValidate&&_.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){m.handleFocus(e,t)})),_.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):_.scrollToRow(l,n))},handleSelected:function(e,t){var r=R.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),_.focus(),t&&_.dispatchEvent("cell-selected",e,t)),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=_.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;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"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(_){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var R=_.props,C=_.reactData,b=_.internalData,o=_.getRefMaps().refElem,e=_.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,I=e.computeTreeOpts,g={},m={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function A(e,t){var a=b.tableFullTreeData,i=b.afterFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,r=I.value,d=r.rowField,s=r.parentField,f=r.children,v=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[s],n=(0,_util.getRowid)(_,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d]},{children:v}):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(_,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_log.warnLog)("vxe.error.unableInsert"),i[p](e),a[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=R.treeConfig,l=C.mergeList,n=C.editStore,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,d=I.value,s=d.transform,f=d.rowField,v=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return _.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?A(p,!0):(a.push.apply(a,p),i.push.apply(i,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+p.length)}));else if(r&&s){var w,g,m,h=_xeUtils.default.findTree(o,function(e){return t[f]===e[f]},{children:v});h?(w=h.parent,g=h.items,v=c[(0,_util.getRowid)(_,w)],m=v?v.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(_,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&w&&e[d.parentField]!==w[f]&&(0,_log.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+w[f]]),w&&(e[d.parentField]=w[f]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),A(p,!0))}else{if(r)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var x=-1;if(_xeUtils.default.isNumber(t)?t<a.length&&(x=t):x=_.findRowIndexOf(a,t),-1===x)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([x,0],p)),i.splice.apply(i,__spreadArray([_.findRowIndexOf(i,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+p.length:x<t+r&&(e.rowspan=r+p.length)})}else r&&s?A(p,!1):(a.unshift.apply(a,p),i.unshift.apply(i,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),_.updateFooter(),_.cacheRowMap(),_.handleTableData(r&&s),r&&s||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=R.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=w.value,c=I.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){_.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=_.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),b.tableFullData=[],b.afterFullData=[],_.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(_,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(_,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=_.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=_.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=_.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<_.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=_.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),_.updateFooter(),_.cacheRowMap(),_.handleTableData(t&&d),t&&d||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(_.getCheckboxRecords()).then(function(e){return _.clearCheckboxRow(),e})},removeRadioRow:function(){var e=_.getRadioRecord();return g.remove(e||[]).then(function(e){return _.clearRadioRow(),e})},removeCurrentRow:function(){var e=_.getCurrentRecord();return g.remove(e||[]).then(function(e){return _.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=R.treeConfig,t=C.editStore,r=b.tableFullTreeData,l=b.tableFullData,n=I.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(_,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(_,e)},n)&&o.push(e)}):t.forEach(function(e){-1<_.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=R.keepSource,t=R.treeConfig,r=b.tableFullData,l=I.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return _.isUpdateByRow(e)},l):r.filter(function(e){return _.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=b.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<_.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,_.updateFooter(),_.dispatchEvent("edit-closed",{row:r,rowIndex:_.getRowIndex(r),$rowIndex:_.getVMRowIndex(r),column:l,columnIndex:_.getColumnIndex(l),$columnIndex:_.getVMColumnIndex(l)},e||null)),_.clearValidate?_.clearValidate():(0,_vue.nextTick)()},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){var t=b.visibleColumn;return _.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=R.editConfig,l=_xeUtils.default.isString(e)?_.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?_.scrollToRow(t,l).then(function(){var e=_.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:_.getRowIndex(t),column:l,columnIndex:_.getColumnIndex(l),cell:e,$table:_}),b._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=b.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?_.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=_.findRowIndexOf(r,e))&&t&&(r=_.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},_.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=R.editConfig,n=R.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=i.activeMethod,d=o.actived,s=e.row,f=e.column,i=f.editRender,o=e.cell||_.getCell(s,f);return e.cell=o,(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(__assign(__assign({},e),{$table:_}))||(n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),_.closeTooltip(),d.column&&g.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===u?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),_.dispatchEvent(r,{row:s,rowIndex:_.getRowIndex(s),$rowIndex:_.getVMRowIndex(s),column:f,columnIndex:_.getColumnIndex(f),$columnIndex:_.getVMColumnIndex(f)},t)):(r=d.column,n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),_.clearValidate&&_.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){m.handleFocus(e,t)})),_.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):_.scrollToRow(l,n))},handleSelected:function(e,t){var r=R.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),_.focus(),t&&_.dispatchEvent("cell-selected",e,t)),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=_.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;

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 () {