vxe-table 4.16.0-beta.8 → 4.16.1

package/es/table/module/edit/hook.js

@@ -98,14 +98,18 @@ hooks.add('tableEditModule', {
         const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
             const { isRowGroupStatus } = reactData;
-            const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
+            const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps, removeRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
-            const { transform, rowField, mapChildrenField } = treeOpts;
+            const { transform, parentField, rowField, mapChildrenField } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             if (!XEUtils.isArray(records)) {
                 records = [records];
             }
             const newRecords = reactive($xeTable.defineField(records.map((record) => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record))));
+            let treeRecords = [];
+            if (treeConfig && transform) {
+                treeRecords = XEUtils.toArrayTree(newRecords, { key: rowField, parentKey: parentField, children: childrenField });
+            }
             if (XEUtils.eqNull(targetRow)) {
                 // 如果为虚拟树
                 if (treeConfig && transform) {
@@ -171,25 +175,34 @@ hooks.add('tableEditModule', {
                             const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
                             const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)];
                             const parentLevel = parentRest ? parentRest.level : 0;
-                            newRecords.forEach((item, i) => {
-                                const rowid = getRowid($xeTable, item);
-                                if (item[treeOpts.parentField]) {
-                                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                                        errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
+                            treeRecords.forEach((row, i) => {
+                                if (parentRow) {
+                                    if (row[parentField] !== parentRow[rowField]) {
+                                        row[parentField] = parentRow[rowField];
+                                        errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, `${parentField}=${parentRow[rowField]}`]);
                                     }
                                 }
-                                if (parentRow) {
-                                    item[treeOpts.parentField] = parentRow[rowField];
+                                else {
+                                    if (row[parentField] !== null) {
+                                        row[parentField] = null;
+                                        errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null']);
+                                    }
                                 }
                                 let targetIndex = matchMapObj.index + i;
                                 if (isInsertNextRow) {
                                     targetIndex = targetIndex + 1;
                                 }
-                                parentMapChilds.splice(targetIndex, 0, item);
+                                parentMapChilds.splice(targetIndex, 0, row);
+                            });
+                            XEUtils.eachTree(treeRecords, (item) => {
+                                const rowid = getRowid($xeTable, item);
                                 const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                                if (item[childrenField]) {
+                                    item[mapChildrenField] = item[childrenField];
+                                }
                                 fullDataRowIdData[rowid] = rest;
                                 fullAllDataRowIdData[rowid] = rest;
-                            });
+                            }, { children: childrenField });
                             // 源
                             if (parentRow) {
                                 const matchObj = XEUtils.findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], { children: childrenField });
@@ -199,7 +212,7 @@ hooks.add('tableEditModule', {
                                     if (isInsertNextRow) {
                                         targetIndex = targetIndex + 1;
                                     }
-                                    parentChilds.splice(targetIndex, 0, ...newRecords);
+                                    parentChilds.splice(targetIndex, 0, ...treeRecords);
                                 }
                             }
                         }
@@ -257,10 +270,27 @@ hooks.add('tableEditModule', {
                     }
                 }
             }
-            newRecords.forEach(newRow => {
+            const handleStatus = (newRow) => {
                 const rowid = getRowid($xeTable, newRow);
-                insertRowMaps[rowid] = newRow;
-            });
+                // 如果是被删除的数据，则还原状态
+                if (removeRowMaps[rowid]) {
+                    delete removeRowMaps[rowid];
+                    if (insertRowMaps[rowid]) {
+                        delete insertRowMaps[rowid];
+                    }
+                }
+                else {
+                    insertRowMaps[rowid] = newRow;
+                }
+            };
+            // 如果为虚拟树
+            if (treeConfig && transform) {
+                XEUtils.eachTree(treeRecords, handleStatus, { children: mapChildrenField });
+            }
+            else {
+                newRecords.forEach(handleStatus);
+            }
+            reactData.removeRowFlag++;
             reactData.insertRowFlag++;
             $xeTable.cacheRowMap(false);
             $xeTable.updateScrollYStatus();
@@ -736,7 +766,12 @@ hooks.add('tableEditModule', {
                 const { editStore } = reactData;
                 const { row, column } = editStore.actived;
                 if (column && row) {
-                    return { row, column };
+                    return {
+                        row,
+                        rowIndex: $xeTable.getRowIndex(row),
+                        column,
+                        columnIndex: $xeTable.getColumnIndex(column)
+                    };
                 }
                 return null;
             },
@@ -747,7 +782,10 @@ hooks.add('tableEditModule', {
                 const { editStore } = reactData;
                 const { row, column } = editStore.selected;
                 if (row && column) {
-                    return { row, column };
+                    return {
+                        row,
+                        column
+                    };
                 }
                 return null;
             },

package/es/table/src/emits.js

@@ -51,6 +51,8 @@ export const tableEmits = [
     'row-dragstart',
     'row-dragover',
     'row-dragend',
+    'row-remove-dragend',
+    'row-insert-dragend',
     'column-dragstart',
     'column-dragover',
     'column-dragend',

package/es/table/src/store.js

@@ -0,0 +1,8 @@
+import { reactive } from 'vue';
+// 跨表拖拽
+export const crossTableDragRowInfo = reactive({
+    row: null
+});
+export function getCrossTableDragRowInfo() {
+    return crossTableDragRowInfo;
+}