ngx-axis-appforge 0.0.80 → 0.0.82

package/fesm2022/ngx-axis-appforge-axis-components-table-helper.mjs

@@ -24,13 +24,13 @@ class TableFieldDisplayService {
             this.fieldDisplayCache.delete(field);
         }
     }
-    getFieldDisplayText(field, row) {
+    getFieldDisplayText(field, row, loopRow) {
         if (["axis-components/text", "axis-components/badge"].includes(field.child()?.component)) {
             if (!this.fieldDisplayCache.has(field.field())) {
                 this.fieldDisplayCache.set(field.field(), new Map());
             }
             if (!this.fieldDisplayCache.get(field.field()).has(row[field.field()])) {
-                const child = this.scope?.snapshotOptions(field.child(), { row });
+                const child = this.scope?.snapshotOptions(field.child(), { row, loopRow });
                 let text;
                 switch (child.component) {
                     case "axis-components/text":
@@ -86,10 +86,10 @@ class TableFieldDisplayService {
         }
         return options.data;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TableFieldDisplayService, deps: [{ token: i1.DatePipe }, { token: i1.DecimalPipe }, { token: i1.PercentPipe }, { token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TableFieldDisplayService });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TableFieldDisplayService, deps: [{ token: i1.DatePipe }, { token: i1.DecimalPipe }, { token: i1.PercentPipe }, { token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TableFieldDisplayService });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TableFieldDisplayService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TableFieldDisplayService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.DatePipe }, { type: i1.DecimalPipe }, { type: i1.PercentPipe }, { type: i1$1.ScopeDirective, decorators: [{
                     type: Optional
@@ -121,6 +121,12 @@ class TableService {
     fields;
     getRow;
     cacheFilterItem;
+    groupAbleFields = computed(() => {
+        const fields = this.fields().filter(f => f.groupAble());
+        fields.sort((a, b) => (a.groupLevel() ?? 0) - (b.groupLevel() ?? 0));
+        return fields;
+    }, ...(ngDevMode ? [{ debugName: "groupAbleFields" }] : []));
+    rowsGroupMap = computed(() => this.buildRowsGroupMap(), ...(ngDevMode ? [{ debugName: "rowsGroupMap" }] : []));
     useBackEndPaging = computed(() => this.options.showPagination() && this.options.useBackEndPaging(), ...(ngDevMode ? [{ debugName: "useBackEndPaging" }] : []));
     rows = computed(() => this.useBackEndPaging() ? this.data()?.rows : this.data(), ...(ngDevMode ? [{ debugName: "rows" }] : []));
     pageIndex = signal(1, ...(ngDevMode ? [{ debugName: "pageIndex" }] : []));
@@ -133,6 +139,8 @@ class TableService {
         return this.fields().filter(f => f.inuse());
     }, ...(ngDevMode ? [{ debugName: "displayFields" }] : []));
     fieldsControlsMap = signal({}, ...(ngDevMode ? [{ debugName: "fieldsControlsMap" }] : []));
+    tableData = signal([], ...(ngDevMode ? [{ debugName: "tableData" }] : []));
+    fieldsFilterValueMap = new Map();
     filedsFilterItemsCache = new Map();
     leaderFieldWidth = computed(() => this.buildLeaderFieldWidth(), ...(ngDevMode ? [{ debugName: "leaderFieldWidth" }] : []));
     pageSizeOptions = computed(() => this.options.pageSizeOptions().split(",").map(size => +size), ...(ngDevMode ? [{ debugName: "pageSizeOptions" }] : []));
@@ -145,6 +153,147 @@ class TableService {
         this.getRow = opts.getRow;
         this.cacheFilterItem = opts.cacheFilterItem ?? true;
         this.ready.set(true);
+        this.refreshTableData();
+    }
+    refreshTableData() {
+        let data = [...(this.rows() ?? [])];
+        if (!this.useBackEndPaging()) {
+            if (this.fieldsFilterValueMap.size) {
+                data = data.filter(row => {
+                    for (const [field, filterValue] of this.fieldsFilterValueMap.entries()) {
+                        if (Array.isArray(filterValue)) {
+                            if (!filterValue.includes(row[field])) {
+                                return false;
+                            }
+                        }
+                        else {
+                            if (row[field] != filterValue) {
+                                return false;
+                            }
+                        }
+                    }
+                    return true;
+                });
+            }
+        }
+        const sortFields = this.fields().filter(f => this.fieldSortAble(f) && f.sortOrder() != null);
+        if (sortFields.length) {
+            sortFields.sort((a, b) => {
+                let ap = this.fieldSortPriority(a);
+                let bp = this.fieldSortPriority(b);
+                if (ap === bp) {
+                    return 0;
+                }
+                if (ap === false) {
+                    return 1;
+                }
+                else if (bp === false) {
+                    return -1;
+                }
+                else {
+                    return bp - ap;
+                }
+            });
+            data.sort((a, b) => {
+                for (const f of sortFields) {
+                    const res = this.fieldsControlsMap()[f.field()]?.sortFn(a, b);
+                    if (res != 0) {
+                        return res * (f.sortOrder() == "descend" ? -1 : 1);
+                    }
+                }
+                return 0;
+            });
+        }
+        this.tableData.set(data);
+    }
+    buildRowsGroupMap() {
+        const rowsGroupMap = new Map();
+        if (!this.useBackEndPaging()) {
+            if (this.groupAbleFields().length > 0) {
+                for (let i = 0; i < this.tableData().length; i++) {
+                    let valuePerfix = "";
+                    const row = this.tableData()[i];
+                    for (const field of this.groupAbleFields()) {
+                        if (!rowsGroupMap.has(field.field())) {
+                            rowsGroupMap.set(field.field(), new Map());
+                        }
+                        const groups = rowsGroupMap.get(field.field());
+                        const value = valuePerfix + row[field.field()];
+                        const newGroup = !groups.has(value);
+                        if (newGroup) {
+                            groups.set(value, [i]);
+                        }
+                        else {
+                            groups.get(value).push(i);
+                        }
+                        valuePerfix += value + "@";
+                    }
+                }
+            }
+        }
+        for (let group of rowsGroupMap.values()) {
+            for (let [value, indexes] of group) {
+                if (indexes.length == 1) {
+                    group.delete(value);
+                }
+            }
+        }
+        return rowsGroupMap;
+    }
+    fieldSortAble(f) {
+        return f.sortAble() || f.groupAble();
+    }
+    fieldSortDirections(f) {
+        return f.groupAble() ? ['ascend', 'descend'] : ['ascend', 'descend', null];
+    }
+    fieldSortPriority(f) {
+        if (f.groupAble()) {
+            return (f.groupLevel() ?? 0);
+        }
+        if (f.sortAble()) {
+            let p = 0;
+            if (this.groupAbleFields().length) {
+                p = this.groupAbleFields()[this.groupAbleFields().length - 1].groupLevel() ?? 0;
+                p *= -1;
+            }
+            return (p - 1 + (f.sortPriority() ?? 0));
+        }
+        return false;
+    }
+    getGroupValue(row) {
+        return row[this.groupAbleFields()[0].field()];
+    }
+    isGroupEnd(index, row) {
+        const topGroupField = this.groupAbleFields()[0];
+        if (!topGroupField) {
+            return false;
+        }
+        const indexs = this.rowsGroupMap().get(topGroupField.field())?.get(row[topGroupField.field()]);
+        if (indexs) {
+            return indexs[indexs.length - 1] == index;
+        }
+        return false;
+    }
+    rowspan(f, index, pageIndex, pageSize, row) {
+        if (f.groupAble()) {
+            const value = this.groupAbleFields().slice(0, this.groupAbleFields().findIndex(f => f.field() == f.field()) + 1).map(f => row[f.field()]).join("@");
+            const indexs = this.rowsGroupMap().get(f.field())?.get(value);
+            if (indexs) {
+                const i = indexs.indexOf(index + (pageIndex - 1) * pageSize);
+                if (i != -1) {
+                    if (i == 0) {
+                        return indexs.length;
+                    }
+                    else if (index == 0) {
+                        return indexs.length - i;
+                    }
+                    else {
+                        return 0;
+                    }
+                }
+            }
+        }
+        return 1;
     }
     refreshFieldControls(f) {
         if (!this.cacheFilterItem) {
@@ -189,7 +338,7 @@ class TableService {
                     }
                 };
             }
-            if (field.sortAble()) {
+            if (this.fieldSortAble(field)) {
                 if (this.useBackEndPaging()) {
                     res[field.field()].sortFn = true;
                 }
@@ -225,10 +374,21 @@ class TableService {
             this.fieldsControlsMap.set(res);
         }
     }
+    sortChange() {
+        this.clearCursorMarks();
+        this.refreshTableData();
+    }
     filterChange(field, value) {
         for (const item of this.filedsFilterItemsCache.get(field).values()) {
             item.byDefault = value != null && (Array.isArray(value) ? value.includes(item.value) : item.value == value);
         }
+        if (value == null || Array.isArray(value) && value.length == 0) {
+            this.fieldsFilterValueMap.delete(field);
+        }
+        else {
+            this.fieldsFilterValueMap.set(field, value);
+        }
+        this.refreshTableData();
     }
     buildLeaderFieldWidth() {
         if (!this.ready()) {
@@ -311,10 +471,10 @@ class TableService {
             }))
         };
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TableService, deps: [{ token: TableFieldDisplayService }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TableService });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TableService, deps: [{ token: TableFieldDisplayService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TableService });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: TableService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: TableService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: TableFieldDisplayService }] });
 
@@ -504,10 +664,10 @@ class SelectService {
         this.subs = [];
         this.subSelects.clear();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: SelectService, deps: [{ token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: SelectService });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SelectService, deps: [{ token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SelectService });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: SelectService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: SelectService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1$1.ScopeDirective, decorators: [{
                     type: Optional
@@ -576,10 +736,10 @@ class ExpandService {
         }
         return res;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: ExpandService, deps: [{ token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: ExpandService });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: ExpandService, deps: [{ token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: ExpandService });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: ExpandService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: ExpandService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1$1.ScopeDirective, decorators: [{
                     type: Optional
@@ -595,13 +755,16 @@ class StatisticService {
     data;
     fields;
     getRow;
+    tableSvc;
     hasStatistic = false;
     statisticMap = computed(() => this.buildStatisticMap(), ...(ngDevMode ? [{ debugName: "statisticMap" }] : []));
+    statisticGroupMap = computed(() => this.buildStatisticGroupMap(), ...(ngDevMode ? [{ debugName: "statisticGroupMap" }] : []));
     init(opts) {
         this.options = opts.options;
         this.data = opts.data;
         this.fields = opts.fields;
         this.getRow = opts.getRow;
+        this.tableSvc = opts.tableSvc;
         this.ready.set(true);
     }
     buildStatisticMap() {
@@ -614,38 +777,65 @@ class StatisticService {
                 res = this.data().statistic_result;
             }
             else {
-                for (const f of this.fields().filter(r => r.statisticAble())) {
-                    let num;
-                    for (let i = 0; i < (this.data() ?? []).length; i++) {
-                        let row = this.data()[i];
-                        if (this.getRow) {
-                            row = this.getRow(row);
-                        }
-                        if (f.statisticType() == "sum" || f.statisticType() == "average") {
-                            num = (num ?? 0) + row[f.field()];
-                        }
-                        else if (f.statisticType() == "max") {
-                            num = Math.max(num ?? Number.MIN_SAFE_INTEGER, row[f.field()]);
-                        }
-                        else if (f.statisticType() == "min") {
-                            num = Math.min(num ?? Number.MAX_SAFE_INTEGER, row[f.field()]);
-                        }
-                        else if (f.statisticType() == "custom" && f.statisticFn()) {
-                            num = this.scope?.runFnWithSnapshot(f.statisticFn(), { result: num, index: i, row: row, value: row[f.field()] });
-                        }
-                    }
-                    if (f.statisticType() == "average" && this.data().length > 0) {
-                        num = (num ?? 0) / this.data().length;
-                    }
-                    if (f.statisticType() == "sum" && this.data().length == 0) {
-                        num = 0;
+                res = this.statisticCompute(this.data() ?? []);
+            }
+        }
+        return res;
+    }
+    buildStatisticGroupMap() {
+        if (!this.ready() || !this.tableSvc) {
+            return {};
+        }
+        let res = {};
+        const groupField = this.tableSvc.groupAbleFields()[0];
+        if (this.options.showStatistic() && groupField) {
+            if (this.options.showPagination() && this.options.useBackEndPaging()) {
+                res = this.data().statistic_result;
+            }
+            else {
+                this.tableSvc.tableData();
+                const group = this.tableSvc.rowsGroupMap().get(groupField.field());
+                if (group) {
+                    for (const [value, indexs] of group) {
+                        res[value] = this.statisticCompute(indexs.map(index => this.tableSvc?.tableData()[index]));
                     }
-                    res[f.field()] = num;
                 }
             }
         }
         return res;
     }
+    statisticCompute(data) {
+        const res = {};
+        for (const f of this.fields().filter(r => r.statisticAble())) {
+            let num;
+            for (let i = 0; i < data.length; i++) {
+                let row = data[i];
+                if (this.getRow) {
+                    row = this.getRow(row);
+                }
+                if (f.statisticType() == "sum" || f.statisticType() == "average") {
+                    num = (num ?? 0) + row[f.field()];
+                }
+                else if (f.statisticType() == "max") {
+                    num = Math.max(num ?? Number.MIN_SAFE_INTEGER, row[f.field()]);
+                }
+                else if (f.statisticType() == "min") {
+                    num = Math.min(num ?? Number.MAX_SAFE_INTEGER, row[f.field()]);
+                }
+                else if (f.statisticType() == "custom" && f.statisticFn()) {
+                    num = this.scope?.runFnWithSnapshot(f.statisticFn(), { result: num, index: i, row: row, value: row[f.field()] });
+                }
+            }
+            if (f.statisticType() == "average" && data.length > 0) {
+                num = (num ?? 0) / data.length;
+            }
+            if (f.statisticType() == "sum" && data.length == 0) {
+                num = 0;
+            }
+            res[f.field()] = num;
+        }
+        return res;
+    }
     get backEndPageParams() {
         const res = {
             query_statistic: !this.hasStatistic && this.options.showStatistic() && this.options.showPagination() && this.options.useBackEndPaging()
@@ -658,10 +848,10 @@ class StatisticService {
         }
         return res;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: StatisticService, deps: [{ token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: StatisticService });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StatisticService, deps: [{ token: i1$1.ScopeDirective, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StatisticService });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.4", ngImport: i0, type: StatisticService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: StatisticService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1$1.ScopeDirective, decorators: [{
                     type: Optional