@etsoo/appscript 1.5.61 → 1.5.63

package/__tests__/app/CoreApp.ts

@@ -1,174 +1,25 @@
-import {
-    INotificaseBase,
-    INotification,
-    Notification,
-    NotificationCallProps,
-    NotificationContainer,
-    NotificationRenderProps
-} from '@etsoo/notificationbase';
-import {
-    ApiAuthorizationScheme,
-    ApiDataError,
-    ApiMethod,
-    createClient
-} from '@etsoo/restclient';
-import {
-    DataTypes,
-    DomUtils,
-    IActionResult,
-    Utils,
-    WindowStorage
-} from '@etsoo/shared';
-import {
-    AddressApi,
-    en,
-    EntityStatus,
-    ExternalSettings,
-    IUser,
-    OrgApi,
-    PublicApi,
-    UserRole,
-    zhHans
-} from '../../src';
-import { AddressUtils } from '../../src/address/AddressUtils';
-import { IAppSettings } from '../../src/app/AppSettings';
-import { CoreApp } from '../../src/app/CoreApp';
-import { InitCallResultData } from '../../src/result/InitCallResult';
-
-// Detected country or region
-const { detectedCountry } = DomUtils;
-
-// Detected culture
-const { detectedCulture } = DomUtils;
-
-// Supported cultures
-const supportedCultures: DataTypes.CultureDefinition[] = [zhHans({}), en({})];
-
-// Supported regions
-const supportedRegions = ['CN'];
-
-// Class implementation for tests
-class NotificationTest extends Notification<any, NotificationCallProps> {
-    render(props: NotificationRenderProps, className?: string, options?: any) {
-        throw new Error('Method not implemented.');
-    }
-}
-
-class NotificationContainerTest extends NotificationContainer<
-    any,
-    NotificationCallProps
-> {
-    protected addRaw(
-        data: INotificaseBase<any, NotificationCallProps>
-    ): INotification<any, NotificationCallProps> {
-        return new NotificationTest(data.type, data.content);
-    }
-}
-
-// Container
-var container = new NotificationContainerTest((update) => {});
+import { ApiDataError, ApiMethod } from '@etsoo/restclient';
+import { DataTypes, IActionResult } from '@etsoo/shared';
+import { EntityStatus, UserRole } from '../../src';
+import { TestApp } from './TestApp';
 
 // Arrange
-class CoreAppTest extends CoreApp<
-    IUser,
-    IAppSettings,
-    {},
-    NotificationCallProps
-> {
-    /**
-     * Constructor
-     * @param settings Settings
-     * @param name Application name
-     */
-    constructor() {
-        super(
-            ExternalSettings.format({
-                /**
-                 * Endpoint of the API service
-                 */
-                endpoint: 'http://{hostname}/com.etsoo.SmartERPApi/api/',
-
-                endpoints: {
-                    core: {
-                        endpoint: 'http://{hostname}:9001/api/',
-                        webUrl: ''
-                    }
-                },
-
-                /**
-                 * App root url
-                 */
-                homepage: '/cms',
-
-                /**
-                 * Web url of the cloud
-                 */
-                webUrl: 'http://localhost',
-
-                // Detected culture
-                detectedCulture,
-
-                // Supported cultures
-                cultures: supportedCultures,
-
-                // Supported regions
-                regions: supportedRegions,
-
-                // Browser's time zone
-                timeZone: Utils.getTimeZone(),
-
-                // Current country or region
-                currentRegion: AddressUtils.getRegion(
-                    supportedRegions,
-                    detectedCountry,
-                    detectedCulture
-                ),
-
-                // Current culture
-                currentCulture: DomUtils.getCulture(
-                    supportedCultures,
-                    detectedCulture
-                )![0]
-            }),
-            createClient(),
-            container,
-            new WindowStorage(),
-            'SmartERP'
-        );
-    }
-
-    freshCountdownUI(callback?: () => PromiseLike<unknown>): void {
-        throw new Error('Method not implemented.');
-    }
-
-    initCallUpdateLocal(data: InitCallResultData, timestamp: number) {
-        this.initCallUpdate(data, timestamp);
-        return this.passphrase;
-    }
-}
-
 // Mixins example
-function EnhanceApp<TBase extends DataTypes.MConstructor<CoreAppTest>>(
+function EnhanceApp<TBase extends DataTypes.MConstructor<TestApp>>(
     Base: TBase
 ) {
-    return class extends Base {
-        readonly addressApi = new AddressApi(this);
-        readonly publicApi = new PublicApi(this);
-        readonly orgApi = new OrgApi(this);
-    };
+    return class extends Base {};
 }
 
-const appClass = EnhanceApp(CoreAppTest);
+const appClass = EnhanceApp(TestApp);
 const app = new appClass();
 app.changeCulture(app.settings.cultures[0]);
 
 test('Test for domain replacement', () => {
-    expect(app.settings.endpoint).toBe(
-        'http://localhost/com.etsoo.SmartERPApi/api/'
-    );
+    expect(app.settings.endpoint).toBe('http://localhost:9000/api/');
 
     expect(app.settings.endpoints?.core.endpoint).toBe(
-        'http://localhost:9001/api/'
+        'https://localhost:9001/api/'
     );
 });
 
@@ -335,121 +186,3 @@ test('Tests for isValidPassword', () => {
     expect(app.isValidPassword('abcd3')).toBeFalsy();
     expect(app.isValidPassword('1234abcd')).toBeTruthy();
 });
-
-test('Tests for addressApi', async () => {
-    const regions = app.addressApi.regions();
-    const cn = regions.find((r) => r.id === 'CN');
-    expect(cn?.label).toBe('中国大陆');
-
-    const favoredRegions = app.addressApi.regions(['US', 'CA']);
-    expect(favoredRegions.length).toBe(2);
-    expect(favoredRegions.find((region) => region.id === 'US')?.label).toBe(
-        '美国'
-    );
-
-    const region = app.addressApi.region('US');
-    expect(region?.label).toBe('美国');
-    const regionFailed = app.addressApi.region('ABC');
-    expect(regionFailed).toBeUndefined();
-
-    /*
-    const results1 = await app.addressApi.autocomplete({
-        query: '青岛市玫瑰庭院',
-        region: 'CN',
-        language: 'zh-CN'
-    });
-
-    const results2 = await app.addressApi.autocomplete({
-        query: '青岛市玫瑰庭院',
-        language: 'zh-CN'
-    });
-
-    const results1 = await app.addressApi.searchPlace({
-        query: '青岛市玫瑰庭院',
-        region: 'CN',
-        language: 'zh-CN'
-    });
-
-    const result = await app.addressApi.parsePlace({
-        city: '青岛',
-        district: '市南'
-    });
-
-    const result = await app.addressApi.GetPlaceDetails(
-        'ChIJczySyo1qljUR1Jnq4Uqak2I',
-        'zh-CN'
-    );
-
-    const results2 = await app.addressApi.searchPlace({
-        query: '青岛市玫瑰庭院',
-        language: 'zh-CN'
-    });
-
-    const cities = await app.addressApi.cities('CNHN');
-    console.log(cities);
-
-    const districts = await app.addressApi.districts(1181);
-    console.log(districts);
-    */
-});
-
-/*
-test('Tests for addressApi Async', async () => {
-    const regions = await app.addressApi.getRegions({
-        items: 3,
-        favoredIds: ['US', 'AU', 'CA', 'NZ']
-    });
-    expect(regions?.length).toBe(3);
-    expect(regions![2].id).toBe('CA');
-});
-*/
-
-test('Tests for addressApi.continents', () => {
-    const continents1 = app.addressApi.continents();
-    const continents2 = app.addressApi.continents(true, true);
-    expect(continents1.length).toBe(6);
-    expect(continents1.some((item) => item.id === 'AN')).toBeFalsy();
-    expect(continents2.length).toBe(7);
-    expect(continents2[0].id).toBe(1);
-});
-
-test('Tests for publicApi', async () => {
-    expect(app.publicApi.getUnitLabel(12, true)).toBe('每年');
-
-    const options = app.publicApi.repeatOptions(['MONTH', 'QUATER', 'YEAR']);
-    expect(options[2]).toStrictEqual({ id: 12, label: '每年' });
-
-    const currencies = app.publicApi.currencies(['NZD', 'AUD', 'USD']);
-    expect(currencies.length).toBe(3);
-    expect(currencies[1].id).toBe('AUD');
-
-    const currencies1 = app.publicApi.currencies(true);
-    expect(currencies1.length >= 10).toBeTruthy();
-
-    expect(app.publicApi.getCurrencyLabel('USD')).toBe('美元');
-
-    const defaultExchangeRate = await app.publicApi.exchangeRate('CNY', {
-        showLoading: false
-    });
-    expect(defaultExchangeRate?.exchangeRate).toBe(100);
-
-    const url = app.publicApi.getOrgAvatar(1);
-    expect(url).toBe(
-        'http://localhost/com.etsoo.SmartERPApi/api/Storage/OrgAvatar/1'
-    );
-
-    /*
-    const amount1 = await app.publicApi.exchangeAmount(1000, 'NZD', 'CNY');
-    const amount2 = await app.publicApi.exchangeAmount(100, 'NZD', 'USD');
-    console.log(amount1, amount2);
-
-    const orgs = await app.orgApi.list();
-    console.log(orgs);
-
-    const orgsQuery = await app.orgApi.query({ currentPage: 1, batchSize: 2 });
-    console.log(orgsQuery);
-
-    const cultures = await app.publicApi.supportedCultures();
-    expect(cultures?.some((culture) => culture.id === 'zh-Hans')).toBeTruthy();
-    */
-});

package/__tests__/app/TestApp.ts

@@ -0,0 +1,136 @@
+import {
+    INotificaseBase,
+    INotification,
+    Notification,
+    NotificationCallProps,
+    NotificationContainer,
+    NotificationRenderProps
+} from '@etsoo/notificationbase';
+import {
+    AddressUtils,
+    CoreApp,
+    createClient,
+    en,
+    ExternalSettings,
+    IAppSettings,
+    InitCallResultData,
+    IUser,
+    zhHans
+} from '../../src';
+import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
+
+// Detected country or region
+const { detectedCountry } = DomUtils;
+
+// Detected culture
+const { detectedCulture } = DomUtils;
+
+// Supported cultures
+const supportedCultures: DataTypes.CultureDefinition[] = [zhHans({}), en({})];
+
+// Supported regions
+const supportedRegions = ['CN'];
+
+// Class implementation for tests
+class NotificationTest extends Notification<any, NotificationCallProps> {
+    render(props: NotificationRenderProps, className?: string, options?: any) {
+        throw new Error('Method not implemented.');
+    }
+}
+
+class NotificationContainerTest extends NotificationContainer<
+    any,
+    NotificationCallProps
+> {
+    protected addRaw(
+        data: INotificaseBase<any, NotificationCallProps>
+    ): INotification<any, NotificationCallProps> {
+        return new NotificationTest(data.type, data.content);
+    }
+}
+
+// Container
+var container = new NotificationContainerTest((update) => {});
+
+// Is local test (integration test)
+// Make sure your local environment is ready
+export const isLocalTest = process.env.NODE_ENV === 'local';
+
+// Test application class
+export class TestApp extends CoreApp<
+    IUser,
+    IAppSettings,
+    {},
+    NotificationCallProps
+> {
+    /**
+     * Constructor
+     * @param settings Settings
+     * @param name Application name
+     */
+    constructor() {
+        super(
+            ExternalSettings.format({
+                /**
+                 * Endpoint of the API service
+                 */
+                endpoint: 'http://{hostname}:9000/api/',
+
+                endpoints: {
+                    core: {
+                        endpoint: 'https://{hostname}:9001/api/',
+                        webUrl: ''
+                    }
+                },
+
+                /**
+                 * App root url
+                 */
+                homepage: '/cms',
+
+                /**
+                 * Web url of the cloud
+                 */
+                webUrl: 'https://localhost',
+
+                // Detected culture
+                detectedCulture,
+
+                // Supported cultures
+                cultures: supportedCultures,
+
+                // Supported regions
+                regions: supportedRegions,
+
+                // Browser's time zone
+                timeZone: Utils.getTimeZone(),
+
+                // Current country or region
+                currentRegion: AddressUtils.getRegion(
+                    supportedRegions,
+                    detectedCountry,
+                    detectedCulture
+                ),
+
+                // Current culture
+                currentCulture: DomUtils.getCulture(
+                    supportedCultures,
+                    detectedCulture
+                )![0]
+            }),
+            createClient(),
+            container,
+            new WindowStorage(),
+            'SmartERP'
+        );
+    }
+
+    freshCountdownUI(callback?: () => PromiseLike<unknown>): void {
+        throw new Error('Method not implemented.');
+    }
+
+    initCallUpdateLocal(data: InitCallResultData, timestamp: number) {
+        this.initCallUpdate(data, timestamp);
+        return this.passphrase;
+    }
+}

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/{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'>[];
+}