vxe-table 4.1.16 → 4.1.17

package/es/edit/src/hook.js

@@ -69,18 +69,19 @@ var editHook = {
         function insertTreeRow(newRecords, isAppend) {
             var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
             var treeOpts = computeTreeOpts.value;
+            var rowField = treeOpts.rowField, parentField = treeOpts.parentField, children = treeOpts.children, mapChildren = treeOpts.mapChildren;
             var funcName = isAppend ? 'push' : 'unshift';
             newRecords.forEach(function (item) {
-                var parentRowId = item[treeOpts.parentField];
+                var parentRowId = item[parentField];
                 var rowid = getRowid($xetable, item);
-                var matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
+                var matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, function (item) { return parentRowId === item[rowField]; }, { children: mapChildren }) : null;
                 if (matchObj) {
                     var parentRow = matchObj.item;
                     var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
                     var parentLevel = parentRest ? parentRest.level : 0;
-                    var parentChilds = parentRow[treeOpts.children];
+                    var parentChilds = parentRow[children];
                     if (!XEUtils.isArray(parentChilds)) {
-                        parentChilds = parentRow[treeOpts.children] = [];
+                        parentChilds = parentRow[children] = [];
                     }
                     parentChilds[funcName](item);
                     var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parent, level: parentLevel + 1 };
@@ -124,7 +125,7 @@ var editHook = {
                 var mergeList = reactData.mergeList, editStore = reactData.editStore;
                 var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
                 var treeOpts = computeTreeOpts.value;
-                var transform = treeOpts.transform;
+                var transform = treeOpts.transform, rowField = treeOpts.rowField, mapChildren = treeOpts.mapChildren;
                 if (!XEUtils.isArray(records)) {
                     records = [records];
                 }
@@ -167,7 +168,7 @@ var editHook = {
                     else {
                         // 如果为虚拟树
                         if (treeConfig && transform) {
-                            var matchObj_1 = XEUtils.findTree(tableFullTreeData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
+                            var matchObj_1 = XEUtils.findTree(tableFullTreeData, function (item) { return row[rowField] === item[rowField]; }, { children: mapChildren });
                             if (matchObj_1) {
                                 var parentRow_1 = matchObj_1.parent;
                                 var parentChilds_1 = matchObj_1.items;
@@ -177,13 +178,13 @@ var editHook = {
                                     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[rowField]) {
+                                                errLog('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[rowField]]);
                                             }
                                         }
                                     }
                                     if (parentRow_1) {
-                                        item[treeOpts.parentField] = parentRow_1[treeOpts.rowField];
+                                        item[treeOpts.parentField] = parentRow_1[rowField];
                                     }
                                     parentChilds_1.splice(matchObj_1.index + i, 0, item);
                                     var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds_1, parent: parentRow_1, level: parentLevel_1 + 1 };
@@ -202,7 +203,16 @@ var editHook = {
                             if (treeConfig) {
                                 throw new Error(getLog('vxe.error.noTree', ['insert']));
                             }
-                            var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+                            var afIndex_1 = -1;
+                            // 如果是可视索引
+                            if (XEUtils.isNumber(row)) {
+                                if (row < afterFullData.length) {
+                                    afIndex_1 = row;
+                                }
+                            }
+                            else {
+                                afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+                            }
                             if (afIndex_1 === -1) {
                                 throw new Error(errLog('vxe.error.unableInsert'));
                             }

package/es/grid/src/grid.js

@@ -1059,7 +1059,7 @@ export default defineComponent({
                 var proxyOpts = computeProxyOpts.value;
                 var formOpts = computeFormOpts.value;
                 if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
-                    errLog('errConflicts', ['grid.data', 'grid.proxy-config']);
+                    errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
                 }
                 if (columns && columns.length) {
                     $xegrid.loadColumn(columns);

package/es/input/src/input.js

@@ -137,6 +137,13 @@ export default defineComponent({
             getRefMaps: function () { return refMaps; }
         };
         var inputMethods = {};
+        var parseDate = function (value, format) {
+            var type = props.type;
+            if (type === 'time') {
+                return toStringTimeDate(value);
+            }
+            return XEUtils.toStringDate(value, format);
+        };
         var computeIsDateTimeType = computed(function () {
             var type = props.type;
             return type === 'time' || type === 'datetime';
@@ -187,18 +194,12 @@ export default defineComponent({
             return type === 'time' ? 'HH:mm:ss' : (props.valueFormat || (type === 'datetime' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'));
         });
         var computeDateValue = computed(function () {
-            var modelValue = props.modelValue, type = props.type;
+            var modelValue = props.modelValue;
             var isDatePickerType = computeIsDatePickerType.value;
             var dateValueFormat = computeDateValueFormat.value;
             var val = null;
             if (modelValue && isDatePickerType) {
-                var date = void 0;
-                if (type === 'time') {
-                    date = toStringTimeDate(modelValue);
-                }
-                else {
-                    date = XEUtils.toStringDate(modelValue, dateValueFormat);
-                }
+                var date = parseDate(modelValue, dateValueFormat);
                 if (XEUtils.isValidDate(date)) {
                     val = date;
                 }
@@ -283,12 +284,15 @@ export default defineComponent({
             }
             return '';
         });
+        var computeFirstDayOfWeek = computed(function () {
+            var startDay = props.startDay, startWeek = props.startWeek;
+            return XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek);
+        });
         var computeWeekDatas = computed(function () {
             var weeks = [];
             var isDatePickerType = computeIsDatePickerType.value;
             if (isDatePickerType) {
-                var startDay = props.startDay, startWeek = props.startWeek;
-                var sWeek = XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek);
+                var sWeek = computeFirstDayOfWeek.value;
                 weeks.push(sWeek);
                 for (var index = 0; index < 6; index++) {
                     if (sWeek >= 6) {
@@ -435,6 +439,7 @@ export default defineComponent({
         });
         var computeWeekDates = computed(function () {
             var dayDatas = computeDayDatas.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             return dayDatas.map(function (list) {
                 var firstItem = list[0];
                 var item = {
@@ -444,7 +449,7 @@ export default defineComponent({
                     isCurrent: false,
                     isNow: false,
                     isNext: false,
-                    label: XEUtils.getYearWeek(firstItem.date)
+                    label: XEUtils.getYearWeek(firstItem.date, firstDayOfWeek)
                 };
                 return [item].concat(list);
             });
@@ -610,18 +615,27 @@ export default defineComponent({
             var type = props.type;
             var valueFormat = props.valueFormat;
             var dateLabelFormat = computeDateLabelFormat.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             var dValue = null;
             var dLabel = '';
             if (value) {
-                if (type === 'time') {
-                    dValue = toStringTimeDate(value);
-                }
-                else {
-                    dValue = XEUtils.toStringDate(value, valueFormat);
-                }
+                dValue = parseDate(value, valueFormat);
             }
             if (XEUtils.isValidDate(dValue)) {
-                dLabel = XEUtils.toDateString(dValue, dateLabelFormat);
+                dLabel = XEUtils.toDateString(dValue, dateLabelFormat, { firstDay: firstDayOfWeek });
+                // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+                if (dateLabelFormat && type === 'week') {
+                    var firstWeekDate = XEUtils.getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek);
+                    if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+                        var yyIndex = dateLabelFormat.indexOf('yyyy');
+                        if (yyIndex > -1) {
+                            var yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4));
+                            if (yyNum && !isNaN(yyNum)) {
+                                dLabel = dLabel.replace("" + yyNum, "" + (yyNum - 1));
+                            }
+                        }
+                    }
+                }
             }
             else {
                 dValue = null;
@@ -680,16 +694,17 @@ export default defineComponent({
             var datetimePanelValue = reactData.datetimePanelValue;
             var isDateTimeType = computeIsDateTimeType.value;
             var dateValueFormat = computeDateValueFormat.value;
+            var firstDayOfWeek = computeFirstDayOfWeek.value;
             if (props.type === 'week') {
                 var sWeek = XEUtils.toNumber(props.selectDay);
-                date = XEUtils.getWhatWeek(date, 0, sWeek);
+                date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek);
             }
             else if (isDateTimeType) {
                 date.setHours(datetimePanelValue.getHours());
                 date.setMinutes(datetimePanelValue.getMinutes());
                 date.setSeconds(datetimePanelValue.getSeconds());
             }
-            var inpVal = XEUtils.toDateString(date, dateValueFormat);
+            var inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek });
             dateCheckMonth(date);
             if (!XEUtils.isEqual(modelValue, inpVal)) {
                 emitModel(inpVal, { type: 'update' });
@@ -723,13 +738,7 @@ export default defineComponent({
                 }
                 else if (isDatePickerType) {
                     if (inputValue) {
-                        var inpDateVal = void 0;
-                        if (type === 'time') {
-                            inpDateVal = toStringTimeDate(inputValue);
-                        }
-                        else {
-                            inpDateVal = XEUtils.toStringDate(inputValue, dateLabelFormat);
-                        }
+                        var inpDateVal = parseDate(inputValue, dateLabelFormat);
                         if (XEUtils.isValidDate(inpDateVal)) {
                             if (type === 'time') {
                                 inpDateVal = XEUtils.toDateString(inpDateVal, dateLabelFormat);
@@ -740,6 +749,7 @@ export default defineComponent({
                             }
                             else {
                                 var isChange = false;
+                                var firstDayOfWeek = computeFirstDayOfWeek.value;
                                 if (type === 'datetime') {
                                     var dateValue = computeDateValue.value;
                                     if (inputValue !== XEUtils.toDateString(dateValue, dateLabelFormat) || inputValue !== XEUtils.toDateString(inpDateVal, dateLabelFormat)) {
@@ -752,7 +762,7 @@ export default defineComponent({
                                 else {
                                     isChange = true;
                                 }
-                                reactData.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat);
+                                reactData.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat, { firstDay: firstDayOfWeek });
                                 if (isChange) {
                                     dateChange(inpDateVal);
                                 }
@@ -1192,17 +1202,18 @@ export default defineComponent({
                 }
                 else {
                     var offsetDay = datePanelValue || XEUtils.getWhatDay(Date.now(), 0, 'first');
+                    var firstDayOfWeek = computeFirstDayOfWeek.value;
                     if (isLeftArrow) {
                         offsetDay = XEUtils.getWhatDay(offsetDay, -1);
                     }
                     else if (isUpArrow) {
-                        offsetDay = XEUtils.getWhatWeek(offsetDay, -1);
+                        offsetDay = XEUtils.getWhatWeek(offsetDay, -1, firstDayOfWeek);
                     }
                     else if (isRightArrow) {
                         offsetDay = XEUtils.getWhatDay(offsetDay, 1);
                     }
                     else if (isDwArrow) {
-                        offsetDay = XEUtils.getWhatWeek(offsetDay, 1);
+                        offsetDay = XEUtils.getWhatWeek(offsetDay, 1, firstDayOfWeek);
                     }
                     dateMoveDay(offsetDay);
                 }
@@ -2037,8 +2048,11 @@ export default defineComponent({
             initValue();
         });
         watch(computeDateLabelFormat, function () {
-            dateParseValue(reactData.datePanelValue);
-            reactData.inputValue = reactData.datePanelLabel;
+            var isDatePickerType = computeIsDatePickerType.value;
+            if (isDatePickerType) {
+                dateParseValue(reactData.datePanelValue);
+                reactData.inputValue = reactData.datePanelLabel;
+            }
         });
         nextTick(function () {
             GlobalEvent.on($xeinput, 'mousewheel', handleGlobalMousewheelEvent);

package/es/radio/src/button.js

@@ -11,7 +11,8 @@ export default defineComponent({
         title: [String, Number],
         content: [String, Number],
         disabled: Boolean,
-        size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
+        strict: { type: Boolean, default: function () { return GlobalConfig.radioButton.strict; } },
+        size: { type: String, default: function () { return GlobalConfig.radioButton.size || GlobalConfig.size; } }
     },
     emits: [
         'update:modelValue',
@@ -34,6 +35,9 @@ export default defineComponent({
         var computeName = computed(function () {
             return $xeradiogroup ? $xeradiogroup.name : null;
         });
+        var computeStrict = computed(function () {
+            return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+        });
         var computeChecked = computed(function () {
             var modelValue = props.modelValue, label = props.label;
             return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
@@ -44,16 +48,27 @@ export default defineComponent({
             }
         };
         Object.assign($xeradiobutton, radioButtonMethods);
+        var handleValue = function (label, evnt) {
+            if ($xeradiogroup) {
+                $xeradiogroup.handleChecked({ label: label }, evnt);
+            }
+            else {
+                emit('update:modelValue', label);
+                radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+            }
+        };
         var changeEvent = function (evnt) {
-            var label = props.label;
             var isDisabled = computeDisabled.value;
             if (!isDisabled) {
-                if ($xeradiogroup) {
-                    $xeradiogroup.handleChecked({ label: label }, evnt);
-                }
-                else {
-                    emit('update:modelValue', label);
-                    radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+                handleValue(props.label, evnt);
+            }
+        };
+        var clickEvent = function (evnt) {
+            var isDisabled = computeDisabled.value;
+            var isStrict = computeStrict.value;
+            if (!isDisabled && !isStrict) {
+                if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+                    handleValue(null, evnt);
                 }
             }
         };
@@ -76,7 +91,8 @@ export default defineComponent({
                     name: name,
                     checked: checked,
                     disabled: isDisabled,
-                    onChange: changeEvent
+                    onChange: changeEvent,
+                    onClick: clickEvent
                 }),
                 h('span', {
                     class: 'vxe-radio--label'

package/es/radio/src/group.js

@@ -7,6 +7,7 @@ export default defineComponent({
     props: {
         modelValue: [String, Number, Boolean],
         disabled: Boolean,
+        strict: { type: Boolean, default: function () { return GlobalConfig.radio.strict; } },
         size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
     },
     emits: [

package/es/radio/src/radio.js

@@ -12,6 +12,7 @@ export default defineComponent({
         content: [String, Number],
         disabled: Boolean,
         name: String,
+        strict: { type: Boolean, default: function () { return GlobalConfig.radio.strict; } },
         size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
     },
     emits: [
@@ -35,20 +36,34 @@ export default defineComponent({
         var computeName = computed(function () {
             return $xeradiogroup ? $xeradiogroup.name : props.name;
         });
+        var computeStrict = computed(function () {
+            return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+        });
         var computeChecked = computed(function () {
             var modelValue = props.modelValue, label = props.label;
             return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
         });
+        var handleValue = function (label, evnt) {
+            if ($xeradiogroup) {
+                $xeradiogroup.handleChecked({ label: label }, evnt);
+            }
+            else {
+                emit('update:modelValue', label);
+                radioMethods.dispatchEvent('change', { label: label }, evnt);
+            }
+        };
         var changeEvent = function (evnt) {
-            var label = props.label;
             var isDisabled = computeDisabled.value;
             if (!isDisabled) {
-                if ($xeradiogroup) {
-                    $xeradiogroup.handleChecked({ label: label }, evnt);
-                }
-                else {
-                    emit('update:modelValue', label);
-                    radioMethods.dispatchEvent('change', { label: label }, evnt);
+                handleValue(props.label, evnt);
+            }
+        };
+        var clickEvent = function (evnt) {
+            var isDisabled = computeDisabled.value;
+            var isStrict = computeStrict.value;
+            if (!isDisabled && !isStrict) {
+                if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+                    handleValue(null, evnt);
                 }
             }
         };
@@ -77,7 +92,8 @@ export default defineComponent({
                     name: name,
                     checked: checked,
                     disabled: isDisabled,
-                    onChange: changeEvent
+                    onChange: changeEvent,
+                    onClick: clickEvent
                 }),
                 h('span', {
                     class: 'vxe-radio--icon'

package/es/table/src/table.js

@@ -2741,15 +2741,16 @@ export default defineComponent({
              */
             getCheckboxRecords: function (isFull) {
                 var treeConfig = props.treeConfig;
-                var tableFullData = internalData.tableFullData, afterFullData = internalData.afterFullData;
+                var tableFullData = internalData.tableFullData, afterFullData = internalData.afterFullData, afterTreeFullData = internalData.afterTreeFullData, tableFullTreeData = internalData.tableFullTreeData;
                 var treeOpts = computeTreeOpts.value;
                 var checkboxOpts = computeCheckboxOpts.value;
+                var transform = treeOpts.transform, children = treeOpts.children, mapChildren = treeOpts.mapChildren;
                 var property = checkboxOpts.checkField;
                 var rowList = [];
-                var currTableData = isFull ? tableFullData : afterFullData;
+                var currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
                 if (property) {
                     if (treeConfig) {
-                        rowList = XEUtils.filterTree(currTableData, function (row) { return XEUtils.get(row, property); }, treeOpts);
+                        rowList = XEUtils.filterTree(currTableData, function (row) { return XEUtils.get(row, property); }, { children: transform ? mapChildren : children });
                     }
                     else {
                         rowList = currTableData.filter(function (row) { return XEUtils.get(row, property); });
@@ -2758,7 +2759,7 @@ export default defineComponent({
                 else {
                     var selection_1 = reactData.selection;
                     if (treeConfig) {
-                        rowList = XEUtils.filterTree(currTableData, function (row) { return $xetable.findRowIndexOf(selection_1, row) > -1; }, treeOpts);
+                        rowList = XEUtils.filterTree(currTableData, function (row) { return $xetable.findRowIndexOf(selection_1, row) > -1; }, { children: transform ? mapChildren : children });
                     }
                     else {
                         rowList = currTableData.filter(function (row) { return $xetable.findRowIndexOf(selection_1, row) > -1; });
@@ -2766,6 +2767,26 @@ export default defineComponent({
                 }
                 return rowList;
             },
+            /**
+             * 只对 tree-config 有效，获取行的父级
+             */
+            getParentRow: function (rowOrRowid) {
+                var treeConfig = props.treeConfig;
+                var fullDataRowIdData = internalData.fullDataRowIdData;
+                if (rowOrRowid && treeConfig) {
+                    var rowid = void 0;
+                    if (XEUtils.isString(rowOrRowid)) {
+                        rowid = rowOrRowid;
+                    }
+                    else {
+                        rowid = getRowid($xetable, rowOrRowid);
+                    }
+                    if (rowid) {
+                        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null;
+                    }
+                }
+                return null;
+            },
             /**
              * 根据行的唯一主键获取行
              * @param {String/Number} rowid 行主键

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

@@ -284,7 +284,16 @@ var GlobalConfig = {
     // transfer: false
     },
     radio: {
-    // size: null
+        // size: null,
+        strict: true
+    },
+    radioButton: {
+        // size: null,
+        strict: true
+    },
+    radioGroup: {
+        // size: null,
+        strict: true
     },
     checkbox: {
     // size: null

package/lib/edit/src/hook.js

@@ -118,22 +118,28 @@ var editHook = {
           fullDataRowIdData = internalData.fullDataRowIdData,
           fullAllDataRowIdData = internalData.fullAllDataRowIdData;
       var treeOpts = computeTreeOpts.value;
+      var rowField = treeOpts.rowField,
+          parentField = treeOpts.parentField,
+          children = treeOpts.children,
+          mapChildren = treeOpts.mapChildren;
       var funcName = isAppend ? 'push' : 'unshift';
       newRecords.forEach(function (item) {
-        var parentRowId = item[treeOpts.parentField];
+        var parentRowId = item[parentField];
         var rowid = (0, _util.getRowid)($xetable, item);
         var matchObj = parentRowId ? _xeUtils.default.findTree(tableFullTreeData, function (item) {
-          return parentRowId === item[treeOpts.rowField];
-        }, treeOpts) : null;
+          return parentRowId === item[rowField];
+        }, {
+          children: mapChildren
+        }) : null;
 
         if (matchObj) {
           var parentRow = matchObj.item;
           var parentRest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, parentRow)];
           var parentLevel = parentRest ? parentRest.level : 0;
-          var parentChilds = parentRow[treeOpts.children];
+          var parentChilds = parentRow[children];
 
           if (!_xeUtils.default.isArray(parentChilds)) {
-            parentChilds = parentRow[treeOpts.children] = [];
+            parentChilds = parentRow[children] = [];
           }
 
           parentChilds[funcName](item);
@@ -206,7 +212,9 @@ var editHook = {
             fullDataRowIdData = internalData.fullDataRowIdData,
             fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var treeOpts = computeTreeOpts.value;
-        var transform = treeOpts.transform;
+        var transform = treeOpts.transform,
+            rowField = treeOpts.rowField,
+            mapChildren = treeOpts.mapChildren;
 
         if (!_xeUtils.default.isArray(records)) {
           records = [records];
@@ -254,8 +262,10 @@ var editHook = {
             // 如果为虚拟树
             if (treeConfig && transform) {
               var matchObj_1 = _xeUtils.default.findTree(tableFullTreeData, function (item) {
-                return row[treeOpts.rowField] === item[treeOpts.rowField];
-              }, treeOpts);
+                return row[rowField] === item[rowField];
+              }, {
+                children: mapChildren
+              });
 
               if (matchObj_1) {
                 var parentRow_1 = matchObj_1.parent;
@@ -267,14 +277,14 @@ var editHook = {
 
                   if (process.env.NODE_ENV === 'development') {
                     if (item[treeOpts.parentField]) {
-                      if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[treeOpts.rowField]) {
-                        (0, _utils.errLog)('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[treeOpts.rowField]]);
+                      if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[rowField]) {
+                        (0, _utils.errLog)('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[rowField]]);
                       }
                     }
                   }
 
                   if (parentRow_1) {
-                    item[treeOpts.parentField] = parentRow_1[treeOpts.rowField];
+                    item[treeOpts.parentField] = parentRow_1[rowField];
                   }
 
                   parentChilds_1.splice(matchObj_1.index + i, 0, item);
@@ -304,7 +314,15 @@ var editHook = {
                 throw new Error((0, _utils.getLog)('vxe.error.noTree', ['insert']));
               }
 
-              var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+              var afIndex_1 = -1; // 如果是可视索引
+
+              if (_xeUtils.default.isNumber(row)) {
+                if (row < afterFullData.length) {
+                  afIndex_1 = row;
+                }
+              } else {
+                afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+              }
 
               if (afIndex_1 === -1) {
                 throw new Error((0, _utils.errLog)('vxe.error.unableInsert'));

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

package/lib/grid/src/grid.js

@@ -1426,7 +1426,7 @@ var _default2 = (0, _vue.defineComponent)({
         var formOpts = computeFormOpts.value;
 
         if (proxyConfig && (data || proxyOpts.form && formOpts.data)) {
-          (0, _utils.errLog)('errConflicts', ['grid.data', 'grid.proxy-config']);
+          (0, _utils.errLog)('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
         }
 
         if (columns && columns.length) {