vxe-table 4.1.21 → 4.2.0-beta.0

package/README.en.md

@@ -29,7 +29,7 @@ A [vue](https://www.npmjs.com/package/vue) based PC form component, support add,
 
 ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png)
 --- | --- | --- | --- | --- |
-Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 8+ ✔ |
+Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ |
 
 ## Features
 

package/README.md

@@ -34,7 +34,7 @@
 
 ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png)
 --- | --- | --- | --- | --- |
-Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 8+ ✔ |
+80+ ✔ | 80+ ✔ | 90+ ✔ | 75+ ✔ | 10+ ✔ |
 
 ## 功能点
 
@@ -156,6 +156,7 @@ export default defineComponent({
 
 ## 文档
 
+💡 [使用指南](https://github.com/xuliangzhan/vxe-table-demo)  
 👉 [查看文档](https://vxetable.cn)  
 
 ## 运行项目

package/README.zh-TW.md

@@ -33,7 +33,7 @@
 
 ![Edge](https://raw.github.com/alrra/browser-logos/master/src/edge/edge_48x48.png) | ![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png) | ![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png) | ![Opera](https://raw.github.com/alrra/browser-logos/master/src/opera/opera_48x48.png) | ![Safari](https://raw.github.com/alrra/browser-logos/master/src/safari/safari_48x48.png)
 --- | --- | --- | --- | --- |
-Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 8+ ✔ |
+Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ |
 
 ## 功能點
 

package/es/edit/src/hook.js

@@ -17,9 +17,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { renderer } from '../../v-x-e-table';
-import { errLog, getLog, isEnableConf, warnLog } from '../../tools/utils';
+import { isEnableConf } from '../../tools/utils';
 import { getCellValue, setCellValue, getRowid } from '../../table/src/util';
 import { browse, removeClass, addClass } from '../../tools/dom';
+import { warnLog, errLog, getLog } from '../../tools/log';
 var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
 var editHook = {
     setupTable: function ($xetable) {

package/es/export/src/hook.js

@@ -3,7 +3,8 @@ import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../table/src/util';
-import { errLog, warnLog, parseFile, formatText } from '../../tools/utils';
+import { parseFile, formatText } from '../../tools/utils';
+import { warnLog, errLog } from '../../tools/log';
 import { readLocalFile, handlePrint, saveLocalFile, createHtmlPage, getExportBlobByContent } from './util';
 var htmlCellElem;
 var csvBOM = '\ufeff';

package/es/export/src/util.js

@@ -2,7 +2,8 @@ import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { browse } from '../../tools/dom';
-import { getLog, parseFile, errLog } from '../../tools/utils';
+import { parseFile } from '../../tools/utils';
+import { errLog, getLog } from '../../tools/log';
 // 导入
 var fileForm;
 var fileInput;
@@ -16,10 +17,7 @@ export function createFrame() {
     return frame;
 }
 export function getExportBlobByContent(content, options) {
-    if (window.Blob) {
-        return new Blob([content], { type: "text/" + options.type + ";charset=utf-8;" });
-    }
-    return null;
+    return new Blob([content], { type: "text/" + options.type + ";charset=utf-8;" });
 }
 export function createHtmlPage(opts, content) {
     var style = opts.style;

package/es/footer/src/footer.js

@@ -39,7 +39,7 @@ export default defineComponent({
         var $xetable = inject('$xetable', {});
         var xID = $xetable.xID, tableProps = $xetable.props, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), refTableHeader = _a.refTableHeader, refTableBody = _a.refTableBody, refValidTooltip = _a.refValidTooltip;
-        var computeTooltipOpts = $xetable.getComputeMaps().computeTooltipOpts;
+        var _b = $xetable.getComputeMaps(), computeTooltipOpts = _b.computeTooltipOpts, computeColumnOpts = _b.computeColumnOpts;
         var refElem = ref();
         var refFooterTable = ref();
         var refFooterColgroup = ref();
@@ -106,6 +106,7 @@ export default defineComponent({
             var visibleColumn = tableInternalData.visibleColumn;
             var scrollYLoad = tableReactData.scrollYLoad, overflowX = tableReactData.overflowX, scrollbarWidth = tableReactData.scrollbarWidth, currentColumn = tableReactData.currentColumn, mergeFooterList = tableReactData.mergeFooterList;
             var tooltipOpts = computeTooltipOpts.value;
+            var columnOpts = computeColumnOpts.value;
             // 如果是使用优化模式
             if (fixedType) {
                 if (scrollYLoad || allColumnFooterOverflow) {
@@ -244,7 +245,7 @@ export default defineComponent({
                                         _a['fixed--hidden'] = fixedHiddenColumn,
                                         _a['col--ellipsis'] = hasEllipsis,
                                         _a['col--current'] = currentColumn === column,
-                                        _a), getPropClass(footerClassName, params), getPropClass(footerCellClassName, params)] }, attrs), { style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle) : null }), tfOns), { key: columnKey ? column.id : $columnIndex }), [
+                                        _a), getPropClass(footerClassName, params), getPropClass(footerCellClassName, params)] }, attrs), { style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle) : null }), tfOns), { key: columnKey || columnOpts.useKey ? column.id : $columnIndex }), [
                                 h('div', {
                                     class: ['vxe-cell', {
                                             'c--title': showTitle,

package/es/form/src/form-gather.js

@@ -1,5 +1,5 @@
 import { defineComponent, h, onUnmounted, inject, ref, reactive, onMounted, provide, nextTick } from 'vue';
-import { errLog } from '../../tools/utils';
+import { errLog } from '../../tools/log';
 import { createItem, watchItem, destroyItem, assemItem } from './util';
 import { formItemProps } from './form-item';
 export default defineComponent({

package/es/form/src/form.js

@@ -13,7 +13,8 @@ import { defineComponent, h, ref, resolveComponent, createCommentVNode, provide,
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
-import { errLog, getFuncText, isEnableConf, eqEmptyValue } from '../../tools/utils';
+import { getFuncText, isEnableConf, eqEmptyValue } from '../../tools/utils';
+import { errLog } from '../../tools/log';
 import { scrollToView } from '../../tools/dom';
 import { createItem, handleFieldOrItem } from './util';
 import { renderTitle } from './render';

package/es/grid/src/grid.js

@@ -16,8 +16,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 };
 import { defineComponent, h, ref, computed, provide, getCurrentInstance, resolveComponent, reactive, onUnmounted, watch, nextTick, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
-import { errLog, getLastZIndex, nextZIndex, isEnableConf } from '../../tools/utils';
+import { getLastZIndex, nextZIndex, isEnableConf } from '../../tools/utils';
 import { getOffsetHeight, getPaddingTopBottomSize, getDomNode } from '../../tools/dom';
+import { errLog } from '../../tools/log';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import tableComponentProps from '../../table/src/props';

package/es/header/src/header.js

@@ -253,7 +253,7 @@ export default defineComponent({
                                         _a['is--filter-active'] = hasFilter,
                                         _a['col--current'] = currentColumn === column,
                                         _a), headerClassName ? (XEUtils.isFunction(headerClassName) ? headerClassName(params) : headerClassName) : '',
-                                    headerCellClassName ? (XEUtils.isFunction(headerCellClassName) ? headerCellClassName(params) : headerCellClassName) : ''], colid: column.id, colspan: column.colSpan > 1 ? column.colSpan : null, rowspan: column.rowSpan > 1 ? column.rowSpan : null, style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null }, thOns), { key: columnKey || isColGroup ? column.id : $columnIndex }), [
+                                    headerCellClassName ? (XEUtils.isFunction(headerCellClassName) ? headerCellClassName(params) : headerCellClassName) : ''], colid: column.id, colspan: column.colSpan > 1 ? column.colSpan : null, rowspan: column.rowSpan > 1 ? column.rowSpan : null, style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null }, thOns), { key: columnKey || columnOpts.useKey || isColGroup ? column.id : $columnIndex }), [
                                 h('div', {
                                     class: ['vxe-cell', {
                                             'c--title': showTitle,

package/es/modal/src/modal.js

@@ -13,7 +13,8 @@ import { defineComponent, h, Teleport, ref, computed, reactive, nextTick, watch,
 import XEUtils from 'xe-utils';
 import { useSize } from '../../hooks/size';
 import { getDomNode, getEventTargetNode } from '../../tools/dom';
-import { errLog, getLastZIndex, nextZIndex, getFuncText } from '../../tools/utils';
+import { getLastZIndex, nextZIndex, getFuncText } from '../../tools/utils';
+import { errLog } from '../../tools/log';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import VxeButtonConstructor from '../../button/src/button';

package/es/table/src/body.js

@@ -19,7 +19,7 @@ import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { mergeBodyMethod, getRowid, getPropClass, removeScrollListener, restoreScrollListener } from './util';
-import { updateCellTitle, setScrollTop } from '../../tools/dom';
+import { updateCellTitle } from '../../tools/dom';
 import { isEnableConf } from '../../tools/utils';
 var renderType = 'body';
 var lineOffsetSizes = {
@@ -40,7 +40,7 @@ export default defineComponent({
         var xesize = inject('xesize', null);
         var xID = $xetable.xID, tableProps = $xetable.props, tableContext = $xetable.context, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), refTableHeader = _a.refTableHeader, refTableBody = _a.refTableBody, refTableFooter = _a.refTableFooter, refTableLeftBody = _a.refTableLeftBody, refTableRightBody = _a.refTableRightBody, refValidTooltip = _a.refValidTooltip;
-        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts;
+        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts, computeColumnOpts = _b.computeColumnOpts;
         var refElem = ref();
         var refBodyTable = ref();
         var refBodyColgroup = ref();
@@ -134,6 +134,7 @@ export default defineComponent({
             var tooltipOpts = computeTooltipOpts.value;
             var rowOpts = computeRowOpts.value;
             var sYOpts = computeSYOpts.value;
+            var columnOpts = computeColumnOpts.value;
             var type = column.type, cellRender = column.cellRender, editRender = column.editRender, align = column.align, showOverflow = column.showOverflow, className = column.className, treeNode = column.treeNode;
             var actived = editStore.actived;
             var scrollYRHeight = sYOpts.rHeight;
@@ -291,7 +292,7 @@ export default defineComponent({
                         _a['col--actived'] = editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
                         _a['col--valid-error'] = hasValidError,
                         _a['col--current'] = currentColumn === column,
-                        _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
+                        _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey || columnOpts.useKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
                     height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
@@ -348,7 +349,7 @@ export default defineComponent({
                             'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                             'row--radio': radioOpts.highlight && selectRow === row,
                             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
-                        }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''], rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || treeConfig ? rowid : $rowIndex }, trOn), tableColumn.map(function (column, $columnIndex) {
+                        }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''], rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: (rowKey || rowOpts.useKey) || treeConfig ? rowid : $rowIndex }, trOn), tableColumn.map(function (column, $columnIndex) {
                     return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 })));
                 // 如果行被展开了
@@ -405,29 +406,28 @@ export default defineComponent({
                 }
                 clearTimeout(scrollProcessTimeout);
                 scrollProcessTimeout = setTimeout(function () {
-                    var tableBody = refTableBody.value;
-                    var leftBody = refTableLeftBody.value;
-                    var rightBody = refTableRightBody.value;
-                    var bodyElem = tableBody.$el;
-                    var leftElem = leftBody ? leftBody.$el : null;
-                    var rightElem = rightBody ? rightBody.$el : null;
+                    // const tableBody = refTableBody.value
+                    // const leftBody = refTableLeftBody.value
+                    // const rightBody = refTableRightBody.value
+                    // const bodyElem = tableBody.$el as XEBodyScrollElement
+                    // const leftElem = leftBody ? leftBody.$el as XEBodyScrollElement : null
+                    // const rightElem = rightBody ? rightBody.$el as XEBodyScrollElement : null
                     restoreScrollListener(elem1);
                     restoreScrollListener(elem2);
                     // 检查滚动条是的同步
-                    var targetTop = bodyElem.scrollTop;
-                    if (fixedType === 'left') {
-                        if (leftElem) {
-                            targetTop = leftElem.scrollTop;
-                        }
-                    }
-                    else if (fixedType === 'right') {
-                        if (rightElem) {
-                            targetTop = rightElem.scrollTop;
-                        }
-                    }
-                    setScrollTop(bodyElem, targetTop);
-                    setScrollTop(leftElem, targetTop);
-                    setScrollTop(rightElem, targetTop);
+                    // let targetTop = bodyElem.scrollTop
+                    // if (fixedType === 'left') {
+                    //   if (leftElem) {
+                    //     targetTop = leftElem.scrollTop
+                    //   }
+                    // } else if (fixedType === 'right') {
+                    //   if (rightElem) {
+                    //     targetTop = rightElem.scrollTop
+                    //   }
+                    // }
+                    // setScrollTop(bodyElem, targetTop)
+                    // setScrollTop(leftElem, targetTop)
+                    // setScrollTop(rightElem, targetTop)
                 }, 300);
             }
         };

package/es/table/src/columnInfo.js

@@ -2,7 +2,8 @@ import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { toFilters } from './util';
-import { warnLog, errLog, getFuncText } from '../../tools/utils';
+import { getFuncText } from '../../tools/utils';
+import { warnLog, errLog } from '../../tools/log';
 var ColumnInfo = /** @class */ (function () {
     /* eslint-disable @typescript-eslint/no-use-before-define */
     function ColumnInfo($xetable, _vm, _a) {
@@ -133,11 +134,10 @@ var ColumnInfo = /** @class */ (function () {
         // 不支持双向的属性
         if (name !== 'filters') {
             if (name === 'field') {
+                // 兼容旧属性
                 this.property = value;
             }
-            else {
-                this[name] = value;
-            }
+            this[name] = value;
         }
     };
     return ColumnInfo;

package/es/table/src/props.js

@@ -8,7 +8,7 @@ export default {
     height: [Number, String],
     // 表格的最大高度
     maxHeight: [Number, String],
-    // 所有列是否允许拖动列宽调整大小
+    // （即将废弃）所有列是否允许拖动列宽调整大小
     resizable: { type: Boolean, default: function () { return GlobalConfig.table.resizable; } },
     // 是否带有斑马纹
     stripe: { type: Boolean, default: function () { return GlobalConfig.table.stripe; } },
@@ -83,9 +83,11 @@ export default {
     // 设置表尾所有内容过长时显示为省略号
     showFooterOverflow: { type: [Boolean, String], default: function () { return GlobalConfig.table.showFooterOverflow; } },
     /** 高级属性 */
-    // 主键配置
+    // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
     columnKey: Boolean,
+    // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
     rowKey: Boolean,
+    // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
     rowId: { type: String, default: function () { return GlobalConfig.table.rowId; } },
     zIndex: Number,
     emptyText: { type: String, default: function () { return GlobalConfig.table.emptyText; } },
@@ -150,6 +152,7 @@ export default {
     scrollY: Object,
     // （即将废弃）优化相关
     animat: { type: Boolean, default: function () { return GlobalConfig.table.animat; } },
+    // （可能会被废弃的参数，不要使用）
     delayHover: { type: Number, default: function () { return GlobalConfig.table.delayHover; } },
     // 额外的参数
     params: Object

package/es/table/src/table.js

@@ -17,7 +17,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import { defineComponent, getCurrentInstance, h, createCommentVNode, resolveComponent, reactive, ref, provide, inject, nextTick, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { browse, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../tools/dom';
-import { warnLog, errLog, getLog, getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../tools/utils';
+import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../tools/utils';
+import { warnLog, errLog, getLog } from '../../tools/log';
 import { createResizeEvent } from '../../tools/resize';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
 import { useSize } from '../../hooks/size';
@@ -5732,15 +5733,25 @@ export default defineComponent({
                 var radioOpts = computeRadioOpts.value;
                 var checkboxOpts = computeCheckboxOpts.value;
                 var expandOpts = computeExpandOpts.value;
+                var rowOpts = computeRowOpts.value;
                 if (process.env.NODE_ENV === 'development') {
-                    if (!props.rowId && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
-                        warnLog('vxe.error.reqProp', ['row-id']);
+                    // if (props.rowId) {
+                    //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+                    // }
+                    // if (props.rowKey) {
+                    //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+                    // }
+                    // if (props.columnKey) {
+                    //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+                    // }
+                    if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
+                        warnLog('vxe.error.reqProp', ['row-config.keyField']);
                     }
                     if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
                         warnLog('vxe.error.reqProp', ['keep-source']);
                     }
-                    if (treeConfig && treeOpts.line && (!props.rowKey || !showOverflow)) {
-                        warnLog('vxe.error.reqProp', ['row-key | show-overflow']);
+                    if (treeConfig && treeOpts.line && (!props.rowKey || !rowOpts.useKey || !showOverflow)) {
+                        warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
                     }
                     if (treeConfig && props.stripe) {
                         warnLog('vxe.error.noTree', ['stripe']);
@@ -5762,14 +5773,14 @@ export default defineComponent({
                 if (process.env.NODE_ENV === 'development') {
                     var customOpts = computeCustomOpts.value;
                     var mouseOpts = computeMouseOpts.value;
-                    var rowOpts = computeRowOpts.value;
+                    var rowOpts_1 = computeRowOpts.value;
                     if (!props.id && props.customConfig && (customOpts.storage === true || (customOpts.storage && customOpts.storage.resizable) || (customOpts.storage && customOpts.storage.visible))) {
                         errLog('vxe.error.reqProp', ['id']);
                     }
                     if (props.treeConfig && checkboxOpts.range) {
                         errLog('vxe.error.noTree', ['checkbox-config.range']);
                     }
-                    if (rowOpts.height && !props.showOverflow) {
+                    if (rowOpts_1.height && !props.showOverflow) {
                         warnLog('vxe.error.notProp', ['table.show-overflow']);
                     }
                     if (!$xetable.handleUpdateCellAreas) {

package/es/table/src/util.js

@@ -33,13 +33,15 @@ export function getRowUniqueId() {
 // 行主键 key
 export function getRowkey($xetable) {
     var props = $xetable.props;
+    var computeRowOpts = $xetable.getComputeMaps().computeRowOpts;
     var rowId = props.rowId;
-    return rowId || '_X_ID';
+    var rowOpts = computeRowOpts.value;
+    return rowId || rowOpts.keyField || '_X_ID';
 }
 // 行主键 value
 export function getRowid($xetable, row) {
-    var rowId = XEUtils.get(row, getRowkey($xetable));
-    return XEUtils.eqNull(rowId) ? '' : encodeURIComponent(rowId);
+    var rowid = XEUtils.get(row, getRowkey($xetable));
+    return XEUtils.eqNull(rowid) ? '' : encodeURIComponent(rowid);
 }
 export var handleFieldOrColumn = function ($xetable, fieldOrColumn) {
     if (fieldOrColumn) {

package/es/toolbar/src/toolbar.js

@@ -15,7 +15,8 @@ import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { useSize } from '../../hooks/size';
 import { getEventTargetNode } from '../../tools/dom';
-import { warnLog, errLog, formatText } from '../../tools/utils';
+import { formatText } from '../../tools/utils';
+import { warnLog, errLog } from '../../tools/log';
 import { GlobalEvent } from '../../tools/event';
 export default defineComponent({
     name: 'VxeToolbar',

package/es/tools/log.js

@@ -0,0 +1,13 @@
+import GlobalConfig from '../v-x-e-table/src/conf';
+export function getLog(message, params) {
+    return "[vxe-table v" + process.env.VUE_APP_VXE_TABLE_VERSION + "] " + GlobalConfig.i18n(message, params);
+}
+function outLog(type) {
+    return function (message, params) {
+        var msg = getLog(message, params);
+        console[type](msg);
+        return msg;
+    };
+}
+export var warnLog = outLog('warn');
+export var errLog = outLog('error');

package/es/tools/utils.js

@@ -2,16 +2,6 @@ import XEUtils from 'xe-utils';
 import GlobalConfig from '../v-x-e-table/src/conf';
 var zindexIndex = 0;
 var lastZindex = 1;
-export function getLog(message, params) {
-    return "[vxe-table] " + GlobalConfig.i18n(message, params);
-}
-function outLog(type) {
-    return function (message, params) {
-        var msg = getLog(message, params);
-        console[type](msg);
-        return msg;
-    };
-}
 export function isEnableConf(conf) {
     return conf && conf.enabled !== false;
 }
@@ -32,8 +22,6 @@ export function nextZIndex() {
 export function getLastZIndex() {
     return lastZindex;
 }
-export var warnLog = outLog('warn');
-export var errLog = outLog('error');
 export function hasChildrenList(item) {
     return item && item.children && item.children.length > 0;
 }

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

@@ -83,6 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
+    version: process.env.VUE_APP_VXE_TABLE_VERSION,
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/es/v-x-e-table/src/conf.js

@@ -25,6 +25,9 @@ var GlobalConfig = {
         // emptyRender: {
         //   name: ''
         // },
+        // rowConfig: {
+        //   keyField: '_X_ID' // 行数据的唯一主键字段名
+        // },
         radioConfig: {
             // trigger: 'default'
             strict: true
@@ -48,7 +51,6 @@ var GlobalConfig = {
         //  storage: false,
         //  checkMethod () {}
         // },
-        // rowId: '_X_ID', // 行数据的唯一主键字段名
         sortConfig: {
             // remote: false,
             // trigger: 'default',

package/es/v-x-e-table/src/interceptor.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { warnLog } from '../../tools/utils';
+import { warnLog } from '../../tools/log';
 var storeMap = {};
 export var interceptor = {
     mixin: function (options) {

package/es/v-x-e-table/src/renderer.js

@@ -18,7 +18,8 @@ import { h, resolveComponent } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from './conf';
 import { getCellValue, setCellValue } from '../../table/src/util';
-import { warnLog, getFuncText, formatText, isEmptyValue } from '../../tools/utils';
+import { getFuncText, formatText, isEmptyValue } from '../../tools/utils';
+import { warnLog } from '../../tools/log';
 import { getOnName } from '../../tools/vn';
 var componentDefaultModelProp = 'modelValue';
 var defaultCompProps = { transfer: true };

package/es/v-x-e-table/src/store.js

@@ -1,4 +1,4 @@
-import { warnLog } from '../../tools/utils';
+import { warnLog } from '../../tools/log';
 import XEUtils from 'xe-utils';
 /**
  * 创建数据仓库

package/lib/edit/src/hook.js

@@ -17,6 +17,8 @@ var _util = require("../../table/src/util");
 
 var _dom = require("../../tools/dom");
 
+var _log = require("../../tools/log");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -159,7 +161,7 @@ var editHook = {
         } else {
           if (process.env.NODE_ENV === 'development') {
             if (parentRowId) {
-              (0, _utils.warnLog)('vxe.error.unableInsert');
+              (0, _log.warnLog)('vxe.error.unableInsert');
             }
           }
 
@@ -278,7 +280,7 @@ var editHook = {
                   if (process.env.NODE_ENV === 'development') {
                     if (item[treeOpts.parentField]) {
                       if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[rowField]) {
-                        (0, _utils.errLog)('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[rowField]]);
+                        (0, _log.errLog)('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[rowField]]);
                       }
                     }
                   }
@@ -304,14 +306,14 @@ var editHook = {
                 });
               } else {
                 if (process.env.NODE_ENV === 'development') {
-                  (0, _utils.warnLog)('vxe.error.unableInsert');
+                  (0, _log.warnLog)('vxe.error.unableInsert');
                 }
 
                 insertTreeRow(newRecords, true);
               }
             } else {
               if (treeConfig) {
-                throw new Error((0, _utils.getLog)('vxe.error.noTree', ['insert']));
+                throw new Error((0, _log.getLog)('vxe.error.noTree', ['insert']));
               }
 
               var afIndex_1 = -1; // 如果是可视索引
@@ -325,7 +327,7 @@ var editHook = {
               }
 
               if (afIndex_1 === -1) {
-                throw new Error((0, _utils.errLog)('vxe.error.unableInsert'));
+                throw new Error((0, _log.errLog)('vxe.error.unableInsert'));
               }
 
               afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));

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");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,_utils.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,_utils.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,_utils.warnLog)("vxe.error.unableInsert"),A(p,!0))}else{if(r)throw new Error((0,_utils.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,_utils.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()),(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)()).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()),(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;