vxe-table 4.1.6 → 4.1.9

package/es/table/src/table.js

@@ -27,7 +27,7 @@ import Cell from './cell';
 import TableBodyComponent from './body';
 import tableProps from './props';
 import tableEmits from './emits';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, restoreScrollLocation, restoreScrollListener } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, restoreScrollListener } from './util';
 var isWebkit = browse['-webkit'] && !browse.edge;
 var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
 var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
@@ -276,8 +276,9 @@ export default defineComponent({
             tableFullColumn: [],
             // 渲染所有列
             visibleColumn: [],
-            // 缓存数据集
+            // 总的缓存数据集
             fullAllDataRowIdData: {},
+            // 渲染中缓存数据
             fullDataRowIdData: {},
             fullColumnIdData: {},
             fullColumnFieldData: {},
@@ -1081,18 +1082,52 @@ export default defineComponent({
                 return cellValue;
             };
         };
+        /**
+         * 预编译
+         * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
+         */
         var updateAfterDataIndex = function () {
-            var afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData;
-            afterFullData.forEach(function (row, _index) {
-                var rowid = getRowid($xetable, row);
-                var rest = fullDataRowIdData[rowid];
-                if (rest) {
-                    rest._index = _index;
-                }
-                else {
-                    fullDataRowIdData[rowid] = { row: row, rowid: rowid, index: -1, $index: -1, _index: _index, items: [], parent: null, level: 0 };
-                }
-            });
+            var treeConfig = props.treeConfig;
+            var afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+            var treeFullData = internalData.treeFullData;
+            var treeOpts = computeTreeOpts.value;
+            if (treeConfig) {
+                XEUtils.eachTree(treeFullData, function (row, index, items, path) {
+                    var rowid = getRowid($xetable, row);
+                    var allrest = fullAllDataRowIdData[rowid];
+                    var fullrest = fullDataRowIdData[rowid];
+                    var seq = path.map(function (num, i) { return i % 2 === 0 ? (Number(num) + 1) : '.'; }).join('');
+                    if (allrest) {
+                        allrest.seq = seq;
+                    }
+                    if (fullrest) {
+                        fullrest.seq = seq;
+                    }
+                    else {
+                        fullAllDataRowIdData[rowid] = { row: row, rowid: rowid, seq: seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 };
+                        fullDataRowIdData[rowid] = { row: row, rowid: rowid, seq: seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 };
+                    }
+                }, treeOpts);
+            }
+            else {
+                afterFullData.forEach(function (row, index) {
+                    var rowid = getRowid($xetable, row);
+                    var allrest = fullAllDataRowIdData[rowid];
+                    var fullrest = fullDataRowIdData[rowid];
+                    var seq = index + 1;
+                    if (allrest) {
+                        allrest.seq = seq;
+                    }
+                    if (fullrest) {
+                        fullrest.seq = seq;
+                        fullrest._index = index;
+                    }
+                    else {
+                        fullAllDataRowIdData[rowid] = { row: row, rowid: rowid, seq: seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 };
+                        fullDataRowIdData[rowid] = { row: row, rowid: rowid, seq: seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 };
+                    }
+                });
+            }
         };
         /**
          * 获取处理后全量的表格数据
@@ -2016,11 +2051,11 @@ export default defineComponent({
                 tableMethods.clearMergeFooterItems();
             }
             reactData.scrollXLoad = scrollXLoad;
-            visibleColumn.forEach(function (column, _index) {
+            visibleColumn.forEach(function (column, index) {
                 var colid = column.id;
                 var rest = fullColumnIdData[colid];
                 if (rest) {
-                    rest._index = _index;
+                    rest._index = index;
                 }
             });
             internalData.visibleColumn = visibleColumn;
@@ -2173,6 +2208,31 @@ export default defineComponent({
                 }
             }
         };
+        var createGetRowCacheProp = function (prop) {
+            return function (row) {
+                var fullDataRowIdData = internalData.fullDataRowIdData;
+                if (row) {
+                    var rowid = getRowid($xetable, row);
+                    var rest = fullDataRowIdData[rowid];
+                    if (rest) {
+                        return rest[prop];
+                    }
+                }
+                return -1;
+            };
+        };
+        var createGetColumnCacheProp = function (prop) {
+            return function (column) {
+                var fullColumnIdData = internalData.fullColumnIdData;
+                if (column) {
+                    var rest = fullColumnIdData[column.id];
+                    if (rest) {
+                        return rest[prop];
+                    }
+                }
+                return -1;
+            };
+        };
         var debounceScrollY = XEUtils.debounce(function (evnt) {
             loadScrollYData(evnt);
         }, 20, { leading: false, trailing: true });
@@ -2298,7 +2358,7 @@ export default defineComponent({
                     }
                     XEUtils.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
                         var rowid = getRowid($xetable, childRow);
-                        var rest = { row: childRow, rowid: rowid, index: -1, _index: -1, $index: -1, items: items, parent: parent, level: parentLevel + nodes.length };
+                        var rest = { row: childRow, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: items, parent: parent, level: parentLevel + nodes.length };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                     }, treeOpts);
@@ -2359,93 +2419,41 @@ export default defineComponent({
                 }
                 return null;
             },
+            /**
+             * 根据 row 获取序号
+             * @param {Row} row 行对象
+             */
+            getRowSeq: createGetRowCacheProp('seq'),
             /**
              * 根据 row 获取相对于 data 中的索引
              * @param {Row} row 行对象
              */
-            getRowIndex: function (row) {
-                var fullDataRowIdData = internalData.fullDataRowIdData;
-                if (row) {
-                    var rowid = getRowid($xetable, row);
-                    var rest = fullDataRowIdData[rowid];
-                    if (rest) {
-                        return rest.index;
-                    }
-                }
-                return -1;
-            },
+            getRowIndex: createGetRowCacheProp('index'),
             /**
              * 根据 row 获取相对于当前数据中的索引
              * @param {Row} row 行对象
              */
-            getVTRowIndex: function (row) {
-                var fullDataRowIdData = internalData.fullDataRowIdData;
-                if (row) {
-                    var rowid = getRowid($xetable, row);
-                    var rest = fullDataRowIdData[rowid];
-                    if (rest) {
-                        return rest._index;
-                    }
-                }
-                return -1;
-            },
+            getVTRowIndex: createGetRowCacheProp('_index'),
             /**
              * 根据 row 获取渲染中的虚拟索引
              * @param {Row} row 行对象
              */
-            getVMRowIndex: function (row) {
-                var fullDataRowIdData = internalData.fullDataRowIdData;
-                if (row) {
-                    var rowid = getRowid($xetable, row);
-                    var rest = fullDataRowIdData[rowid];
-                    if (rest) {
-                        return rest.$index;
-                    }
-                }
-                return -1;
-            },
+            getVMRowIndex: createGetRowCacheProp('$index'),
             /**
              * 根据 column 获取相对于 columns 中的索引
              * @param {ColumnInfo} column 列配置
              */
-            getColumnIndex: function (column) {
-                var fullColumnIdData = internalData.fullColumnIdData;
-                if (column) {
-                    var rest = fullColumnIdData[column.id];
-                    if (rest) {
-                        return rest.index;
-                    }
-                }
-                return -1;
-            },
+            getColumnIndex: createGetColumnCacheProp('index'),
             /**
              * 根据 column 获取相对于当前表格列中的索引
              * @param {ColumnInfo} column 列配置
              */
-            getVTColumnIndex: function (column) {
-                var fullColumnIdData = internalData.fullColumnIdData;
-                if (column) {
-                    var rest = fullColumnIdData[column.id];
-                    if (rest) {
-                        return rest._index;
-                    }
-                }
-                return -1;
-            },
+            getVTColumnIndex: createGetColumnCacheProp('_index'),
             /**
              * 根据 column 获取渲染中的虚拟索引
              * @param {ColumnInfo} column 列配置
              */
-            getVMColumnIndex: function (column) {
-                var fullColumnIdData = internalData.fullColumnIdData;
-                if (column) {
-                    var rest = fullColumnIdData[column.id];
-                    if (rest) {
-                        return rest.$index;
-                    }
-                }
-                return -1;
-            },
+            getVMColumnIndex: createGetColumnCacheProp('$index'),
             /**
              * 创建 data 对象
              * 对于某些特殊场景可能会用到，会自动对数据的字段名进行检测，如果不存在就自动定义
@@ -3203,7 +3211,7 @@ export default defineComponent({
                             }
                         }
                         else {
-                            if (afterFullData.indexOf(selectRow) > -1) {
+                            if ($xetable.findRowIndexOf(afterFullData, selectRow) > -1) {
                                 return selectRow;
                             }
                         }
@@ -3972,6 +3980,7 @@ export default defineComponent({
             var mouseConfig = props.mouseConfig, keyboardConfig = props.keyboardConfig;
             var filterStore = reactData.filterStore, ctxMenuStore = reactData.ctxMenuStore, editStore = reactData.editStore;
             var mouseOpts = computeMouseOpts.value;
+            var keyboardOpts = computeKeyboardOpts.value;
             var actived = editStore.actived;
             var isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE);
             if (isEsc) {
@@ -3986,13 +3995,15 @@ export default defineComponent({
                             $xetable.closeMenu();
                         }
                         tableMethods.closeFilter();
-                        // 如果是激活编辑状态，则取消编辑
-                        if (actived.row) {
-                            var params_1 = actived.args;
-                            $xetable.clearActived(evnt);
-                            // 如果配置了选中功能，则为选中状态
-                            if (mouseOpts.selected) {
-                                nextTick(function () { return $xetable.handleSelected(params_1, evnt); });
+                        if (keyboardConfig && keyboardOpts.isEsc) {
+                            // 如果是激活编辑状态，则取消编辑
+                            if (actived.row) {
+                                var params_1 = actived.args;
+                                $xetable.clearActived(evnt);
+                                // 如果配置了选中功能，则为选中状态
+                                if (mouseOpts.selected) {
+                                    nextTick(function () { return $xetable.handleSelected(params_1, evnt); });
+                                }
                             }
                         }
                     }
@@ -4058,7 +4069,7 @@ export default defineComponent({
                             $xetable.closeMenu();
                         }
                         tableMethods.closeFilter();
-                        if (actived.row) {
+                        if (keyboardConfig && keyboardOpts.isEsc) {
                             // 如果是激活编辑状态，则取消编辑
                             if (actived.row) {
                                 var params_2 = actived.args;
@@ -4460,6 +4471,8 @@ export default defineComponent({
                 var isLazy = treeConfig && treeOpts.lazy;
                 var handleCache = function (row, index, items, path, parent, nodes) {
                     var rowid = getRowid($xetable, row);
+                    var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
+                    var level = nodes ? nodes.length - 1 : 0;
                     if (eqEmptyValue(rowid)) {
                         rowid = getRowUniqueId();
                         XEUtils.set(row, rowkey, rowid);
@@ -4467,7 +4480,7 @@ export default defineComponent({
                     if (isLazy && row[treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.children])) {
                         row[treeOpts.children] = null;
                     }
-                    var rest = { row: row, rowid: rowid, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items: items, parent: parent, level: nodes ? nodes.length - 1 : 0 };
+                    var rest = { row: row, rowid: rowid, seq: seq, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items: items, parent: parent, level: level };
                     if (isSource) {
                         fullDataRowIdData[rowid] = rest;
                     }

package/es/table/src/util.js

@@ -77,6 +77,9 @@ export function toFilters(filters) {
     }
     return filters;
 }
+export function toTreePathSeq(path) {
+    return path.map(function (num, i) { return i % 2 === 0 ? (Number(num) + 1) : '.'; }).join('');
+}
 export function getCellValue(row, column) {
     return XEUtils.get(row, column.property);
 }

package/es/tools/dom.js

@@ -123,13 +123,7 @@ export function scrollToView(elem) {
     }
 }
 export function triggerEvent(targetElem, type) {
-    var evnt;
-    if (typeof Event === 'function') {
-        evnt = new Event(type);
+    if (targetElem) {
+        targetElem.dispatchEvent(new Event(type));
     }
-    else {
-        evnt = document.createEvent('Event');
-        evnt.initEvent(type, true, true);
-    }
-    targetElem.dispatchEvent(evnt);
 }

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

@@ -90,6 +90,9 @@ var GlobalConfig = {
         mouseConfig: {
             extension: true
         },
+        keyboardConfig: {
+            isEsc: true
+        },
         areaConfig: {
             selectCellByHeader: true
         },

package/lib/button/src/button.js

@@ -175,48 +175,49 @@ var _default2 = (0, _vue.defineComponent)({
           };
 
           var _a = (0, _dom.getAbsolutePos)(targetElem),
+              top_1 = _a.top,
+              left = _a.left,
               boundingTop = _a.boundingTop,
-              boundingLeft = _a.boundingLeft,
               visibleHeight = _a.visibleHeight,
               visibleWidth = _a.visibleWidth;
 
           var panelPlacement = 'bottom';
 
           if (transfer) {
-            var left = boundingLeft + targetWidth - panelWidth;
-            var top_1 = boundingTop + targetHeight;
+            var btnLeft = left + targetWidth - panelWidth;
+            var btnTop = top_1 + targetHeight;
 
             if (placement === 'top') {
               panelPlacement = 'top';
-              top_1 = boundingTop - panelHeight;
+              btnTop = top_1 - panelHeight;
             } else if (!placement) {
               // 如果下面不够放，则向上
-              if (top_1 + panelHeight + marginSize > visibleHeight) {
+              if (boundingTop + targetHeight + panelHeight + marginSize > visibleHeight) {
                 panelPlacement = 'top';
-                top_1 = boundingTop - panelHeight;
+                btnTop = top_1 - panelHeight;
               } // 如果上面不够放，则向下（优先）
 
 
-              if (top_1 < marginSize) {
+              if (btnTop < marginSize) {
                 panelPlacement = 'bottom';
-                top_1 = boundingTop + targetHeight;
+                btnTop = top_1 + targetHeight;
               }
             } // 如果溢出右边
 
 
-            if (left + panelWidth + marginSize > visibleWidth) {
-              left -= left + panelWidth + marginSize - visibleWidth;
+            if (btnLeft + panelWidth + marginSize > visibleWidth) {
+              btnLeft -= btnLeft + panelWidth + marginSize - visibleWidth;
             } // 如果溢出左边
 
 
-            if (left < marginSize) {
-              left = marginSize;
+            if (btnLeft < marginSize) {
+              btnLeft = marginSize;
             }
 
             Object.assign(panelStyle, {
-              left: left + "px",
+              left: btnLeft + "px",
               right: 'auto',
-              top: top_1 + "px",
+              top: btnTop + "px",
               minWidth: targetWidth + "px"
             });
           } else {

package/lib/button/src/button.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")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default2=(0,_vue.defineComponent)({name:"VxeButton",props:{type:String,className:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},emits:["click","dropdown-click"],setup:function(m,e){function _(e){u.dispatchEvent("click",{$event:e},e)}function b(e){0===e.button&&e.stopPropagation()}function h(e){var t=e.currentTarget,n=z.value,t=(o=(0,_dom.getEventTargetNode)(e,t,"vxe-button")).flag,o=o.targetElem;t&&(n&&(n.dataset.active="N"),P.showPanel=!1,setTimeout(function(){n&&"Y"===n.dataset.active||(P.animatVisible=!1)},350),u.dispatchEvent("dropdown-click",{name:o.getAttribute("name"),$event:e},e))}function x(){var e=z.value;e&&(e.dataset.active="Y",P.inited||(P.inited=!0),n.showTime=setTimeout(function(){"Y"===e.dataset.active?q():P.animatVisible=!1},250))}function g(){r()}function w(){var e=m.content,t=m.icon,n=[];return m.loading?n.push((0,_vue.h)("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):t&&n.push((0,_vue.h)("i",{class:["vxe-button--icon",t]})),T.default?n.push((0,_vue.h)("span",{class:"vxe-button--content"},T.default({}))):e&&n.push((0,_vue.h)("span",{class:"vxe-button--content"},(0,_utils.getFuncText)(e))),n}var T=e.slots,o=e.emit,t=_xeUtils.default.uniqueId(),y=(0,_size.useSize)(m),P=(0,_vue.reactive)({inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:{},panelPlacement:""}),n={showTime:null},N=(0,_vue.ref)(),k=(0,_vue.ref)(),z=(0,_vue.ref)(),i={refElem:N},a={xID:t,props:m,context:e,reactData:P,internalData:n,getRefMaps:function(){return i}},u={},O=(0,_vue.computed)(function(){var e=m.type;return!!e&&-1<["submit","reset","button"].indexOf(e)}),S=(0,_vue.computed)(function(){var e=m.type;return e&&"text"===e?e:"button"}),s=function(){P.panelIndex<(0,_utils.getLastZIndex)()&&(P.panelIndex=(0,_utils.nextZIndex)())},l=function(){return(0,_vue.nextTick)().then(function(){var e=m.transfer,t=m.placement,n=P.panelIndex,o=k.value,i=z.value;if(i&&o){var a=o.offsetHeight,u=o.offsetWidth,s=i.offsetHeight,l=i.offsetWidth,r={zIndex:n},c=(0,_dom.getAbsolutePos)(o),d=c.boundingTop,i=c.boundingLeft,n=c.visibleHeight,o=c.visibleWidth,c="bottom";return e?(e=d+a,"top"===t?(c="top",e=d-s):t||(n<e+s+5&&(c="top",e=d-s),e<5&&(c="bottom",e=d+a)),o<(i=i+u-l)+l+5&&(i-=i+l+5-o),i<5&&(i=5),Object.assign(r,{left:i+"px",right:"auto",top:e+"px",minWidth:u+"px"})):"top"===t?(c="top",r.bottom=a+"px"):t||n<d+a+s&&5<d-a-s&&(c="top",r.bottom=a+"px"),P.panelStyle=r,P.panelPlacement=c,(0,_vue.nextTick)()}})},q=function(){var e=z.value;e&&(e.dataset.active="Y",P.animatVisible=!0,setTimeout(function(){"Y"===e.dataset.active&&(P.showPanel=!0,s(),l(),setTimeout(function(){P.showPanel&&l()},50))},20))},r=function(){var e=z.value;clearTimeout(n.showTime),e?(e.dataset.active="N",setTimeout(function(){"Y"!==e.dataset.active&&(P.showPanel=!1,setTimeout(function(){"Y"!==e.dataset.active&&(P.animatVisible=!1)},350))},100)):(P.animatVisible=!1,P.showPanel=!1)},u={dispatchEvent:function(e,t,n){o(e,Object.assign({$button:a,$event:n},t))},focus:function(){return k.value.focus(),(0,_vue.nextTick)()},blur:function(){return k.value.blur(),(0,_vue.nextTick)()}};Object.assign(a,u),(0,_vue.onMounted)(function(){_event.GlobalEvent.on(a,"mousewheel",function(e){var t=z.value;P.showPanel&&!(0,_dom.getEventTargetNode)(e,t).flag&&r()})}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(a,"mousewheel")});return a.renderVN=function(){var e=m.className,t=m.transfer,n=m.type,o=m.round,i=m.circle,a=m.destroyOnClose,u=m.status,s=m.name,l=m.disabled,r=m.loading,c=P.inited,d=P.showPanel,v=O.value,f=S.value,p=y.value;return T.dropdowns?(0,_vue.h)("div",{ref:N,class:["vxe-button--dropdown",e,((e={})["size--"+p]=p,e["is--active"]=d,e)]},[(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((e={})["size--"+p]=p,e["theme--"+u]=u,e["is--round"]=o,e["is--circle"]=i,e["is--disabled"]=l||r,e["is--loading"]=r,e)],name:s,type:v?n:"button",disabled:l||r,onMouseenter:x,onMouseleave:g,onClick:_},w().concat([(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+_conf.default.icon.BUTTON_DROPDOWN})])),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!t||!c},[(0,_vue.h)("div",{ref:z,class:["vxe-button--dropdown-panel",((t={})["size--"+p]=p,t["animat--leave"]=P.animatVisible,t["animat--enter"]=d,t)],placement:P.panelPlacement,style:P.panelStyle},c?[(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper",onMousedown:b,onClick:h,onMouseenter:q,onMouseleave:g},a&&!d?[]:T.dropdowns({}))]:[])])]):(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((f={})["size--"+p]=p,f["theme--"+u]=u,f["is--round"]=o,f["is--circle"]=i,f["is--disabled"]=l||r,f["is--loading"]=r,f)],name:s,type:v?n:"button",disabled:l||r,onClick:_},w())},a},render:function(){return this.renderVN()}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default2=(0,_vue.defineComponent)({name:"VxeButton",props:{type:String,className:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},emits:["click","dropdown-click"],setup:function(m,e){function _(e){u.dispatchEvent("click",{$event:e},e)}function b(e){0===e.button&&e.stopPropagation()}function h(e){var t=e.currentTarget,n=z.value,t=(o=(0,_dom.getEventTargetNode)(e,t,"vxe-button")).flag,o=o.targetElem;t&&(n&&(n.dataset.active="N"),P.showPanel=!1,setTimeout(function(){n&&"Y"===n.dataset.active||(P.animatVisible=!1)},350),u.dispatchEvent("dropdown-click",{name:o.getAttribute("name"),$event:e},e))}function x(){var e=z.value;e&&(e.dataset.active="Y",P.inited||(P.inited=!0),n.showTime=setTimeout(function(){"Y"===e.dataset.active?q():P.animatVisible=!1},250))}function g(){r()}function w(){var e=m.content,t=m.icon,n=[];return m.loading?n.push((0,_vue.h)("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):t&&n.push((0,_vue.h)("i",{class:["vxe-button--icon",t]})),T.default?n.push((0,_vue.h)("span",{class:"vxe-button--content"},T.default({}))):e&&n.push((0,_vue.h)("span",{class:"vxe-button--content"},(0,_utils.getFuncText)(e))),n}var T=e.slots,o=e.emit,t=_xeUtils.default.uniqueId(),y=(0,_size.useSize)(m),P=(0,_vue.reactive)({inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:{},panelPlacement:""}),n={showTime:null},N=(0,_vue.ref)(),k=(0,_vue.ref)(),z=(0,_vue.ref)(),i={refElem:N},a={xID:t,props:m,context:e,reactData:P,internalData:n,getRefMaps:function(){return i}},u={},O=(0,_vue.computed)(function(){var e=m.type;return!!e&&-1<["submit","reset","button"].indexOf(e)}),S=(0,_vue.computed)(function(){var e=m.type;return e&&"text"===e?e:"button"}),s=function(){P.panelIndex<(0,_utils.getLastZIndex)()&&(P.panelIndex=(0,_utils.nextZIndex)())},l=function(){return(0,_vue.nextTick)().then(function(){var e=m.transfer,t=m.placement,n=P.panelIndex,o=k.value,i=z.value;if(i&&o){var a=o.offsetHeight,u=o.offsetWidth,s=i.offsetHeight,l=i.offsetWidth,r={zIndex:n},c=(0,_dom.getAbsolutePos)(o),d=c.top,v=c.left,i=c.boundingTop,n=c.visibleHeight,o=c.visibleWidth,c="bottom";return e?(e=d+a,"top"===t?(c="top",e=d-s):t||(n<i+a+s+5&&(c="top",e=d-s),e<5&&(c="bottom",e=d+a)),o<(v=v+u-l)+l+5&&(v-=v+l+5-o),v<5&&(v=5),Object.assign(r,{left:v+"px",right:"auto",top:e+"px",minWidth:u+"px"})):"top"===t?(c="top",r.bottom=a+"px"):t||n<i+a+s&&5<i-a-s&&(c="top",r.bottom=a+"px"),P.panelStyle=r,P.panelPlacement=c,(0,_vue.nextTick)()}})},q=function(){var e=z.value;e&&(e.dataset.active="Y",P.animatVisible=!0,setTimeout(function(){"Y"===e.dataset.active&&(P.showPanel=!0,s(),l(),setTimeout(function(){P.showPanel&&l()},50))},20))},r=function(){var e=z.value;clearTimeout(n.showTime),e?(e.dataset.active="N",setTimeout(function(){"Y"!==e.dataset.active&&(P.showPanel=!1,setTimeout(function(){"Y"!==e.dataset.active&&(P.animatVisible=!1)},350))},100)):(P.animatVisible=!1,P.showPanel=!1)},u={dispatchEvent:function(e,t,n){o(e,Object.assign({$button:a,$event:n},t))},focus:function(){return k.value.focus(),(0,_vue.nextTick)()},blur:function(){return k.value.blur(),(0,_vue.nextTick)()}};Object.assign(a,u),(0,_vue.onMounted)(function(){_event.GlobalEvent.on(a,"mousewheel",function(e){var t=z.value;P.showPanel&&!(0,_dom.getEventTargetNode)(e,t).flag&&r()})}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(a,"mousewheel")});return a.renderVN=function(){var e=m.className,t=m.transfer,n=m.type,o=m.round,i=m.circle,a=m.destroyOnClose,u=m.status,s=m.name,l=m.disabled,r=m.loading,c=P.inited,d=P.showPanel,v=O.value,f=S.value,p=y.value;return T.dropdowns?(0,_vue.h)("div",{ref:N,class:["vxe-button--dropdown",e,((e={})["size--"+p]=p,e["is--active"]=d,e)]},[(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((e={})["size--"+p]=p,e["theme--"+u]=u,e["is--round"]=o,e["is--circle"]=i,e["is--disabled"]=l||r,e["is--loading"]=r,e)],name:s,type:v?n:"button",disabled:l||r,onMouseenter:x,onMouseleave:g,onClick:_},w().concat([(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+_conf.default.icon.BUTTON_DROPDOWN})])),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!t||!c},[(0,_vue.h)("div",{ref:z,class:["vxe-button--dropdown-panel",((t={})["size--"+p]=p,t["animat--leave"]=P.animatVisible,t["animat--enter"]=d,t)],placement:P.panelPlacement,style:P.panelStyle},c?[(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper",onMousedown:b,onClick:h,onMouseenter:q,onMouseleave:g},a&&!d?[]:T.dropdowns({}))]:[])])]):(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((f={})["size--"+p]=p,f["theme--"+u]=u,f["is--round"]=o,f["is--circle"]=i,f["is--disabled"]=l||r,f["is--loading"]=r,f)],name:s,type:v?n:"button",disabled:l||r,onClick:_},w())},a},render:function(){return this.renderVN()}});exports.default=_default2;

package/lib/edit/src/hook.js

@@ -141,6 +141,7 @@ var editHook = {
           var rest = {
             row: item,
             rowid: rowid,
+            seq: -1,
             index: -1,
             _index: -1,
             $index: -1,
@@ -162,6 +163,7 @@ var editHook = {
           var rest = {
             row: item,
             rowid: rowid,
+            seq: -1,
             index: -1,
             _index: -1,
             $index: -1,
@@ -283,6 +285,7 @@ var editHook = {
                   var rest = {
                     row: item,
                     rowid: rowid,
+                    seq: -1,
                     index: -1,
                     _index: -1,
                     $index: -1,

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(R){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=R.reactData,I=R.internalData,o=R.getRefMaps().refElem,e=R.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,m=e.computeCheckboxOpts,b=e.computeSYOpts,S=e.computeTreeOpts,h={},w={};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=I.treeFullData,i=I.afterFullData,u=I.fullDataRowIdData,c=I.fullAllDataRowIdData,d=S.value,s=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[d.parentField],n=(0,_util.getRowid)(R,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d.rowField]},d):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(R,t)])?r.level:0,r=t[d.children],(r=!_xeUtils.default.isArray(r)?t[d.children]=[]:r)[s](e),{row:e,rowid:n,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[s](e),a[s](e),{row:e,rowid:n,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e}),R.updateVirtualTreeData()}return h={insert:function(e){return h.insertAt(e,null)},insertAt:function(e,t){var r=_.treeConfig,l=C.mergeList,n=C.editStore,o=C.scrollYLoad,a=I.treeFullData,i=I.afterFullData,u=I.tableFullData,c=I.fullDataRowIdData,d=I.fullAllDataRowIdData,s=b.value,f=S.value,v=f.transform,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return R.defineField(Object.assign({},e))});if(t)if(-1===t)r&&v?A(p,!0):(i.push.apply(i,p),u.push.apply(u,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+p.length)}));else if(r&&v){var w,g,m,h=_xeUtils.default.findTree(a,function(e){return t[f.rowField]===e[f.rowField]},f);h?(w=h.parent,g=h.items,a=d[(0,_util.getRowid)(R,w)],m=a?a.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(R,e);"development"===process.env.NODE_ENV&&e[f.parentField]&&w&&e[f.parentField]!==w[f.rowField]&&(0,_utils.errLog)("vxe.error.errProp",[f.parentField+"="+e[f.parentField],f.parentField+"="+w[f.rowField]]),w&&(e[f.parentField]=w[f.rowField]),g.splice(h.index+t,0,e);e={row:e,rowid:r,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};c[r]=e,d[r]=e}),R.updateVirtualTreeData()):("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=R.findRowIndexOf(i,t);if(-1===x)throw new Error((0,_utils.errLog)("vxe.error.unableInsert"));i.splice.apply(i,__spreadArray([x,0],p)),u.splice.apply(u,__spreadArray([R.findRowIndexOf(u,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&&v?A(p,!1):(i.unshift.apply(i,p),u.unshift.apply(u,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),C.scrollYLoad=!r&&-1<s.gt&&s.gt<u.length,R.updateFooter(),R.cacheRowMap(),R.handleTableData(v),R.updateAfterDataIndex(),R.checkSelectionStatus(),o&&R.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return R.updateCellAreas(),R.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=_.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=C.scrollYLoad,a=I.treeFullData,i=I.afterFullData,u=I.tableFullData,c=m.value,d=b.value,s=S.value,f=s.transform,v=l.actived,p=l.removeList,w=l.insertList,c=c.checkField,g=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(function(e){R.isInsertByRow(e)||p.push(e)}),c||e.forEach(function(e){e=R.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),u===e?(e=g=u.slice(0),I.tableFullData=[],I.afterFullData=[],R.clearMergeCells()):t&&f?e.forEach(function(e){var t=(0,_util.getRowid)(R,e),r=_xeUtils.default.findTree(a,function(e){return t===(0,_util.getRowid)(R,e)},s);r&&(r=r.items.splice(r.index,1),g.push(r[0]));e=R.findRowIndexOf(i,e);-1<e&&i.splice(e,1),R.updateVirtualTreeData()}):e.forEach(function(e){var t=R.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),g.push(t[0]));var l=R.findRowIndexOf(i,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)}),i.splice(l,1))}),v.row&&-1<R.findRowIndexOf(e,v.row)&&h.clearActived(),e.forEach(function(e){e=R.findRowIndexOf(w,e);-1<e&&w.splice(e,1)}),C.scrollYLoad=!t&&-1<d.gt&&d.gt<u.length,R.updateFooter(),R.cacheRowMap(),R.handleTableData(f),R.updateAfterDataIndex(),R.checkSelectionStatus(),o&&R.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return R.updateCellAreas(),R.recalculate()}).then(function(){return{row:g.length?g[g.length-1]:null,rows:g}})},removeCheckboxRow:function(){return h.remove(R.getCheckboxRecords()).then(function(e){return R.clearCheckboxRow(),e})},removeRadioRow:function(){var e=R.getRadioRecord();return h.remove(e||[]).then(function(e){return R.clearRadioRow(),e})},removeCurrentRow:function(){var e=R.getCurrentRecord();return h.remove(e||[]).then(function(e){return R.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:h.getInsertRecords(),removeRecords:h.getRemoveRecords(),updateRecords:h.getUpdateRecords()}},getInsertRecords:function(){var e=_.treeConfig,t=C.editStore,r=I.treeFullData,l=I.tableFullData,n=S.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(R,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(R,e)},n)&&o.push(e)}):t.forEach(function(e){-1<R.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=_.keepSource,t=_.treeConfig,r=I.tableFullData,l=S.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return R.isUpdateByRow(e)},l):r.filter(function(e){return R.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=I.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<R.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,R.updateFooter(),R.dispatchEvent("edit-closed",{row:r,rowIndex:R.getRowIndex(r),$rowIndex:R.getVMRowIndex(r),column:l,columnIndex:R.getColumnIndex(l),$columnIndex:R.getVMColumnIndex(l)},e||null)),(R.clearValidate?R.clearValidate():(0,_vue.nextTick)()).then(function(){return R.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=I.visibleColumn;return R.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=_.editConfig,l=_xeUtils.default.isString(e)?R.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?R.scrollToRow(t,l).then(function(){var e=R.getCell(t,l);return e&&(w.handleActived({row:t,rowIndex:R.getRowIndex(t),column:l,columnIndex:R.getColumnIndex(l),cell:e,$table:R}),I._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=I.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?R.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=R.findRowIndexOf(r,e))&&t&&(r=R.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},R.handleSelected(r,{}))),(0,_vue.nextTick)()}},w={handleActived:function(e,t){var r,l=_.editConfig,n=_.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=e.cell||R.getCell(s,f);return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(n&&(h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea())),R.closeTooltip(),h.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(){w.handleFocus(e,t)})),R.dispatchEvent(r,{row:s,rowIndex:R.getRowIndex(s),$rowIndex:R.getVMRowIndex(s),column:f,columnIndex:R.getColumnIndex(f),$columnIndex:R.getVMColumnIndex(f)},t)):(r=d.column,n&&(h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),R.clearValidate&&R.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){w.handleFocus(e,t)})),R.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())):R.scrollToRow(l,n))},handleSelected:function(e,t){var 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)&&(h.clearActived(t),h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&w.addCellSelectedClass(),R.focus()),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=R.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},h),w)},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");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(R){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=R.reactData,I=R.internalData,o=R.getRefMaps().refElem,e=R.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,m=e.computeCheckboxOpts,b=e.computeSYOpts,S=e.computeTreeOpts,h={},w={};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=I.treeFullData,i=I.afterFullData,u=I.fullDataRowIdData,c=I.fullAllDataRowIdData,d=S.value,s=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[d.parentField],n=(0,_util.getRowid)(R,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d.rowField]},d):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(R,t)])?r.level:0,r=t[d.children],(r=!_xeUtils.default.isArray(r)?t[d.children]=[]:r)[s](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[s](e),a[s](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}),R.updateVirtualTreeData()}return h={insert:function(e){return h.insertAt(e,null)},insertAt:function(e,t){var r=_.treeConfig,l=C.mergeList,n=C.editStore,o=C.scrollYLoad,a=I.treeFullData,i=I.afterFullData,u=I.tableFullData,c=I.fullDataRowIdData,d=I.fullAllDataRowIdData,s=b.value,f=S.value,v=f.transform,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return R.defineField(Object.assign({},e))});if(t)if(-1===t)r&&v?A(p,!0):(i.push.apply(i,p),u.push.apply(u,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+p.length)}));else if(r&&v){var w,g,m,h=_xeUtils.default.findTree(a,function(e){return t[f.rowField]===e[f.rowField]},f);h?(w=h.parent,g=h.items,a=d[(0,_util.getRowid)(R,w)],m=a?a.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(R,e);"development"===process.env.NODE_ENV&&e[f.parentField]&&w&&e[f.parentField]!==w[f.rowField]&&(0,_utils.errLog)("vxe.error.errProp",[f.parentField+"="+e[f.parentField],f.parentField+"="+w[f.rowField]]),w&&(e[f.parentField]=w[f.rowField]),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};c[r]=e,d[r]=e}),R.updateVirtualTreeData()):("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=R.findRowIndexOf(i,t);if(-1===x)throw new Error((0,_utils.errLog)("vxe.error.unableInsert"));i.splice.apply(i,__spreadArray([x,0],p)),u.splice.apply(u,__spreadArray([R.findRowIndexOf(u,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&&v?A(p,!1):(i.unshift.apply(i,p),u.unshift.apply(u,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),C.scrollYLoad=!r&&-1<s.gt&&s.gt<u.length,R.updateFooter(),R.cacheRowMap(),R.handleTableData(v),R.updateAfterDataIndex(),R.checkSelectionStatus(),o&&R.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return R.updateCellAreas(),R.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=_.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=C.scrollYLoad,a=I.treeFullData,i=I.afterFullData,u=I.tableFullData,c=m.value,d=b.value,s=S.value,f=s.transform,v=l.actived,p=l.removeList,w=l.insertList,c=c.checkField,g=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(function(e){R.isInsertByRow(e)||p.push(e)}),c||e.forEach(function(e){e=R.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),u===e?(e=g=u.slice(0),I.tableFullData=[],I.afterFullData=[],R.clearMergeCells()):t&&f?e.forEach(function(e){var t=(0,_util.getRowid)(R,e),r=_xeUtils.default.findTree(a,function(e){return t===(0,_util.getRowid)(R,e)},s);r&&(r=r.items.splice(r.index,1),g.push(r[0]));e=R.findRowIndexOf(i,e);-1<e&&i.splice(e,1),R.updateVirtualTreeData()}):e.forEach(function(e){var t=R.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),g.push(t[0]));var l=R.findRowIndexOf(i,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)}),i.splice(l,1))}),v.row&&-1<R.findRowIndexOf(e,v.row)&&h.clearActived(),e.forEach(function(e){e=R.findRowIndexOf(w,e);-1<e&&w.splice(e,1)}),C.scrollYLoad=!t&&-1<d.gt&&d.gt<u.length,R.updateFooter(),R.cacheRowMap(),R.handleTableData(f),R.updateAfterDataIndex(),R.checkSelectionStatus(),o&&R.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return R.updateCellAreas(),R.recalculate()}).then(function(){return{row:g.length?g[g.length-1]:null,rows:g}})},removeCheckboxRow:function(){return h.remove(R.getCheckboxRecords()).then(function(e){return R.clearCheckboxRow(),e})},removeRadioRow:function(){var e=R.getRadioRecord();return h.remove(e||[]).then(function(e){return R.clearRadioRow(),e})},removeCurrentRow:function(){var e=R.getCurrentRecord();return h.remove(e||[]).then(function(e){return R.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:h.getInsertRecords(),removeRecords:h.getRemoveRecords(),updateRecords:h.getUpdateRecords()}},getInsertRecords:function(){var e=_.treeConfig,t=C.editStore,r=I.treeFullData,l=I.tableFullData,n=S.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(R,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(R,e)},n)&&o.push(e)}):t.forEach(function(e){-1<R.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=_.keepSource,t=_.treeConfig,r=I.tableFullData,l=S.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return R.isUpdateByRow(e)},l):r.filter(function(e){return R.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=I.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<R.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,R.updateFooter(),R.dispatchEvent("edit-closed",{row:r,rowIndex:R.getRowIndex(r),$rowIndex:R.getVMRowIndex(r),column:l,columnIndex:R.getColumnIndex(l),$columnIndex:R.getVMColumnIndex(l)},e||null)),(R.clearValidate?R.clearValidate():(0,_vue.nextTick)()).then(function(){return R.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=I.visibleColumn;return R.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=_.editConfig,l=_xeUtils.default.isString(e)?R.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?R.scrollToRow(t,l).then(function(){var e=R.getCell(t,l);return e&&(w.handleActived({row:t,rowIndex:R.getRowIndex(t),column:l,columnIndex:R.getColumnIndex(l),cell:e,$table:R}),I._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=I.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?R.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=R.findRowIndexOf(r,e))&&t&&(r=R.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},R.handleSelected(r,{}))),(0,_vue.nextTick)()}},w={handleActived:function(e,t){var r,l=_.editConfig,n=_.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=e.cell||R.getCell(s,f);return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(n&&(h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea())),R.closeTooltip(),h.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(){w.handleFocus(e,t)})),R.dispatchEvent(r,{row:s,rowIndex:R.getRowIndex(s),$rowIndex:R.getVMRowIndex(s),column:f,columnIndex:R.getColumnIndex(f),$columnIndex:R.getVMColumnIndex(f)},t)):(r=d.column,n&&(h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),R.clearValidate&&R.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){w.handleFocus(e,t)})),R.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())):R.scrollToRow(l,n))},handleSelected:function(e,t){var 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)&&(h.clearActived(t),h.clearSelected(),R.clearCellAreas&&(R.clearCellAreas(),R.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&w.addCellSelectedClass(),R.focus()),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=R.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},h),w)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;

package/lib/export/src/hook.js

@@ -121,6 +121,10 @@ function getFooterData(opts, footerTableData) {
 
 function getCsvCellTypeLabel(column, cellValue) {
   if (cellValue) {
+    if (column.type === 'seq') {
+      return "\t" + cellValue;
+    }
+
     switch (column.cellType) {
       case 'string':
         if (!isNaN(cellValue)) {
@@ -368,15 +372,24 @@ var tableExportHook = {
       return row[treeOpts.children] && row[treeOpts.children].length;
     };
 
-    var getSeq = function getSeq(row, rowIndex, column, columnIndex) {
+    var getSeq = function getSeq(row, rowIndex, column, columnIndex, path) {
       var seqOpts = computeSeqOpts.value;
       var seqMethod = seqOpts.seqMethod || column.seqMethod;
-      return seqMethod ? seqMethod({
-        row: row,
-        rowIndex: rowIndex,
-        column: column,
-        columnIndex: columnIndex
-      }) : seqOpts.startIndex + rowIndex + 1;
+
+      if (seqMethod) {
+        return seqMethod({
+          row: row,
+          rowIndex: rowIndex,
+          column: column,
+          columnIndex: columnIndex
+        });
+      }
+
+      if (path) {
+        return (0, _util.toTreePathSeq)(path);
+      }
+
+      return seqOpts.startIndex + rowIndex + 1;
     };
 
     var toBooleanValue = function toBooleanValue(cellValue) {
@@ -397,12 +410,13 @@ var tableExportHook = {
       if (treeConfig) {
         // 如果是树表格只允许导出数据源
         var rest_1 = [];
+        var expandMaps_1 = new Map();
 
         _xeUtils.default.eachTree(datas, function (item, rowIndex, items, path, parent, nodes) {
           var row = item._row || item;
           var parentRow = parent && parent._row ? parent._row : parent;
 
-          if (isAllExpand || !parentRow || $xetable.isTreeExpandByRow(parentRow)) {
+          if (isAllExpand || !parentRow || expandMaps_1.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)) {
             var hasRowChild = hasTreeChildren(row);
             var item_3 = {
               _row: row,
@@ -433,7 +447,7 @@ var tableExportHook = {
               } else {
                 switch (column.type) {
                   case 'seq':
-                    cellValue = getSeq(row, rowIndex, column, columnIndex);
+                    cellValue = getSeq(row, rowIndex, column, columnIndex, path);
                     break;
 
                   case 'checkbox':
@@ -475,6 +489,7 @@ var tableExportHook = {
 
               item_3[column.id] = _xeUtils.default.toValueString(cellValue);
             });
+            expandMaps_1.set(row, 1);
             rest_1.push(Object.assign(item_3, row));
           }
         }, treeOpts);
@@ -509,7 +524,7 @@ var tableExportHook = {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq(row, rowIndex, column, columnIndex);
+                cellValue = getSeq(row, rowIndex, column, columnIndex, []);
                 break;
 
               case 'checkbox':