@etsoo/appscript 1.5.62 → 1.5.64

package/lib/{mjs/erp → cjs/api}/AuthApi.d.ts

@@ -2,15 +2,16 @@ import { IApiPayload } from '@etsoo/restclient';
 import { IUser } from '../state/User';
 import { BaseApi } from './BaseApi';
 import { ResultPayload } from './dto/ResultPayload';
-import { LoginRQ } from './rq/LoginRQ';
-import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
 import { 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 { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+import { SignoutRQ } from './rq/SignoutRQ';
 import { SwitchOrgRQ } from './rq/SwitchOrgRQ';
+import { AuthRequest } from './rq/AuthRequest';
 /**
  * Authentication API
  */
@@ -26,6 +27,12 @@ export declare class AuthApi extends BaseApi {
      * @returns Result
      */
     apiRefreshToken(rq: TokenRQ, payload?: IApiPayload<ApiRefreshTokenDto>): Promise<ApiRefreshTokenDto | undefined>;
+    /**
+     * Authorization request
+     * @param auth Authorization request data
+     * @param payload Payload
+     */
+    authRequest(auth: AuthRequest, payload?: IApiPayload<string>): Promise<string | undefined>;
     /**
      * Exchange token
      * @param rq Request data

package/lib/cjs/{erp → api}/AuthApi.js

@@ -16,6 +16,14 @@ class AuthApi extends BaseApi_1.BaseApi {
     apiRefreshToken(rq, payload) {
         return this.api.put('Auth/ApiRefreshToken', rq, payload);
     }
+    /**
+     * Authorization request
+     * @param auth Authorization request data
+     * @param payload Payload
+     */
+    authRequest(auth, payload) {
+        return this.api.post('Auth/AuthRequest', auth, payload);
+    }
     /**
      * Exchange token
      * @param rq Request data

package/lib/{mjs/erp → cjs/api}/EntityApi.d.ts

@@ -2,11 +2,9 @@ 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
@@ -40,7 +38,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<T extends IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected listBase<T extends IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Merge
      * @param rq Request data
@@ -56,13 +54,6 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected queryBase<T extends IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
-    /**
-     * 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): Promise<import("./dto/AuditLineDto").AuditLineDto[] | undefined>;
     /**
      * Query favored country ids
      * @returns Result

package/lib/cjs/{erp → api}/EntityApi.js

@@ -63,15 +63,6 @@ class EntityApi extends BaseApi_1.BaseApi {
     queryBase(rq, payload, queryKey = '') {
         return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
     }
-    /**
-     * Query audit history
-     * @param rq Request data
-     * @param payload Payload
-     * @returns Result
-     */
-    queryAuditBase(rq, payload) {
-        return this.api.post(`${this.flag}/QueryAudit`, rq, payload);
-    }
     /**
      * Query favored country ids
      * @returns Result

package/lib/cjs/api/dto/AntiforgeryRequestToken.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 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 → cjs/api}/dto/AuditLineDto.d.ts

@@ -1,4 +1,4 @@
-import { IApiPayload } from '@etsoo/restclient';
+import { IApiPayload } from "@etsoo/restclient";
 /**
  * Audit line data
  */

package/lib/cjs/{erp → api}/dto/PinDto.d.ts

@@ -47,7 +47,7 @@ export type PinDto = {
      * Gender
      * 性别
      */
-    gender?: 'F' | 'M';
+    gender?: "F" | "M";
     /**
      * Birthday
      * 生日

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

@@ -1,17 +1,22 @@
 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/lib/{mjs/erp → cjs/api}/rq/QueryPagingData.d.ts

@@ -6,17 +6,17 @@ 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/lib/{mjs/erp/rq/TiplistRQ.d.ts → cjs/api/rq/QueryRQ.d.ts}

@@ -1,14 +1,18 @@
 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/lib/cjs/api/rq/StatusQueryRQ.d.ts

@@ -0,0 +1,17 @@
+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/lib/cjs/api/rq/UpdateModel.d.ts

@@ -0,0 +1,18 @@
+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/lib/cjs/app/CoreApp.d.ts

@@ -3,15 +3,16 @@ import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, ErrorData, ErrorType, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { EntityStatus } from '../business/EntityStatus';
-import { InitCallDto } from '../erp/dto/InitCallDto';
+import { InitCallDto } from '../api/dto/InitCallDto';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { AppLoginParams, AppTryLoginParams, FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps } from './IApp';
 import { UserRole } from './UserRole';
 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';
+import { AuthApi } from '../api/AuthApi';
 type ApiRefreshTokenFunction = (api: IApi, rq: ApiRefreshTokenRQ) => Promise<[string, number] | undefined>;
 type ApiTaskData = [IApi, number, number, ApiRefreshTokenFunction, string?];
 /**
@@ -189,6 +190,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     addRootUrl(url: string): string;
+    /**
+     * Create Auth API
+     * @param api Specify the API to use
+     * @returns Result
+     */
+    protected createAuthApi(api?: IApi): AuthApi;
     /**
      * Restore settings from persisted source
      */

package/lib/cjs/app/CoreApp.js

@@ -11,7 +11,7 @@ const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
-const AuthApi_1 = require("../erp/AuthApi");
+const AuthApi_1 = require("../api/AuthApi");
 let CJ;
 const loadCrypto = () => import('crypto-js');
 // System API name
@@ -270,6 +270,14 @@ class CoreApp {
                     ? url
                     : '/' + url));
     }
+    /**
+     * Create Auth API
+     * @param api Specify the API to use
+     * @returns Result
+     */
+    createAuthApi(api) {
+        return new AuthApi_1.AuthApi(this, api);
+    }
     /**
      * Restore settings from persisted source
      */
@@ -1404,7 +1412,7 @@ class CoreApp {
         props ?? (props = {});
         props.token ?? (props.token = this.getCacheToken());
         // Call refresh token API
-        let data = await new AuthApi_1.AuthApi(this).refreshToken(props);
+        let data = await this.createAuthApi().refreshToken(props);
         let r;
         if (Array.isArray(data)) {
             const [token, result] = data;
@@ -1492,7 +1500,7 @@ class CoreApp {
             throw new Error('System API is not allowed to exchange token');
         }
         // Call the API quietly, no loading bar and no error popup
-        const data = await new AuthApi_1.AuthApi(this).exchangeToken({ token }, {
+        const data = await this.createAuthApi().exchangeToken({ token }, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
@@ -1548,7 +1556,7 @@ class CoreApp {
         // Default appId
         rq.appId ?? (rq.appId = this.settings.appId);
         // Call the API quietly, no loading bar and no error popup
-        return new AuthApi_1.AuthApi(this, api).apiRefreshToken(rq, {
+        return this.createAuthApi(api).apiRefreshToken(rq, {
             showLoading: false,
             onError: (error) => {
                 console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
@@ -1641,7 +1649,7 @@ class CoreApp {
         this.resetApis();
         const token = this.getCacheToken();
         if (token) {
-            const result = await new AuthApi_1.AuthApi(this).signout({
+            const result = await this.createAuthApi().signout({
                 deviceId: this.deviceId,
                 token
             }, {

package/lib/cjs/app/IApp.d.ts

@@ -8,8 +8,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/lib/cjs/business/EntityStatus.d.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 declare enum EntityStatus {

package/lib/cjs/business/EntityStatus.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityStatus = void 0;
 /**
  * Standard entity status enum
- * @see com.etsoo.CoreFramework.Business.EntityStatus
+ * C# com.etsoo.CoreFramework.Business.EntityStatus
  * Labels also included within i18n
  */
 var EntityStatus;

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

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

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

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

package/lib/cjs/index.d.ts

@@ -1,87 +1,69 @@
-export * from './address/AddressAutocomplete';
-export * from './address/AddressCity';
-export * from './address/AddressContinent';
-export * from './address/AddressDistrict';
-export * from './address/AddressLocation';
-export * from './address/AddressPlace';
-export * from './address/AddressPlaceBase';
-export * from './address/AddressRegion';
-export * from './address/AddressState';
-export * from './address/AddressUtils';
-export * from './app/AppSettings';
-export * from './app/CoreApp';
-export * from './app/ExternalSettings';
-export * from './app/IApp';
-export * from './app/UserRole';
-export * from './bridges/BridgeUtils';
-export * from './bridges/IBridgeHost';
-export * from './business/ApiService';
-export * from './business/BusinessTax';
-export * from './business/BusinessUtils';
-export * from './business/CultureItem';
-export * from './business/Currency';
-export * from './business/DataPrivacy';
-export * from './business/EntityStatus';
-export * from './business/ProductUnit';
-export * from './business/RepeatOption';
-export * from './business/ShoppingCart';
-export * from './custom/CustomField';
-export * from './custom/CustomFieldData';
-export * from './def/ListItem';
-export * from './erp/dto/ApiRefreshTokenDto';
-export * from './erp/dto/AuditLineDto';
-export * from './erp/dto/CurrencyDto';
-export * from './erp/dto/ExchangeRateDto';
-export * from './erp/dto/ExchangeRateHistoryDto';
-export * from './erp/dto/IdLabelDto';
-export * from './erp/dto/IdLabelPrimaryDto';
-export * from './erp/dto/InitCallDto';
-export * from './erp/dto/OrgDto';
-export * from './erp/dto/OrgQueryDto';
-export * from './erp/dto/OrgViewDto';
-export * from './erp/dto/PinDto';
-export * from './erp/dto/PlaceParsedDto';
-export * from './erp/dto/ResponseActionMessageDto';
-export * from './erp/dto/ResultPayload';
-export * from './erp/rq/ApiRefreshTokenRQ';
-export * from './erp/rq/AuthRequest';
-export * from './erp/rq/GetLogInUrlRQ';
-export * from './erp/rq/LoginIdRQ';
-export * from './erp/rq/LoginRQ';
-export * from './erp/rq/MemberListRQ';
-export * from './erp/rq/MergeRQ';
-export * from './erp/rq/OrgListRQ';
-export * from './erp/rq/OrgQueryRQ';
-export * from './erp/rq/ParsePinRQ';
-export * from './erp/rq/PlaceParseRQ';
-export * from './erp/rq/PlaceQueryRQ';
-export * from './erp/rq/QueryPagingData';
-export * from './erp/rq/QueryRQ';
-export * from './erp/rq/RefreshTokenRQ';
-export * from './erp/rq/RegionsRQ';
-export * from './erp/rq/ResetPasswordRQ';
-export * from './erp/rq/SendActionMessageRQ';
-export * from './erp/rq/SignoutRQ';
-export * from './erp/rq/SwitchOrgRQ';
-export * from './erp/rq/TiplistRQ';
-export * from './erp/rq/TokenRQ';
-export * from './erp/rq/UpdateStatusRQ';
-export * from './erp/AddressApi';
-export * from './erp/AuthApi';
-export * from './erp/BaseApi';
-export * from './erp/EntityApi';
-export * from './erp/MemberApi';
-export * from './erp/OrgApi';
-export * from './erp/PublicApi';
-export * from './i18n/CultureUtils';
-export * from './i18n/en';
-export * from './i18n/zhHans';
-export * from './i18n/zhHant';
-export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from '@etsoo/restclient';
-export type { IApi, IApiPayload } from '@etsoo/restclient';
-export * from './result/ActionResult';
-export * from './result/ActionResultError';
-export * from './result/InitCallResult';
-export * from './state/Culture';
-export * from './state/State';
-export * from './state/User';
+export * from "./address/AddressAutocomplete";
+export * from "./address/AddressCity";
+export * from "./address/AddressContinent";
+export * from "./address/AddressDistrict";
+export * from "./address/AddressLocation";
+export * from "./address/AddressPlace";
+export * from "./address/AddressPlaceBase";
+export * from "./address/AddressRegion";
+export * from "./address/AddressState";
+export * from "./address/AddressUtils";
+export * from "./api/dto/AntiforgeryRequestToken";
+export * from "./api/dto/ApiRefreshTokenDto";
+export * from "./api/dto/AuditLineDto";
+export * from "./api/dto/IdLabelDto";
+export * from "./api/dto/IdLabelPrimaryDto";
+export * from "./api/dto/InitCallDto";
+export * from "./api/dto/PinDto";
+export * from "./api/dto/ResultPayload";
+export * from "./api/rq/ApiRefreshTokenRQ";
+export * from "./api/rq/AuthRequest";
+export * from "./api/rq/GetLogInUrlRQ";
+export * from "./api/rq/LoginIdRQ";
+export * from "./api/rq/LoginRQ";
+export * from "./api/rq/MergeRQ";
+export * from "./api/rq/QueryPagingData";
+export * from "./api/rq/QueryRQ";
+export * from "./api/rq/RefreshTokenRQ";
+export * from "./api/rq/ResetPasswordRQ";
+export * from "./api/rq/SignoutRQ";
+export * from "./api/rq/StatusQueryRQ";
+export * from "./api/rq/SwitchOrgRQ";
+export * from "./api/rq/TokenRQ";
+export * from "./api/rq/UpdateModel";
+export * from "./api/rq/UpdateStatusRQ";
+export * from "./api/AuthApi";
+export * from "./api/BaseApi";
+export * from "./api/EntityApi";
+export * from "./app/AppSettings";
+export * from "./app/CoreApp";
+export * from "./app/ExternalSettings";
+export * from "./app/IApp";
+export * from "./app/UserRole";
+export * from "./bridges/BridgeUtils";
+export * from "./bridges/IBridgeHost";
+export * from "./business/ApiService";
+export * from "./business/BusinessTax";
+export * from "./business/BusinessUtils";
+export * from "./business/CultureItem";
+export * from "./business/Currency";
+export * from "./business/DataPrivacy";
+export * from "./business/EntityStatus";
+export * from "./business/ProductUnit";
+export * from "./business/RepeatOption";
+export * from "./business/ShoppingCart";
+export * from "./custom/CustomField";
+export * from "./custom/CustomFieldData";
+export * from "./def/ListItem";
+export * from "./i18n/CultureUtils";
+export * from "./i18n/en";
+export * from "./i18n/zhHans";
+export * from "./i18n/zhHant";
+export { ApiAuthorizationScheme, ApiDataError, ApiMethod, ApiResponseType, createClient, createClientAsync } from "@etsoo/restclient";
+export type { IApi, IApiPayload } from "@etsoo/restclient";
+export * from "./result/ActionResult";
+export * from "./result/ActionResultError";
+export * from "./result/InitCallResult";
+export * from "./state/Culture";
+export * from "./state/State";
+export * from "./state/User";