vxe-table 4.1.4 → 4.1.7

package/es/table/src/table.js

@@ -2260,18 +2260,13 @@ export default defineComponent({
                     var oRow = tableSourceData[rowIndex];
                     if (oRow && row) {
                         if (field) {
-                            XEUtils.set(oRow, field, XEUtils.get(record || row, field));
+                            var newValue = XEUtils.get(record || row, field);
+                            XEUtils.set(row, field, newValue);
+                            XEUtils.set(oRow, field, newValue);
                         }
                         else {
-                            if (record) {
-                                tableSourceData[rowIndex] = record;
-                                XEUtils.clear(row, undefined);
-                                Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                                tablePrivateMethods.cacheRowMap(true);
-                            }
-                            else {
-                                XEUtils.destructuring(oRow, XEUtils.clone(row, true));
-                            }
+                            var newRecord = XEUtils.clone(__assign({}, record), true);
+                            XEUtils.destructuring(oRow, Object.assign(row, newRecord));
                         }
                     }
                     reactData.tableData = tableData.slice(0);
@@ -2291,8 +2286,8 @@ export default defineComponent({
                 var tableSourceData = internalData.tableSourceData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var treeOpts = computeTreeOpts.value;
                 var children = treeOpts.children;
-                var rest = fullAllDataRowIdData[getRowid($xetable, row)];
-                var parentLevel = rest ? rest.level : 0;
+                var parentRest = fullAllDataRowIdData[getRowid($xetable, row)];
+                var parentLevel = parentRest ? parentRest.level : 0;
                 return tableMethods.createData(childRecords).then(function (rows) {
                     if (keepSource) {
                         var rowid_1 = getRowid($xetable, row);
@@ -3059,6 +3054,17 @@ export default defineComponent({
                 var treeOpts = computeTreeOpts.value;
                 var reserveSelection = [];
                 if (checkboxOpts.reserve) {
+                    var afterFullIdMaps_1 = {};
+                    if (treeConfig) {
+                        XEUtils.eachTree(afterFullData, function (row) {
+                            afterFullIdMaps_1[getRowid($xetable, row)] = 1;
+                        }, treeOpts);
+                    }
+                    else {
+                        afterFullData.forEach(function (row) {
+                            afterFullIdMaps_1[getRowid($xetable, row)] = 1;
+                        });
+                    }
                     XEUtils.each(checkboxReserveRowMap, function (oldRow, oldRowid) {
                         if (oldRow) {
                             if (isFull) {
@@ -3067,15 +3073,8 @@ export default defineComponent({
                                 }
                             }
                             else {
-                                if (treeConfig) {
-                                    if (!XEUtils.findTree(afterFullData, function (row) { return getRowid($xetable, row) === oldRowid; }, treeOpts)) {
-                                        reserveSelection.push(oldRow);
-                                    }
-                                }
-                                else {
-                                    if (!afterFullData.some(function (row) { return getRowid($xetable, row) === oldRowid; })) {
-                                        reserveSelection.push(oldRow);
-                                    }
+                                if (!afterFullIdMaps_1[oldRowid]) {
+                                    reserveSelection.push(oldRow);
                                 }
                             }
                         }
@@ -3126,11 +3125,12 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             setCurrentRow: function (row) {
+                var rowOpts = computeRowOpts.value;
                 var el = refElem.value;
                 tableMethods.clearCurrentRow();
                 tableMethods.clearCurrentColumn();
                 reactData.currentRow = row;
-                if (props.highlightCurrentRow) {
+                if (rowOpts.isCurrent || props.highlightCurrentRow) {
                     if (el) {
                         XEUtils.arrayEach(el.querySelectorAll("[rowid=\"" + getRowid($xetable, row) + "\"]"), function (elem) { return addClass(elem, 'row--current'); });
                     }
@@ -3176,7 +3176,8 @@ export default defineComponent({
              * 用于当前行，获取当前行的数据
              */
             getCurrentRecord: function () {
-                return props.highlightCurrentRow ? reactData.currentRow : null;
+                var rowOpts = computeRowOpts.value;
+                return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null;
             },
             /**
              * 用于单选行，获取当已选中的数据
@@ -3202,7 +3203,7 @@ export default defineComponent({
                             }
                         }
                         else {
-                            if (afterFullData.indexOf(selectRow) > -1) {
+                            if ($xetable.findRowIndexOf(afterFullData, selectRow) > -1) {
                                 return selectRow;
                             }
                         }
@@ -3211,7 +3212,8 @@ export default defineComponent({
                 return null;
             },
             getCurrentColumn: function () {
-                return props.highlightCurrentColumn ? reactData.currentColumn : null;
+                var columnOpts = computeColumnOpts.value;
+                return columnOpts.isCurrent || props.highlightCurrentColumn ? reactData.currentColumn : null;
             },
             /**
              * 用于当前列，设置某列行为高亮状态
@@ -3970,6 +3972,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) {
@@ -3984,13 +3987,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); });
+                                }
                             }
                         }
                     }
@@ -4014,6 +4019,7 @@ export default defineComponent({
                     var editOpts = computeEditOpts.value;
                     var treeOpts = computeTreeOpts.value;
                     var menuList = computeMenuList.value;
+                    var rowOpts = computeRowOpts.value;
                     var selected = editStore.selected, actived = editStore.actived;
                     var keyCode = evnt.keyCode;
                     var isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE);
@@ -4055,7 +4061,7 @@ export default defineComponent({
                             $xetable.closeMenu();
                         }
                         tableMethods.closeFilter();
-                        if (actived.row) {
+                        if (keyboardConfig && keyboardOpts.isEsc) {
                             // 如果是激活编辑状态，则取消编辑
                             if (actived.row) {
                                 var params_2 = actived.args;
@@ -4094,7 +4100,7 @@ export default defineComponent({
                             internalData._keyCtx = false;
                         }, 1000);
                     }
-                    else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && highlightCurrentRow && currentRow))) {
+                    else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
                         // 退出选中
                         if (hasCtrlKey) {
                             // 如果是激活编辑状态，则取消编辑
@@ -4128,7 +4134,7 @@ export default defineComponent({
                                     }
                                 }
                             }
-                            else if (treeConfig && highlightCurrentRow && currentRow) {
+                            else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                                 // 如果是树形表格当前行回车移动到子节点
                                 var childrens = currentRow[treeOpts.children];
                                 if (childrens && childrens.length) {
@@ -4153,7 +4159,7 @@ export default defineComponent({
                             if (selected.row && selected.column) {
                                 $xetable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                             }
-                            else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+                            else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                                 // 当前行按键上下移动
                                 $xetable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
                             }
@@ -4168,7 +4174,7 @@ export default defineComponent({
                             $xetable.moveTabSelected(actived.args, hasShiftKey, evnt);
                         }
                     }
-                    else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+                    else if (keyboardConfig && isEnableConf(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
                         if (!isEditStatus) {
                             var delMethod = keyboardOpts.delMethod, backMethod = keyboardOpts.backMethod;
                             // 如果是删除键
@@ -4204,7 +4210,7 @@ export default defineComponent({
                                     tableMethods.updateFooter();
                                 }
                             }
-                            else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+                            else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                                 // 如果树形表格回退键关闭当前行返回父节点
                                 var parentRow_1 = XEUtils.findTree(internalData.afterFullData, function (item) { return item === currentRow; }, treeOpts).parent;
                                 if (parentRow_1) {
@@ -4845,6 +4851,7 @@ export default defineComponent({
             triggerHeaderCellClickEvent: function (evnt, params) {
                 var _lastResizeTime = internalData._lastResizeTime;
                 var sortOpts = computeSortOpts.value;
+                var columnOpts = computeColumnOpts.value;
                 var column = params.column;
                 var cell = evnt.currentTarget;
                 var triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300;
@@ -4854,7 +4861,7 @@ export default defineComponent({
                     tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column));
                 }
                 tableMethods.dispatchEvent('header-cell-click', Object.assign({ triggerResizable: triggerResizable, triggerSort: triggerSort, triggerFilter: triggerFilter, cell: cell }, params), evnt);
-                if (props.highlightCurrentColumn) {
+                if (columnOpts.isCurrent || props.highlightCurrentColumn) {
                     tableMethods.setCurrentColumn(column);
                 }
             },
@@ -4874,6 +4881,7 @@ export default defineComponent({
                 var treeOpts = computeTreeOpts.value;
                 var radioOpts = computeRadioOpts.value;
                 var checkboxOpts = computeCheckboxOpts.value;
+                var rowOpts = computeRowOpts.value;
                 var actived = editStore.actived;
                 var row = params.row, column = params.column;
                 var type = column.type, treeNode = column.treeNode;
@@ -4900,7 +4908,7 @@ export default defineComponent({
                 if (!triggerTreeNode) {
                     if (!triggerExpandNode) {
                         // 如果是高亮行
-                        if (highlightCurrentRow) {
+                        if (rowOpts.isCurrent || highlightCurrentRow) {
                             if (!triggerCheckbox && !triggerRadio) {
                                 tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
                             }
@@ -5214,6 +5222,7 @@ export default defineComponent({
                 tablePrivateMethods.handleTableData();
                 tablePrivateMethods.updateScrollYSpace();
             },
+            updateVirtualTreeData: updateVirtualTreeData,
             /**
              * 处理固定列的显示状态
              */
@@ -5681,6 +5690,8 @@ export default defineComponent({
             var leftList = columnStore.leftList, rightList = columnStore.rightList;
             var tooltipOpts = computeTooltipOpts.value;
             var treeOpts = computeTreeOpts.value;
+            var rowOpts = computeRowOpts.value;
+            var columnOpts = computeColumnOpts.value;
             var vSize = computeSize.value;
             var tableBorder = computeTableBorder.value;
             var mouseOpts = computeMouseOpts.value;
@@ -5695,8 +5706,8 @@ export default defineComponent({
                         _a['cell--highlight'] = highlightCell,
                         _a['cell--selected'] = mouseConfig && mouseOpts.selected,
                         _a['cell--area'] = mouseConfig && mouseOpts.area,
-                        _a['row--highlight'] = highlightHoverRow,
-                        _a['column--highlight'] = highlightHoverColumn,
+                        _a['row--highlight'] = rowOpts.isHover || highlightHoverRow,
+                        _a['column--highlight'] = columnOpts.isHover || highlightHoverColumn,
                         _a['is--header'] = showHeader,
                         _a['is--footer'] = showFooter,
                         _a['is--group'] = isGroup,

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

@@ -10,6 +10,7 @@ var GlobalConfig = {
         showHeader: true,
         animat: true,
         delayHover: 250,
+        autoResize: true,
         // keepSource: false,
         // showOverflow: null,
         // showHeaderOverflow: null,
@@ -17,7 +18,6 @@ var GlobalConfig = {
         // resizeInterval: 500,
         // size: null,
         // zIndex: null,
-        // autoResize: false,
         // stripe: false,
         // border: false,
         // round: false,
@@ -90,6 +90,9 @@ var GlobalConfig = {
         mouseConfig: {
             extension: true
         },
+        keyboardConfig: {
+            isEsc: true
+        },
         areaConfig: {
             selectCellByHeader: true
         },

package/es/validator/src/hook.js

@@ -160,14 +160,14 @@ var validatorHook = {
                     var ruleProps = Object.keys(validRest);
                     return nextTick().then(function () {
                         if (ruleProps.length) {
-                            return Promise.reject(validRest[ruleProps[0]][0]);
+                            return validRest[ruleProps[0]][0];
                         }
                         if (cb) {
                             cb();
                         }
                     });
                 }).catch(function (firstErrParams) {
-                    return new Promise(function (resolve, reject) {
+                    return new Promise(function (resolve) {
                         var finish = function () {
                             nextTick(function () {
                                 if (cb) {
@@ -175,7 +175,7 @@ var validatorHook = {
                                     resolve();
                                 }
                                 else {
-                                    reject(validRest);
+                                    resolve(validRest);
                                 }
                             });
                         };