ngx-axis-appforge 0.0.83 → 0.0.85

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

@@ -29,7 +29,7 @@ class TableFieldDisplayService {
             if (!this.fieldDisplayCache.has(field.field())) {
                 this.fieldDisplayCache.set(field.field(), new Map());
             }
-            if (!this.fieldDisplayCache.get(field.field()).has(row[field.field()])) {
+            if (row[field.field()] === undefined || !this.fieldDisplayCache.get(field.field()).has(row[field.field()])) {
                 const child = this.scope?.snapshotOptions(field.child(), { row, loopRow });
                 let text;
                 switch (child.component) {
@@ -61,6 +61,9 @@ class TableFieldDisplayService {
                         text = child.text;
                         break;
                 }
+                if (row[field.field()] === undefined) {
+                    return text;
+                }
                 this.fieldDisplayCache.get(field.field()).set(row[field.field()], text);
             }
             return this.fieldDisplayCache.get(field.field()).get(row[field.field()]);
@@ -117,6 +120,7 @@ class TableService {
     }
     ready = signal(false, ...(ngDevMode ? [{ debugName: "ready" }] : []));
     data;
+    customExportData;
     options;
     fields;
     getRow;
@@ -126,7 +130,13 @@ class TableService {
         fields.sort((a, b) => (a.groupLevel() ?? 0) - (b.groupLevel() ?? 0));
         return fields;
     }, ...(ngDevMode ? [{ debugName: "groupAbleFields" }] : []));
+    groupAbleFieldsForExport = computed(() => {
+        const fields = this.fields().filter(f => f.groupAble() && f.export?.());
+        fields.sort((a, b) => (a.groupLevel() ?? 0) - (b.groupLevel() ?? 0));
+        return fields;
+    }, ...(ngDevMode ? [{ debugName: "groupAbleFieldsForExport" }] : []));
     rowsGroupMap = computed(() => this.buildRowsGroupMap(), ...(ngDevMode ? [{ debugName: "rowsGroupMap" }] : []));
+    rowsGroupMapForExport = computed(() => this.buildRowsGroupMapForExport(), ...(ngDevMode ? [{ debugName: "rowsGroupMapForExport" }] : []));
     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" }] : []));
@@ -139,6 +149,7 @@ class TableService {
         return this.fields().filter(f => f.inuse());
     }, ...(ngDevMode ? [{ debugName: "displayFields" }] : []));
     fieldsControlsMap = signal({}, ...(ngDevMode ? [{ debugName: "fieldsControlsMap" }] : []));
+    tableDataForExport = computed(() => this.buildTableDataForExport(), ...(ngDevMode ? [{ debugName: "tableDataForExport" }] : []));
     tableData = signal([], ...(ngDevMode ? [{ debugName: "tableData" }] : []));
     fieldsFilterValueMap = new Map();
     filedsFilterItemsCache = new Map();
@@ -148,6 +159,7 @@ class TableService {
     pageCursorMarkIndexs = [];
     init(opts) {
         this.data = opts.data;
+        this.customExportData = opts.customExportData;
         this.options = opts.options;
         this.fields = opts.fields;
         this.getRow = opts.getRow;
@@ -155,6 +167,58 @@ class TableService {
         this.ready.set(true);
         this.refreshTableData();
     }
+    buildTableDataForExport() {
+        const data = [...(this.customExportData?.() ?? this.tableData())];
+        const sortFields = this.fields().filter(f => f.export?.() && this.fieldSortAble(f) && f.sortOrder() != null);
+        if (sortFields.length) {
+            sortFields.sort((a, b) => {
+                let ap = this.fieldSortPriority(a, this.groupAbleFieldsForExport());
+                let bp = this.fieldSortPriority(b, this.groupAbleFieldsForExport());
+                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) {
+                    let sortFn = this.fieldsControlsMap()[f.field()]?.sortFn;
+                    if (typeof sortFn != "function") {
+                        sortFn = (a, b) => {
+                            const va = a[f.field()];
+                            const vb = b[f.field()];
+                            const ta = typeof va;
+                            const tb = typeof vb;
+                            if (ta == tb) {
+                                if (ta == "number") {
+                                    return va - vb;
+                                }
+                                else {
+                                    return va.localeCompare(vb);
+                                }
+                            }
+                            else if (ta == "number") {
+                                return -1;
+                            }
+                        };
+                    }
+                    const res = sortFn(a, b);
+                    if (res != 0) {
+                        return res * (f.sortOrder() == "descend" ? -1 : 1);
+                    }
+                }
+                return 0;
+            });
+        }
+        return data;
+    }
     refreshTableData() {
         let data = [...(this.rows() ?? [])];
         if (!this.useBackEndPaging()) {
@@ -210,13 +274,20 @@ class TableService {
         this.tableData.set(data);
     }
     buildRowsGroupMap() {
+        return this._buildRowsGroupMap(this.tableData(), this.useBackEndPaging());
+    }
+    buildRowsGroupMapForExport() {
+        return this._buildRowsGroupMap(this.tableDataForExport(), false, this.groupAbleFieldsForExport());
+    }
+    _buildRowsGroupMap(data, useBackEndPaging = false, groupAbleFields) {
         const rowsGroupMap = new Map();
-        if (!this.useBackEndPaging()) {
-            if (this.groupAbleFields().length > 0) {
-                for (let i = 0; i < this.tableData().length; i++) {
+        groupAbleFields ??= this.groupAbleFields();
+        if (!useBackEndPaging) {
+            if (groupAbleFields.length > 0) {
+                for (let i = 0; i < data.length; i++) {
                     let valuePerfix = "";
-                    const row = this.tableData()[i];
-                    for (const field of this.groupAbleFields()) {
+                    const row = data[i];
+                    for (const field of groupAbleFields) {
                         if (!rowsGroupMap.has(field.field())) {
                             rowsGroupMap.set(field.field(), new Map());
                         }
@@ -234,11 +305,13 @@ class TableService {
                 }
             }
         }
-        for (let group of rowsGroupMap.values()) {
-            for (let [value, indexes] of group) {
-                if (indexes.length == 1) {
-                    group.delete(value);
+        else {
+            for (const field in data.group_result ?? {}) {
+                const groups = new Map();
+                for (const value in data.group_result[field]) {
+                    groups.set(value, data.group_result[field][value]);
                 }
+                rowsGroupMap.set(field, groups);
             }
         }
         return rowsGroupMap;
@@ -249,14 +322,15 @@ class TableService {
     fieldSortDirections(f) {
         return f.groupAble() ? ['ascend', 'descend'] : ['ascend', 'descend', null];
     }
-    fieldSortPriority(f) {
+    fieldSortPriority(f, groupAbleFields) {
         if (f.groupAble()) {
-            return (f.groupLevel() ?? 0);
+            return (f.groupLevel() ?? 0) * -1;
         }
+        groupAbleFields ??= this.groupAbleFields();
         if (f.sortAble()) {
             let p = 0;
-            if (this.groupAbleFields().length) {
-                p = this.groupAbleFields()[this.groupAbleFields().length - 1].groupLevel() ?? 0;
+            if (groupAbleFields.length) {
+                p = groupAbleFields[groupAbleFields.length - 1].groupLevel() ?? 0;
                 p *= -1;
             }
             return (p - 1 + (f.sortPriority() ?? 0));
@@ -266,6 +340,9 @@ class TableService {
     getGroupValue(row) {
         return row[this.groupAbleFields()[0].field()];
     }
+    getGroupValueForExport(row) {
+        return row[this.groupAbleFieldsForExport()[0].field()];
+    }
     isGroupEnd(index, row) {
         const topGroupField = this.groupAbleFields()[0];
         if (!topGroupField) {
@@ -277,6 +354,17 @@ class TableService {
         }
         return false;
     }
+    isGroupEndForExport(index, row) {
+        const topGroupField = this.groupAbleFieldsForExport()[0];
+        if (!topGroupField) {
+            return false;
+        }
+        const indexs = this.rowsGroupMapForExport().get(topGroupField.field())?.get(row[topGroupField.field()]?.toString());
+        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("@");
@@ -462,13 +550,16 @@ class TableService {
         this.pageCursorMarks.clear();
     }
     get backEndPageParams() {
+        const sortFields = this.displayFields().filter(f => this.fieldSortAble(f) && f.sortOrder() != null);
+        sortFields.sort((a, b) => this.fieldSortPriority(b) - this.fieldSortPriority(a));
         return {
             use_page: true,
             page_index: this.pageIndex() - 1,
             page_size: this.options.pageSize(),
             query_total: !this.hasTotal,
             cursor_mark: this.getNearestCursorMark(),
-            order_by: this.displayFields().filter(f => f.sortAble() && f.sortOrder() != null).map(f => ({
+            group_fields: this.groupAbleFields().map(f => f.field()),
+            order_by: sortFields.map(f => ({
                 column: f.field(),
                 desc_order: f.sortOrder() == "descend"
             }))
@@ -759,9 +850,12 @@ class StatisticService {
     fields;
     getRow;
     tableSvc;
+    useBackEndPaging = computed(() => this.options.showPagination() && this.options.useBackEndPaging(), ...(ngDevMode ? [{ debugName: "useBackEndPaging" }] : []));
     hasStatistic = false;
     statisticMap = computed(() => this.buildStatisticMap(), ...(ngDevMode ? [{ debugName: "statisticMap" }] : []));
+    statisticMapForExport = computed(() => this.buildStatisticMapForExport(), ...(ngDevMode ? [{ debugName: "statisticMapForExport" }] : []));
     statisticGroupMap = computed(() => this.buildStatisticGroupMap(), ...(ngDevMode ? [{ debugName: "statisticGroupMap" }] : []));
+    statisticGroupMapForExport = computed(() => this.buildStatisticGroupMapForExport(), ...(ngDevMode ? [{ debugName: "statisticGroupMapForExport" }] : []));
     init(opts) {
         this.options = opts.options;
         this.data = opts.data;
@@ -771,36 +865,62 @@ class StatisticService {
         this.ready.set(true);
     }
     buildStatisticMap() {
+        return this._buildStatisticMap(this.data());
+    }
+    buildStatisticMapForExport() {
+        return this._buildStatisticMap(this.tableSvc?.customExportData?.() ?? this.data());
+    }
+    _buildStatisticMap(data) {
         if (!this.ready()) {
             return {};
         }
         let res = {};
-        if (this.options.showStatistic() && this.data()) {
-            if (this.options.showPagination() && this.options.useBackEndPaging()) {
-                res = this.data().statistic_result;
+        if (this.options.showStatistic() && data) {
+            if (this.useBackEndPaging()) {
+                res = data.statistic_result;
             }
             else {
-                res = this.statisticCompute(this.data() ?? []);
+                res = this.statisticCompute(data);
             }
         }
-        return res;
+        return res ?? {};
     }
     buildStatisticGroupMap() {
+        if (!this.ready() || !this.tableSvc) {
+            return {};
+        }
+        return this._buildStatisticGroupMap(this.tableSvc.tableData(), this.useBackEndPaging());
+    }
+    buildStatisticGroupMapForExport() {
+        if (!this.ready() || !this.tableSvc) {
+            return {};
+        }
+        return this._buildStatisticGroupMap(this.tableSvc.tableDataForExport(), false, this.tableSvc.groupAbleFieldsForExport(), this.tableSvc.rowsGroupMapForExport());
+    }
+    _buildStatisticGroupMap(data, useBackEndPaging = false, groupAbleFields, rowsGroupMap) {
         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;
+        if (useBackEndPaging) {
+            if (data?.query_statistic_group) {
+                res = data.statistic_group_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]));
+        }
+        else {
+            groupAbleFields ??= this.tableSvc.groupAbleFields();
+            const groupField = groupAbleFields[0];
+            if (this.options.showStatistic() && groupField) {
+                if (useBackEndPaging) {
+                    res = data.statistic_result;
+                }
+                else {
+                    rowsGroupMap ??= this.tableSvc.rowsGroupMap();
+                    const group = rowsGroupMap.get(groupField.field());
+                    if (group) {
+                        for (const [value, indexs] of group) {
+                            res[value] = this.statisticCompute(indexs.map(index => data[index]));
+                        }
                     }
                 }
             }