@etsoo/smarterp-core 1.0.4 → 1.0.5

package/lib/cjs/AppApi.d.ts

@@ -16,6 +16,7 @@ import { AppReadDto } from "./dto/app/AppReadDto";
 import { CreateApiKeyData } from "./dto/app/CreateApiKeyData";
 import { IActionResult } from "@etsoo/shared";
 import { AppCreateApiKeyRQ } from "./rq/app/AppCreateApiKeyRQ";
+import { AppData } from "./dto/app/AppData";
 /**
  * Application API
  */
@@ -53,7 +54,7 @@ export declare class AppApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    getMy(rq: AppGetMyRQ, payload?: IApiPayload<AppQueryData[]>): Promise<AppQueryData[] | undefined>;
+    getMy(rq: AppGetMyRQ, payload?: IApiPayload<AppData[]>): Promise<AppData[] | undefined>;
     /**
      * List
      * @param rq Request data

package/lib/cjs/CoreApp.d.ts

@@ -7,7 +7,6 @@ import { UserApi } from "./UserApi";
 import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
 import { IdentityType } from "./dto/IdentityType";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { AppQueryData } from "./dto/app/AppQueryData";
 import { ListType } from "@etsoo/shared";
 /**
  * Core application interface
@@ -48,7 +47,11 @@ export interface ICoreApp {
      * @param data App data
      * @returns Name
      */
-    getAppName(data: AppQueryData): string;
+    getAppName(data: {
+        id: number;
+        name: string;
+        localName?: string;
+    }): string;
     /**
      * Get user identifier type label
      * 获取用户标识类型标签

package/lib/cjs/UserApi.d.ts

@@ -71,7 +71,7 @@ export declare class UserApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    getLatestApp(payload?: IApiPayload<string>): Promise<string | undefined>;
+    getLatestApp(payload?: IApiPayload<AppData>): Promise<AppData | undefined>;
     /**
      * Update avatar
      * @param data Avatar form data

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

@@ -38,6 +38,12 @@ function AppSwitchPopover(props) {
             const index = data.findIndex((a) => a.id === currentApp);
             if (index >= 0)
                 data.splice(index, 1);
-            return ((0, jsx_runtime_1.jsxs)(material_1.Stack, { direction: "column", margin: 2, children: [data.map((appData) => ((0, jsx_runtime_1.jsx)(material_1.Button, { onClick: async () => { }, children: app.core.getAppName(appData) }, appData.id))), (data.length === 0 || data.length === maxItems) && ((0, jsx_runtime_1.jsxs)(material_1.Button, { onClick: () => navigate("./app/my"), children: [labels.more, "..."] }))] }));
+            return ((0, jsx_runtime_1.jsxs)(material_1.Stack, { direction: "column", margin: 2, children: [data.map((appData) => ((0, jsx_runtime_1.jsx)(material_1.Button, { onClick: async () => {
+                            const tasks = appData.urls.map((u) => app.core.authApi.getLogInUrl({ showLoading: false }, u.api));
+                            const url = await Promise.any(tasks);
+                            if (url == null)
+                                return;
+                            app.loadUrlEx(url);
+                        }, children: app.core.getAppName(appData) }, appData.id))), (data.length === 0 || data.length === maxItems) && ((0, jsx_runtime_1.jsxs)(material_1.Button, { onClick: () => navigate("./app/my"), children: [labels.more, "..."] }))] }));
         } }));
 }

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

@@ -1,3 +1,21 @@
+/**
+ * Application URL
+ * 应用网址
+ */
+export type AppUrl = {
+    /**
+     * Web URL
+     */
+    web: string;
+    /**
+     * API URL
+     */
+    api: string;
+    /**
+     * Help URL
+     */
+    help?: string;
+};
 /**
  * Application data
  * 程序数据
@@ -14,15 +32,15 @@ export type AppData = {
      */
     name: string;
     /**
-     * Web URL
-     * Web网址
+     * Local name
+     * 本地名称
      */
-    webUrl: string;
+    localName?: string;
     /**
-     * Help URL
-     * 帮助网址
+     * Application URLs
+     * 程序网址
      */
-    helpUrl?: string;
+    urls: AppUrl[];
     /**
      * Logo
      * 图标

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

@@ -29,16 +29,6 @@ export type AppQueryData = {
      * 是否需要本地地址
      */
     requireLocalUrl?: boolean;
-    /**
-     * Web URL
-     * 网页地址
-     */
-    webUrl: string;
-    /**
-     * Help URL
-     * 帮助地址
-     */
-    helpUrl?: string;
     /**
      * Logo
      * 图标

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

@@ -1,5 +1,6 @@
 import { EntityStatus } from "@etsoo/appscript";
 import { IdentityType } from "../IdentityType";
+import { AppUrl } from "./AppData";
 /**
  * App read data
  * 应用读取数据
@@ -26,17 +27,9 @@ export type AppReadDto = {
      */
     localName?: string;
     /**
-     * Local URL
+     * Local URLs
      */
-    localUrl?: string;
-    /**
-     * Local help URL
-     */
-    localHelpUrl?: string;
-    /**
-     * Local APIs
-     */
-    localApis?: string[];
+    localUrls?: AppUrl[];
     /**
      * Expiry
      */

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

@@ -1,4 +1,5 @@
 import { EntityStatus } from "@etsoo/appscript";
+import { AppUrl } from "./AppData";
 /**
  * App read for update data
  * 应用更新数据
@@ -17,17 +18,9 @@ export type AppUpdateReadDto = {
      */
     localName?: string;
     /**
-     * Local URL
+     * Local URLs
      */
-    localUrl?: string;
-    /**
-     * Local help URL
-     */
-    localHelpUrl?: string;
-    /**
-     * Local APIs
-     */
-    localApis?: string[];
+    localUrls?: AppUrl[];
     /**
      * Status
      */

package/lib/cjs/index.d.ts

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

package/lib/cjs/index.js

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

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

@@ -1,4 +1,5 @@
 import { EntityStatus, UpdateModel } from "@etsoo/appscript";
+import { AppUrl } from "../../dto/app/AppData";
 /**
  * App update request data
  * 应用更新请求数据
@@ -10,20 +11,10 @@ export interface AppUpdateRQ extends UpdateModel {
      */
     localName?: string;
     /**
-     * Local Web URL
+     * Local URLs
      * 本地网址
      */
-    localUrl?: string;
-    /**
-     * Local help URL
-     * 本地帮助网址
-     */
-    localHelpUrl?: string;
-    /**
-     * Local APIs
-     * 本地接口
-     */
-    localApis?: string[];
+    localUrls?: AppUrl[];
     /**
      * Status
      */

package/lib/mjs/AppApi.d.ts

@@ -16,6 +16,7 @@ import { AppReadDto } from "./dto/app/AppReadDto";
 import { CreateApiKeyData } from "./dto/app/CreateApiKeyData";
 import { IActionResult } from "@etsoo/shared";
 import { AppCreateApiKeyRQ } from "./rq/app/AppCreateApiKeyRQ";
+import { AppData } from "./dto/app/AppData";
 /**
  * Application API
  */
@@ -53,7 +54,7 @@ export declare class AppApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    getMy(rq: AppGetMyRQ, payload?: IApiPayload<AppQueryData[]>): Promise<AppQueryData[] | undefined>;
+    getMy(rq: AppGetMyRQ, payload?: IApiPayload<AppData[]>): Promise<AppData[] | undefined>;
     /**
      * List
      * @param rq Request data

package/lib/mjs/CoreApp.d.ts

@@ -7,7 +7,6 @@ import { UserApi } from "./UserApi";
 import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
 import { IdentityType } from "./dto/IdentityType";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { AppQueryData } from "./dto/app/AppQueryData";
 import { ListType } from "@etsoo/shared";
 /**
  * Core application interface
@@ -48,7 +47,11 @@ export interface ICoreApp {
      * @param data App data
      * @returns Name
      */
-    getAppName(data: AppQueryData): string;
+    getAppName(data: {
+        id: number;
+        name: string;
+        localName?: string;
+    }): string;
     /**
      * Get user identifier type label
      * 获取用户标识类型标签

package/lib/mjs/UserApi.d.ts

@@ -71,7 +71,7 @@ export declare class UserApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    getLatestApp(payload?: IApiPayload<string>): Promise<string | undefined>;
+    getLatestApp(payload?: IApiPayload<AppData>): Promise<AppData | undefined>;
     /**
      * Update avatar
      * @param data Avatar form data

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

@@ -32,6 +32,12 @@ export function AppSwitchPopover(props) {
             const index = data.findIndex((a) => a.id === currentApp);
             if (index >= 0)
                 data.splice(index, 1);
-            return (_jsxs(Stack, { direction: "column", margin: 2, children: [data.map((appData) => (_jsx(Button, { onClick: async () => { }, children: app.core.getAppName(appData) }, appData.id))), (data.length === 0 || data.length === maxItems) && (_jsxs(Button, { onClick: () => navigate("./app/my"), children: [labels.more, "..."] }))] }));
+            return (_jsxs(Stack, { direction: "column", margin: 2, children: [data.map((appData) => (_jsx(Button, { onClick: async () => {
+                            const tasks = appData.urls.map((u) => app.core.authApi.getLogInUrl({ showLoading: false }, u.api));
+                            const url = await Promise.any(tasks);
+                            if (url == null)
+                                return;
+                            app.loadUrlEx(url);
+                        }, children: app.core.getAppName(appData) }, appData.id))), (data.length === 0 || data.length === maxItems) && (_jsxs(Button, { onClick: () => navigate("./app/my"), children: [labels.more, "..."] }))] }));
         } }));
 }

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

@@ -1,3 +1,21 @@
+/**
+ * Application URL
+ * 应用网址
+ */
+export type AppUrl = {
+    /**
+     * Web URL
+     */
+    web: string;
+    /**
+     * API URL
+     */
+    api: string;
+    /**
+     * Help URL
+     */
+    help?: string;
+};
 /**
  * Application data
  * 程序数据
@@ -14,15 +32,15 @@ export type AppData = {
      */
     name: string;
     /**
-     * Web URL
-     * Web网址
+     * Local name
+     * 本地名称
      */
-    webUrl: string;
+    localName?: string;
     /**
-     * Help URL
-     * 帮助网址
+     * Application URLs
+     * 程序网址
      */
-    helpUrl?: string;
+    urls: AppUrl[];
     /**
      * Logo
      * 图标

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

@@ -29,16 +29,6 @@ export type AppQueryData = {
      * 是否需要本地地址
      */
     requireLocalUrl?: boolean;
-    /**
-     * Web URL
-     * 网页地址
-     */
-    webUrl: string;
-    /**
-     * Help URL
-     * 帮助地址
-     */
-    helpUrl?: string;
     /**
      * Logo
      * 图标

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

@@ -1,5 +1,6 @@
 import { EntityStatus } from "@etsoo/appscript";
 import { IdentityType } from "../IdentityType";
+import { AppUrl } from "./AppData";
 /**
  * App read data
  * 应用读取数据
@@ -26,17 +27,9 @@ export type AppReadDto = {
      */
     localName?: string;
     /**
-     * Local URL
+     * Local URLs
      */
-    localUrl?: string;
-    /**
-     * Local help URL
-     */
-    localHelpUrl?: string;
-    /**
-     * Local APIs
-     */
-    localApis?: string[];
+    localUrls?: AppUrl[];
     /**
      * Expiry
      */

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

@@ -1,4 +1,5 @@
 import { EntityStatus } from "@etsoo/appscript";
+import { AppUrl } from "./AppData";
 /**
  * App read for update data
  * 应用更新数据
@@ -17,17 +18,9 @@ export type AppUpdateReadDto = {
      */
     localName?: string;
     /**
-     * Local URL
+     * Local URLs
      */
-    localUrl?: string;
-    /**
-     * Local help URL
-     */
-    localHelpUrl?: string;
-    /**
-     * Local APIs
-     */
-    localApis?: string[];
+    localUrls?: AppUrl[];
     /**
      * Status
      */

package/lib/mjs/index.d.ts

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

package/lib/mjs/index.js

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

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

@@ -1,4 +1,5 @@
 import { EntityStatus, UpdateModel } from "@etsoo/appscript";
+import { AppUrl } from "../../dto/app/AppData";
 /**
  * App update request data
  * 应用更新请求数据
@@ -10,20 +11,10 @@ export interface AppUpdateRQ extends UpdateModel {
      */
     localName?: string;
     /**
-     * Local Web URL
+     * Local URLs
      * 本地网址
      */
-    localUrl?: string;
-    /**
-     * Local help URL
-     * 本地帮助网址
-     */
-    localHelpUrl?: string;
-    /**
-     * Local APIs
-     * 本地接口
-     */
-    localApis?: string[];
+    localUrls?: AppUrl[];
     /**
      * Status
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -53,8 +53,8 @@
     "vitest": "^3.0.5"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.2",
-    "@etsoo/materialui": "^1.4.81",
+    "@etsoo/appscript": "^1.6.6",
+    "@etsoo/materialui": "^1.4.82",
     "@etsoo/react": "^1.8.30",
     "@etsoo/shared": "^1.2.61",
     "@etsoo/toolpad": "^1.0.15",

package/src/AppApi.ts

@@ -21,6 +21,7 @@ import { AppReadDto } from "./dto/app/AppReadDto";
 import { CreateApiKeyData } from "./dto/app/CreateApiKeyData";
 import { IActionResult } from "@etsoo/shared";
 import { AppCreateApiKeyRQ } from "./rq/app/AppCreateApiKeyRQ";
+import { AppData } from "./dto/app/AppData";
 
 /**
  * Application API
@@ -74,7 +75,7 @@ export class AppApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  getMy(rq: AppGetMyRQ, payload?: IApiPayload<AppQueryData[]>) {
+  getMy(rq: AppGetMyRQ, payload?: IApiPayload<AppData[]>) {
     return this.api.post(`${this.flag}/GetMy`, rq, payload);
   }
 

package/src/CoreApp.ts

@@ -7,7 +7,6 @@ import { UserApi } from "./UserApi";
 import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
 import { IdentityType } from "./dto/IdentityType";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { AppQueryData } from "./dto/app/AppQueryData";
 import { DataTypes, ListType } from "@etsoo/shared";
 
 /**
@@ -56,7 +55,7 @@ export interface ICoreApp {
    * @param data App data
    * @returns Name
    */
-  getAppName(data: AppQueryData): string;
+  getAppName(data: { id: number; name: string; localName?: string }): string;
 
   /**
    * Get user identifier type label

package/src/UserApi.ts

@@ -107,7 +107,7 @@ export class UserApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  getLatestApp(payload?: IApiPayload<string>) {
+  getLatestApp(payload?: IApiPayload<AppData>) {
     return this.api.get("User/GetLatestApp", undefined, payload);
   }
 

package/src/components/app/AppSwitchPopover.tsx

@@ -2,9 +2,9 @@ import React from "react";
 import { Button, Stack, Typography } from "@mui/material";
 import { useNavigate } from "react-router-dom";
 import { ButtonPopover } from "@etsoo/materialui";
-import { AppQueryData } from "../../dto/app/AppQueryData";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 import { IdentityType } from "../../dto/IdentityType";
+import { AppData } from "../../dto/app/AppData";
 
 export type AppSwitchPopoverProps = {
   appName: string;
@@ -31,7 +31,7 @@ export function AppSwitchPopover(props: AppSwitchPopoverProps) {
 
   // Layout
   return (
-    <ButtonPopover<AppQueryData[]>
+    <ButtonPopover<AppData[]>
       button={(callback) => (
         <Typography
           variant="h6"
@@ -66,7 +66,17 @@ export function AppSwitchPopover(props: AppSwitchPopoverProps) {
         return (
           <Stack direction="column" margin={2}>
             {data.map((appData) => (
-              <Button key={appData.id} onClick={async () => {}}>
+              <Button
+                key={appData.id}
+                onClick={async () => {
+                  const tasks = appData.urls.map((u) =>
+                    app.core.authApi.getLogInUrl({ showLoading: false }, u.api)
+                  );
+                  const url = await Promise.any(tasks);
+                  if (url == null) return;
+                  app.loadUrlEx(url);
+                }}
+              >
                 {app.core.getAppName(appData)}
               </Button>
             ))}

package/src/dto/app/AppData.ts

@@ -1,3 +1,24 @@
+/**
+ * Application URL
+ * 应用网址
+ */
+export type AppUrl = {
+  /**
+   * Web URL
+   */
+  web: string;
+
+  /**
+   * API URL
+   */
+  api: string;
+
+  /**
+   * Help URL
+   */
+  help?: string;
+};
+
 /**
  * Application data
  * 程序数据
@@ -16,16 +37,16 @@ export type AppData = {
   name: string;
 
   /**
-   * Web URL
-   * Web网址
+   * Local name
+   * 本地名称
    */
-  webUrl: string;
+  localName?: string;
 
   /**
-   * Help URL
-   * 帮助网址
+   * Application URLs
+   * 程序网址
    */
-  helpUrl?: string;
+  urls: AppUrl[];
 
   /**
    * Logo

package/src/dto/app/AppQueryData.ts

@@ -35,18 +35,6 @@ export type AppQueryData = {
    */
   requireLocalUrl?: boolean;
 
-  /**
-   * Web URL
-   * 网页地址
-   */
-  webUrl: string;
-
-  /**
-   * Help URL
-   * 帮助地址
-   */
-  helpUrl?: string;
-
   /**
    * Logo
    * 图标

package/src/dto/app/AppReadDto.ts

@@ -1,5 +1,6 @@
 import { EntityStatus } from "@etsoo/appscript";
 import { IdentityType } from "../IdentityType";
+import { AppUrl } from "./AppData";
 
 /**
  * App read data
@@ -32,19 +33,9 @@ export type AppReadDto = {
   localName?: string;
 
   /**
-   * Local URL
+   * Local URLs
    */
-  localUrl?: string;
-
-  /**
-   * Local help URL
-   */
-  localHelpUrl?: string;
-
-  /**
-   * Local APIs
-   */
-  localApis?: string[];
+  localUrls?: AppUrl[];
 
   /**
    * Expiry

package/src/dto/app/AppUpdateReadDto.ts

@@ -1,4 +1,5 @@
 import { EntityStatus } from "@etsoo/appscript";
+import { AppUrl } from "./AppData";
 
 /**
  * App read for update data
@@ -21,19 +22,9 @@ export type AppUpdateReadDto = {
   localName?: string;
 
   /**
-   * Local URL
+   * Local URLs
    */
-  localUrl?: string;
-
-  /**
-   * Local help URL
-   */
-  localHelpUrl?: string;
-
-  /**
-   * Local APIs
-   */
-  localApis?: string[];
+  localUrls?: AppUrl[];
 
   /**
    * Status

package/src/index.ts

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

package/src/rq/app/AppUpdateRQ.ts

@@ -1,4 +1,5 @@
 import { EntityStatus, UpdateModel } from "@etsoo/appscript";
+import { AppUrl } from "../../dto/app/AppData";
 
 /**
  * App update request data
@@ -12,22 +13,10 @@ export interface AppUpdateRQ extends UpdateModel {
   localName?: string;
 
   /**
-   * Local Web URL
+   * Local URLs
    * 本地网址
    */
-  localUrl?: string;
-
-  /**
-   * Local help URL
-   * 本地帮助网址
-   */
-  localHelpUrl?: string;
-
-  /**
-   * Local APIs
-   * 本地接口
-   */
-  localApis?: string[];
+  localUrls?: AppUrl[];
 
   /**
    * Status