@visactor/vtable 1.15.1-alpha.1 → 1.15.2-alpha.0

package/es/data/DataSource.js

@@ -8,7 +8,7 @@ import { EventTarget } from "../event/EventTarget";
 
 import { getValueByPath, isAllDigits } from "../tools/util";
 
-import { arrayEqual, cloneDeep, isValid } from "@visactor/vutils";
+import { arrayEqual, cloneDeep, isNumber, isValid } from "@visactor/vutils";
 
 import { RecordAggregator, SumAggregator, CountAggregator, MaxAggregator, MinAggregator, AvgAggregator, NoneAggregator, CustomAggregator } from "../ts-types/dataset/aggregation";
 
@@ -25,7 +25,7 @@ const EVENT_TYPE = {
     CHANGE_ORDER: "change_order"
 };
 
-function getValue(value, promiseCallBack) {
+export function getValue(value, promiseCallBack) {
     const maybePromiseOrValue = getOrApply(value);
     if (isPromise(maybePromiseOrValue)) {
         const promiseValue = maybePromiseOrValue.then((r => (promiseCallBack(r), r)));
@@ -67,7 +67,7 @@ export class DataSource extends EventTarget {
     constructor(dataSourceObj, dataConfig, pagination, columns, rowHierarchyType, hierarchyExpandLevel) {
         var _a;
         super(), this.currentIndexedData = [], this.hierarchyExpandLevel = 0, this.hasHierarchyStateExpand = !1, 
-        this.beforeChangedRecordsMap = {}, this.registedAggregators = {}, this.fieldAggregators = [], 
+        this.beforeChangedRecordsMap = new Map, this.registedAggregators = {}, this.fieldAggregators = [], 
         this.registerAggregators(), this.dataSourceObj = dataSourceObj, this.dataConfig = dataConfig, 
         this._get = null == dataSourceObj ? void 0 : dataSourceObj.get, this.columns = columns, 
         this._source = (null == dataSourceObj ? void 0 : dataSourceObj.records) ? this.processRecords(null == dataSourceObj ? void 0 : dataSourceObj.records) : dataSourceObj, 
@@ -99,6 +99,20 @@ export class DataSource extends EventTarget {
             } else !0 === nodeData.children && !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.collapse);
         }
     }
+    supplementConfig(pagination, columns, rowHierarchyType, hierarchyExpandLevel) {
+        var _a;
+        this.columns = columns, 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,
+            perPageCount: this._sourceLength,
+            currentPage: 0
+        }, hierarchyExpandLevel >= 1 && (this.hierarchyExpandLevel = hierarchyExpandLevel), 
+        this.currentIndexedData = Array.from({
+            length: this._sourceLength
+        }, ((_, i) => i)), "tree" === rowHierarchyType && this.initTreeHierarchyState(), 
+        this.rowHierarchyType = rowHierarchyType, this.updatePagerData();
+    }
     registerAggregator(type, aggregator) {
         this.registedAggregators[type] = aggregator;
     }
@@ -200,6 +214,9 @@ export class DataSource extends 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!");
     }
+    getRecordIndexPaths(bodyShowIndex) {
+        return this._currentPagerIndexedData[bodyShowIndex];
+    }
     get records() {
         return Array.isArray(this._source) ? this._source : [];
     }
@@ -230,7 +247,11 @@ export class DataSource extends EventTarget {
     getHierarchyState(index) {
         var _a;
         const record = this.getOriginalRecord(this.currentPagerIndexedData[index]);
-        return null !== (_a = null == record ? void 0 : record.hierarchyState) && void 0 !== _a ? _a : null;
+        if (null == record ? void 0 : record.hierarchyState) {
+            const hierarchyState = record.hierarchyState;
+            if ((null === (_a = record.children) || void 0 === _a ? void 0 : _a.length) > 0 || !0 === record.children) return hierarchyState;
+        }
+        return null;
     }
     toggleHierarchyState(index, bodyStartIndex, bodyEndIndex) {
         const oldIndexedData = this.currentIndexedData.slice(0), indexed = this.getIndexKey(index), state = this.getHierarchyState(index), data = this.getOriginalRecord(indexed);
@@ -292,12 +313,8 @@ export class DataSource extends EventTarget {
         var _a;
         if (null !== field && index >= 0) {
             const dataIndex = this.getIndexKey(index);
-            if (!this.beforeChangedRecordsMap[dataIndex]) {
-                const originRecord = this.getOriginalRecord(dataIndex);
-                this.beforeChangedRecordsMap[dataIndex] = null !== (_a = cloneDeep(originRecord, void 0, [ "vtable_gantt_linkedFrom", "vtable_gantt_linkedTo" ])) && void 0 !== _a ? _a : {};
-            }
-            if ("string" == typeof field || "number" == typeof field) {
-                const beforeChangedValue = this.beforeChangedRecordsMap[dataIndex][field], record = this.getOriginalRecord(dataIndex);
+            if (this.cacheBeforeChangedRecord(dataIndex, table), "string" == typeof field || "number" == typeof field) {
+                const beforeChangedValue = null === (_a = this.beforeChangedRecordsMap.get(dataIndex.toString())) || void 0 === _a ? void 0 : _a[field], record = this.getOriginalRecord(dataIndex);
                 let formatValue = value;
                 "number" == typeof beforeChangedValue && isAllDigits(value) && (formatValue = parseFloat(value)), 
                 isPromise(record) ? record.then((record => {
@@ -307,6 +324,13 @@ export class DataSource extends EventTarget {
             }
         }
     }
+    cacheBeforeChangedRecord(dataIndex, table) {
+        var _a;
+        if (!this.beforeChangedRecordsMap.has(dataIndex.toString())) {
+            const originRecord = this.getOriginalRecord(dataIndex);
+            this.beforeChangedRecordsMap.set(dataIndex.toString(), null !== (_a = cloneDeep(originRecord, void 0, [ "vtable_gantt_linkedFrom", "vtable_gantt_linkedTo" ])) && void 0 !== _a ? _a : {});
+        }
+    }
     setRecord(record, index) {
         var _a, _b;
         let isAdd = !0;
@@ -350,14 +374,14 @@ export class DataSource extends EventTarget {
         }
     }
     addRecordForSorted(record) {
-        Array.isArray(this.records) && (this.beforeChangedRecordsMap = [], this.records.push(record), 
+        Array.isArray(this.records) && (this.beforeChangedRecordsMap.clear(), 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));
     }
     addRecordsForSorted(recordArr) {
         if (Array.isArray(this.records)) {
-            if (this.beforeChangedRecordsMap = [], Array.isArray(recordArr)) {
+            if (this.beforeChangedRecordsMap.clear(), 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();
@@ -365,10 +389,10 @@ export class DataSource extends EventTarget {
             this.userPagination || (this.pagination.perPageCount = this._sourceLength, this.pagination.totalCount = this._sourceLength);
         }
     }
-    adjustBeforeChangedRecordsMap(insertIndex, insertCount) {
-        for (let key = this.beforeChangedRecordsMap.length - 1; key >= insertIndex; key--) {
-            const record = this.beforeChangedRecordsMap[key];
-            delete this.beforeChangedRecordsMap[key], this.beforeChangedRecordsMap[key + insertCount] = record;
+    adjustBeforeChangedRecordsMap(insertIndex, insertCount, type = "add") {
+        for (let key = this.beforeChangedRecordsMap.size - 1; key >= insertIndex; key--) {
+            const record = this.beforeChangedRecordsMap.get(key.toString());
+            this.beforeChangedRecordsMap.delete(key.toString()), this.beforeChangedRecordsMap.set((key + ("add" === type ? insertCount : -insertCount)).toString(), record);
         }
     }
     deleteRecords(recordIndexs) {
@@ -378,7 +402,7 @@ export class DataSource extends EventTarget {
             for (let index = 0; index < recordIndexsMaxToMin.length; index++) {
                 const recordIndex = recordIndexsMaxToMin[index];
                 if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
-                delete this.beforeChangedRecordsMap[recordIndex], realDeletedRecordIndexs.push(recordIndex);
+                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;
@@ -396,22 +420,21 @@ export class DataSource extends EventTarget {
                 const recordIndex = recordIndexsMaxToMin[index];
                 if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
                 const rawIndex = this.currentIndexedData[recordIndex];
-                delete this.beforeChangedRecordsMap[rawIndex], this.records.splice(rawIndex, 1), 
-                this._sourceLength -= 1;
+                this.records.splice(rawIndex, 1), this._sourceLength -= 1;
             }
             this.sortedIndexMap.clear(), this.userPagination || (this.pagination.perPageCount = this._sourceLength, 
-            this.pagination.totalCount = this._sourceLength);
+            this.pagination.totalCount = this._sourceLength), this.beforeChangedRecordsMap.clear();
         }
     }
     updateRecords(records, recordIndexs) {
         const realDeletedRecordIndexs = [];
         for (let index = 0; index < recordIndexs.length; index++) {
             const recordIndex = recordIndexs[index];
-            if (Array.isArray(recordIndex)) delete this.beforeChangedRecordsMap[recordIndex.join(",")], 
+            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;
-                delete this.beforeChangedRecordsMap[recordIndex], realDeletedRecordIndexs.push(recordIndex);
+                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];
             }
@@ -425,7 +448,7 @@ export class DataSource extends EventTarget {
             if (recordIndex >= this._sourceLength || recordIndex < 0) continue;
             const rawIndex = this.currentIndexedData[recordIndex];
             if ("number" != typeof rawIndex) return;
-            delete this.beforeChangedRecordsMap[rawIndex], realDeletedRecordIndexs.push(recordIndex), 
+            this.beforeChangedRecordsMap.delete(rawIndex.toString()), realDeletedRecordIndexs.push(recordIndex), 
             this.records[rawIndex] = records[index];
         }
         this.sortedIndexMap.clear();
@@ -477,7 +500,7 @@ export class DataSource extends EventTarget {
     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]);
+        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;
@@ -562,8 +585,8 @@ export class DataSource extends EventTarget {
         }));
     }
     getRawRecord(dataIndex) {
-        var _a;
-        if (null === (_a = this.beforeChangedRecordsMap) || void 0 === _a ? void 0 : _a[dataIndex]) return this.beforeChangedRecordsMap[dataIndex];
+        var _a, _b;
+        if (null === (_a = this.beforeChangedRecordsMap) || void 0 === _a ? void 0 : _a.has(dataIndex.toString())) return null === (_b = this.beforeChangedRecordsMap) || void 0 === _b ? void 0 : _b.get(dataIndex.toString());
         let data;
         return data = this.dataSourceObj.records ? Array.isArray(dataIndex) ? getValueFromDeepArray(this.records, dataIndex) : this.records[dataIndex] : this._get(dataIndex), 
         getValue(data, (val => {
@@ -590,7 +613,9 @@ export class DataSource extends EventTarget {
     }
     fieldPromiseCallBack(_index, _field, _value) {}
     recordPromiseCallBack(_index, _record) {}
-    isCanExchangeOrder(sourceIndex, targetIndex) {
+    canChangeOrder(sourceIndex, targetIndex) {
+        var _a;
+        if (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.canChangeOrder) return this.dataSourceObj.canChangeOrder(sourceIndex, targetIndex);
         if (this.hasHierarchyStateExpand) {
             let sourceIndexs = this.currentPagerIndexedData[sourceIndex], targetIndexs = this.currentPagerIndexedData[targetIndex];
             if (sourceIndexs = Array.isArray(sourceIndexs) ? [ ...sourceIndexs ] : [ sourceIndexs ], 
@@ -608,9 +633,9 @@ export class DataSource extends EventTarget {
         }
         return !0;
     }
-    reorderRecord(sourceIndex, targetIndex) {
-        var _a, _b;
-        if (!(null === (_a = this.lastSortStates) || void 0 === _a ? void 0 : _a.some((state => "asc" === state.order || "desc" === state.order))) && this.isCanExchangeOrder(sourceIndex, targetIndex)) if (this.hasHierarchyStateExpand) {
+    changeOrder(sourceIndex, targetIndex) {
+        var _a, _b, _c;
+        if (null === (_a = this.dataSourceObj) || void 0 === _a ? void 0 : _a.changeOrder) this.dataSourceObj.changeOrder(sourceIndex, targetIndex); else if (!(null === (_b = this.lastSortStates) || void 0 === _b ? void 0 : _b.some((state => "asc" === state.order || "desc" === state.order))) && this.canChangeOrder(sourceIndex, targetIndex)) if (this.hasHierarchyStateExpand) {
             let sourceI, targetI, sourceIndexs = this.currentPagerIndexedData[sourceIndex], targetIndexs = this.currentPagerIndexedData[targetIndex];
             if (sourceIndexs = Array.isArray(sourceIndexs) ? [ ...sourceIndexs ] : [ sourceIndexs ], 
             targetIndexs = Array.isArray(targetIndexs) ? [ ...targetIndexs ] : [ targetIndexs ], 
@@ -623,7 +648,7 @@ export class DataSource extends 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.filteredChildren ? parent.filteredChildren.splice(sourceI, 1) : parent.children.splice(sourceI, 1);
-                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(null !== (_b = parent.filteredChildren) && void 0 !== _b ? _b : parent.children, sourceIds);
+                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(null !== (_c = parent.filteredChildren) && void 0 !== _c ? _c : parent.children, sourceIds);
                 } else {
                     const sourceIds = this.records.splice(sourceI, 1);
                     sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(this.records, sourceIds);
@@ -674,7 +699,12 @@ export class DataSource extends EventTarget {
     }
 }
 
-function getValueFromDeepArray(array, index) {
+DataSource.EMPTY = new DataSource({
+    get() {},
+    length: 0
+});
+
+export function getValueFromDeepArray(array, index) {
     var _a;
     let result = array;
     for (let i = 0; i < index.length; i++) {
@@ -687,8 +717,16 @@ function getValueFromDeepArray(array, index) {
     return result;
 }
 
-//# sourceMappingURL=DataSource.js.map
-DataSource.EMPTY = new DataSource({
-    get() {},
-    length: 0
-});
+export function sortRecordIndexs(recordIndexs, sort) {
+    return recordIndexs.sort(((a, b) => {
+        var _a, _b;
+        isNumber(a) && (a = [ a ]), isNumber(b) && (b = [ b ]);
+        const length = Math.max(a.length, b.length);
+        for (let i = 0; i < length; i++) {
+            const aa = null !== (_a = a[i]) && void 0 !== _a ? _a : -1, bb = null !== (_b = b[i]) && void 0 !== _b ? _b : -1;
+            if (aa !== bb) return 1 === sort ? aa - bb : bb - aa;
+        }
+        return 0;
+    }));
+}
+//# sourceMappingURL=DataSource.js.map