vxe-table 4.1.4 → 4.1.7

package/es/edit/src/hook.js

@@ -17,8 +17,8 @@ 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 } from '../../tools/utils';
-import { getCellValue, setCellValue } from '../../table/src/util';
+import { errLog, getLog, isEnableConf, warnLog } from '../../tools/utils';
+import { getCellValue, setCellValue, getRowid } from '../../table/src/util';
 import { browse, removeClass, addClass } from '../../tools/dom';
 var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
 var editHook = {
@@ -66,6 +66,42 @@ var editHook = {
                 }
             }
         }
+        function insertTreeRow(newRecords, isAppend) {
+            var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+            var treeOpts = computeTreeOpts.value;
+            var funcName = isAppend ? 'push' : 'unshift';
+            newRecords.forEach(function (item) {
+                var parentRowId = item[treeOpts.parentField];
+                var rowid = getRowid($xetable, item);
+                var matchObj = parentRowId ? XEUtils.findTree(treeFullData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
+                if (matchObj) {
+                    var parentRow = matchObj.item;
+                    var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
+                    var parentLevel = parentRest ? parentRest.level : 0;
+                    var parentChilds = parentRow[treeOpts.children];
+                    if (!XEUtils.isArray(parentChilds)) {
+                        parentChilds = parentRow[treeOpts.children] = [];
+                    }
+                    parentChilds[funcName](item);
+                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parent, level: parentLevel + 1 };
+                    fullDataRowIdData[rowid] = rest;
+                    fullAllDataRowIdData[rowid] = rest;
+                }
+                else {
+                    if (process.env.NODE_ENV === 'development') {
+                        if (parentRowId) {
+                            warnLog('vxe.error.unableInsert');
+                        }
+                    }
+                    afterFullData[funcName](item);
+                    treeFullData[funcName](item);
+                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: treeFullData, parent: null, level: 0 };
+                    fullDataRowIdData[rowid] = rest;
+                    fullAllDataRowIdData[rowid] = rest;
+                }
+            });
+            $xetable.updateVirtualTreeData();
+        }
         editMethods = {
             /**
              * 往表格中插入临时数据
@@ -77,9 +113,9 @@ var editHook = {
             },
             /**
              * 往表格指定行中插入临时数据
-             * 如果 row 为空则从插入到顶部
-             * 如果 row 为 -1 则从插入到底部
-             * 如果 row 为有效行则插入到该行的位置
+             * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+             * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+             * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
              * @param {Object/Array} records 新的数据
              * @param {Row} row 指定行
              */
@@ -87,62 +123,112 @@ var editHook = {
                 var _a;
                 var treeConfig = props.treeConfig;
                 var mergeList = reactData.mergeList, editStore = reactData.editStore, scrollYLoad = reactData.scrollYLoad;
-                var afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var sYOpts = computeSYOpts.value;
+                var treeOpts = computeTreeOpts.value;
+                var transform = treeOpts.transform;
                 if (!XEUtils.isArray(records)) {
                     records = [records];
                 }
                 var newRecords = records.map(function (record) { return $xetable.defineField(Object.assign({}, record)); });
                 if (!row) {
-                    afterFullData.unshift.apply(afterFullData, newRecords);
-                    tableFullData.unshift.apply(tableFullData, newRecords);
-                    // 刷新单元格合并
-                    mergeList.forEach(function (mergeItem) {
-                        var mergeRowIndex = mergeItem.row;
-                        if (mergeRowIndex > 0) {
-                            mergeItem.row = mergeRowIndex + newRecords.length;
-                        }
-                    });
-                }
-                else {
-                    if (row === -1) {
-                        afterFullData.push.apply(afterFullData, newRecords);
-                        tableFullData.push.apply(tableFullData, newRecords);
+                    // 如果为虚拟树
+                    if (treeConfig && transform) {
+                        insertTreeRow(newRecords, false);
+                    }
+                    else {
+                        afterFullData.unshift.apply(afterFullData, newRecords);
+                        tableFullData.unshift.apply(tableFullData, newRecords);
                         // 刷新单元格合并
                         mergeList.forEach(function (mergeItem) {
-                            var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                            if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                                mergeItem.rowspan = mergeRowspan + newRecords.length;
+                            var mergeRowIndex = mergeItem.row;
+                            if (mergeRowIndex > 0) {
+                                mergeItem.row = mergeRowIndex + newRecords.length;
                             }
                         });
                     }
-                    else {
-                        if (treeConfig) {
-                            throw new Error(getLog('vxe.error.noTree', ['insert']));
+                }
+                else {
+                    if (row === -1) {
+                        // 如果为虚拟树
+                        if (treeConfig && transform) {
+                            insertTreeRow(newRecords, true);
                         }
-                        var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
-                        if (afIndex_1 === -1) {
-                            throw new Error(errLog('vxe.error.unableInsert'));
+                        else {
+                            afterFullData.push.apply(afterFullData, newRecords);
+                            tableFullData.push.apply(tableFullData, newRecords);
+                            // 刷新单元格合并
+                            mergeList.forEach(function (mergeItem) {
+                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+                                    mergeItem.rowspan = mergeRowspan + newRecords.length;
+                                }
+                            });
                         }
-                        afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
-                        tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords));
-                        // 刷新单元格合并
-                        mergeList.forEach(function (mergeItem) {
-                            var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                            if (mergeRowIndex > afIndex_1) {
-                                mergeItem.row = mergeRowIndex + newRecords.length;
+                    }
+                    else {
+                        // 如果为虚拟树
+                        if (treeConfig && transform) {
+                            var matchObj_1 = XEUtils.findTree(treeFullData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
+                            if (matchObj_1) {
+                                var parentRow_1 = matchObj_1.parent;
+                                var parentChilds_1 = matchObj_1.items;
+                                var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow_1)];
+                                var parentLevel_1 = parentRest ? parentRest.level : 0;
+                                newRecords.forEach(function (item, i) {
+                                    var rowid = getRowid($xetable, item);
+                                    if (process.env.NODE_ENV === 'development') {
+                                        if (item[treeOpts.parentField]) {
+                                            if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[treeOpts.rowField]) {
+                                                errLog('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[treeOpts.rowField]]);
+                                            }
+                                        }
+                                    }
+                                    if (parentRow_1) {
+                                        item[treeOpts.parentField] = parentRow_1[treeOpts.rowField];
+                                    }
+                                    parentChilds_1.splice(matchObj_1.index + i, 0, item);
+                                    var rest = { row: item, rowid: rowid, index: -1, _index: -1, $index: -1, items: parentChilds_1, parent: parentRow_1, level: parentLevel_1 + 1 };
+                                    fullDataRowIdData[rowid] = rest;
+                                    fullAllDataRowIdData[rowid] = rest;
+                                });
+                                $xetable.updateVirtualTreeData();
                             }
-                            else if (mergeRowIndex + mergeRowspan > afIndex_1) {
-                                mergeItem.rowspan = mergeRowspan + newRecords.length;
+                            else {
+                                if (process.env.NODE_ENV === 'development') {
+                                    warnLog('vxe.error.unableInsert');
+                                }
+                                insertTreeRow(newRecords, true);
                             }
-                        });
+                        }
+                        else {
+                            if (treeConfig) {
+                                throw new Error(getLog('vxe.error.noTree', ['insert']));
+                            }
+                            var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex_1 === -1) {
+                                throw new Error(errLog('vxe.error.unableInsert'));
+                            }
+                            afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
+                            tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords));
+                            // 刷新单元格合并
+                            mergeList.forEach(function (mergeItem) {
+                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                if (mergeRowIndex > afIndex_1) {
+                                    mergeItem.row = mergeRowIndex + newRecords.length;
+                                }
+                                else if (mergeRowIndex + mergeRowspan > afIndex_1) {
+                                    mergeItem.rowspan = mergeRowspan + newRecords.length;
+                                }
+                            });
+                        }
                     }
                 }
                 (_a = editStore.insertList).unshift.apply(_a, newRecords);
                 reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
                 $xetable.cacheRowMap();
-                $xetable.handleTableData();
+                $xetable.handleTableData(transform);
                 $xetable.updateAfterDataIndex();
                 $xetable.checkSelectionStatus();
                 if (scrollYLoad) {
@@ -167,9 +253,11 @@ var editHook = {
             remove: function (rows) {
                 var treeConfig = props.treeConfig;
                 var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection, scrollYLoad = reactData.scrollYLoad;
-                var afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var treeFullData = internalData.treeFullData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
                 var checkboxOpts = computeCheckboxOpts.value;
                 var sYOpts = computeSYOpts.value;
+                var treeOpts = computeTreeOpts.value;
+                var transform = treeOpts.transform;
                 var actived = editStore.actived, removeList = editStore.removeList, insertList = editStore.insertList;
                 var property = checkboxOpts.checkField;
                 var rest = [];
@@ -202,27 +290,45 @@ var editHook = {
                     $xetable.clearMergeCells();
                 }
                 else {
-                    rows.forEach(function (row) {
-                        var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
-                        if (tfIndex > -1) {
-                            var rItems = tableFullData.splice(tfIndex, 1);
-                            rest.push(rItems[0]);
-                        }
-                        var afIndex = $xetable.findRowIndexOf(afterFullData, row);
-                        if (afIndex > -1) {
-                            // 刷新单元格合并
-                            mergeList.forEach(function (mergeItem) {
-                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                                if (mergeRowIndex > afIndex) {
-                                    mergeItem.row = mergeRowIndex - 1;
-                                }
-                                else if (mergeRowIndex + mergeRowspan > afIndex) {
-                                    mergeItem.rowspan = mergeRowspan - 1;
-                                }
-                            });
-                            afterFullData.splice(afIndex, 1);
-                        }
-                    });
+                    // 如果为虚拟树
+                    if (treeConfig && transform) {
+                        rows.forEach(function (row) {
+                            var rowid = getRowid($xetable, row);
+                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            if (matchObj) {
+                                var rItems = matchObj.items.splice(matchObj.index, 1);
+                                rest.push(rItems[0]);
+                            }
+                            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex > -1) {
+                                afterFullData.splice(afIndex, 1);
+                            }
+                            $xetable.updateVirtualTreeData();
+                        });
+                    }
+                    else {
+                        rows.forEach(function (row) {
+                            var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+                            if (tfIndex > -1) {
+                                var rItems = tableFullData.splice(tfIndex, 1);
+                                rest.push(rItems[0]);
+                            }
+                            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex > -1) {
+                                // 刷新单元格合并
+                                mergeList.forEach(function (mergeItem) {
+                                    var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                    if (mergeRowIndex > afIndex) {
+                                        mergeItem.row = mergeRowIndex - 1;
+                                    }
+                                    else if (mergeRowIndex + mergeRowspan > afIndex) {
+                                        mergeItem.rowspan = mergeRowspan - 1;
+                                    }
+                                });
+                                afterFullData.splice(afIndex, 1);
+                            }
+                        });
+                    }
                 }
                 // 如果当前行被激活编辑，则清除激活状态
                 if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
@@ -238,7 +344,7 @@ var editHook = {
                 reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
                 $xetable.cacheRowMap();
-                $xetable.handleTableData();
+                $xetable.handleTableData(transform);
                 $xetable.updateAfterDataIndex();
                 $xetable.checkSelectionStatus();
                 if (scrollYLoad) {
@@ -294,16 +400,30 @@ var editHook = {
              * 获取新增的临时数据
              */
             getInsertRecords: function () {
+                var treeConfig = props.treeConfig;
                 var editStore = reactData.editStore;
-                var tableFullData = internalData.tableFullData;
+                var treeFullData = internalData.treeFullData, tableFullData = internalData.tableFullData;
+                var treeOpts = computeTreeOpts.value;
                 var insertList = editStore.insertList;
                 var insertRecords = [];
                 if (insertList.length) {
-                    tableFullData.forEach(function (row) {
-                        if ($xetable.findRowIndexOf(insertList, row) > -1) {
-                            insertRecords.push(row);
-                        }
-                    });
+                    // 如果为虚拟树
+                    if (treeConfig && treeOpts.transform) {
+                        insertList.forEach(function (row) {
+                            var rowid = getRowid($xetable, row);
+                            var matchObj = XEUtils.findTree(treeFullData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            if (matchObj) {
+                                insertRecords.push(row);
+                            }
+                        });
+                    }
+                    else {
+                        insertList.forEach(function (row) {
+                            if ($xetable.findRowIndexOf(tableFullData, row) > -1) {
+                                insertRecords.push(row);
+                            }
+                        });
+                    }
                 }
                 return insertRecords;
             },

package/es/form/src/form.js

@@ -379,7 +379,7 @@ export default defineComponent({
                         callback();
                     }
                 }).catch(function () {
-                    return new Promise(function (resolve, reject) {
+                    return new Promise(function (resolve) {
                         showErrTime = window.setTimeout(function () {
                             itemList.forEach(function (item) {
                                 if (item.errRule) {
@@ -397,7 +397,7 @@ export default defineComponent({
                             resolve();
                         }
                         else {
-                            reject(validRest);
+                            resolve(validRest);
                         }
                     });
                 });

package/es/input/src/input.js

@@ -511,11 +511,17 @@ export default defineComponent({
             var type = props.type, immediate = props.immediate;
             return immediate || !(type === 'text' || type === 'number' || type === 'integer' || type === 'float');
         });
+        function toFloatValueFixed(inputValue, digitsValue) {
+            if (/^-/.test('' + inputValue)) {
+                return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue);
+            }
+            return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue);
+        }
         function getNumberValue(val) {
             var type = props.type, exponential = props.exponential;
             var inpMaxlength = computeInpMaxlength.value;
             var digitsValue = computeDigitsValue.value;
-            var restVal = (type === 'float' ? XEUtils.toFixed(XEUtils.floor(val, digitsValue), digitsValue) : XEUtils.toValueString(val));
+            var restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue) : XEUtils.toValueString(val));
             if (exponential && (val === restVal || XEUtils.toValueString(val).toLowerCase() === XEUtils.toNumber(restVal).toExponential())) {
                 return val;
             }
@@ -647,7 +653,7 @@ export default defineComponent({
             }
             else if (type === 'float') {
                 if (inputValue) {
-                    var validValue = XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue);
+                    var validValue = toFloatValueFixed(inputValue, digitsValue);
                     if (inputValue !== validValue) {
                         emitModel(validValue, { type: 'init' });
                     }

package/es/table/src/body.js

@@ -290,6 +290,7 @@ export default defineComponent({
             var radioOpts = computeRadioOpts.value;
             var treeOpts = computeTreeOpts.value;
             var editOpts = computeEditOpts.value;
+            var rowOpts = computeRowOpts.value;
             var rows = [];
             tableData.forEach(function (row, $rowIndex) {
                 var trOn = {};
@@ -302,7 +303,7 @@ export default defineComponent({
                 // 确保任何情况下 rowIndex 都精准指向真实 data 索引
                 rowIndex = $xetable.getRowIndex(row);
                 // 事件绑定
-                if (highlightHoverRow) {
+                if (rowOpts.isHover || highlightHoverRow) {
                     trOn.onMouseenter = function (evnt) {
                         if (isOperateMouse()) {
                             return;
@@ -402,6 +403,7 @@ export default defineComponent({
             var highlightHoverRow = tableProps.highlightHoverRow;
             var scrollXLoad = tableReactData.scrollXLoad, scrollYLoad = tableReactData.scrollYLoad;
             var elemStore = tableInternalData.elemStore, lastScrollTop = tableInternalData.lastScrollTop, lastScrollLeft = tableInternalData.lastScrollLeft;
+            var rowOpts = computeRowOpts.value;
             var tableHeader = refTableHeader.value;
             var tableBody = refTableBody.value;
             var tableFooter = refTableFooter.value;
@@ -425,7 +427,7 @@ export default defineComponent({
             tableInternalData.lastScrollTop = scrollTop;
             tableInternalData.lastScrollLeft = scrollLeft;
             tableInternalData.lastScrollTime = Date.now();
-            if (highlightHoverRow) {
+            if (rowOpts.isHover || highlightHoverRow) {
                 $xetable.clearHoverRow();
             }
             if (leftElem && fixedType === 'left') {
@@ -519,6 +521,7 @@ export default defineComponent({
             var highlightHoverRow = tableProps.highlightHoverRow;
             var scrollYLoad = tableReactData.scrollYLoad;
             var lastScrollTop = tableInternalData.lastScrollTop, lastScrollLeft = tableInternalData.lastScrollLeft;
+            var rowOpts = computeRowOpts.value;
             var tableBody = refTableBody.value;
             var scrollBodyElem = refElem.value;
             var bodyElem = tableBody.$el;
@@ -539,7 +542,7 @@ export default defineComponent({
                 tableInternalData.lastScrollTop = scrollTop;
                 tableInternalData.lastScrollLeft = scrollLeft;
                 tableInternalData.lastScrollTime = Date.now();
-                if (highlightHoverRow) {
+                if (rowOpts.isHover || highlightHoverRow) {
                     $xetable.clearHoverRow();
                 }
                 handleWheel(evnt, isTopWheel, deltaTop, isRollX, isRollY);

package/es/table/src/props.js

@@ -30,15 +30,15 @@ export default {
     footerAlign: { type: String, default: function () { return GlobalConfig.table.footerAlign; } },
     // 是否显示表头
     showHeader: { type: Boolean, default: function () { return GlobalConfig.table.showHeader; } },
-    // 是否要高亮当前选中行
+    // （即将废弃）是否要高亮当前选中行
     highlightCurrentRow: { type: Boolean, default: function () { return GlobalConfig.table.highlightCurrentRow; } },
-    // 鼠标移到行是否要高亮显示
+    // （即将废弃）鼠标移到行是否要高亮显示
     highlightHoverRow: { type: Boolean, default: function () { return GlobalConfig.table.highlightHoverRow; } },
-    // 是否要高亮当前选中列
+    // （即将废弃）是否要高亮当前选中列
     highlightCurrentColumn: { type: Boolean, default: function () { return GlobalConfig.table.highlightCurrentColumn; } },
-    // 鼠标移到列是否要高亮显示
+    // （即将废弃）鼠标移到列是否要高亮显示
     highlightHoverColumn: { type: Boolean, default: function () { return GlobalConfig.table.highlightHoverColumn; } },
-    // 激活单元格编辑时是否高亮显示
+    // （即将废弃）激活单元格编辑时是否高亮显示
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -148,7 +148,7 @@ export default {
     scrollX: Object,
     // 纵向虚拟滚动配置项
     scrollY: Object,
-    // 优化相关
+    // （即将废弃）优化相关
     animat: { type: Boolean, default: function () { return GlobalConfig.table.animat; } },
     delayHover: { type: Number, default: function () { return GlobalConfig.table.delayHover; } },
     // 额外的参数