@visactor/vtable 1.22.11-alpha.5 → 1.22.11-alpha.7

package/cjs/data/DataSource.d.ts

@@ -89,14 +89,19 @@ export declare class DataSource extends EventTarget implements DataSourceAPI {
     changeFieldValueByRecordIndex(value: FieldData, recordIndex: number | number[], field: FieldDef, table?: BaseTableAPI): FieldData;
     cacheBeforeChangedRecord(dataIndex: number | number[], table?: BaseTableAPI): void;
     setRecord(record: any, index: number): void;
-    addRecord(record: any, index: number): void;
-    addRecords(recordArr: any, index: number): void;
+    private _getRawRecordsArray;
+    private _hasFilterInEffect;
+    private _normalizeInsertIndex;
+    private _mapViewInsertIndexToRawInsertIndex;
+    private _resetIndexingFromViewRecords;
+    addRecord(record: any, index: number, syncToOriginalRecords?: boolean): void;
+    addRecords(recordArr: any, index: number, syncToOriginalRecords?: boolean): void;
     addRecordForSorted(record: any): void;
     addRecordsForSorted(recordArr: any): void;
     adjustBeforeChangedRecordsMap(insertIndex: number, insertCount: number, type?: 'add' | 'delete'): void;
-    deleteRecords(recordIndexs: number[]): number[];
+    deleteRecords(recordIndexs: number[], syncToOriginalRecords?: boolean): number[];
     deleteRecordsForSorted(recordIndexs: number[]): void;
-    updateRecords(records: any[], recordIndexs: (number | number[])[]): (number | number[])[];
+    updateRecords(records: any[], recordIndexs: (number | number[])[], syncToOriginalRecords?: boolean): (number | number[])[];
     updateRecordsForSorted(records: any[], recordIndexs: number[]): void;
     sort(states: Array<SortState>): void;
     setSortedIndexMap(field: FieldDef, filedMap: ISortedMapItem): void;

package/cjs/data/DataSource.js

@@ -382,38 +382,82 @@ class DataSource extends EventTarget_1.EventTarget {
             Array.isArray(indexed) || this.records.splice(indexed, 1, record);
         }
     }
-    addRecord(record, index) {
+    _getRawRecordsArray() {
         var _a;
-        if (Array.isArray(this.records)) {
-            this.records.splice(index, 0, record), this.adjustBeforeChangedRecordsMap(index, 1), 
-            this.currentIndexedData.push(this.currentIndexedData.length), this._sourceLength += 1;
-            for (let i = 0; i < this.fieldAggregators.length; i++) this.fieldAggregators[i].push(record);
-            if ("tree" === this.rowHierarchyType && this.initTreeHierarchyState(), this.userPagination) {
-                this.pagination.totalCount = this._sourceLength;
-                const {perPageCount: perPageCount, currentPage: currentPage} = this.pagination;
-                index < perPageCount * (currentPage || 0) + perPageCount && this.updatePagerData();
-            } else this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength, 
-            this.updatePagerData();
-            (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.added) && this.dataSourceObj.added(index, 1);
-        }
-    }
-    addRecords(recordArr, index) {
-        var _a;
-        if (Array.isArray(this.records)) {
-            if (Array.isArray(recordArr)) {
-                this.records.splice(index, 0, ...recordArr), this.adjustBeforeChangedRecordsMap(index, recordArr.length);
-                for (let i = 0; i < recordArr.length; i++) this.currentIndexedData.push(this.currentIndexedData.length);
-                this._sourceLength += recordArr.length;
-                for (let i = 0; i < this.fieldAggregators.length; i++) for (let j = 0; j < recordArr.length; j++) this.fieldAggregators[i].push(recordArr[j]);
+        const rawRecords = null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.records;
+        return Array.isArray(rawRecords) ? rawRecords : null;
+    }
+    _hasFilterInEffect() {
+        var _a, _b, _c, _d, _e;
+        return (null !== (_c = null === (_b = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) || void 0 === _b ? void 0 : _b.length) && void 0 !== _c ? _c : 0) >= 1 || (null !== (_e = null === (_d = this.lastFilterRules) || void 0 === _d ? void 0 : _d.length) && void 0 !== _e ? _e : 0) >= 1;
+    }
+    _normalizeInsertIndex(index, length) {
+        return null == index || index > length ? length : index < 0 ? 0 : index;
+    }
+    _mapViewInsertIndexToRawInsertIndex(rawRecords, viewIndex) {
+        if (viewIndex >= this.records.length) return rawRecords.length;
+        if (viewIndex <= 0) return 0;
+        const prevRecord = this.records[viewIndex - 1], rawIndex = rawRecords.indexOf(prevRecord);
+        return rawIndex >= 0 ? rawIndex + 1 : rawRecords.length;
+    }
+    _resetIndexingFromViewRecords() {
+        if (this._sourceLength = this.records.length, this.currentIndexedData = Array.from({
+            length: this._sourceLength
+        }, ((_, i) => i)), "tree" === this.rowHierarchyType && this.initTreeHierarchyState(), 
+        this.userPagination) return this.pagination.totalCount = this._sourceLength, void this.updatePagerData();
+        this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength, 
+        this.updatePagerData();
+    }
+    addRecord(record, index, syncToOriginalRecords = !1) {
+        var _a, _b, _c;
+        if (!syncToOriginalRecords) {
+            if (Array.isArray(this.records)) {
+                this.records.splice(index, 0, record), this.adjustBeforeChangedRecordsMap(index, 1), 
+                this.currentIndexedData.push(this.currentIndexedData.length), this._sourceLength += 1;
+                for (let i = 0; i < this.fieldAggregators.length; i++) this.fieldAggregators[i].push(record);
+                if ("tree" === this.rowHierarchyType && this.initTreeHierarchyState(), this.userPagination) {
+                    this.pagination.totalCount = this._sourceLength;
+                    const {perPageCount: perPageCount, currentPage: currentPage} = this.pagination;
+                    index < perPageCount * (currentPage || 0) + perPageCount && this.updatePagerData();
+                } else this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength, 
+                this.updatePagerData();
+                (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.added) && this.dataSourceObj.added(index, 1);
+            }
+            return;
+        }
+        const rawRecords = this._getRawRecordsArray();
+        if (!rawRecords) return;
+        const viewInsertIndex = this._normalizeInsertIndex(index, this.records.length), rawInsertIndex = this._hasFilterInEffect() ? this._mapViewInsertIndexToRawInsertIndex(rawRecords, viewInsertIndex) : this._normalizeInsertIndex(viewInsertIndex, rawRecords.length);
+        rawRecords.splice(rawInsertIndex, 0, record), this.beforeChangedRecordsMap.clear(), 
+        this.sortedIndexMap.clear(), this.updateFilterRules(null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.filterRules), 
+        (null === (_c = this.dataSourceObj) || void 0 === _c ? void 0 : _c.added) && this.dataSourceObj.added(rawInsertIndex, 1);
+    }
+    addRecords(recordArr, index, syncToOriginalRecords = !1) {
+        var _a, _b, _c;
+        if (!syncToOriginalRecords) {
+            if (Array.isArray(this.records)) {
+                if (Array.isArray(recordArr)) {
+                    this.records.splice(index, 0, ...recordArr), this.adjustBeforeChangedRecordsMap(index, recordArr.length);
+                    for (let i = 0; i < recordArr.length; i++) this.currentIndexedData.push(this.currentIndexedData.length);
+                    this._sourceLength += recordArr.length;
+                    for (let i = 0; i < this.fieldAggregators.length; i++) for (let j = 0; j < recordArr.length; j++) this.fieldAggregators[i].push(recordArr[j]);
+                }
+                if (this.userPagination) {
+                    this.pagination.totalCount = this._sourceLength;
+                    const {perPageCount: perPageCount, currentPage: currentPage} = this.pagination;
+                    index < perPageCount * (currentPage || 0) + perPageCount && this.updatePagerData();
+                } else this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength, 
+                this.updatePagerData();
+                (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.added) && this.dataSourceObj.added(index, recordArr.length);
             }
-            if (this.userPagination) {
-                this.pagination.totalCount = this._sourceLength;
-                const {perPageCount: perPageCount, currentPage: currentPage} = this.pagination;
-                index < perPageCount * (currentPage || 0) + perPageCount && this.updatePagerData();
-            } else this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength, 
-            this.updatePagerData();
-            (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.added) && this.dataSourceObj.added(index, recordArr.length);
+            return;
         }
+        const rawRecords = this._getRawRecordsArray();
+        if (!rawRecords || !Array.isArray(recordArr) || 0 === recordArr.length) return;
+        const viewInsertIndex = this._normalizeInsertIndex(index, this.records.length), rawInsertIndex = this._hasFilterInEffect() ? this._mapViewInsertIndexToRawInsertIndex(rawRecords, viewInsertIndex) : this._normalizeInsertIndex(viewInsertIndex, rawRecords.length);
+        rawRecords.splice(rawInsertIndex, 0, ...recordArr), this.beforeChangedRecordsMap.clear(), 
+        this.sortedIndexMap.clear(), this.updateFilterRules(null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.filterRules), 
+        (null === (_c = this.dataSourceObj) || void 0 === _c ? void 0 : _c.added) && this.dataSourceObj.added(rawInsertIndex, recordArr.length);
     }
     addRecordForSorted(record) {
         Array.isArray(this.records) && (this.beforeChangedRecordsMap.clear(), this.records.push(record), 
@@ -442,23 +486,38 @@ class DataSource extends EventTarget_1.EventTarget {
             this.beforeChangedRecordsMap.delete(key.toString()), this.beforeChangedRecordsMap.set((key + delta).toString(), record);
         }
     }
-    deleteRecords(recordIndexs) {
-        var _a;
-        if (Array.isArray(this.records)) {
-            const realDeletedRecordIndexs = [], recordIndexsMaxToMin = recordIndexs.sort(((a, b) => b - a));
-            for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
-                const recordIndex = recordIndexsMaxToMin[index];
-                if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
-                this.adjustBeforeChangedRecordsMap(recordIndex, 1, "delete"), realDeletedRecordIndexs.push(recordIndex);
-                const deletedRecord = this.records[recordIndex];
-                for (let i = 0; i < this.fieldAggregators.length; i++) this.fieldAggregators[i].deleteRecord(deletedRecord);
-                this.records.splice(recordIndex, 1), this.currentIndexedData.pop(), this._sourceLength -= 1;
+    deleteRecords(recordIndexs, syncToOriginalRecords = !1) {
+        var _a, _b, _c;
+        if (!syncToOriginalRecords) {
+            if (Array.isArray(this.records)) {
+                const realDeletedRecordIndexs = [], recordIndexsMaxToMin = recordIndexs.sort(((a, b) => b - a));
+                for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
+                    const recordIndex = recordIndexsMaxToMin[index];
+                    if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
+                    this.adjustBeforeChangedRecordsMap(recordIndex, 1, "delete"), realDeletedRecordIndexs.push(recordIndex);
+                    const deletedRecord = this.records[recordIndex];
+                    for (let i = 0; i < this.fieldAggregators.length; i++) this.fieldAggregators[i].deleteRecord(deletedRecord);
+                    this.records.splice(recordIndex, 1), this.currentIndexedData.pop(), this._sourceLength -= 1;
+                }
+                return this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
+                this.pagination.totalCount = this._sourceLength), this.updatePagerData(), (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.deleted) && this.dataSourceObj.deleted(realDeletedRecordIndexs), 
+                realDeletedRecordIndexs;
             }
-            return this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
-            this.pagination.totalCount = this._sourceLength), this.updatePagerData(), (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.deleted) && this.dataSourceObj.deleted(realDeletedRecordIndexs), 
-            realDeletedRecordIndexs;
-        }
-        return [];
+            return [];
+        }
+        const rawRecords = this._getRawRecordsArray();
+        if (!rawRecords || !Array.isArray(this.records)) return [];
+        const realDeletedRecordIndexs = [], recordIndexsMaxToMin = recordIndexs.slice().sort(((a, b) => b - a)), rawDeletedIndexs = [];
+        for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
+            const viewIndex = recordIndexsMaxToMin[index];
+            if (viewIndex >= this.records.length || viewIndex < 0) continue;
+            const deletedRecord = this.records[viewIndex], rawIndex = rawRecords.indexOf(deletedRecord);
+            rawIndex >= 0 && (rawRecords.splice(rawIndex, 1), rawDeletedIndexs.push(rawIndex)), 
+            realDeletedRecordIndexs.push(viewIndex);
+        }
+        return this.beforeChangedRecordsMap.clear(), this.sortedIndexMap.clear(), this.updateFilterRules(null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.filterRules), 
+        (null === (_c = this.dataSourceObj) || void 0 === _c ? void 0 : _c.deleted) && this.dataSourceObj.deleted(rawDeletedIndexs), 
+        realDeletedRecordIndexs;
     }
     deleteRecordsForSorted(recordIndexs) {
         if (Array.isArray(this.records)) {
@@ -473,20 +532,38 @@ class DataSource extends EventTarget_1.EventTarget {
             this.pagination.totalCount = this._sourceLength), this.beforeChangedRecordsMap.clear();
         }
     }
-    updateRecords(records, recordIndexs) {
-        const realDeletedRecordIndexs = [];
+    updateRecords(records, recordIndexs, syncToOriginalRecords = !1) {
+        var _a;
+        if (!syncToOriginalRecords) {
+            const realDeletedRecordIndexs = [];
+            for (let index = 0; index < recordIndexs.length; index++) {
+                const recordIndex = recordIndexs[index];
+                if (Array.isArray(recordIndex)) this.beforeChangedRecordsMap.delete(recordIndex.toString()), 
+                realDeletedRecordIndexs.push(recordIndex), recordIndex.slice(0, -1).reduce(((acc, key) => (void 0 === acc[key] && (acc[key] = {}), 
+                acc[key].children)), this.records)[recordIndex[recordIndex.length - 1]] = records[index]; else {
+                    if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
+                    this.beforeChangedRecordsMap.delete(recordIndex.toString()), realDeletedRecordIndexs.push(recordIndex);
+                    for (let i = 0; i < this.fieldAggregators.length; i++) this.fieldAggregators[i].updateRecord(this.records[recordIndex], records[index]);
+                    this.records[recordIndex] = records[index];
+                }
+            }
+            return this.userPagination && this.updatePagerData(), realDeletedRecordIndexs;
+        }
+        const rawRecords = this._getRawRecordsArray();
+        if (!rawRecords || !Array.isArray(this.records)) return [];
+        const realUpdatedIndexs = [];
         for (let index = 0; index < recordIndexs.length; index++) {
             const recordIndex = recordIndexs[index];
             if (Array.isArray(recordIndex)) this.beforeChangedRecordsMap.delete(recordIndex.toString()), 
-            realDeletedRecordIndexs.push(recordIndex), recordIndex.slice(0, -1).reduce(((acc, key) => (void 0 === acc[key] && (acc[key] = {}), 
-            acc[key].children)), this.records)[recordIndex[recordIndex.length - 1]] = records[index]; else {
-                if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
-                this.beforeChangedRecordsMap.delete(recordIndex.toString()), realDeletedRecordIndexs.push(recordIndex);
-                for (let i = 0; i < this.fieldAggregators.length; i++) this.fieldAggregators[i].updateRecord(this.records[recordIndex], records[index]);
-                this.records[recordIndex] = records[index];
+            realUpdatedIndexs.push(recordIndex), recordIndex.slice(0, -1).reduce(((acc, key) => (void 0 === acc[key] && (acc[key] = {}), 
+            acc[key].children)), rawRecords)[recordIndex[recordIndex.length - 1]] = records[index]; else {
+                if (recordIndex >= this.records.length || recordIndex < 0) continue;
+                const oldRecord = this.records[recordIndex], rawIndex = rawRecords.indexOf(oldRecord);
+                rawIndex >= 0 && (rawRecords[rawIndex] = records[index]), realUpdatedIndexs.push(recordIndex);
             }
         }
-        return this.userPagination && this.updatePagerData(), realDeletedRecordIndexs;
+        return this.beforeChangedRecordsMap.clear(), this.sortedIndexMap.clear(), this.updateFilterRules(null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules), 
+        realUpdatedIndexs;
     }
     updateRecordsForSorted(records, recordIndexs) {
         const realDeletedRecordIndexs = [];