@etsoo/smarterp-core 1.1.59 → 1.1.61

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, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
+import { AuthApi, BusinessUtils, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { DataTypes } from "@etsoo/shared";
+import { DataTypes, NumberUtils } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
@@ -217,4 +217,38 @@ 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 ? ("qty" in item ? item.qty : item.amount) : 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/OrgApi.d.ts

@@ -26,6 +26,8 @@ import { OrgQueryApiData } from "./dto/org/OrgQueryApiData";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { UploadFilesResult } from "./dto/org/UploadFilesResult";
 import { OrgOwnsRQ } from "./rq/org/OrgOwnsRQ";
+import { OrgUsageReportRQ } from "./rq/org/OrgUsageReportRQ";
+import { OrgReportData } from "./dto/org/OrgReportData";
 /**
  * Organization API
  * 机构接口
@@ -247,4 +249,11 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     updateResourceRead(id: number, payload?: IApiPayload<OrgUpdateResourceReadData>): Promise<OrgUpdateResourceReadData | undefined>;
+    /**
+     * Get usage report
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<OrgReportData[]>): Promise<OrgReportData[] | undefined>;
 }

package/lib/mjs/OrgApi.js

@@ -302,4 +302,13 @@ export class OrgApi extends EntityApi {
     updateResourceRead(id, payload) {
         return this.api.get(`${this.flag}/UpdateResourceRead/${id}`, undefined, payload);
     }
+    /**
+     * Get usage report
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq, payload) {
+        return this.api.post(`${this.flag}/UsageReport`, rq, payload);
+    }
 }

package/lib/mjs/PublicApi.d.ts

@@ -12,6 +12,8 @@ import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
 import { ChinaPinData } from "./dto/public/ChinaPinData";
 import { ParseNameRQ } from "./rq/public/ParseNameRQ";
 import { NameData } from "./dto/public/NameData";
+import { TimeZoneItem } from "./dto/public/TimeZoneItem";
+import { TimeZoneRQ } from "./rq/public/TimeZoneRQ";
 /**
  * Public API
  * 公共接口
@@ -78,6 +80,13 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     getRegions(ids?: string[], payload?: IApiPayload<RegionData[]>): Promise<RegionData[] | undefined>;
+    /**
+     * Get time zones
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getTimeZones(rq?: TimeZoneRQ, payload?: IApiPayload<TimeZoneItem[]>): Promise<TimeZoneItem[] | undefined>;
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

package/lib/mjs/PublicApi.js

@@ -95,6 +95,15 @@ export class PublicApi extends BaseApi {
             contentType: "application/json"
         });
     }
+    /**
+     * Get time zones
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    getTimeZones(rq, payload) {
+        return this.api.post("Public/GetTimeZones", rq, payload);
+    }
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
@@ -113,7 +122,7 @@ export class PublicApi extends BaseApi {
     }
     getUnitJoin(isJoined) {
         return typeof isJoined === "string"
-            ? this.app.get(isJoined) ?? isJoined
+            ? (this.app.get(isJoined) ?? isJoined)
             : isJoined
                 ? this.app.get("unitJoin")
                 : undefined;

package/lib/mjs/components/index.d.ts

@@ -18,4 +18,5 @@ export * from "./public/ButtonRadioRegions";
 export * from "./public/ButtonRegions";
 export * from "./public/CultureList";
 export * from "./public/ProductBaseUnits";
+export * from "./public/TimeZoneList";
 export * from "./user/UserTiplist";

package/lib/mjs/components/index.js

@@ -23,5 +23,6 @@ export * from "./public/ButtonRadioRegions";
 export * from "./public/ButtonRegions";
 export * from "./public/CultureList";
 export * from "./public/ProductBaseUnits";
+export * from "./public/TimeZoneList";
 // user
 export * from "./user/UserTiplist";

package/lib/mjs/components/public/TimeZoneList.d.ts

@@ -0,0 +1,33 @@
+import { TiplistProps } from "@etsoo/materialui";
+import { TimeZoneItem } from "../../dto/public/TimeZoneItem";
+import { TimeZoneRQ } from "../../rq/public/TimeZoneRQ";
+/**
+ * Time zone tiplist properties
+ * 时区提示列表属性
+ */
+export type TimeZoneTiplistProps = Omit<TiplistProps<TimeZoneItem, "id">, "loadData" | "label" | "name"> & {
+    /**
+     * Label
+     */
+    label?: string;
+    /**
+     * Name
+     */
+    name?: string;
+    /**
+     * Default request data
+     */
+    rq?: Partial<TimeZoneRQ>;
+    /**
+     * Load data handler
+     * @param rq Request data
+     */
+    onLoadData?: (rq: TimeZoneRQ) => TimeZoneRQ;
+};
+/**
+ * Time zone tiplist
+ * 时区提示列表
+ * @param props Properties
+ * @returns Component
+ */
+export declare function TimeZoneTiplist(props: TimeZoneTiplistProps): import("react").JSX.Element;

package/lib/mjs/components/public/TimeZoneList.js

@@ -0,0 +1,24 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Tiplist } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+/**
+ * Time zone tiplist
+ * 时区提示列表
+ * @param props Properties
+ * @returns Component
+ */
+export function TimeZoneTiplist(props) {
+    // App
+    const app = useRequiredAppContext();
+    // Destruct
+    const { fullWidth = true, label = app.get("timeZone"), maxItems = 10, getOptionLabel = (data) => data.displayName, onLoadData = (rq) => rq, name = "timeZone", rq = { enabled: true }, ...rest } = props;
+    // Layout
+    return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.publicApi.getTimeZones(onLoadData({
+            ...rq,
+            keyword,
+            id,
+            queryPaging: {
+                batchSize: maxItems
+            }
+        }), { showLoading: false, defaultValue: [] }), ...rest }));
+}

package/lib/mjs/dto/org/OrgReportData.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Organization usage report data
+ * 机构使用报告数据
+ */
+type OrgUsageReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Qty.
+     * 数量
+     */
+    qty: number;
+};
+/**
+ * Organization amount report data
+ * 机构金额报告数据
+ */
+type OrgAmountReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Amount
+     * 金额
+     */
+    amount: number;
+};
+/**
+ * Organization report data
+ * 机构报告数据
+ */
+export type OrgReportData = OrgUsageReportData | OrgAmountReportData;
+export {};

package/lib/mjs/dto/org/OrgReportData.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/dto/public/TimeZoneItem.d.ts

@@ -0,0 +1,22 @@
+export type TimeZoneItem = {
+    /**
+     * IANA Id
+     * IANA 编号
+     */
+    id: string;
+    /**
+     * Display name
+     * 显示名称
+     */
+    displayName: string;
+    /**
+     * Standard name
+     * 标准名称
+     */
+    standardName: string;
+    /**
+     * UTC offset
+     * UTC偏移
+     */
+    utcOffset: string;
+};

package/lib/mjs/dto/public/TimeZoneItem.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/i18n/en.json

@@ -106,6 +106,7 @@
     "roleOperator": "Operator",
     "rolePartner": "Channel Partner",
     "roleUser": "User",
+    "samePeriodLastYear": "Same period last year",
     "slogan": "Slogan",
     "smarterp": "SmartERP Cloud",
     "signin": "Sign in",
@@ -132,6 +133,7 @@
     "templateCMSPODATA": "CMS PO data",
     "templateCMSSTOCKDATA": "CMS stock data",
     "templateKind": "Template kind",
+    "timeZone": "Time zone",
     "years5": ["1 year", "2 years", "3 years", "4 years", "5 years"],
     "uiTypeEmail": "Email",
     "uiTypeMobile": "Mobile",
@@ -139,5 +141,7 @@
     "uiTypeAlipay": "Alipay",
     "uiTypeGoogle": "Google",
     "uiTypeMicrosoft": "Microsoft",
-    "updatedAt": "Updated at"
+    "updatedAt": "Updated at",
+    "usage": "Usage",
+    "usageReport": "Usage report"
 }

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

@@ -106,6 +106,7 @@
     "roleOperator": "操作员",
     "rolePartner": "渠道伙伴",
     "roleUser": "用户",
+    "samePeriodLastYear": "去年同期",
     "slogan": "标语",
     "smarterp": "司友®云ERP",
     "signin": "登录",
@@ -132,6 +133,7 @@
     "templateCMSPODATA": "CMS采购数据",
     "templateCMSSTOCKDATA": "CMS库存数据",
     "templateKind": "模板类型",
+    "timeZone": "时区",
     "years5": ["1年", "2年", "3年", "4年", "5年"],
     "uiTypeEmail": "电子邮箱",
     "uiTypeMobile": "手机号",
@@ -139,5 +141,7 @@
     "uiTypeAlipay": "支付宝",
     "uiTypeGoogle": "谷歌",
     "uiTypeMicrosoft": "微软",
-    "updatedAt": "更新时间"
+    "updatedAt": "更新时间",
+    "usage": "使用量",
+    "usageReport": "使用情况报告"
 }

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

@@ -106,6 +106,7 @@
     "roleOperator": "操作員",
     "rolePartner": "渠道夥伴",
     "roleUser": "用戶",
+    "samePeriodLastYear": "去年同期",
     "signin": "登入",
     "signout": "登出",
     "slogan": "標語",
@@ -132,6 +133,7 @@
     "templateCMSPODATA": "CMS採購數據",
     "templateCMSSTOCKDATA": "CMS庫存數據",
     "templateKind": "模板類型",
+    "timeZone": "時區",
     "years5": ["1年", "2年", "3年", "4年", "5年"],
     "uiTypeEmail": "電子郵件",
     "uiTypeMobile": "手機號碼",
@@ -139,5 +141,7 @@
     "uiTypeAlipay": "支付寶",
     "uiTypeGoogle": "谷歌",
     "uiTypeMicrosoft": "微軟",
-    "updatedAt": "更新時間"
+    "updatedAt": "更新時間",
+    "usage": "使用量",
+    "usageReport": "使用情況報告"
 }

package/lib/mjs/index.d.ts

@@ -22,6 +22,7 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
+export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -33,6 +34,7 @@ export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/NameData";
 export * from "./dto/public/PlaceCommon";
 export * from "./dto/public/RegionData";
+export * from "./dto/public/TimeZoneItem";
 export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
@@ -68,6 +70,7 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
+export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";
@@ -77,6 +80,7 @@ export * from "./rq/public/CreateBarcodeRQ";
 export * from "./rq/public/ParseNameRQ";
 export * from "./rq/public/PinyinRQ";
 export * from "./rq/public/PlaceQueryRQ";
+export * from "./rq/public/TimeZoneRQ";
 export * from "./rq/user/AuditHistoryRQ";
 export * from "./rq/user/UserUpdateRQ";
 export * from "./AppApi";

package/lib/mjs/index.js

@@ -23,6 +23,7 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
+export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -34,6 +35,7 @@ export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/NameData";
 export * from "./dto/public/PlaceCommon";
 export * from "./dto/public/RegionData";
+export * from "./dto/public/TimeZoneItem";
 export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
@@ -71,6 +73,7 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
+export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";
@@ -80,6 +83,7 @@ export * from "./rq/public/CreateBarcodeRQ";
 export * from "./rq/public/ParseNameRQ";
 export * from "./rq/public/PinyinRQ";
 export * from "./rq/public/PlaceQueryRQ";
+export * from "./rq/public/TimeZoneRQ";
 export * from "./rq/user/AuditHistoryRQ";
 export * from "./rq/user/UserUpdateRQ";
 // APIs

package/lib/mjs/rq/org/OrgUsageReportRQ.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Organization usage report request data
+ * 机构使用报告请求数据
+ */
+export type OrgUsageReportRQ = {
+    /**
+     * Organization id
+     * 机构编号
+     */
+    orgId?: number;
+    /**
+     * Year
+     * 年
+     */
+    year?: number;
+    /**
+     * Whether to include last year data
+     * 是否包含去年数据
+     */
+    hasLastYear?: boolean;
+};

package/lib/mjs/rq/org/OrgUsageReportRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/rq/public/TimeZoneRQ.d.ts

@@ -0,0 +1,14 @@
+import { QueryRQ } from "@etsoo/appscript";
+export type TimeZoneRQ = QueryRQ<string> & {
+    /**
+     * Culture, like "en-US", "zh-CN", etc.
+     * If not specified, the current culture will be used.
+     * 文化
+     */
+    culture?: string;
+    /**
+     * All system timezones
+     * 所有系统时区
+     */
+    all?: boolean;
+};

package/lib/mjs/rq/public/TimeZoneRQ.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.59",
+  "version": "1.1.61",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -40,16 +40,16 @@
   "license": "MIT",
   "homepage": "https://github.com/ETSOO/smarterp-core#readme",
   "devDependencies": {
-    "@babel/core": "^7.29.7",
-    "@babel/plugin-transform-runtime": "^7.29.7",
-    "@babel/preset-env": "^7.29.7",
-    "@babel/runtime-corejs3": "^7.29.7",
+    "@babel/core": "^8.0.1",
+    "@babel/plugin-transform-runtime": "^8.0.1",
+    "@babel/preset-env": "^8.0.1",
+    "@babel/runtime-corejs3": "^8.0.0",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^6.0.2",
     "jsdom": "^29.1.1",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.9"
   },
   "overrides": {
     "react": "$react",
@@ -57,9 +57,9 @@
   },
   "dependencies": {
     "@etsoo/appscript": "^1.6.66",
-    "@etsoo/materialui": "^1.6.70",
+    "@etsoo/materialui": "^1.6.71",
     "@etsoo/react": "^1.8.91",
-    "@etsoo/shared": "^1.2.84",
+    "@etsoo/shared": "^1.2.86",
     "@etsoo/toolpad": "^1.0.50",
     "@mui/material": "^9.1.1",
     "ajv": "^8.20.0",

package/src/CoreApp.ts

@@ -6,16 +6,18 @@ 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 } from "@etsoo/shared";
+import { DataTypes, ListType, ListType1, NumberUtils } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
+import { OrgReportData } from "./dto/org/OrgReportData";
 
 type AppData = { id: number; appId?: number; name: string; localName?: string };
 
@@ -149,6 +151,33 @@ 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: OrgReportData[], 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: OrgReportData[],
+    hasLastYear?: boolean,
+    year?: number
+  ): {
+    labels: string[];
+    currentYearData: number[];
+    lastYearData: number[];
+  };
 }
 
 /**
@@ -383,4 +412,52 @@ 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: OrgReportData[], 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 ? ("qty" in item ? item.qty : item.amount) : 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: OrgReportData[],
+    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/OrgApi.ts

@@ -36,6 +36,8 @@ import { OrgQueryApiData } from "./dto/org/OrgQueryApiData";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { UploadFilesResult } from "./dto/org/UploadFilesResult";
 import { OrgOwnsRQ } from "./rq/org/OrgOwnsRQ";
+import { OrgUsageReportRQ } from "./rq/org/OrgUsageReportRQ";
+import { OrgReportData } from "./dto/org/OrgReportData";
 
 /**
  * Organization API
@@ -412,4 +414,14 @@ export class OrgApi extends EntityApi {
       payload
     );
   }
+
+  /**
+   * Get usage report
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<OrgReportData[]>) {
+    return this.api.post(`${this.flag}/UsageReport`, rq, payload);
+  }
 }