@etsoo/appscript 1.5.61 → 1.5.63

package/package.json

@@ -1,73 +1,76 @@
 {
-    "name": "@etsoo/appscript",
-    "version": "1.5.61",
-    "description": "Applications shared TypeScript framework",
-    "main": "lib/cjs/index.js",
-    "module": "lib/mjs/index.js",
-    "types": "lib/mjs/index.d.ts",
-    "exports": {
-        ".": {
-            "import": "./lib/mjs/index.js",
-            "require": "./lib/cjs/index.js"
-        }
-    },
-    "scripts": {
-        "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json",
-        "format": "prettier --write src/**/*.ts",
-        "lint": "eslint --ext .ts src/",
-        "test": "jest",
-        "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand"
-    },
-    "jest": {
-        "automock": false,
-        "testMatch": [
-            "<rootDir>/__tests__/**/*.ts"
-        ],
-        "testEnvironment": "jsdom",
-        "transform": {
-            ".+\\.jsx?$": "babel-jest",
-            ".+\\.tsx?$": "ts-jest"
-        },
-        "transformIgnorePatterns": [
-            "/node_modules/(?!@etsoo/).+\\.js$"
-        ]
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/ETSOO/AppScript.git"
-    },
-    "keywords": [
-        "notification",
-        "TypeScript",
-        "ETSOO",
-        "SmartERP",
-        "司友云平台",
-        "青岛亿速思维",
-        "上海亿商"
+  "name": "@etsoo/appscript",
+  "version": "1.5.63",
+  "description": "Applications shared TypeScript framework",
+  "main": "lib/cjs/index.js",
+  "module": "lib/mjs/index.js",
+  "types": "lib/mjs/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib/mjs/index.js",
+      "require": "./lib/cjs/index.js"
+    }
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json",
+    "format": "prettier --write src/**/*.ts",
+    "lint": "eslint --ext .ts src/",
+    "test": "jest",
+    "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand"
+  },
+  "jest": {
+    "automock": false,
+    "testMatch": [
+      "<rootDir>/__tests__/**/*.ts"
     ],
-    "author": "Garry Xiao",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/ETSOO/AppScript/issues"
-    },
-    "homepage": "https://github.com/ETSOO/AppScript#readme",
-    "dependencies": {
-        "@etsoo/notificationbase": "^1.1.52",
-        "@etsoo/restclient": "^1.1.14",
-        "@etsoo/shared": "^1.2.51",
-        "crypto-js": "^4.2.0"
+    "testPathIgnorePatterns": [
+      "<rootDir>/__tests__/app/TestApp.ts"
+    ],
+    "testEnvironment": "jsdom",
+    "transform": {
+      ".+\\.jsx?$": "babel-jest",
+      ".+\\.tsx?$": "ts-jest"
     },
-    "devDependencies": {
-        "@babel/cli": "^7.25.7",
-        "@babel/core": "^7.25.8",
-        "@babel/plugin-transform-runtime": "^7.25.7",
-        "@babel/preset-env": "^7.25.8",
-        "@babel/runtime-corejs3": "^7.25.7",
-        "@types/crypto-js": "^4.2.2",
-        "@types/jest": "^29.5.13",
-        "jest": "^29.7.0",
-        "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.2.5",
-        "typescript": "^5.6.3"
-    }
+    "transformIgnorePatterns": [
+      "/node_modules/(?!@etsoo/).+\\.js$"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ETSOO/AppScript.git"
+  },
+  "keywords": [
+    "notification",
+    "TypeScript",
+    "ETSOO",
+    "SmartERP",
+    "司友云平台",
+    "青岛亿速思维",
+    "上海亿商"
+  ],
+  "author": "Garry Xiao",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ETSOO/AppScript/issues"
+  },
+  "homepage": "https://github.com/ETSOO/AppScript#readme",
+  "dependencies": {
+    "@etsoo/notificationbase": "^1.1.53",
+    "@etsoo/restclient": "^1.1.15",
+    "@etsoo/shared": "^1.2.54",
+    "crypto-js": "^4.2.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.25.9",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/runtime-corejs3": "^7.26.0",
+    "@types/crypto-js": "^4.2.2",
+    "@types/jest": "^29.5.14",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
+  }
 }

package/src/{erp → api}/AuthApi.ts

@@ -2,17 +2,18 @@ import { IApiPayload } from '@etsoo/restclient';
 import { IUser } from '../state/User';
 import { BaseApi } from './BaseApi';
 import { ResultPayload } from './dto/ResultPayload';
-import { LoginIdRQ } from './rq/LoginIdRQ';
-import { LoginRQ } from './rq/LoginRQ';
-import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
 import { ActionResult, IActionResult } from '@etsoo/shared';
-import { SignoutRQ } from './rq/SignoutRQ';
-import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
+import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
 import { TokenRQ } from './rq/TokenRQ';
 import { ApiRefreshTokenDto } from './dto/ApiRefreshTokenDto';
-import { RefreshTokenProps, RefreshTokenResult } from '../app/IApp';
+import { GetLogInUrlRQ } from './rq/GetLogInUrlRQ';
+import { LoginRQ } from './rq/LoginRQ';
+import { LoginIdRQ } from './rq/LoginIdRQ';
 import { RefreshTokenRQ } from './rq/RefreshTokenRQ';
+import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+import { SignoutRQ } from './rq/SignoutRQ';
 import { SwitchOrgRQ } from './rq/SwitchOrgRQ';
+import { AuthRequest } from './rq/AuthRequest';
 
 /**
  * Authentication API
@@ -33,6 +34,15 @@ export class AuthApi extends BaseApi {
         return this.api.put('Auth/ApiRefreshToken', rq, payload);
     }
 
+    /**
+     * Authorization request
+     * @param auth Authorization request data
+     * @param payload Payload
+     */
+    authRequest(auth: AuthRequest, payload?: IApiPayload<string>) {
+        return this.api.post('Auth/AuthRequest', auth, payload);
+    }
+
     /**
      * Exchange token
      * @param rq Request data

package/src/{erp → api}/EntityApi.ts

@@ -2,13 +2,10 @@ import { IApi, IApiPayload } from '@etsoo/restclient';
 import { IActionResult, IdType } from '@etsoo/shared';
 import { IApp } from '../app/IApp';
 import { BaseApi } from './BaseApi';
-import { AuditLinePayload } from './dto/AuditLineDto';
 import { ResultPayload } from './dto/ResultPayload';
 import { MergeRQ } from './rq/MergeRQ';
 import { QueryRQ } from './rq/QueryRQ';
-import { TiplistRQ } from './rq/TiplistRQ';
 import { UpdateStatusRQ } from './rq/UpdateStatusRQ';
-
 /**
  * Entity API
  * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
@@ -71,7 +68,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected listBase<
         T extends IdType,
-        RQ extends TiplistRQ<T>,
+        RQ extends QueryRQ<T>,
         R extends object
     >(rq: RQ, payload?: IApiPayload<R[]>) {
         let { queryPaging, ...rest } = rq;
@@ -113,19 +110,6 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
         return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
     }
 
-    /**
-     * Query audit history
-     * @param rq Request data
-     * @param payload Payload
-     * @returns Result
-     */
-    protected queryAuditBase<T extends IdType, R extends QueryRQ<T>>(
-        rq: R,
-        payload?: AuditLinePayload
-    ) {
-        return this.api.post(`${this.flag}/QueryAudit`, rq, payload);
-    }
-
     /**
      * Query favored country ids
      * @returns Result

package/src/api/dto/AntiforgeryRequestToken.ts

@@ -0,0 +1,23 @@
+/**
+ * Antiforgery token
+ * 反伪造令牌
+ */
+export type AntiforgeryRequestToken = {
+    /**
+     * Name of the form field used for the request token
+     * 用于请求令牌的表单字段名称
+     */
+    name: string;
+
+    /**
+     * Name of the header used for the request token
+     * 用于请求令牌的标头名称
+     */
+    headerName?: string;
+
+    /**
+     * Request token value
+     * 请求令牌值
+     */
+    value?: string;
+};

package/{lib/mjs/erp/dto/ResultPayload.d.ts → src/api/dto/ResultPayload.ts}

@@ -1,14 +1,32 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult, IdActionResult } from '@etsoo/shared';
+import {
+    IActionResult,
+    IdActionResult,
+    IdMsgActionResult,
+    MsgActionResult
+} from '@etsoo/shared';
+
 /**
  * Action result payload
  */
 export type ResultPayload = IApiPayload<IActionResult>;
+
 /**
  * Number id action result payload
  */
 export type IdResultPayload = IApiPayload<IdActionResult>;
+
 /**
  * String id action result payload
  */
 export type StringIdResultPayload = IApiPayload<IdActionResult<string>>;
+
+/**
+ * Id and message action result payload
+ */
+export type IdMsgResultPayload = IApiPayload<IdMsgActionResult>;
+
+/**
+ * Message action result payload
+ */
+export type MsgResultPayload = IApiPayload<MsgActionResult>;

package/src/{erp → api}/rq/QueryPagingData.ts

@@ -6,20 +6,20 @@ export type QueryPagingData = {
     /**
      * Current page
      */
-    currentPage: number;
+    currentPage?: number;
 
     /**
-     * Batch size
+     * Keyset array, same order as the order by fields
      */
-    batchSize: number;
+    keysets?: unknown[];
 
     /**
-     * Order by field name
+     * Batch size
      */
-    orderBy?: string;
+    batchSize: number;
 
     /**
-     * Order by ascending
+     * Order by fields
      */
-    orderByAsc?: boolean;
+    orderBy?: Record<string, boolean>;
 };

package/src/{erp/rq/TiplistRQ.ts → api/rq/QueryRQ.ts}

@@ -2,15 +2,20 @@ import { IdType } from '@etsoo/shared';
 import { QueryPagingData } from './QueryPagingData';
 
 /**
- * Tiplist request data
- * com.etsoo.CoreFramework.Models.TiplistRQ
+ * Query request data
+ * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export type TiplistRQ<T extends IdType = number> = {
+export type QueryRQ<T extends IdType = number> = {
     /**
-     * number id
+     * Number id
      */
     id?: T;
 
+    /**
+     * Included ids
+     */
+    ids?: T[];
+
     /**
      * Excluded ids
      */

package/src/api/rq/StatusQueryRQ.ts

@@ -0,0 +1,19 @@
+import { IdType } from '@etsoo/shared';
+import { QueryRQ } from './QueryRQ';
+import { EntityStatus } from '../../business/EntityStatus';
+
+/**
+ * Query with status request data
+ * com.etsoo.CoreFramework.Models.QueryRQ
+ */
+export type StatusQueryRQ<T extends IdType = number> = QueryRQ<T> & {
+    /**
+     * Disabled or not, null for all, true for disabled (> EntityStatus.Approved), false for enabled (<= 100)
+     */
+    disabled?: boolean;
+
+    /**
+     * Status
+     */
+    status?: EntityStatus;
+};

package/src/api/rq/UpdateModel.ts

@@ -0,0 +1,20 @@
+import { IdType } from '@etsoo/shared';
+
+/**
+ * Update model
+ * 更新模型
+ */
+export interface UpdateModel<T extends IdType = number> {
+    /**
+     * Id
+     * 编号
+     */
+    id: T;
+
+    /**
+     * Changed (modified) fields
+     * 'Exclude' items from a union type while 'omit' items from an object type.
+     * 更改的字段，注意 'Exclude' 用于联合类型，'omit' 用于对象类型。
+     */
+    changedFields?: Exclude<keyof this, 'changedFields'>[];
+}

package/src/app/CoreApp.ts

@@ -26,7 +26,7 @@ import { AddressRegion } from '../address/AddressRegion';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { DataPrivacy } from '../business/DataPrivacy';
 import { EntityStatus } from '../business/EntityStatus';
-import { InitCallDto } from '../erp/dto/InitCallDto';
+import { InitCallDto } from '../api/dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
@@ -46,9 +46,9 @@ import { UserRole } from './UserRole';
 import type CryptoJS from 'crypto-js';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
-import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
-import { AuthApi } from '../erp/AuthApi';
-import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
+import { ApiRefreshTokenDto } from '../api/dto/ApiRefreshTokenDto';
+import { ApiRefreshTokenRQ } from '../api/rq/ApiRefreshTokenRQ';
+import { AuthApi } from '../api/AuthApi';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
@@ -478,6 +478,15 @@ export abstract class CoreApp<
         );
     }
 
+    /**
+     * Create Auth API
+     * @param api Specify the API to use
+     * @returns Result
+     */
+    protected createAuthApi(api?: IApi) {
+        return new AuthApi(this, api);
+    }
+
     /**
      * Restore settings from persisted source
      */
@@ -1948,7 +1957,7 @@ export abstract class CoreApp<
         props.token ??= this.getCacheToken();
 
         // Call refresh token API
-        let data = await new AuthApi(this).refreshToken<IActionResult<U>>(
+        let data = await this.createAuthApi().refreshToken<IActionResult<U>>(
             props
         );
 
@@ -2045,7 +2054,7 @@ export abstract class CoreApp<
         }
 
         // Call the API quietly, no loading bar and no error popup
-        const data = await new AuthApi(this).exchangeToken(
+        const data = await this.createAuthApi().exchangeToken(
             { token },
             {
                 showLoading: false,
@@ -2119,7 +2128,7 @@ export abstract class CoreApp<
         rq.appId ??= this.settings.appId;
 
         // Call the API quietly, no loading bar and no error popup
-        return new AuthApi(this, api).apiRefreshToken(rq, {
+        return this.createAuthApi(api).apiRefreshToken(rq, {
             showLoading: false,
             onError: (error) => {
                 console.error(
@@ -2229,7 +2238,7 @@ export abstract class CoreApp<
 
         const token = this.getCacheToken();
         if (token) {
-            const result = await new AuthApi(this).signout(
+            const result = await this.createAuthApi().signout(
                 {
                     deviceId: this.deviceId,
                     token

package/src/app/IApp.ts

@@ -23,8 +23,8 @@ import { UserRole } from './UserRole';
 import { EntityStatus } from '../business/EntityStatus';
 import { Currency } from '../business/Currency';
 import { ExternalEndpoint } from './ExternalSettings';
-import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
-import { ApiRefreshTokenRQ } from '../erp/rq/ApiRefreshTokenRQ';
+import { ApiRefreshTokenDto } from '../api/dto/ApiRefreshTokenDto';
+import { ApiRefreshTokenRQ } from '../api/rq/ApiRefreshTokenRQ';
 
 /**
  * Detect IP callback interface

package/src/business/EntityStatus.ts

@@ -1,6 +1,6 @@
 /**
  * Standard entity status enum
- * @see com.etsoo.CoreFramework.Business.EntityStatus
+ * C# com.etsoo.CoreFramework.Business.EntityStatus
  * Labels also included within i18n
  */
 export enum EntityStatus {

package/src/i18n/en.json

@@ -77,8 +77,10 @@
     "expiry": "Expiry",
     "exportToPdf": "Export to PDF",
     "failed": "Operation failed",
+    "familyName": "Family name",
     "field": "Field",
     "fileDownloaded": "The file has been downloaded",
+    "givenName": "Given name",
     "help": "Help",
     "hideIt": "Hide it",
     "id": "Number#",

package/src/i18n/zh-Hans.json

@@ -77,8 +77,10 @@
     "expiry": "到期时间",
     "exportToPdf": "导出为PDF",
     "failed": "操作失败",
+    "familyName": "姓氏",
     "field": "字段",
     "fileDownloaded": "文件已下载",
+    "givenName": "名",
     "help": "帮助",
     "hideIt": "隐藏",
     "id": "编号",

package/src/i18n/zh-Hant.json

@@ -77,8 +77,10 @@
     "expiry": "到期時間",
     "exportToPdf": "導出為PDF",
     "failed": "操作失敗",
+    "familyName": "姓氏",
     "field": "字段",
     "fileDownloaded": "文件已下載",
+    "givenName": "名",
     "help": "幫助",
     "hideIt": "隱藏",
     "id": "編號",