@etsoo/smarterp-core 1.1.68 → 1.1.70

package/__tests__/CoreUtils.ts

@@ -1,4 +1,46 @@
-import { CoreUtils } from "../src";
+import { CoreUtils, PeriodReportData } from "../src";
+import { TestApp } from "./app/TestApp";
+
+const app = new TestApp();
+
+test("Test for transformReportData", () => {
+  const source: PeriodReportData[] = [
+    {
+      period: 202601,
+      value: 236
+    },
+    {
+      period: 202602,
+      value: 99
+    },
+    {
+      period: 202603,
+      value: 120
+    },
+    {
+      period: 202604,
+      value: 199
+    },
+    {
+      period: 202605,
+      value: 230
+    },
+    {
+      period: 202606,
+      value: 3
+    },
+    {
+      period: 202505,
+      value: 215
+    }
+  ];
+
+  const result = CoreUtils.transformReportData(app, source, true, 2026);
+
+  expect(result.labels.length).toBe(12);
+  expect(result.currentYearData[5]).toBe(3);
+  expect(result.lastYearData[4]).toBe(215);
+});
 
 test("Test for validateJson with string schema", async () => {
   const schema =

package/__tests__/OrgApi.ts

@@ -3,51 +3,10 @@ import { isLocalTest, TestApp } from "./app/TestApp";
 import { EntityStatus } from "@etsoo/appscript";
 import { OrgApi } from "../src/OrgApi";
 import { OrgCreateRQ } from "../src/rq/org/OrgCreateRQ";
-import { CoreApp, PeriodReportData } from "../src";
 
 const app = new TestApp();
 await app.changeCulture(app.settings.cultures[0]);
 
-test("Test SysResourceKeyPrefix", () => {
-  const source: PeriodReportData[] = [
-    {
-      period: 202601,
-      value: 236
-    },
-    {
-      period: 202602,
-      value: 99
-    },
-    {
-      period: 202603,
-      value: 120
-    },
-    {
-      period: 202604,
-      value: 199
-    },
-    {
-      period: 202605,
-      value: 230
-    },
-    {
-      period: 202606,
-      value: 3
-    },
-    {
-      period: 202505,
-      value: 215
-    }
-  ];
-
-  const core = new CoreApp(app, app.api);
-  const result = core.transformReportData(source, true, 2026);
-
-  expect(result.labels.length).toBe(12);
-  expect(result.currentYearData[5]).toBe(3);
-  expect(result.lastYearData[4]).toBe(215);
-});
-
 test("Test SysResourceKeyPrefix", () => {
   expect(OrgApi.SysResourceKeyPrefix).toBe("etsoo");
 });

package/lib/cjs/CoreApp.d.ts

@@ -11,7 +11,6 @@ import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
 import { ReportApi } from "./ReportApi";
-import { PeriodReportData } from "./dto/report/PeriodReportData";
 type AppData = {
     id: number;
     appId?: number;
@@ -129,27 +128,6 @@ export interface ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
-    /**
-     * Get report data
-     * 获取报告数据
-     * @param data Input data
-     * @param year Year to calculate
-     * @returns Result
-     */
-    getReportData(data: PeriodReportData[], year: number): number[];
-    /**
-     * Transform report data for chart
-     * 转换报告数据用于图表
-     * @param data Input data
-     * @param hasLastYear Has last year data
-     * @param year Year to calculate, default is current year
-     * @returns Transformed report data
-     */
-    transformReportData(data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
-        labels: string[];
-        currentYearData: number[];
-        lastYearData: number[];
-    };
 }
 /**
  * Core application
@@ -289,26 +267,5 @@ export declare class CoreApp implements ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
-    /**
-     * Get report data
-     * 获取报告数据
-     * @param data Input data
-     * @param year Year to calculate
-     * @returns Result
-     */
-    getReportData(data: PeriodReportData[], year: number): number[];
-    /**
-     * Transform report data for chart
-     * 转换报告数据用于图表
-     * @param data Input data
-     * @param hasLastYear Has last year data
-     * @param year Year to calculate, default is current year
-     * @returns Transformed report data
-     */
-    transformReportData(data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
-        labels: string[];
-        currentYearData: number[];
-        lastYearData: number[];
-    };
 }
 export {};

package/lib/cjs/CoreApp.js

@@ -229,39 +229,5 @@ class CoreApp {
                 return id;
         });
     }
-    /**
-     * Get report data
-     * 获取报告数据
-     * @param data Input data
-     * @param year Year to calculate
-     * @returns Result
-     */
-    getReportData(data, year) {
-        const [start, end] = shared_1.NumberUtils.getMonthPeriodRange(year);
-        const items = [];
-        for (let i = start; i <= end; i++) {
-            const item = data.find((d) => d.period === i);
-            items.push(item?.value ?? 0);
-        }
-        return items;
-    }
-    /**
-     * Transform report data for chart
-     * 转换报告数据用于图表
-     * @param data Input data
-     * @param hasLastYear Has last year data
-     * @param year Year to calculate, default is current year
-     * @returns Transformed report data
-     */
-    transformReportData(data, hasLastYear, year) {
-        year ??= new Date().getFullYear();
-        const months = appscript_1.BusinessUtils.getMonths(this.app.get("months") ?? []);
-        const labels = months.map((m) => m.label);
-        const currentYearData = this.getReportData(data, year);
-        const lastYearData = hasLastYear == null || hasLastYear
-            ? this.getReportData(data, year - 1)
-            : [];
-        return { labels, currentYearData, lastYearData };
-    }
 }
 exports.CoreApp = CoreApp;

package/lib/cjs/CoreUtils.d.ts

@@ -1,4 +1,7 @@
+import { DataTypes } from "@etsoo/shared";
 import type { ErrorObject } from "ajv";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
+import { IApp } from "@etsoo/appscript";
 /**
  * Core utilities
  */
@@ -10,6 +13,25 @@ export declare namespace CoreUtils {
      * @returns Styles
      */
     function avatarStyles(isOrg?: boolean): React.CSSProperties;
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @param selector Selector function or number field to extract value from data
+     * @returns Result
+     */
+    function getReportDataBase<D extends {
+        period: number;
+    }>(data: D[], year: number, selector: ((item: D | undefined | null) => number | undefined | null) | DataTypes.Keys<D, number | null | undefined>): number[];
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    function getReportData(data: PeriodReportData[], year: number): number[];
     /**
      * Merge an array with another array, starting from the end
      * 合并数组，从末尾开始
@@ -17,6 +39,37 @@ export declare namespace CoreUtils {
      * @param target Target array
      */
     function mergeArray(source: string[], target: string[]): void;
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param selector Selector function or number field to extract value from data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportDataBase<D extends {
+        period: number;
+    }>(app: IApp, data: D[], selector: ((item: D | undefined | null) => number | undefined | null) | DataTypes.Keys<D, number | null | undefined>, hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportData(app: IApp, data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
     /**
      * Validate JSON input against a schema
      * 验证 JSON 输入是否符合架构

package/lib/cjs/CoreUtils.js

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreUtils = void 0;
+const shared_1 = require("@etsoo/shared");
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
+const appscript_1 = require("@etsoo/appscript");
 /**
  * Core utilities
  */
@@ -24,6 +26,43 @@ var CoreUtils;
         };
     }
     CoreUtils.avatarStyles = avatarStyles;
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @param selector Selector function or number field to extract value from data
+     * @returns Result
+     */
+    function getReportDataBase(data, year, selector) {
+        const [start, end] = shared_1.NumberUtils.getMonthPeriodRange(year);
+        const items = [];
+        for (let i = start; i <= end; i++) {
+            const item = data.find((d) => d.period === i);
+            if (typeof selector === "function") {
+                items.push(selector(item) ?? 0);
+            }
+            else {
+                if (item == null)
+                    items.push(0);
+                else
+                    items.push(item[selector] ?? 0);
+            }
+        }
+        return items;
+    }
+    CoreUtils.getReportDataBase = getReportDataBase;
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    function getReportData(data, year) {
+        return getReportDataBase(data, year, "value");
+    }
+    CoreUtils.getReportData = getReportData;
     /**
      * Merge an array with another array, starting from the end
      * 合并数组，从末尾开始
@@ -38,6 +77,40 @@ var CoreUtils;
         }
     }
     CoreUtils.mergeArray = mergeArray;
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param selector Selector function or number field to extract value from data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportDataBase(app, data, selector, hasLastYear, year) {
+        year ??= new Date().getFullYear();
+        const months = appscript_1.BusinessUtils.getMonths(app.get("months") ?? []);
+        const labels = months.map((m) => m.label);
+        const currentYearData = getReportDataBase(data, year, selector);
+        const lastYearData = hasLastYear == null || hasLastYear
+            ? getReportDataBase(data, year - 1, selector)
+            : [];
+        return { labels, currentYearData, lastYearData };
+    }
+    CoreUtils.transformReportDataBase = transformReportDataBase;
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportData(app, data, hasLastYear, year) {
+        return transformReportDataBase(app, data, "value", hasLastYear, year);
+    }
+    CoreUtils.transformReportData = transformReportData;
     let ajv = null;
     /**
      * Validate JSON input against a schema

package/lib/cjs/i18n/en.json

@@ -81,6 +81,7 @@
     "owner": "Owner",
     "parameters": "Parameters",
     "parentOrg": "Parent org",
+    "period": "Period",
     "pin": "ID",
     "preferredName": "Preferred name",
     "queryKeyword": "Query keyword",

package/lib/cjs/i18n/zh-Hans.json

@@ -81,6 +81,7 @@
     "owner": "所有者",
     "parameters": "参数",
     "parentOrg": "上级机构",
+    "period": "期间",
     "pin": "身份证号码",
     "preferredName": "首选名称",
     "queryKeyword": "查询关键字",

package/lib/cjs/i18n/zh-Hant.json

@@ -81,6 +81,7 @@
     "owner": "所有者",
     "parameters": "參數",
     "parentOrg": "上級機構",
+    "period": "期間",
     "pin": "身份證號碼",
     "preferredName": "首選名稱",
     "queryKeyword": "查詢關鍵字",

package/lib/mjs/CoreApp.d.ts

@@ -11,7 +11,6 @@ import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
 import { ReportApi } from "./ReportApi";
-import { PeriodReportData } from "./dto/report/PeriodReportData";
 type AppData = {
     id: number;
     appId?: number;
@@ -129,27 +128,6 @@ export interface ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
-    /**
-     * Get report data
-     * 获取报告数据
-     * @param data Input data
-     * @param year Year to calculate
-     * @returns Result
-     */
-    getReportData(data: PeriodReportData[], year: number): number[];
-    /**
-     * Transform report data for chart
-     * 转换报告数据用于图表
-     * @param data Input data
-     * @param hasLastYear Has last year data
-     * @param year Year to calculate, default is current year
-     * @returns Transformed report data
-     */
-    transformReportData(data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
-        labels: string[];
-        currentYearData: number[];
-        lastYearData: number[];
-    };
 }
 /**
  * Core application
@@ -289,26 +267,5 @@ export declare class CoreApp implements ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
-    /**
-     * Get report data
-     * 获取报告数据
-     * @param data Input data
-     * @param year Year to calculate
-     * @returns Result
-     */
-    getReportData(data: PeriodReportData[], year: number): number[];
-    /**
-     * Transform report data for chart
-     * 转换报告数据用于图表
-     * @param data Input data
-     * @param hasLastYear Has last year data
-     * @param year Year to calculate, default is current year
-     * @returns Transformed report data
-     */
-    transformReportData(data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
-        labels: string[];
-        currentYearData: number[];
-        lastYearData: number[];
-    };
 }
 export {};

package/lib/mjs/CoreApp.js

@@ -3,9 +3,9 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, BusinessUtils, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
+import { AuthApi, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { DataTypes, NumberUtils } from "@etsoo/shared";
+import { DataTypes } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
@@ -226,38 +226,4 @@ export class CoreApp {
                 return id;
         });
     }
-    /**
-     * Get report data
-     * 获取报告数据
-     * @param data Input data
-     * @param year Year to calculate
-     * @returns Result
-     */
-    getReportData(data, year) {
-        const [start, end] = NumberUtils.getMonthPeriodRange(year);
-        const items = [];
-        for (let i = start; i <= end; i++) {
-            const item = data.find((d) => d.period === i);
-            items.push(item?.value ?? 0);
-        }
-        return items;
-    }
-    /**
-     * Transform report data for chart
-     * 转换报告数据用于图表
-     * @param data Input data
-     * @param hasLastYear Has last year data
-     * @param year Year to calculate, default is current year
-     * @returns Transformed report data
-     */
-    transformReportData(data, hasLastYear, year) {
-        year ??= new Date().getFullYear();
-        const months = BusinessUtils.getMonths(this.app.get("months") ?? []);
-        const labels = months.map((m) => m.label);
-        const currentYearData = this.getReportData(data, year);
-        const lastYearData = hasLastYear == null || hasLastYear
-            ? this.getReportData(data, year - 1)
-            : [];
-        return { labels, currentYearData, lastYearData };
-    }
 }

package/lib/mjs/CoreUtils.d.ts

@@ -1,4 +1,7 @@
+import { DataTypes } from "@etsoo/shared";
 import type { ErrorObject } from "ajv";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
+import { IApp } from "@etsoo/appscript";
 /**
  * Core utilities
  */
@@ -10,6 +13,25 @@ export declare namespace CoreUtils {
      * @returns Styles
      */
     function avatarStyles(isOrg?: boolean): React.CSSProperties;
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @param selector Selector function or number field to extract value from data
+     * @returns Result
+     */
+    function getReportDataBase<D extends {
+        period: number;
+    }>(data: D[], year: number, selector: ((item: D | undefined | null) => number | undefined | null) | DataTypes.Keys<D, number | null | undefined>): number[];
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    function getReportData(data: PeriodReportData[], year: number): number[];
     /**
      * Merge an array with another array, starting from the end
      * 合并数组，从末尾开始
@@ -17,6 +39,37 @@ export declare namespace CoreUtils {
      * @param target Target array
      */
     function mergeArray(source: string[], target: string[]): void;
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param selector Selector function or number field to extract value from data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportDataBase<D extends {
+        period: number;
+    }>(app: IApp, data: D[], selector: ((item: D | undefined | null) => number | undefined | null) | DataTypes.Keys<D, number | null | undefined>, hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportData(app: IApp, data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
     /**
      * Validate JSON input against a schema
      * 验证 JSON 输入是否符合架构

package/lib/mjs/CoreUtils.js

@@ -1,4 +1,6 @@
+import { NumberUtils } from "@etsoo/shared";
 import addFormats from "ajv-formats";
+import { BusinessUtils } from "@etsoo/appscript";
 /**
  * Core utilities
  */
@@ -18,6 +20,43 @@ export var CoreUtils;
         };
     }
     CoreUtils.avatarStyles = avatarStyles;
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @param selector Selector function or number field to extract value from data
+     * @returns Result
+     */
+    function getReportDataBase(data, year, selector) {
+        const [start, end] = NumberUtils.getMonthPeriodRange(year);
+        const items = [];
+        for (let i = start; i <= end; i++) {
+            const item = data.find((d) => d.period === i);
+            if (typeof selector === "function") {
+                items.push(selector(item) ?? 0);
+            }
+            else {
+                if (item == null)
+                    items.push(0);
+                else
+                    items.push(item[selector] ?? 0);
+            }
+        }
+        return items;
+    }
+    CoreUtils.getReportDataBase = getReportDataBase;
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    function getReportData(data, year) {
+        return getReportDataBase(data, year, "value");
+    }
+    CoreUtils.getReportData = getReportData;
     /**
      * Merge an array with another array, starting from the end
      * 合并数组，从末尾开始
@@ -32,6 +71,40 @@ export var CoreUtils;
         }
     }
     CoreUtils.mergeArray = mergeArray;
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param selector Selector function or number field to extract value from data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportDataBase(app, data, selector, hasLastYear, year) {
+        year ??= new Date().getFullYear();
+        const months = BusinessUtils.getMonths(app.get("months") ?? []);
+        const labels = months.map((m) => m.label);
+        const currentYearData = getReportDataBase(data, year, selector);
+        const lastYearData = hasLastYear == null || hasLastYear
+            ? getReportDataBase(data, year - 1, selector)
+            : [];
+        return { labels, currentYearData, lastYearData };
+    }
+    CoreUtils.transformReportDataBase = transformReportDataBase;
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param app App instance
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    function transformReportData(app, data, hasLastYear, year) {
+        return transformReportDataBase(app, data, "value", hasLastYear, year);
+    }
+    CoreUtils.transformReportData = transformReportData;
     let ajv = null;
     /**
      * Validate JSON input against a schema

package/lib/mjs/i18n/en.json

@@ -81,6 +81,7 @@
     "owner": "Owner",
     "parameters": "Parameters",
     "parentOrg": "Parent org",
+    "period": "Period",
     "pin": "ID",
     "preferredName": "Preferred name",
     "queryKeyword": "Query keyword",

package/lib/mjs/i18n/zh-Hans.json

@@ -81,6 +81,7 @@
     "owner": "所有者",
     "parameters": "参数",
     "parentOrg": "上级机构",
+    "period": "期间",
     "pin": "身份证号码",
     "preferredName": "首选名称",
     "queryKeyword": "查询关键字",

package/lib/mjs/i18n/zh-Hant.json

@@ -81,6 +81,7 @@
     "owner": "所有者",
     "parameters": "參數",
     "parentOrg": "上級機構",
+    "period": "期間",
     "pin": "身份證號碼",
     "preferredName": "首選名稱",
     "queryKeyword": "查詢關鍵字",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.68",
+  "version": "1.1.70",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -56,7 +56,7 @@
     "react-dom": "$react-dom"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.67",
+    "@etsoo/appscript": "^1.6.68",
     "@etsoo/materialui": "^1.6.72",
     "@etsoo/react": "^1.8.92",
     "@etsoo/shared": "^1.2.86",

package/src/CoreApp.ts

@@ -6,19 +6,17 @@ import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
 import {
   AuthApi,
-  BusinessUtils,
   IApp,
   IdentityType,
   IdentityTypeFlags,
   UserIdentifierType
 } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { DataTypes, ListType, ListType1, NumberUtils } from "@etsoo/shared";
+import { DataTypes, ListType, ListType1 } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
 import { ReportApi } from "./ReportApi";
-import { PeriodReportData } from "./dto/report/PeriodReportData";
 
 type AppData = { id: number; appId?: number; name: string; localName?: string };
 
@@ -157,33 +155,6 @@ export interface ICoreApp {
    * @returns List
    */
   getIdentityFlags(identity?: number | true): ListType[];
-
-  /**
-   * Get report data
-   * 获取报告数据
-   * @param data Input data
-   * @param year Year to calculate
-   * @returns Result
-   */
-  getReportData(data: PeriodReportData[], year: number): number[];
-
-  /**
-   * Transform report data for chart
-   * 转换报告数据用于图表
-   * @param data Input data
-   * @param hasLastYear Has last year data
-   * @param year Year to calculate, default is current year
-   * @returns Transformed report data
-   */
-  transformReportData(
-    data: PeriodReportData[],
-    hasLastYear?: boolean,
-    year?: number
-  ): {
-    labels: string[];
-    currentYearData: number[];
-    lastYearData: number[];
-  };
 }
 
 /**
@@ -427,52 +398,4 @@ export class CoreApp implements ICoreApp {
       if (id === 0 || (id & identity) > 0) return id;
     });
   }
-
-  /**
-   * Get report data
-   * 获取报告数据
-   * @param data Input data
-   * @param year Year to calculate
-   * @returns Result
-   */
-  getReportData(data: PeriodReportData[], year: number) {
-    const [start, end] = NumberUtils.getMonthPeriodRange(year);
-    const items: number[] = [];
-
-    for (let i = start; i <= end; i++) {
-      const item = data.find((d) => d.period === i);
-      items.push(item?.value ?? 0);
-    }
-
-    return items;
-  }
-
-  /**
-   * Transform report data for chart
-   * 转换报告数据用于图表
-   * @param data Input data
-   * @param hasLastYear Has last year data
-   * @param year Year to calculate, default is current year
-   * @returns Transformed report data
-   */
-  transformReportData(
-    data: PeriodReportData[],
-    hasLastYear?: boolean,
-    year?: number
-  ) {
-    year ??= new Date().getFullYear();
-
-    const months = BusinessUtils.getMonths(
-      this.app.get<string[]>("months") ?? []
-    );
-    const labels = months.map((m) => m.label);
-
-    const currentYearData = this.getReportData(data, year);
-    const lastYearData =
-      hasLastYear == null || hasLastYear
-        ? this.getReportData(data, year - 1)
-        : [];
-
-    return { labels, currentYearData, lastYearData };
-  }
 }

package/src/CoreUtils.ts

@@ -1,6 +1,9 @@
+import { DataTypes, NumberUtils } from "@etsoo/shared";
 import type Ajv from "ajv";
 import type { ErrorObject } from "ajv";
 import addFormats from "ajv-formats";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
+import { BusinessUtils, IApp } from "@etsoo/appscript";
 
 /**
  * Core utilities
@@ -20,6 +23,48 @@ export namespace CoreUtils {
     };
   }
 
+  /**
+   * Get report data
+   * 获取报告数据
+   * @param data Input data
+   * @param year Year to calculate
+   * @param selector Selector function or number field to extract value from data
+   * @returns Result
+   */
+  export function getReportDataBase<D extends { period: number }>(
+    data: D[],
+    year: number,
+    selector:
+      | ((item: D | undefined | null) => number | undefined | null)
+      | DataTypes.Keys<D, number | null | undefined>
+  ) {
+    const [start, end] = NumberUtils.getMonthPeriodRange(year);
+    const items: number[] = [];
+
+    for (let i = start; i <= end; i++) {
+      const item = data.find((d) => d.period === i);
+      if (typeof selector === "function") {
+        items.push(selector(item) ?? 0);
+      } else {
+        if (item == null) items.push(0);
+        else items.push((item[selector] as number) ?? 0);
+      }
+    }
+
+    return items;
+  }
+
+  /**
+   * Get report data
+   * 获取报告数据
+   * @param data Input data
+   * @param year Year to calculate
+   * @returns Result
+   */
+  export function getReportData(data: PeriodReportData[], year: number) {
+    return getReportDataBase(data, year, "value");
+  }
+
   /**
    * Merge an array with another array, starting from the end
    * 合并数组，从末尾开始
@@ -33,6 +78,57 @@ export namespace CoreUtils {
     }
   }
 
+  /**
+   * Transform report data for chart
+   * 转换报告数据用于图表
+   * @param app App instance
+   * @param data Input data
+   * @param selector Selector function or number field to extract value from data
+   * @param hasLastYear Has last year data
+   * @param year Year to calculate, default is current year
+   * @returns Transformed report data
+   */
+  export function transformReportDataBase<D extends { period: number }>(
+    app: IApp,
+    data: D[],
+    selector:
+      | ((item: D | undefined | null) => number | undefined | null)
+      | DataTypes.Keys<D, number | null | undefined>,
+    hasLastYear?: boolean,
+    year?: number
+  ) {
+    year ??= new Date().getFullYear();
+
+    const months = BusinessUtils.getMonths(app.get<string[]>("months") ?? []);
+    const labels = months.map((m) => m.label);
+
+    const currentYearData = getReportDataBase(data, year, selector);
+    const lastYearData =
+      hasLastYear == null || hasLastYear
+        ? getReportDataBase(data, year - 1, selector)
+        : [];
+
+    return { labels, currentYearData, lastYearData };
+  }
+
+  /**
+   * Transform report data for chart
+   * 转换报告数据用于图表
+   * @param app App instance
+   * @param data Input data
+   * @param hasLastYear Has last year data
+   * @param year Year to calculate, default is current year
+   * @returns Transformed report data
+   */
+  export function transformReportData(
+    app: IApp,
+    data: PeriodReportData[],
+    hasLastYear?: boolean,
+    year?: number
+  ) {
+    return transformReportDataBase(app, data, "value", hasLastYear, year);
+  }
+
   let ajv: Ajv | null = null;
 
   /**

package/src/i18n/en.json

@@ -81,6 +81,7 @@
   "owner": "Owner",
   "parameters": "Parameters",
   "parentOrg": "Parent org",
+  "period": "Period",
   "pin": "ID",
   "preferredName": "Preferred name",
   "queryKeyword": "Query keyword",

package/src/i18n/zh-Hans.json

@@ -81,6 +81,7 @@
   "owner": "所有者",
   "parameters": "参数",
   "parentOrg": "上级机构",
+  "period": "期间",
   "pin": "身份证号码",
   "preferredName": "首选名称",
   "queryKeyword": "查询关键字",

package/src/i18n/zh-Hant.json

@@ -81,6 +81,7 @@
   "owner": "所有者",
   "parameters": "參數",
   "parentOrg": "上級機構",
+  "period": "期間",
   "pin": "身份證號碼",
   "preferredName": "首選名稱",
   "queryKeyword": "查詢關鍵字",

package/src/rq/report/OrderDailyReportRQ.ts

@@ -15,7 +15,7 @@ export type OrderDailyReportRQ = {
    * Start date
    * 开始日期
    */
-  startDate?: string; // DateOnly maps to string (ISO format: YYYY-MM-DD)
+  startDate?: string;
 
   /**
    * Days to cover