@etsoo/smarterp-core 1.0.24 → 1.0.26

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2004-2024 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
+Copyright (c) 2004-2025 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/cjs/CoreApp.d.ts

@@ -4,10 +4,15 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
-import { IdentityType } from "./dto/IdentityType";
+import { AuthApi, IApp, IdentityType, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { ListType } from "@etsoo/shared";
+type AppData = {
+    id: number;
+    appId?: number;
+    name: string;
+    localName?: string;
+};
 /**
  * Core application interface
  * 核心应用程序接口
@@ -47,11 +52,7 @@ export interface ICoreApp {
      * @param data App data
      * @returns Name
      */
-    getAppName(data: {
-        id: number;
-        name: string;
-        localName?: string;
-    }): string;
+    getAppName(data: AppData): string;
     /**
      * Get user identifier type label
      * 获取用户标识类型标签
@@ -137,11 +138,7 @@ export declare class CoreApp implements ICoreApp {
      * @param data App data
      * @returns Name
      */
-    getAppName(data: {
-        id: number;
-        name: string;
-        localName?: string;
-    }): string;
+    getAppName(data: AppData): string;
     /**
      * Get user identifier type label
      * 获取用户标识类型标签
@@ -165,3 +162,4 @@ export declare class CoreApp implements ICoreApp {
      */
     getIdentities(identity?: number): ListType[];
 }
+export {};

package/lib/cjs/CoreApp.js

@@ -7,7 +7,6 @@ const AppApi_1 = require("./AppApi");
 const PublicApi_1 = require("./PublicApi");
 const UserApi_1 = require("./UserApi");
 const appscript_1 = require("@etsoo/appscript");
-const IdentityType_1 = require("./dto/IdentityType");
 const AuthCodeApi_1 = require("./AuthCodeApi");
 const shared_1 = require("@etsoo/shared");
 /**
@@ -90,7 +89,7 @@ class CoreApp {
      * @returns Name
      */
     getAppName(data) {
-        return data.localName ?? this.app.get(`app${data.id}`) ?? data.name;
+        return (data.localName ?? this.app.get(`app${data.appId ?? data.id}`) ?? data.name);
     }
     /**
      * Get user identifier type label
@@ -124,8 +123,8 @@ class CoreApp {
      */
     getIdentities(identity) {
         if (identity == null)
-            return this.app.getEnumList(IdentityType_1.IdentityType, "id");
-        return this.app.getEnumList(IdentityType_1.IdentityType, "id", (id, _key) => {
+            return this.app.getEnumList(appscript_1.IdentityType, "id");
+        return this.app.getEnumList(appscript_1.IdentityType, "id", (id, _key) => {
             if ((id & identity) > 0)
                 return id;
         });

package/lib/cjs/components/app/AppSwitchPopover.js

@@ -10,7 +10,7 @@ const material_1 = require("@mui/material");
 const react_router_dom_1 = require("react-router-dom");
 const materialui_1 = require("@etsoo/materialui");
 const ICoreServiceApp_1 = require("../../ICoreServiceApp");
-const IdentityType_1 = require("../../dto/IdentityType");
+const appscript_1 = require("@etsoo/appscript");
 function AppSwitchPopover(props) {
     // Destruct
     const { appName } = props;
@@ -31,7 +31,7 @@ function AppSwitchPopover(props) {
                 ml: 0.5,
                 whiteSpace: "nowrap",
                 cursor: "pointer"
-            }, title: labels.switchApp, onClick: (e) => callback(e.currentTarget), children: appName })), loadData: () => app.core.appApi.getMy({ maxItems, identityType: IdentityType_1.IdentityType.User }, { showLoading: false }), position: "left", children: (data) => {
+            }, title: labels.switchApp, onClick: (e) => callback(e.currentTarget), children: appName })), loadData: () => app.core.appApi.getMy({ maxItems, identityType: appscript_1.IdentityType.User }, { showLoading: false }), position: "left", children: (data) => {
             if (data == null)
                 return (0, jsx_runtime_1.jsx)(react_1.default.Fragment, {});
             // Remove the current app

package/lib/cjs/dto/app/AppPurchasedQueryData.d.ts

@@ -5,6 +5,10 @@ import { AppQueryData } from "./AppQueryData";
  * 购买的应用查询数据
  */
 export type AppPurchasedQueryData = AppQueryData & {
+    /**
+     * Global app id
+     */
+    appId: number;
     /**
      * Expiry
      * 到期时间

package/lib/cjs/dto/app/AppQueryData.d.ts

@@ -1,4 +1,4 @@
-import { IdentityType } from "../IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 import { AppUrl } from "./AppData";
 /**
  * Application query data

package/lib/cjs/dto/app/AppReadDto.d.ts

@@ -1,5 +1,4 @@
-import { EntityStatus } from "@etsoo/appscript";
-import { IdentityType } from "../IdentityType";
+import { EntityStatus, IdentityType } from "@etsoo/appscript";
 import { AppUrl } from "./AppData";
 /**
  * App read data

package/lib/cjs/dto/member/MemberReadDto.d.ts

@@ -1,5 +1,4 @@
-import { EntityStatus, UserRole } from "@etsoo/appscript";
-import { IdentityType } from "../IdentityType";
+import { EntityStatus, IdentityType, UserRole } from "@etsoo/appscript";
 /**
  * Member read for view data
  * 读取成员查看数据

package/lib/cjs/index.d.ts

@@ -24,7 +24,6 @@ export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
 export * from "./dto/user/UserUpdateReadDto";
-export * from "./dto/IdentityType";
 export * from "./i18n/CoreCulture";
 export * from "./rq/app/AppBuyNewRQ";
 export * from "./rq/app/AppBuyRQ";

package/lib/cjs/index.js

@@ -41,7 +41,6 @@ __exportStar(require("./dto/user/AuditHistoryDto"), exports);
 __exportStar(require("./dto/user/DeviceListDto"), exports);
 __exportStar(require("./dto/user/UserIdentifierData"), exports);
 __exportStar(require("./dto/user/UserUpdateReadDto"), exports);
-__exportStar(require("./dto/IdentityType"), exports);
 // i18n
 __exportStar(require("./i18n/CoreCulture"), exports);
 // RQ

package/lib/cjs/rq/app/AppGetMyRQ.d.ts

@@ -1,4 +1,4 @@
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 /**
  * Get user's latest accessed applications request data
  * 获取用户最近访问的应用请求数据

package/lib/cjs/rq/app/AppListRQ.d.ts

@@ -1,5 +1,4 @@
-import { QueryRQ } from "@etsoo/appscript";
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType, QueryRQ } from "@etsoo/appscript";
 /**
  * Application list request data
  * 应用列表请求数据

package/lib/mjs/CoreApp.d.ts

@@ -4,10 +4,15 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
-import { IdentityType } from "./dto/IdentityType";
+import { AuthApi, IApp, IdentityType, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { ListType } from "@etsoo/shared";
+type AppData = {
+    id: number;
+    appId?: number;
+    name: string;
+    localName?: string;
+};
 /**
  * Core application interface
  * 核心应用程序接口
@@ -47,11 +52,7 @@ export interface ICoreApp {
      * @param data App data
      * @returns Name
      */
-    getAppName(data: {
-        id: number;
-        name: string;
-        localName?: string;
-    }): string;
+    getAppName(data: AppData): string;
     /**
      * Get user identifier type label
      * 获取用户标识类型标签
@@ -137,11 +138,7 @@ export declare class CoreApp implements ICoreApp {
      * @param data App data
      * @returns Name
      */
-    getAppName(data: {
-        id: number;
-        name: string;
-        localName?: string;
-    }): string;
+    getAppName(data: AppData): string;
     /**
      * Get user identifier type label
      * 获取用户标识类型标签
@@ -165,3 +162,4 @@ export declare class CoreApp implements ICoreApp {
      */
     getIdentities(identity?: number): ListType[];
 }
+export {};

package/lib/mjs/CoreApp.js

@@ -3,8 +3,7 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, UserIdentifierType } from "@etsoo/appscript";
-import { IdentityType } from "./dto/IdentityType";
+import { AuthApi, IdentityType, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { DataTypes } from "@etsoo/shared";
 /**
@@ -87,7 +86,7 @@ export class CoreApp {
      * @returns Name
      */
     getAppName(data) {
-        return data.localName ?? this.app.get(`app${data.id}`) ?? data.name;
+        return (data.localName ?? this.app.get(`app${data.appId ?? data.id}`) ?? data.name);
     }
     /**
      * Get user identifier type label

package/lib/mjs/components/app/AppSwitchPopover.js

@@ -4,7 +4,7 @@ import { Button, Stack, Typography } from "@mui/material";
 import { useNavigate } from "react-router-dom";
 import { ButtonPopover } from "@etsoo/materialui";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 export function AppSwitchPopover(props) {
     // Destruct
     const { appName } = props;

package/lib/mjs/dto/app/AppPurchasedQueryData.d.ts

@@ -5,6 +5,10 @@ import { AppQueryData } from "./AppQueryData";
  * 购买的应用查询数据
  */
 export type AppPurchasedQueryData = AppQueryData & {
+    /**
+     * Global app id
+     */
+    appId: number;
     /**
      * Expiry
      * 到期时间

package/lib/mjs/dto/app/AppQueryData.d.ts

@@ -1,4 +1,4 @@
-import { IdentityType } from "../IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 import { AppUrl } from "./AppData";
 /**
  * Application query data

package/lib/mjs/dto/app/AppReadDto.d.ts

@@ -1,5 +1,4 @@
-import { EntityStatus } from "@etsoo/appscript";
-import { IdentityType } from "../IdentityType";
+import { EntityStatus, IdentityType } from "@etsoo/appscript";
 import { AppUrl } from "./AppData";
 /**
  * App read data

package/lib/mjs/dto/member/MemberReadDto.d.ts

@@ -1,5 +1,4 @@
-import { EntityStatus, UserRole } from "@etsoo/appscript";
-import { IdentityType } from "../IdentityType";
+import { EntityStatus, IdentityType, UserRole } from "@etsoo/appscript";
 /**
  * Member read for view data
  * 读取成员查看数据

package/lib/mjs/index.d.ts

@@ -24,7 +24,6 @@ export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
 export * from "./dto/user/UserUpdateReadDto";
-export * from "./dto/IdentityType";
 export * from "./i18n/CoreCulture";
 export * from "./rq/app/AppBuyNewRQ";
 export * from "./rq/app/AppBuyRQ";

package/lib/mjs/index.js

@@ -25,7 +25,6 @@ export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
 export * from "./dto/user/UserUpdateReadDto";
-export * from "./dto/IdentityType";
 // i18n
 export * from "./i18n/CoreCulture";
 // RQ

package/lib/mjs/rq/app/AppGetMyRQ.d.ts

@@ -1,4 +1,4 @@
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 /**
  * Get user's latest accessed applications request data
  * 获取用户最近访问的应用请求数据

package/lib/mjs/rq/app/AppListRQ.d.ts

@@ -1,5 +1,4 @@
-import { QueryRQ } from "@etsoo/appscript";
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType, QueryRQ } from "@etsoo/appscript";
 /**
  * Application list request data
  * 应用列表请求数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -20,7 +20,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json",
     "test": "vitest",
-    "localtest": "set NODE_ENV=local&&jest"
+    "localtest": "set NODE_ENV=local&&vitest"
   },
   "repository": {
     "type": "git",
@@ -50,15 +50,15 @@
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.8"
+    "vitest": "^3.0.9"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.18",
-    "@etsoo/materialui": "^1.4.97",
-    "@etsoo/react": "^1.8.32",
+    "@etsoo/appscript": "^1.6.19",
+    "@etsoo/materialui": "^1.4.99",
+    "@etsoo/react": "^1.8.33",
     "@etsoo/shared": "^1.2.62",
     "@etsoo/toolpad": "^1.0.19",
-    "@mui/material": "^6.4.7",
+    "@mui/material": "^6.4.8",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

package/src/CoreApp.ts

@@ -4,11 +4,17 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
-import { IdentityType } from "./dto/IdentityType";
+import {
+  AuthApi,
+  IApp,
+  IdentityType,
+  UserIdentifierType
+} from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
 import { DataTypes, ListType } from "@etsoo/shared";
 
+type AppData = { id: number; appId?: number; name: string; localName?: string };
+
 /**
  * Core application interface
  * 核心应用程序接口
@@ -55,7 +61,7 @@ export interface ICoreApp {
    * @param data App data
    * @returns Name
    */
-  getAppName(data: { id: number; name: string; localName?: string }): string;
+  getAppName(data: AppData): string;
 
   /**
    * Get user identifier type label
@@ -168,8 +174,10 @@ export class CoreApp implements ICoreApp {
    * @param data App data
    * @returns Name
    */
-  getAppName(data: { id: number; name: string; localName?: string }) {
-    return data.localName ?? this.app.get(`app${data.id}`) ?? data.name;
+  getAppName(data: AppData) {
+    return (
+      data.localName ?? this.app.get(`app${data.appId ?? data.id}`) ?? data.name
+    );
   }
 
   /**

package/src/components/app/AppSwitchPopover.tsx

@@ -3,9 +3,8 @@ import { Button, Stack, Typography } from "@mui/material";
 import { useNavigate } from "react-router-dom";
 import { ButtonPopover } from "@etsoo/materialui";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
-import { IdentityType } from "../../dto/IdentityType";
 import { AppData } from "../../dto/app/AppData";
-import { AuthRequest } from "@etsoo/appscript";
+import { AuthRequest, IdentityType } from "@etsoo/appscript";
 
 export type AppSwitchPopoverProps = {
   appName: string;

package/src/dto/app/AppPurchasedQueryData.ts

@@ -6,6 +6,11 @@ import { AppQueryData } from "./AppQueryData";
  * 购买的应用查询数据
  */
 export type AppPurchasedQueryData = AppQueryData & {
+  /**
+   * Global app id
+   */
+  appId: number;
+
   /**
    * Expiry
    * 到期时间

package/src/dto/app/AppQueryData.ts

@@ -1,4 +1,4 @@
-import { IdentityType } from "../IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 import { AppUrl } from "./AppData";
 
 /**

package/src/dto/app/AppReadDto.ts

@@ -1,5 +1,4 @@
-import { EntityStatus } from "@etsoo/appscript";
-import { IdentityType } from "../IdentityType";
+import { EntityStatus, IdentityType } from "@etsoo/appscript";
 import { AppUrl } from "./AppData";
 
 /**

package/src/dto/member/MemberReadDto.ts

@@ -1,5 +1,4 @@
-import { EntityStatus, UserRole } from "@etsoo/appscript";
-import { IdentityType } from "../IdentityType";
+import { EntityStatus, IdentityType, UserRole } from "@etsoo/appscript";
 
 /**
  * Member read for view data

package/src/index.ts

@@ -31,8 +31,6 @@ export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
 export * from "./dto/user/UserUpdateReadDto";
 
-export * from "./dto/IdentityType";
-
 // i18n
 export * from "./i18n/CoreCulture";
 

package/src/rq/app/AppGetMyRQ.ts

@@ -1,4 +1,4 @@
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType } from "@etsoo/appscript";
 
 /**
  * Get user's latest accessed applications request data

package/src/rq/app/AppListRQ.ts

@@ -1,5 +1,4 @@
-import { QueryRQ } from "@etsoo/appscript";
-import { IdentityType } from "../../dto/IdentityType";
+import { IdentityType, QueryRQ } from "@etsoo/appscript";
 
 /**
  * Application list request data

package/lib/cjs/dto/IdentityType.d.ts

@@ -1,21 +0,0 @@
-/**
- * Identity type
- * 标识类型
- */
-export declare enum IdentityType {
-    /**
-     * User
-     * 用户
-     */
-    User = 1,
-    /**
-     * Customer
-     * 客户
-     */
-    Customer = 2,
-    /**
-     * Supplier
-     * 供应商
-     */
-    Supplier = 4
-}

package/lib/cjs/dto/IdentityType.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdentityType = void 0;
-/**
- * Identity type
- * 标识类型
- */
-var IdentityType;
-(function (IdentityType) {
-    /**
-     * User
-     * 用户
-     */
-    IdentityType[IdentityType["User"] = 1] = "User";
-    /**
-     * Customer
-     * 客户
-     */
-    IdentityType[IdentityType["Customer"] = 2] = "Customer";
-    /**
-     * Supplier
-     * 供应商
-     */
-    IdentityType[IdentityType["Supplier"] = 4] = "Supplier";
-})(IdentityType || (exports.IdentityType = IdentityType = {}));

package/lib/mjs/dto/IdentityType.d.ts

@@ -1,21 +0,0 @@
-/**
- * Identity type
- * 标识类型
- */
-export declare enum IdentityType {
-    /**
-     * User
-     * 用户
-     */
-    User = 1,
-    /**
-     * Customer
-     * 客户
-     */
-    Customer = 2,
-    /**
-     * Supplier
-     * 供应商
-     */
-    Supplier = 4
-}

package/lib/mjs/dto/IdentityType.js

@@ -1,22 +0,0 @@
-/**
- * Identity type
- * 标识类型
- */
-export var IdentityType;
-(function (IdentityType) {
-    /**
-     * User
-     * 用户
-     */
-    IdentityType[IdentityType["User"] = 1] = "User";
-    /**
-     * Customer
-     * 客户
-     */
-    IdentityType[IdentityType["Customer"] = 2] = "Customer";
-    /**
-     * Supplier
-     * 供应商
-     */
-    IdentityType[IdentityType["Supplier"] = 4] = "Supplier";
-})(IdentityType || (IdentityType = {}));

package/src/dto/IdentityType.ts

@@ -1,23 +0,0 @@
-/**
- * Identity type
- * 标识类型
- */
-export enum IdentityType {
-  /**
-   * User
-   * 用户
-   */
-  User = 1,
-
-  /**
-   * Customer
-   * 客户
-   */
-  Customer = 2,
-
-  /**
-   * Supplier
-   * 供应商
-   */
-  Supplier = 4
-}