@etsoo/smarterp-core 1.0.44 → 1.0.46

package/lib/mjs/OrgApi.d.ts

@@ -6,11 +6,13 @@ import { OrgQueryDto } from "./dto/org/OrgQueryDto";
 import { OrgReadDto } from "./dto/org/OrgReadDto";
 import { OrgUpdateReadDto } from "./dto/org/OrgUpdateReadDto";
 import { OrgListDto } from "./dto/org/OrgListDto";
-import { AntiforgeryRequestToken, EntityApi, IApp, IdResultPayload, MsgResultPayload, ResultPayload } from "@etsoo/appscript";
+import { AntiforgeryRequestToken, EntityApi, IApp, IdResultPayload, ResultPayload, StringIdResultPayload } from "@etsoo/appscript";
 import { OrgListRQ } from "./rq/org/OrgListRQ";
 import { OrgGetMyRQ } from "./rq/org/OrgGetMyRQ";
 import { OrgGetMyData } from "./dto/org/OrgGetMyData";
 import { OrgDownloadKind } from "./dto/org/OrgDownloadKind";
+import { SendEmailMessage } from "./rq/org/SendEmailMessage";
+import { SendSMSMessage } from "./rq/org/SendSMSMessage";
 /**
  * Organization API
  * 机构接口
@@ -44,6 +46,13 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     downloadFile(kind: OrgDownloadKind, id: number): Promise<void>;
+    /**
+     * Format HTML content
+     * @param content HTML content
+     * @param payload Payload
+     * @returns Result
+     */
+    formatHtmlContent(content: string, payload?: IApiPayload<string>): Promise<string | undefined>;
     /**
      * Get user's latest accessed organizations
      * @param rq Request data
@@ -86,6 +95,22 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     requestToken(payload?: IApiPayload<AntiforgeryRequestToken>): Promise<AntiforgeryRequestToken | undefined>;
+    /**
+     * Send email
+     * 发送邮件
+     * @param message Email message
+     * @param payload Payload
+     * @returns Result
+     */
+    sendEmail(message: SendEmailMessage, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
+    /**
+     * Send SMS
+     * 发送短信
+     * @param message SMS message
+     * @param payload Payload
+     * @returns Result
+     */
+    sendSMS(message: SendSMSMessage, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
     /**
      * Update
      * @param rq Request data
@@ -100,7 +125,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    updateAvatar(id: number, data: FormData, payload?: MsgResultPayload): Promise<import("@etsoo/shared").MsgActionResult | undefined>;
+    updateAvatar(id: number, data: FormData, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
     /**
      * Update read
      * @param id Id

package/lib/mjs/OrgApi.js

@@ -52,6 +52,15 @@ export class OrgApi extends EntityApi {
             "DownloadFile";
         await this.app.download(result, filename);
     }
+    /**
+     * Format HTML content
+     * @param content HTML content
+     * @param payload Payload
+     * @returns Result
+     */
+    formatHtmlContent(content, payload) {
+        return this.api.post(`${this.flag}/FormatHtmlContent`, content, payload);
+    }
     /**
      * Get user's latest accessed organizations
      * @param rq Request data
@@ -106,6 +115,26 @@ export class OrgApi extends EntityApi {
     requestToken(payload) {
         return this.api.get(`${this.flag}/RequestToken`, undefined, payload);
     }
+    /**
+     * Send email
+     * 发送邮件
+     * @param message Email message
+     * @param payload Payload
+     * @returns Result
+     */
+    sendEmail(message, payload) {
+        return this.api.post(`${this.flag}/SendEmail`, message, payload);
+    }
+    /**
+     * Send SMS
+     * 发送短信
+     * @param message SMS message
+     * @param payload Payload
+     * @returns Result
+     */
+    sendSMS(message, payload) {
+        return this.api.post(`${this.flag}/SendSMS`, message, payload);
+    }
     /**
      * Update
      * @param rq Request data

package/lib/mjs/PublicApi.d.ts

@@ -9,6 +9,7 @@ import { PlaceCommon } from "./dto/public/PlaceCommon";
 import { BaseApi, Currency, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
 import { MemberInvitationDto } from "./dto/public/MemberInvitationDto";
 import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
+import { ChinaPinData } from "./dto/public/ChinaPinData";
 /**
  * Public API
  * 公共接口
@@ -77,6 +78,13 @@ export declare class PublicApi extends BaseApi {
      * @param payload Payload
      */
     mobileQRCode(id?: string, host?: string, payload?: IApiPayload<string>): Promise<string | undefined>;
+    /**
+     * Parse China PIN
+     * @param pin Pin code
+     * @param payload Payload
+     * @returns Result
+     */
+    parseChinaPin(pin: string, payload?: IApiPayload<ChinaPinData>): Promise<ChinaPinData | undefined>;
     /**
      * Query place
      * @param rq Request data

package/lib/mjs/PublicApi.js

@@ -100,6 +100,15 @@ export class PublicApi extends BaseApi {
     mobileQRCode(id, host, payload) {
         return this.api.post("Public/MobileQRCode", { id, host }, payload);
     }
+    /**
+     * Parse China PIN
+     * @param pin Pin code
+     * @param payload Payload
+     * @returns Result
+     */
+    parseChinaPin(pin, payload) {
+        return this.api.get(`Public/ParseChinaPin/${pin}`, undefined, payload);
+    }
     /**
      * Query place
      * @param rq Request data

package/lib/mjs/UserApi.d.ts

@@ -1,4 +1,4 @@
-import { EntityApi, IApp, IdResultPayload, MsgResultPayload, QueryRQ, ResultPayload } from "@etsoo/appscript";
+import { EntityApi, IApp, IdResultPayload, QueryRQ, ResultPayload, StringIdResultPayload } from "@etsoo/appscript";
 import { IApi, IApiPayload } from "@etsoo/restclient";
 import { DeviceListDto } from "./dto/user/DeviceListDto";
 import { AuditHistoryRQ } from "./rq/user/AuditHistoryRQ";
@@ -93,7 +93,7 @@ export declare class UserApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    updateAvatar(data: FormData, payload?: MsgResultPayload): Promise<import("@etsoo/shared").MsgActionResult | undefined>;
+    updateAvatar(data: FormData, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
     /**
      * Update read
      * @param payload Payload

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

@@ -0,0 +1,31 @@
+/**
+ * China Pin Data
+ * 中国身份证数据
+ */
+export type ChinaPinData = {
+    /**
+     * State num id
+     * 州省数字编号
+     */
+    stateNum: string;
+    /**
+     * City num id
+     * 城市数字编号
+     */
+    cityNum: string;
+    /**
+     * District number id
+     * 区县数字编号
+     */
+    districtNum: string;
+    /**
+     * Birthday
+     * 出生日期
+     */
+    birthday: string | Date;
+    /**
+     * Is female
+     * 是否为女性
+     */
+    isFemale: boolean;
+};

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

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

package/lib/mjs/i18n/en.json

@@ -27,9 +27,11 @@
     "expandNavMenuAriaLabel": "Expand navigation menu",
     "fileName": "File name",
     "fullName": "Full name",
+    "idContact": "Contact",
     "idCustomer": "Customer",
+    "idOrg": "Organization",
     "idSupplier": "Supplier",
-    "idUser": "User/Org.",
+    "idUser": "User",
     "identifier": "Identifier",
     "identityType": "Identity type",
     "inviteMember": "Invite member",

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

@@ -27,9 +27,11 @@
     "expandNavMenuAriaLabel": "展开导航菜单",
     "fileName": "文件名",
     "fullName": "全称",
+    "idContact": "联系人",
     "idCustomer": "客户",
+    "idOrg": "机构",
     "idSupplier": "供应商",
-    "idUser": "用户/机构",
+    "idUser": "用户",
     "identifier": "标识",
     "identityType": "对象身份",
     "inviteMember": "邀请成员",

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

@@ -30,9 +30,11 @@
     "latinFamilyName": "姓氏（拼音）",
     "latinGivenName": "名（拼音）",
     "lightMode": "淺色模式",
+    "idContact": "聯絡人",
     "idCustomer": "客戶",
+    "idOrg": "機構",
     "idSupplier": "供應商",
-    "idUser": "使用者/機構",
+    "idUser": "用户",
     "identifier": "標識",
     "identityType": "對象身份",
     "inviteMember": "邀請成員",

package/lib/mjs/index.d.ts

@@ -16,6 +16,7 @@ export * from "./dto/org/OrgListDto";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
+export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
 export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/PlaceCommon";
@@ -47,6 +48,8 @@ export * from "./rq/org/OrgGetMyRQ";
 export * from "./rq/org/OrgListRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateRQ";
+export * from "./rq/org/SendEmailMessage";
+export * from "./rq/org/SendSMSMessage";
 export * from "./rq/public/AcceptInvitationRQ";
 export * from "./rq/public/CreateBarcodeRQ";
 export * from "./rq/public/PinyinRQ";

package/lib/mjs/index.js

@@ -17,6 +17,7 @@ export * from "./dto/org/OrgListDto";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
+export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
 export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/PlaceCommon";
@@ -50,6 +51,8 @@ export * from "./rq/org/OrgGetMyRQ";
 export * from "./rq/org/OrgListRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateRQ";
+export * from "./rq/org/SendEmailMessage";
+export * from "./rq/org/SendSMSMessage";
 export * from "./rq/public/AcceptInvitationRQ";
 export * from "./rq/public/CreateBarcodeRQ";
 export * from "./rq/public/PinyinRQ";

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

@@ -0,0 +1,59 @@
+/**
+ * Email importance
+ * 邮件重要性
+ */
+export declare enum EmailImportance {
+    Low = "Low",
+    Normal = "Normal",
+    High = "High"
+}
+/**
+ * Email priority
+ * 邮件优先级
+ */
+export declare enum EmailPriority {
+    NonUrgent = "NonUrgent",
+    Normal = "Normal",
+    Urgent = "Urgent"
+}
+/**
+ * Send email message
+ * 发送邮件消息
+ */
+export type SendEmailMessage = {
+    /**
+     * Subject
+     * 主题
+     */
+    subject: string;
+    /**
+     * Body
+     * 内容
+     */
+    body: string;
+    /**
+     * Recipients
+     * 收件人
+     */
+    to: string[];
+    /**
+     * CC
+     * 抄送人
+     */
+    cc?: string[];
+    /**
+     * BCC
+     * 密送人
+     */
+    bcc?: string[];
+    /**
+     * Importance
+     * 重要性
+     */
+    importance?: EmailImportance;
+    /**
+     * Priority
+     * 优先级
+     */
+    priority?: EmailPriority;
+};

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

@@ -0,0 +1,20 @@
+/**
+ * Email importance
+ * 邮件重要性
+ */
+export var EmailImportance;
+(function (EmailImportance) {
+    EmailImportance["Low"] = "Low";
+    EmailImportance["Normal"] = "Normal";
+    EmailImportance["High"] = "High";
+})(EmailImportance || (EmailImportance = {}));
+/**
+ * Email priority
+ * 邮件优先级
+ */
+export var EmailPriority;
+(function (EmailPriority) {
+    EmailPriority["NonUrgent"] = "NonUrgent";
+    EmailPriority["Normal"] = "Normal";
+    EmailPriority["Urgent"] = "Urgent";
+})(EmailPriority || (EmailPriority = {}));

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

@@ -0,0 +1,36 @@
+/**
+ * Send SMS message
+ * 发送短信消息
+ */
+export type SendSMSMessage = {
+    /**
+     * Kind
+     * 类型
+     */
+    kind: string;
+    /**
+     * Culture
+     * 文化
+     */
+    culture: string;
+    /**
+     * Region
+     * 地区
+     */
+    region: string;
+    /**
+     * Mobiles
+     * 移动号码
+     */
+    to: string[];
+    /**
+     * Template id
+     * 模板编号
+     */
+    templateId?: string;
+    /**
+     * Body
+     * 内容
+     */
+    body: string;
+};

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -47,16 +47,16 @@
     "@babel/runtime-corejs3": "^7.27.0",
     "@types/react": "^18.3.20",
     "@types/react-dom": "^18.3.6",
-    "@vitejs/plugin-react": "^4.4.0",
+    "@vitejs/plugin-react": "^4.4.1",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.22",
-    "@etsoo/materialui": "^1.5.30",
-    "@etsoo/react": "^1.8.39",
-    "@etsoo/shared": "^1.2.68",
+    "@etsoo/appscript": "^1.6.26",
+    "@etsoo/materialui": "^1.5.31",
+    "@etsoo/react": "^1.8.40",
+    "@etsoo/shared": "^1.2.69",
     "@etsoo/toolpad": "^1.0.26",
     "@mui/material": "^7.0.2",
     "react": "^18.3.1",

package/src/CoreApp.ts

@@ -8,6 +8,7 @@ import {
   AuthApi,
   IApp,
   IdentityType,
+  IdentityTypeFlags,
   UserIdentifierType
 } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
@@ -83,6 +84,18 @@ export interface ICoreApp {
     joinChar?: string
   ): string;
 
+  /**
+   * Get identity label
+   * 获取身份标签
+   * @param identity Identity value
+   * @param joinChar Join character
+   * @returns Label(s)
+   */
+  getIdentityFlagsLabel(
+    identity: IdentityTypeFlags | null | undefined,
+    joinChar?: string
+  ): string;
+
   /**
    * Get identities
    * 获取身份列表
@@ -90,6 +103,14 @@ export interface ICoreApp {
    * @returns List
    */
   getIdentities(identity?: number): ListType[];
+
+  /**
+   * Get identity flags
+   * 获取身份标志组合
+   * @param identity Identity value combined
+   * @returns List
+   */
+  getIdentityFlags(identity?: number): ListType[];
 }
 
 /**
@@ -210,6 +231,25 @@ export class CoreApp implements ICoreApp {
     return identities.map((r) => r.label).join(joinChar);
   }
 
+  /**
+   * Get identity flags label
+   * 获取身份组合标签
+   * @param identity Identity value
+   * @param joinChar Join character
+   * @returns Label(s)
+   */
+  getIdentityFlagsLabel(
+    identity: IdentityTypeFlags | null | undefined,
+    joinChar?: string
+  ) {
+    if (identity == null) return "";
+
+    joinChar ??= ", ";
+
+    const identities = this.getIdentityFlags(identity);
+    return identities.map((r) => r.label).join(joinChar);
+  }
+
   /**
    * Get identities
    * 获取身份列表
@@ -222,4 +262,17 @@ export class CoreApp implements ICoreApp {
       if ((id & identity) > 0) return id;
     });
   }
+
+  /**
+   * Get identity flags
+   * 获取身份标志组合
+   * @param identity Identity value combined
+   * @returns List
+   */
+  getIdentityFlags(identity?: number) {
+    if (identity == null) return this.app.getEnumList(IdentityTypeFlags, "id");
+    return this.app.getEnumList(IdentityTypeFlags, "id", (id, _key) => {
+      if ((id & identity) > 0) return id;
+    });
+  }
 }

package/src/MemberApi.ts

@@ -6,8 +6,8 @@ import {
   EntityApi,
   IApp,
   IdResultPayload,
-  MsgResultPayload,
-  ResultPayload
+  ResultPayload,
+  StringIdResultPayload
 } from "@etsoo/appscript";
 import { MemberListDto } from "./dto/member/MemberListDto";
 import { MemberReadDto } from "./dto/member/MemberReadDto";
@@ -55,7 +55,7 @@ export class MemberApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  invite(rq: MemberInviteRQ, payload?: MsgResultPayload) {
+  invite(rq: MemberInviteRQ, payload?: StringIdResultPayload) {
     return this.api.post(`${this.flag}/Invite`, rq, payload);
   }
 
@@ -106,7 +106,7 @@ export class MemberApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  updateAvatar(id: number, data: FormData, payload?: MsgResultPayload) {
+  updateAvatar(id: number, data: FormData, payload?: StringIdResultPayload) {
     return this.api.put(`${this.flag}/UpdateAvatar/${id}`, data, payload);
   }
 

package/src/OrgApi.ts

@@ -11,14 +11,16 @@ import {
   EntityApi,
   IApp,
   IdResultPayload,
-  MsgResultPayload,
-  ResultPayload
+  ResultPayload,
+  StringIdResultPayload
 } from "@etsoo/appscript";
 import { OrgListRQ } from "./rq/org/OrgListRQ";
 import { OrgGetMyRQ } from "./rq/org/OrgGetMyRQ";
 import { OrgGetMyData } from "./dto/org/OrgGetMyData";
 import { OrgDownloadKind } from "./dto/org/OrgDownloadKind";
 import { DataTypes } from "@etsoo/shared";
+import { SendEmailMessage } from "./rq/org/SendEmailMessage";
+import { SendSMSMessage } from "./rq/org/SendSMSMessage";
 
 /**
  * Organization API
@@ -83,6 +85,16 @@ export class OrgApi extends EntityApi {
     await this.app.download(result, filename);
   }
 
+  /**
+   * Format HTML content
+   * @param content HTML content
+   * @param payload Payload
+   * @returns Result
+   */
+  formatHtmlContent(content: string, payload?: IApiPayload<string>) {
+    return this.api.post(`${this.flag}/FormatHtmlContent`, content, payload);
+  }
+
   /**
    * Get user's latest accessed organizations
    * @param rq Request data
@@ -143,6 +155,28 @@ export class OrgApi extends EntityApi {
     return this.api.get(`${this.flag}/RequestToken`, undefined, payload);
   }
 
+  /**
+   * Send email
+   * 发送邮件
+   * @param message Email message
+   * @param payload Payload
+   * @returns Result
+   */
+  sendEmail(message: SendEmailMessage, payload?: StringIdResultPayload) {
+    return this.api.post(`${this.flag}/SendEmail`, message, payload);
+  }
+
+  /**
+   * Send SMS
+   * 发送短信
+   * @param message SMS message
+   * @param payload Payload
+   * @returns Result
+   */
+  sendSMS(message: SendSMSMessage, payload?: StringIdResultPayload) {
+    return this.api.post(`${this.flag}/SendSMS`, message, payload);
+  }
+
   /**
    * Update
    * @param rq Request data
@@ -160,7 +194,7 @@ export class OrgApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  updateAvatar(id: number, data: FormData, payload?: MsgResultPayload) {
+  updateAvatar(id: number, data: FormData, payload?: StringIdResultPayload) {
     return this.api.put(`${this.flag}/UpdateAvatar/${id}`, data, payload);
   }
 

package/src/PublicApi.ts

@@ -16,6 +16,7 @@ import {
 } from "@etsoo/appscript";
 import { MemberInvitationDto } from "./dto/public/MemberInvitationDto";
 import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
+import { ChinaPinData } from "./dto/public/ChinaPinData";
 
 const unitPrefix = "unit";
 
@@ -128,6 +129,16 @@ export class PublicApi extends BaseApi {
     return this.api.post("Public/MobileQRCode", { id, host }, payload);
   }
 
+  /**
+   * Parse China PIN
+   * @param pin Pin code
+   * @param payload Payload
+   * @returns Result
+   */
+  parseChinaPin(pin: string, payload?: IApiPayload<ChinaPinData>) {
+    return this.api.get(`Public/ParseChinaPin/${pin}`, undefined, payload);
+  }
+
   /**
    * Query place
    * @param rq Request data

package/src/UserApi.ts

@@ -2,9 +2,9 @@ import {
   EntityApi,
   IApp,
   IdResultPayload,
-  MsgResultPayload,
   QueryRQ,
-  ResultPayload
+  ResultPayload,
+  StringIdResultPayload
 } from "@etsoo/appscript";
 import { IApi, IApiPayload } from "@etsoo/restclient";
 import { DeviceListDto } from "./dto/user/DeviceListDto";
@@ -142,7 +142,7 @@ export class UserApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  updateAvatar(data: FormData, payload?: MsgResultPayload) {
+  updateAvatar(data: FormData, payload?: StringIdResultPayload) {
     payload ??= { config: {} };
 
     // Credentials for anti-forgery cookie sending