@visactor/vtable 0.22.4-alpha.0 → 0.23.0

package/cjs/data/DataSource.js

@@ -86,13 +86,13 @@ class DataSource extends EventTarget_1.EventTarget {
         return EVENT_TYPE;
     }
     constructor(dataSourceObj, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel) {
-        var _a, _b;
+        var _a;
         super(), this.currentIndexedData = [], this.hierarchyExpandLevel = 0, this.hasHierarchyStateExpand = !1, 
         this.beforeChangedRecordsMap = [], this.registedAggregators = {}, this.fieldAggregators = [], 
         this.layoutColumnObjects = [], this.registerAggregators(), this.dataSourceObj = dataSourceObj, 
-        this.dataConfig = dataConfig, this._get = (null == dataSourceObj ? void 0 : dataSourceObj.get.bind(dataSourceObj)) || void 0, 
-        this.layoutColumnObjects = columnObjs, this._source = this.processRecords(null !== (_a = null == dataSourceObj ? void 0 : dataSourceObj.source) && void 0 !== _a ? _a : dataSourceObj), 
-        this._sourceLength = (null === (_b = this._source) || void 0 === _b ? void 0 : _b.length) || 0, 
+        this.dataConfig = dataConfig, this._get = null == dataSourceObj ? void 0 : dataSourceObj.get, 
+        this.layoutColumnObjects = columnObjs, this._source = (null == dataSourceObj ? void 0 : dataSourceObj.records) ? this.processRecords(null == dataSourceObj ? void 0 : dataSourceObj.records) : dataSourceObj, 
+        this._sourceLength = (null === (_a = this._source) || void 0 === _a ? void 0 : _a.length) || 0, 
         this.sortedIndexMap = new Map, this._currentPagerIndexedData = [], this.userPagination = pagination, 
         this.pagination = pagination || {
             totalCount: this._sourceLength,
@@ -102,7 +102,7 @@ class DataSource extends EventTarget_1.EventTarget {
         this.currentIndexedData = Array.from({
             length: this._sourceLength
         }, ((_, i) => i)), "tree" === rowHierarchyType && this.initTreeHierarchyState(), 
-        this.updatePagerData();
+        this.rowHierarchyType = rowHierarchyType, this.updatePagerData();
     }
     initTreeHierarchyState() {
         var _a;
@@ -111,8 +111,8 @@ class DataSource extends EventTarget_1.EventTarget {
         }, ((_, i) => i));
         let nodeLength = this._sourceLength;
         for (let i = 0; i < nodeLength; i++) {
-            const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey);
-            if ((null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) > 0) {
+            const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey), children = null !== (_a = nodeData.filteredChildren) && void 0 !== _a ? _a : nodeData.children;
+            if ((null == children ? void 0 : children.length) > 0) {
                 if (this.hierarchyExpandLevel > 1 ? !nodeData.hierarchyState && (nodeData.hierarchyState = ts_types_1.HierarchyState.expand) : !nodeData.hierarchyState && (nodeData.hierarchyState = ts_types_1.HierarchyState.collapse), 
                 this.hasHierarchyStateExpand = !0, nodeData.hierarchyState === ts_types_1.HierarchyState.collapse) continue;
                 const childrenLength = this.initChildrenNodeHierarchy(indexKey, this.hierarchyExpandLevel, 2, nodeData);
@@ -149,18 +149,29 @@ class DataSource extends EventTarget_1.EventTarget {
         }
     }
     processRecords(records) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this._generateFieldAggragations();
-        const filteredRecords = [], isHasAggregation = this.fieldAggregators.length >= 1, isHasFilterRule = (null === (_b = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) || void 0 === _b ? void 0 : _b.length) >= 1;
-        if (isHasFilterRule || isHasAggregation) {
+        const filteredRecords = [], isHasAggregation = this.fieldAggregators.length >= 1;
+        if ((null === (_b = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) || void 0 === _b ? void 0 : _b.length) >= 1 || (null === (_c = this.lastFilterRules) || void 0 === _c ? void 0 : _c.length) >= 1 || isHasAggregation) {
             for (let i = 0, len = records.length; i < len; i++) {
                 const record = records[i];
-                isHasFilterRule ? this.filterRecord(record) && (filteredRecords.push(record), isHasAggregation && this.processRecord(record)) : isHasAggregation && this.processRecord(record);
+                (null === (_e = null === (_d = this.dataConfig) || void 0 === _d ? void 0 : _d.filterRules) || void 0 === _e ? void 0 : _e.length) >= 1 ? this.filterRecord(record) && (filteredRecords.push(record), 
+                "tree" === this.rowHierarchyType && record.children && (record.filteredChildren = this.filteredChildren(record.children)), 
+                isHasAggregation && this.processRecord(record)) : (null === (_f = this.lastFilterRules) || void 0 === _f ? void 0 : _f.length) >= 1 ? (this.clearFilteredChildren(record), 
+                isHasAggregation && this.processRecord(record)) : isHasAggregation && this.processRecord(record);
             }
-            if (isHasFilterRule) return filteredRecords;
+            if ((null === (_h = null === (_g = this.dataConfig) || void 0 === _g ? void 0 : _g.filterRules) || void 0 === _h ? void 0 : _h.length) >= 1) return filteredRecords;
         }
         return records;
     }
+    filteredChildren(records) {
+        const filteredRecords = [];
+        for (let i = 0, len = records.length; i < len; i++) {
+            const record = records[i];
+            this.filterRecord(record) && (filteredRecords.push(record), record.children && (record.filteredChildren = this.filteredChildren(record.children)));
+        }
+        return filteredRecords;
+    }
     processRecord(record) {
         for (let i = 0; i < this.fieldAggregators.length; i++) {
             this.fieldAggregators[i].push(record);
@@ -169,12 +180,12 @@ class DataSource extends EventTarget_1.EventTarget {
     initChildrenNodeHierarchy(indexKey, hierarchyExpandLevel, currentLevel, nodeData) {
         var _a, _b, _c;
         let childTotalLength = 0;
-        const nodeLength = null !== (_b = null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
+        const nodeLength = nodeData.filteredChildren ? nodeData.filteredChildren.length : null !== (_b = null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
         for (let j = 0; j < nodeLength; j++) {
             (currentLevel <= hierarchyExpandLevel || nodeData.hierarchyState === ts_types_1.HierarchyState.expand) && (childTotalLength += 1);
-            const childNodeData = nodeData.children[j], childIndexKey = Array.isArray(indexKey) ? indexKey.concat(j) : [ indexKey, j ];
+            const childNodeData = nodeData.filteredChildren ? nodeData.filteredChildren[j] : nodeData.children[j], childIndexKey = Array.isArray(indexKey) ? indexKey.concat(j) : [ indexKey, j ];
             (currentLevel <= hierarchyExpandLevel || nodeData.hierarchyState === ts_types_1.HierarchyState.expand) && this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childTotalLength, 0, childIndexKey), 
-            (null === (_c = childNodeData.children) || void 0 === _c ? void 0 : _c.length) > 0 && (currentLevel < hierarchyExpandLevel || childNodeData.hierarchyState === ts_types_1.HierarchyState.expand ? (!childNodeData.hierarchyState && (childNodeData.hierarchyState = ts_types_1.HierarchyState.expand), 
+            (childNodeData.filteredChildren ? childNodeData.filteredChildren.length > 0 : (null === (_c = childNodeData.children) || void 0 === _c ? void 0 : _c.length) > 0) && (currentLevel < hierarchyExpandLevel || childNodeData.hierarchyState === ts_types_1.HierarchyState.expand ? (!childNodeData.hierarchyState && (childNodeData.hierarchyState = ts_types_1.HierarchyState.expand), 
             this.hasHierarchyStateExpand = !0) : !childNodeData.hierarchyState && (childNodeData.hierarchyState = ts_types_1.HierarchyState.collapse)), 
             childNodeData.hierarchyState === ts_types_1.HierarchyState.expand && (childTotalLength += this.initChildrenNodeHierarchy(childIndexKey, hierarchyExpandLevel, currentLevel + 1, childNodeData));
         }
@@ -195,6 +206,9 @@ class DataSource extends EventTarget_1.EventTarget {
             firstLevelIndex >= startIndex && firstLevelIndex < endIndex) this._currentPagerIndexedData.push(currentIndexedData[i]); else if (firstLevelIndex >= endIndex) break;
         } else if (this._sourceLength > 0) throw new Error("currentIndexedData should has values!");
     }
+    get records() {
+        return Array.isArray(this._source) ? this._source : [];
+    }
     get source() {
         return this._source;
     }
@@ -231,10 +245,12 @@ class DataSource extends EventTarget_1.EventTarget {
         this.pushChildrenNode(indexed, ts_types_1.HierarchyState.expand, data), this.hasHierarchyStateExpand = !0; else if (state === ts_types_1.HierarchyState.expand) {
             let childrenLength = 0;
             const computeChildrenNodeLength = (indexKey, hierarchyState, nodeData) => {
-                if (hierarchyState && hierarchyState !== ts_types_1.HierarchyState.collapse && hierarchyState !== ts_types_1.HierarchyState.none && nodeData.children) for (let i = 0; i < nodeData.children.length; i++) {
+                if (!hierarchyState || hierarchyState === ts_types_1.HierarchyState.collapse || hierarchyState === ts_types_1.HierarchyState.none) return;
+                const children = nodeData.filteredChildren ? nodeData.filteredChildren : nodeData.children;
+                if (children) for (let i = 0; i < children.length; i++) {
                     childrenLength += 1;
                     const childIndex = Array.isArray(indexKey) ? indexKey.concat([ i ]) : [ indexKey, i ];
-                    computeChildrenNodeLength(childIndex, nodeData.children[i].hierarchyState, nodeData.children[i]);
+                    computeChildrenNodeLength(childIndex, children[i].hierarchyState, children[i]);
                 }
             };
             computeChildrenNodeLength(indexed, state, data), this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexed) + 1, childrenLength), 
@@ -244,23 +260,25 @@ class DataSource extends EventTarget_1.EventTarget {
         return (0, diff_cell_1.calculateArrayDiff)(oldIndexedData, this.currentIndexedData);
     }
     pushChildrenNode(indexKey, hierarchyState, nodeData) {
+        var _a;
         if (!hierarchyState || hierarchyState === ts_types_1.HierarchyState.collapse || hierarchyState === ts_types_1.HierarchyState.none) return 0;
         let childrenLength = 0;
-        if (nodeData.children) {
+        const children = nodeData.filteredChildren ? nodeData.filteredChildren : nodeData.children;
+        if (children) {
             const subNodeSortedIndexArray = Array.from({
-                length: nodeData.children.length
+                length: children.length
             }, ((_, i) => i));
             this.lastOrder && "normal" !== this.lastOrder && this.lastOrderField && sort.sort((index => (0, 
             vutils_1.isValid)(subNodeSortedIndexArray[index]) ? subNodeSortedIndexArray[index] : subNodeSortedIndexArray[index] = index), ((index, rel) => {
                 subNodeSortedIndexArray[index] = rel;
-            }), nodeData.children.length, this.lastOrderFn, this.lastOrder, (index => this.getOriginalField(Array.isArray(indexKey) ? indexKey.concat([ index ]) : [ indexKey, index ], this.lastOrderField)));
+            }), children.length, this.lastOrderFn, this.lastOrder, (index => this.getOriginalField(Array.isArray(indexKey) ? indexKey.concat([ index ]) : [ indexKey, index ], this.lastOrderField)));
             for (let i = 0; i < subNodeSortedIndexArray.length; i++) {
                 childrenLength += 1;
                 const childIndex = Array.isArray(indexKey) ? indexKey.concat([ subNodeSortedIndexArray[i] ]) : [ indexKey, subNodeSortedIndexArray[i] ];
                 this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childrenLength, 0, childIndex);
                 const childData = this.getOriginalRecord(childIndex);
-                !nodeData.children[i].hierarchyState && childData.children && (nodeData.children[i].hierarchyState = ts_types_1.HierarchyState.collapse), 
-                childrenLength += this.pushChildrenNode(childIndex, nodeData.children[i].hierarchyState, nodeData.children[subNodeSortedIndexArray[i]]);
+                !childData.hierarchyState && (null !== (_a = childData.filteredChildren) && void 0 !== _a ? _a : childData.children) && (childData.hierarchyState = ts_types_1.HierarchyState.collapse), 
+                childrenLength += this.pushChildrenNode(childIndex, childData.hierarchyState, children[subNodeSortedIndexArray[i]]);
             }
         }
         return childrenLength;
@@ -283,74 +301,94 @@ class DataSource extends EventTarget_1.EventTarget {
         }
     }
     setRecord(record, index) {
-        const indexed = this.getIndexKey(index);
-        if (Array.isArray(indexed)) {
-            const c_node_index = indexed[indexed.length - 1];
-            this.getOriginalRecord(indexed.slice(0, indexed.length - 1)).children.splice(c_node_index, 1, record);
-        } else this.source.splice(indexed, 1, record);
+        var _a, _b;
+        let isAdd = !0;
+        if ((null === (_b = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) || void 0 === _b ? void 0 : _b.length) >= 1 && (this.filterRecord(record) ? "tree" === this.rowHierarchyType && record.children && (record.filteredChildren = this.filteredChildren(record.children)) : isAdd = !1), 
+        isAdd && Array.isArray(this.records)) {
+            const indexed = this.getIndexKey(index);
+            Array.isArray(indexed) || this.records.splice(indexed, 1, record);
+        }
     }
     addRecord(record, index) {
-        if (this.source.splice(index, 0, record), this.currentIndexedData.push(this.currentIndexedData.length), 
-        this._sourceLength += 1, 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();
+        var _a;
+        if (Array.isArray(this.records)) {
+            if (this.records.splice(index, 0, record), this.currentIndexedData.push(this.currentIndexedData.length), 
+            this._sourceLength += 1, "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) {
-        if (Array.isArray(recordArr)) {
-            this.source.splice(index, 0, ...recordArr);
-            for (let i = 0; i < recordArr.length; i++) this.currentIndexedData.push(this.currentIndexedData.length);
-            this._sourceLength += recordArr.length;
+        var _a;
+        if (Array.isArray(this.records)) {
+            if (Array.isArray(recordArr)) {
+                this.records.splice(index, 0, ...recordArr);
+                for (let i = 0; i < recordArr.length; i++) this.currentIndexedData.push(this.currentIndexedData.length);
+                this._sourceLength += 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);
         }
-        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();
     }
     addRecordForSorted(record) {
-        this.source.push(record), this.currentIndexedData.push(this.currentIndexedData.length), 
+        Array.isArray(this.records) && (this.records.push(record), this.currentIndexedData.push(this.currentIndexedData.length), 
         this._sourceLength += 1, this.sortedIndexMap.clear(), this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
-        this.pagination.totalCount = this._sourceLength);
+        this.pagination.totalCount = this._sourceLength));
     }
     addRecordsForSorted(recordArr) {
-        if (Array.isArray(recordArr)) {
-            this.source.push(...recordArr);
-            for (let i = 0; i < recordArr.length; i++) this.currentIndexedData.push(this.currentIndexedData.length);
-            this._sourceLength += recordArr.length, this.sortedIndexMap.clear();
+        if (Array.isArray(this.records)) {
+            if (Array.isArray(recordArr)) {
+                this.records.push(...recordArr);
+                for (let i = 0; i < recordArr.length; i++) this.currentIndexedData.push(this.currentIndexedData.length);
+                this._sourceLength += recordArr.length, this.sortedIndexMap.clear();
+            }
+            this.userPagination || (this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength);
         }
-        this.userPagination || (this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength);
     }
     deleteRecords(recordIndexs) {
-        const realDeletedRecordIndexs = [], recordIndexsMaxToMin = recordIndexs.sort(((a, b) => b - a));
-        for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
-            const recordIndex = recordIndexsMaxToMin[index];
-            recordIndex >= this._sourceLength || recordIndex < 0 || (realDeletedRecordIndexs.push(recordIndex), 
-            this.source.splice(recordIndex, 1), this.currentIndexedData.pop(), this._sourceLength -= 1);
+        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];
+                recordIndex >= this._sourceLength || recordIndex < 0 || (realDeletedRecordIndexs.push(recordIndex), 
+                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(), realDeletedRecordIndexs;
+        return [];
     }
     deleteRecordsForSorted(recordIndexs) {
-        const 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;
-            const rawIndex = this.currentIndexedData[recordIndex];
-            this.source.splice(rawIndex, 1), this._sourceLength -= 1;
+        if (Array.isArray(this.records)) {
+            const 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;
+                const rawIndex = this.currentIndexedData[recordIndex];
+                this.records.splice(rawIndex, 1), this._sourceLength -= 1;
+            }
+            this.sortedIndexMap.clear(), this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
+            this.pagination.totalCount = this._sourceLength);
         }
-        this.sortedIndexMap.clear(), this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
-        this.pagination.totalCount = this._sourceLength);
     }
     updateRecords(records, recordIndexs) {
         const realDeletedRecordIndexs = [];
         for (let index = 0; index < recordIndexs.length; index++) {
             const recordIndex = recordIndexs[index];
             recordIndex >= this._sourceLength || recordIndex < 0 || (realDeletedRecordIndexs.push(recordIndex), 
-            this.source[recordIndex] = records[index]);
+            this.records[recordIndex] = records[index]);
         }
         return this.userPagination && this.updatePagerData(), realDeletedRecordIndexs;
     }
@@ -361,7 +399,7 @@ class DataSource extends EventTarget_1.EventTarget {
             if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
             const rawIndex = this.currentIndexedData[recordIndex];
             if ("number" != typeof rawIndex) return;
-            realDeletedRecordIndexs.push(recordIndex), this.source[rawIndex] = records[index];
+            realDeletedRecordIndexs.push(recordIndex), this.records[rawIndex] = records[index];
         }
         this.sortedIndexMap.clear();
     }
@@ -390,18 +428,23 @@ class DataSource extends EventTarget_1.EventTarget {
         }, this.sortedIndexMap.set(field, filedMap)), filedMap[order] = sortedIndexArray, 
         this.updatePagerData(), this.fireListeners(EVENT_TYPE.CHANGE_ORDER, null);
     }
-    filterRecord(record) {
+    clearFilteredChildren(record) {
         var _a, _b;
+        record.filteredChildren = void 0;
+        for (let i = 0; null !== (_b = i < (null === (_a = record.children) || void 0 === _a ? void 0 : _a.length)) && void 0 !== _b && _b; i++) this.clearFilteredChildren(record.children[i]);
+    }
+    filterRecord(record) {
+        var _a, _b, _c;
         let isReserved = !0;
-        for (let i = 0; i < this.dataConfig.filterRules.length; i++) {
-            const filterRule = null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules[i];
+        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];
             if (filterRule.filterKey) {
                 const filterValue = record[filterRule.filterKey];
                 if (-1 === filterRule.filteredValues.indexOf(filterValue)) {
                     isReserved = !1;
                     break;
                 }
-            } else if (!(null === (_b = filterRule.filterFunc) || void 0 === _b ? void 0 : _b.call(filterRule, record))) {
+            } else if (!(null === (_c = filterRule.filterFunc) || void 0 === _c ? void 0 : _c.call(filterRule, record))) {
                 isReserved = !1;
                 break;
             }
@@ -410,7 +453,8 @@ class DataSource extends EventTarget_1.EventTarget {
     }
     updateFilterRulesForSorted(filterRules) {
         var _a, _b, _c;
-        this.dataConfig.filterRules = filterRules, this._source = this.processRecords(null !== (_b = null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.source) && void 0 !== _b ? _b : this.dataSourceObj), 
+        this.lastFilterRules = this.dataConfig.filterRules, this.dataConfig.filterRules = filterRules, 
+        this._source = this.processRecords(null !== (_b = null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.records) && void 0 !== _b ? _b : this.dataSourceObj), 
         this._sourceLength = (null === (_c = this._source) || void 0 === _c ? void 0 : _c.length) || 0, 
         this.sortedIndexMap.clear(), this.currentIndexedData = Array.from({
             length: this._sourceLength
@@ -419,12 +463,14 @@ class DataSource extends EventTarget_1.EventTarget {
     }
     updateFilterRules(filterRules) {
         var _a, _b, _c;
-        this.dataConfig.filterRules = filterRules, this._source = this.processRecords(null !== (_b = null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.source) && void 0 !== _b ? _b : this.dataSourceObj), 
+        this.lastFilterRules = this.dataConfig.filterRules, this.dataConfig.filterRules = filterRules, 
+        this._source = this.processRecords(null !== (_b = null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.records) && void 0 !== _b ? _b : this.dataSourceObj), 
         this._sourceLength = (null === (_c = this._source) || void 0 === _c ? void 0 : _c.length) || 0, 
         this.currentIndexedData = Array.from({
             length: this._sourceLength
         }, ((_, i) => i)), this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
-        this.pagination.totalCount = this._sourceLength), this.updatePagerData();
+        this.pagination.totalCount = this._sourceLength, "tree" === this.rowHierarchyType && this.initTreeHierarchyState()), 
+        this.updatePagerData();
     }
     clearSortedIndexMap() {
         this.lastOrderField && this.lastOrder && this.sortedIndexMap.forEach(((sortMap, key) => {
@@ -450,7 +496,7 @@ class DataSource extends EventTarget_1.EventTarget {
     }
     release() {
         var _a;
-        null === (_a = super.release) || void 0 === _a || _a.call(this);
+        null === (_a = super.release) || void 0 === _a || _a.call(this), this.lastFilterRules = null;
     }
     clearSortedMap() {
         this.currentIndexedData && (this.currentIndexedData.length = 0), this.currentIndexedData = null, 
@@ -462,14 +508,18 @@ class DataSource extends EventTarget_1.EventTarget {
         this.currentIndexedData = null, this.currentPagerIndexedData.length = 0;
     }
     getOriginalRecord(dataIndex) {
-        var _a;
-        return (null === (_a = this.dataConfig) || void 0 === _a ? void 0 : _a.filterRules) ? this.source[dataIndex] : getValue(this._get(dataIndex), (val => {
+        let data;
+        return data = this.dataSourceObj.records ? Array.isArray(dataIndex) ? getValueFromDeepArray(this.records, dataIndex) : this.records[dataIndex] : this._get(dataIndex), 
+        getValue(data, (val => {
             this.recordPromiseCallBack(dataIndex, val);
         }));
     }
     getRawRecord(dataIndex) {
         var _a;
-        return (null === (_a = this.beforeChangedRecordsMap) || void 0 === _a ? void 0 : _a[dataIndex]) ? this.beforeChangedRecordsMap[dataIndex] : getValue(this._get(dataIndex), (val => {
+        if (null === (_a = this.beforeChangedRecordsMap) || void 0 === _a ? void 0 : _a[dataIndex]) return this.beforeChangedRecordsMap[dataIndex];
+        let data;
+        return data = this.dataSourceObj.records ? Array.isArray(dataIndex) ? getValueFromDeepArray(this.records, dataIndex) : this.records[dataIndex] : this._get(dataIndex), 
+        getValue(data, (val => {
             this.recordPromiseCallBack(dataIndex, val);
         }));
     }
@@ -512,6 +562,7 @@ class DataSource extends EventTarget_1.EventTarget {
         return !0;
     }
     reorderRecord(sourceIndex, targetIndex) {
+        var _a;
         if ("asc" !== this.lastOrder && "desc" !== this.lastOrder && this.isCanExchangeOrder(sourceIndex, targetIndex)) if (this.hasHierarchyStateExpand) {
             let sourceI, targetI, sourceIndexs = this.currentPagerIndexedData[sourceIndex], targetIndexs = this.currentPagerIndexedData[targetIndex];
             if (sourceIndexs = Array.isArray(sourceIndexs) ? [ ...sourceIndexs ] : [ sourceIndexs ], 
@@ -524,37 +575,37 @@ class DataSource extends EventTarget_1.EventTarget {
                 }
                 if (sourceI = sourceIndexs.splice(sourceIndexs.length - 1, 1)[0], targetI = targetIndexs.splice(targetIndexs.length - 1, 1)[0], 
                 sourceIndexs.length >= 1) {
-                    const parent = this.getOriginalRecord(sourceIndexs), sourceIds = parent.children.splice(sourceI, 1);
-                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(parent.children, sourceIds);
+                    const parent = this.getOriginalRecord(sourceIndexs), sourceIds = parent.filteredChildren ? parent.filteredChildren.splice(sourceI, 1) : parent.children.splice(sourceI, 1);
+                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(null !== (_a = parent.filteredChildren) && void 0 !== _a ? _a : parent.children, sourceIds);
                 } else {
-                    const sourceIds = this.source.splice(sourceI, 1);
-                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(this.source, sourceIds);
+                    const sourceIds = this.records.splice(sourceI, 1);
+                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(this.records, sourceIds);
                 }
             } else {
                 sourceI = this.currentPagerIndexedData[sourceIndex], targetI = this.currentPagerIndexedData[targetIndex];
-                const records = this.source.splice(sourceI, 1);
-                records.unshift(targetI, 0), Array.prototype.splice.apply(this.source, records);
+                const records = this.records.splice(sourceI, 1);
+                records.unshift(targetI, 0), Array.prototype.splice.apply(this.records, records);
             }
             this.restoreTreeHierarchyState(), this.updatePagerData();
         } else {
-            const records = this.source.splice(sourceIndex, 1);
-            records.unshift(targetIndex, 0), Array.prototype.splice.apply(this.source, records);
+            const records = this.records.splice(sourceIndex, 1);
+            records.unshift(targetIndex, 0), Array.prototype.splice.apply(this.records, records);
         }
     }
     restoreTreeHierarchyState() {
-        var _a;
+        var _a, _b;
         if (this.hierarchyExpandLevel) {
             for (let i = 0; i < this._sourceLength; i++) {
                 const nodeData = this.getOriginalRecord(i);
-                nodeData.children && !nodeData.hierarchyState && (nodeData.hierarchyState = ts_types_1.HierarchyState.collapse);
+                (null !== (_a = nodeData.filteredChildren) && void 0 !== _a ? _a : nodeData.children) && !nodeData.hierarchyState && (nodeData.hierarchyState = ts_types_1.HierarchyState.collapse);
             }
             this.currentIndexedData = Array.from({
                 length: this._sourceLength
             }, ((_, i) => i));
             let nodeLength = this._sourceLength;
             for (let i = 0; i < nodeLength; i++) {
-                const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey);
-                if ((null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) > 0 && nodeData.hierarchyState === ts_types_1.HierarchyState.expand) {
+                const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey), children = null !== (_b = nodeData.filteredChildren) && void 0 !== _b ? _b : nodeData.children;
+                if ((null == children ? void 0 : children.length) > 0 && nodeData.hierarchyState === ts_types_1.HierarchyState.expand) {
                     this.hasHierarchyStateExpand = !0;
                     const childrenLength = this.restoreChildrenNodeHierarchy(indexKey, nodeData);
                     i += childrenLength, nodeLength += childrenLength;
@@ -565,10 +616,10 @@ class DataSource extends EventTarget_1.EventTarget {
     restoreChildrenNodeHierarchy(indexKey, nodeData) {
         var _a, _b;
         let childTotalLength = 0;
-        const nodeLength = null !== (_b = null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
+        const children = null !== (_a = nodeData.filteredChildren) && void 0 !== _a ? _a : nodeData.children, nodeLength = null !== (_b = null == children ? void 0 : children.length) && void 0 !== _b ? _b : 0;
         for (let j = 0; j < nodeLength; j++) {
             nodeData.hierarchyState === ts_types_1.HierarchyState.expand && (childTotalLength += 1);
-            const childNodeData = nodeData.children[j], childIndexKey = Array.isArray(indexKey) ? indexKey.concat(j) : [ indexKey, j ];
+            const childNodeData = children[j], childIndexKey = Array.isArray(indexKey) ? indexKey.concat(j) : [ indexKey, j ];
             nodeData.hierarchyState === ts_types_1.HierarchyState.expand && this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childTotalLength, 0, childIndexKey), 
             childTotalLength += this.restoreChildrenNodeHierarchy(childIndexKey, childNodeData);
         }
@@ -576,8 +627,21 @@ class DataSource extends EventTarget_1.EventTarget {
     }
 }
 
+function getValueFromDeepArray(array, index) {
+    var _a;
+    let result = array;
+    for (let i = 0; i < index.length; i++) {
+        const currentIdx = index[i];
+        if (!result[currentIdx]) return;
+        result = result[currentIdx];
+        const children = null !== (_a = result.filteredChildren) && void 0 !== _a ? _a : null == result ? void 0 : result.children;
+        children && i + 1 < index.length && (result = children);
+    }
+    return result;
+}
+
+//# sourceMappingURL=DataSource.js.map
 exports.DataSource = DataSource, DataSource.EMPTY = new DataSource({
     get() {},
     length: 0
-});
-//# sourceMappingURL=DataSource.js.map
+});