@etsoo/smarterp-core 1.0.45 → 1.0.46

package/lib/cjs/CoreApp.d.ts

@@ -4,7 +4,7 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IApp, IdentityType, UserIdentifierType } from "@etsoo/appscript";
+import { AuthApi, IApp, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { ListType } from "@etsoo/shared";
 type AppData = {
@@ -68,6 +68,14 @@ export interface ICoreApp {
      * @returns Label(s)
      */
     getIdentityLabel(identity: IdentityType | null | undefined, 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
      * 获取身份列表
@@ -75,6 +83,13 @@ export interface ICoreApp {
      * @returns List
      */
     getIdentities(identity?: number): ListType[];
+    /**
+     * Get identity flags
+     * 获取身份标志组合
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentityFlags(identity?: number): ListType[];
 }
 /**
  * Core application
@@ -154,6 +169,14 @@ export declare class CoreApp implements ICoreApp {
      * @returns Label(s)
      */
     getIdentityLabel(identity: IdentityType | null | undefined, joinChar?: string): string;
+    /**
+     * Get identity flags label
+     * 获取身份组合标签
+     * @param identity Identity value
+     * @param joinChar Join character
+     * @returns Label(s)
+     */
+    getIdentityFlagsLabel(identity: IdentityTypeFlags | null | undefined, joinChar?: string): string;
     /**
      * Get identities
      * 获取身份列表
@@ -161,5 +184,12 @@ export declare class CoreApp implements ICoreApp {
      * @returns List
      */
     getIdentities(identity?: number): ListType[];
+    /**
+     * Get identity flags
+     * 获取身份标志组合
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentityFlags(identity?: number): ListType[];
 }
 export {};

package/lib/cjs/CoreApp.js

@@ -115,6 +115,20 @@ class CoreApp {
         const identities = this.getIdentities(identity);
         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, joinChar) {
+        if (identity == null)
+            return "";
+        joinChar ??= ", ";
+        const identities = this.getIdentityFlags(identity);
+        return identities.map((r) => r.label).join(joinChar);
+    }
     /**
      * Get identities
      * 获取身份列表
@@ -129,5 +143,19 @@ class CoreApp {
                 return id;
         });
     }
+    /**
+     * Get identity flags
+     * 获取身份标志组合
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentityFlags(identity) {
+        if (identity == null)
+            return this.app.getEnumList(appscript_1.IdentityTypeFlags, "id");
+        return this.app.getEnumList(appscript_1.IdentityTypeFlags, "id", (id, _key) => {
+            if ((id & identity) > 0)
+                return id;
+        });
+    }
 }
 exports.CoreApp = CoreApp;

package/lib/cjs/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/cjs/i18n/zh-Hans.json

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

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

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

package/lib/mjs/CoreApp.d.ts

@@ -4,7 +4,7 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IApp, IdentityType, UserIdentifierType } from "@etsoo/appscript";
+import { AuthApi, IApp, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { ListType } from "@etsoo/shared";
 type AppData = {
@@ -68,6 +68,14 @@ export interface ICoreApp {
      * @returns Label(s)
      */
     getIdentityLabel(identity: IdentityType | null | undefined, 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
      * 获取身份列表
@@ -75,6 +83,13 @@ export interface ICoreApp {
      * @returns List
      */
     getIdentities(identity?: number): ListType[];
+    /**
+     * Get identity flags
+     * 获取身份标志组合
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentityFlags(identity?: number): ListType[];
 }
 /**
  * Core application
@@ -154,6 +169,14 @@ export declare class CoreApp implements ICoreApp {
      * @returns Label(s)
      */
     getIdentityLabel(identity: IdentityType | null | undefined, joinChar?: string): string;
+    /**
+     * Get identity flags label
+     * 获取身份组合标签
+     * @param identity Identity value
+     * @param joinChar Join character
+     * @returns Label(s)
+     */
+    getIdentityFlagsLabel(identity: IdentityTypeFlags | null | undefined, joinChar?: string): string;
     /**
      * Get identities
      * 获取身份列表
@@ -161,5 +184,12 @@ export declare class CoreApp implements ICoreApp {
      * @returns List
      */
     getIdentities(identity?: number): ListType[];
+    /**
+     * Get identity flags
+     * 获取身份标志组合
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentityFlags(identity?: number): ListType[];
 }
 export {};

package/lib/mjs/CoreApp.js

@@ -3,7 +3,7 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IdentityType, UserIdentifierType } from "@etsoo/appscript";
+import { AuthApi, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { DataTypes } from "@etsoo/shared";
 /**
@@ -112,6 +112,20 @@ export class CoreApp {
         const identities = this.getIdentities(identity);
         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, joinChar) {
+        if (identity == null)
+            return "";
+        joinChar ??= ", ";
+        const identities = this.getIdentityFlags(identity);
+        return identities.map((r) => r.label).join(joinChar);
+    }
     /**
      * Get identities
      * 获取身份列表
@@ -126,4 +140,18 @@ export class CoreApp {
                 return id;
         });
     }
+    /**
+     * Get identity flags
+     * 获取身份标志组合
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentityFlags(identity) {
+        if (identity == null)
+            return this.app.getEnumList(IdentityTypeFlags, "id");
+        return this.app.getEnumList(IdentityTypeFlags, "id", (id, _key) => {
+            if ((id & identity) > 0)
+                return id;
+        });
+    }
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -47,15 +47,15 @@
     "@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.24",
-    "@etsoo/materialui": "^1.5.30",
-    "@etsoo/react": "^1.8.39",
+    "@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",

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/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/src/i18n/zh-Hans.json

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

package/src/i18n/zh-Hant.json

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

package/vite.config.mts

@@ -4,6 +4,11 @@ import react from "@vitejs/plugin-react";
 export default defineConfig({
   plugins: [react()],
   test: {
+    server: {
+      deps: {
+        inline: [/@mui\/x-data-grid.*/]
+      }
+    },
     globals: true,
     environment: "jsdom",
     include: ["__tests__/**/*.ts(x)?"],