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

package/cjs/data/DataSource.d.ts

@@ -33,6 +33,7 @@ export declare class DataSource extends EventTarget implements DataSourceAPI {
     private _sourceLength;
     private _source;
     protected sortedIndexMap: Map<FieldDef, ISortedMapItem>;
+    private _forceVisibleRecords?;
     private lastSortStates;
     currentIndexedData: (number | number[])[] | null;
     protected userPagination: IPagination;
@@ -105,6 +106,8 @@ export declare class DataSource extends EventTarget implements DataSourceAPI {
     updateRecordsForSorted(records: any[], recordIndexs: number[]): void;
     sort(states: Array<SortState>): void;
     setSortedIndexMap(field: FieldDef, filedMap: ISortedMapItem): void;
+    markForceVisibleRecord(record: any): void;
+    clearForceVisibleRecords(): void;
     private clearFilteredChildren;
     private filterRecord;
     updateFilterRulesForSorted(filterRules?: FilterRules): void;

package/cjs/data/DataSource.js

@@ -395,8 +395,15 @@ class DataSource extends EventTarget_1.EventTarget {
         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;
+        if (0 === this.records.length) return rawRecords.length;
+        if (viewIndex <= 0) {
+            const firstVisibleRecord = this.records[0], rawIndex = rawRecords.indexOf(firstVisibleRecord);
+            return rawIndex >= 0 ? rawIndex : 0;
+        }
+        if (viewIndex >= this.records.length) {
+            const lastVisibleRecord = this.records[this.records.length - 1], rawIndex = rawRecords.indexOf(lastVisibleRecord);
+            return rawIndex >= 0 ? rawIndex + 1 : rawRecords.length;
+        }
         const prevRecord = this.records[viewIndex - 1], rawIndex = rawRecords.indexOf(prevRecord);
         return rawIndex >= 0 ? rawIndex + 1 : rawRecords.length;
     }
@@ -428,8 +435,8 @@ class DataSource extends EventTarget_1.EventTarget {
         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), 
+        rawRecords.splice(rawInsertIndex, 0, record), syncToOriginalRecords && this._hasFilterInEffect() && this.markForceVisibleRecord(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) {
@@ -455,8 +462,8 @@ class DataSource extends EventTarget_1.EventTarget {
         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), 
+        if (rawRecords.splice(rawInsertIndex, 0, ...recordArr), syncToOriginalRecords && this._hasFilterInEffect()) for (let i = 0; i < recordArr.length; i++) this.markForceVisibleRecord(recordArr[i]);
+        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) {
@@ -629,23 +636,31 @@ class DataSource extends EventTarget_1.EventTarget {
     setSortedIndexMap(field, filedMap) {
         this.sortedIndexMap.set(field, filedMap);
     }
+    markForceVisibleRecord(record) {
+        !record || "object" != typeof record && "function" != typeof record || (this._forceVisibleRecords || (this._forceVisibleRecords = new WeakSet), 
+        this._forceVisibleRecords.add(record));
+    }
+    clearForceVisibleRecords() {
+        this._forceVisibleRecords = void 0;
+    }
     clearFilteredChildren(record) {
         var _a, _b;
         record.filteredChildren = void 0;
         for (let i = 0; i < (null !== (_b = null === (_a = record.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0); i++) this.clearFilteredChildren(record.children[i]);
     }
     filterRecord(record) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
+        if (null === (_a = this._forceVisibleRecords) || void 0 === _a ? void 0 : _a.has(record)) return !0;
         let isReserved = !0;
-        for (let i = 0; i < (null === (_a = this.dataConfig.filterRules) || void 0 === _a ? void 0 : _a.length); i++) {
-            const filterRule = null === (_b = this.dataConfig) || void 0 === _b ? void 0 : _b.filterRules[i];
+        for (let i = 0; i < (null === (_b = this.dataConfig.filterRules) || void 0 === _b ? void 0 : _b.length); i++) {
+            const filterRule = null === (_c = this.dataConfig) || void 0 === _c ? void 0 : _c.filterRules[i];
             if (filterRule.filterKey) {
                 const filterValue = record[filterRule.filterKey];
                 if (-1 === filterRule.filteredValues.indexOf(filterValue)) {
                     isReserved = !1;
                     break;
                 }
-            } else if (!(null === (_c = filterRule.filterFunc) || void 0 === _c ? void 0 : _c.call(filterRule, record))) {
+            } else if (!(null === (_d = filterRule.filterFunc) || void 0 === _d ? void 0 : _d.call(filterRule, record))) {
                 isReserved = !1;
                 break;
             }