@etsoo/appscript 1.3.33 → 1.3.35

package/lib/mjs/erp/AddressApi.js

@@ -2,6 +2,7 @@ import { DataTypes } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion } from '../address/AddressRegion';
 import { BaseApi } from './BaseApi';
+const cachedRegions = {};
 /**
  * Address Api
  */
@@ -9,10 +10,13 @@ export class AddressApi extends BaseApi {
     /**
      * Get all continents
      * @param isNumberKey Is number key or key as id
+     * @param includeAntarctica Include Antarctica or not
      * @returns Continents
      */
-    async continents(isNumberKey = false) {
-        return DataTypes.getEnumKeys(AddressContinent).map((key) => ({
+    continents(isNumberKey = false, includeAntarctica = false) {
+        return DataTypes.getEnumKeys(AddressContinent)
+            .filter((item) => includeAntarctica || item !== 'AN')
+            .map((key) => ({
             id: isNumberKey
                 ? DataTypes.getEnumByKey(AddressContinent, key)
                 : key.toString(),
@@ -29,20 +33,47 @@ export class AddressApi extends BaseApi {
         return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
     }
     /**
-     * Get region list
-     * @param isRemote Is Remote version
-     * @returns Result
+     * Get all regions
+     * @param rq Rquest data
      */
-    regions(isRemote) {
-        if (isRemote) {
-            return this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false });
+    async getRegions(rq) {
+        const culture = this.app.culture;
+        let regions = cachedRegions[culture];
+        if (regions == null) {
+            regions = await this.api.get(`Address/RegionList?language=${culture}`, undefined, { defaultValue: [], showLoading: false });
+            if (regions == null)
+                return undefined;
+            cachedRegions[culture] = regions;
         }
-        else {
-            return AddressRegion.all.map((region) => {
-                region.label = this.app.getRegionLabel(region.id);
-                return { ...region };
+        const { favoredIds = [], items = 8, keyword } = rq !== null && rq !== void 0 ? rq : {};
+        // Keyword filter
+        if (keyword)
+            regions = regions.filter((region) => region.label.includes(keyword) || region.id === keyword);
+        // Order by favoredIds
+        if (favoredIds.length > 0) {
+            regions = [...regions].sort((r1, r2) => {
+                const n1 = favoredIds.indexOf(r1.id);
+                const n2 = favoredIds.indexOf(r2.id);
+                if (n1 === n2)
+                    return 0;
+                if (n1 === -1)
+                    return 1;
+                if (n2 === -1)
+                    return -1;
+                return n1 - n2;
             });
         }
+        // Return the top items
+        return regions.slice(0, items);
+    }
+    regions(p) {
+        const items = p == null || p.length === 0
+            ? AddressRegion.all
+            : AddressRegion.all.filter((ad) => p.includes(ad.id));
+        return items.map((region) => ({
+            ...region,
+            label: this.app.getRegionLabel(region.id)
+        }));
     }
     /**
      * Get state list

package/lib/mjs/erp/BaseApi.js

@@ -2,6 +2,12 @@
  * SmartERP base API
  */
 export class BaseApi {
+    /**
+     * API Last error
+     */
+    get lastError() {
+        return this.api.lastError;
+    }
     /**
      * Constructor
      * @param app Application
@@ -11,10 +17,4 @@ export class BaseApi {
         this.app = app;
         this.api = api;
     }
-    /**
-     * API Last error
-     */
-    get lastError() {
-        return this.api.lastError;
-    }
 }

package/lib/mjs/erp/EntityApi.d.ts

@@ -54,6 +54,11 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected queryAuditBase<T extends DataTypes.IdType, R extends QueryRQ<T>>(rq: R, payload?: AuditLinePayload): Promise<AuditLineDto[] | undefined>;
+    /**
+     * Query favored country ids
+     * @returns Result
+     */
+    protected queryFavoredCountryIdsBase(api?: string): Promise<string[]>;
     /**
      * Read
      * @param id Id

package/lib/mjs/erp/EntityApi.js

@@ -56,6 +56,19 @@ export class EntityApi extends BaseApi {
     queryAuditBase(rq, payload) {
         return this.api.post(`${this.flag}/QueryAudit`, rq, payload);
     }
+    /**
+     * Query favored country ids
+     * @returns Result
+     */
+    async queryFavoredCountryIdsBase(api) {
+        api !== null && api !== void 0 ? api : (api = `${this.flag}/QueryFavoredCountryIds`);
+        const result = await this.api.get(api, undefined, {
+            showLoading: false
+        });
+        if (result == null)
+            return [];
+        return result.map((item) => item.id);
+    }
     /**
      * Read
      * @param id Id

package/lib/mjs/erp/dto/AuditLineDto.d.ts

@@ -2,7 +2,7 @@ import { IApiPayload } from '@etsoo/restclient';
 /**
  * Audit line data
  */
-export declare type AuditLineDto = {
+export type AuditLineDto = {
     id: number;
     creation: Date;
     user: string;
@@ -14,11 +14,11 @@ export declare type AuditLineDto = {
 /**
  * Audit line changes data
  */
-export declare type AuditLineChangesDto = {
+export type AuditLineChangesDto = {
     oldData: Record<string, unknown>;
     newData: Record<string, unknown>;
 };
 /**
  * Audit line API payload
  */
-export declare type AuditLinePayload = IApiPayload<AuditLineDto[]>;
+export type AuditLinePayload = IApiPayload<AuditLineDto[]>;

package/lib/mjs/erp/dto/CurrencyDto.d.ts

@@ -3,4 +3,4 @@ import { ExchangeRateDto } from './ExchangeRateDto';
 /**
  * Currency data
  */
-export declare type CurrencyDto = ListType1 & ExchangeRateDto;
+export type CurrencyDto = ListType1 & ExchangeRateDto;

package/lib/mjs/erp/dto/ExchangeRateDto.d.ts

@@ -1,7 +1,7 @@
 /**
  * Exchange rate data
  */
-export declare type ExchangeRateDto = {
+export type ExchangeRateDto = {
     /**
      * Exchange rate
      */

package/lib/mjs/erp/dto/ExchangeRateHistoryDto.d.ts

@@ -3,6 +3,6 @@ import { ExchangeRateDto } from './ExchangeRateDto';
 /**
  * Exchange rate history data
  */
-export declare type ExchangeRateHistoryDto = ExchangeRateDto & {
+export type ExchangeRateHistoryDto = ExchangeRateDto & {
     id: Currency;
 };

package/lib/mjs/erp/dto/IdLabelDto.d.ts

@@ -2,4 +2,4 @@ import { ListType, ListType1 } from '@etsoo/shared';
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? ListType[] : ListType1[];
+export type IdLabelConditional<T extends boolean> = T extends true ? ListType[] : ListType1[];

package/lib/mjs/erp/dto/IdLabelPrimaryDto.d.ts

@@ -2,7 +2,7 @@ import { DataTypes } from '@etsoo/shared';
 /**
  * Dto with id, label and primary field
  */
-export declare type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = DataTypes.IdLabelItem<T> & {
+export type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = DataTypes.IdLabelItem<T> & {
     /**
      * Is primary
      */

package/lib/mjs/erp/dto/InitCallDto.d.ts

@@ -1,7 +1,7 @@
 /**
  * Init call dto
  */
-export declare type InitCallDto = {
+export type InitCallDto = {
     /**
      * Device id
      */

package/lib/mjs/erp/dto/OrgDto.d.ts

@@ -1,7 +1,7 @@
 /**
  * Organization data
  */
-export declare type OrgDto = {
+export type OrgDto = {
     /**
      * Id
      */

package/lib/mjs/erp/dto/OrgQueryDto.d.ts

@@ -1,7 +1,7 @@
 /**
  * Organization query data
  */
-export declare type OrgQueryDto = {
+export type OrgQueryDto = {
     /**
      * Id
      */

package/lib/mjs/erp/dto/PublicProductDto.d.ts

@@ -3,7 +3,7 @@ import { EntityStatus } from '../../business/EntityStatus';
 /**
  * Public product data
  */
-export declare type PublicProductDto = {
+export type PublicProductDto = {
     /**
      * Id
      */
@@ -28,7 +28,7 @@ export declare type PublicProductDto = {
 /**
  * Public product with organization data
  */
-export declare type PublicOrgProductDto = PublicProductDto & {
+export type PublicOrgProductDto = PublicProductDto & {
     /**
      * Purchased service status
      */

package/lib/mjs/erp/dto/ResultPayload.d.ts

@@ -3,12 +3,12 @@ import { IActionResult, IdActionResult } from '../../result/IActionResult';
 /**
  * Action result payload
  */
-export declare type ResultPayload = IApiPayload<IActionResult>;
+export type ResultPayload = IApiPayload<IActionResult>;
 /**
  * Number id action result payload
  */
-export declare type IdResultPayload = IApiPayload<IdActionResult>;
+export type IdResultPayload = IApiPayload<IdActionResult>;
 /**
  * String id action result payload
  */
-export declare type StringIdResultPayload = IApiPayload<IdActionResult<string>>;
+export type StringIdResultPayload = IApiPayload<IdActionResult<string>>;

package/lib/mjs/erp/rq/MemberListRQ.d.ts

@@ -2,4 +2,4 @@ import { TiplistRQ } from './TiplistRQ';
 /**
  * Member list request data
  */
-export declare type MemberListRQ = TiplistRQ<string> & {};
+export type MemberListRQ = TiplistRQ<string> & {};

package/lib/mjs/erp/rq/OrgListRQ.d.ts

@@ -2,7 +2,7 @@ import { TiplistRQ } from './TiplistRQ';
 /**
  * Organization list request data
  */
-export declare type OrgListRQ = TiplistRQ & {
+export type OrgListRQ = TiplistRQ & {
     /**
      * Service id
      */

package/lib/mjs/erp/rq/OrgQueryRQ.d.ts

@@ -2,7 +2,7 @@ import { QueryRQ } from './QueryRQ';
 /**
  * Organization query request data
  */
-export declare type OrgQueryRQ = QueryRQ & {
+export type OrgQueryRQ = QueryRQ & {
     /**
      * Name
      */

package/lib/mjs/erp/rq/QueryRQ.d.ts

@@ -3,7 +3,7 @@ import { DataTypes } from '@etsoo/shared';
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export declare type QueryRQ<T extends DataTypes.IdType = number> = {
+export type QueryRQ<T extends DataTypes.IdType = number> = {
     /**
      * Number id
      */

package/lib/mjs/erp/rq/RefreshTokenRQ.d.ts

@@ -1,7 +1,7 @@
 /**
  * Refresh token request data
  */
-export declare type RefreshTokenRQ = {
+export type RefreshTokenRQ = {
     /**
      * Device id
      */

package/lib/mjs/erp/rq/RegionsRQ.d.ts

@@ -0,0 +1,14 @@
+export type RegionsRQ = {
+    /**
+     * Favored country ids from top to bottom
+     */
+    favoredIds?: string[];
+    /**
+     * Items count to query
+     */
+    items?: number;
+    /**
+     * Filter keyword
+     */
+    keyword?: string;
+};

package/lib/mjs/erp/rq/RegionsRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/erp/rq/TiplistRQ.d.ts

@@ -3,7 +3,7 @@ import { DataTypes } from '@etsoo/shared';
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export declare type TiplistRQ<T extends DataTypes.IdType = number> = {
+export type TiplistRQ<T extends DataTypes.IdType = number> = {
     /**
      * number id
      */

package/lib/mjs/i18n/en-US.json

@@ -2,6 +2,7 @@
     "accountant": "Accountant",
     "actions": "Actions",
     "add": "Add",
+    "assignedId": "Assigned ID",
     "audits": "Audits",
     "author": "Author",
     "authorizer": "Authorizer",

package/lib/mjs/i18n/zh-CN.json

@@ -2,6 +2,7 @@
     "accountant": "会计",
     "actions": "操作",
     "add": "添加",
+    "assignedId": "分配的编号",
     "audits": "操作历史",
     "author": "作者",
     "authorizer": "授权人",

package/lib/mjs/i18n/zh-HK.json

@@ -2,6 +2,7 @@
     "accountant": "會計",
     "actions": "操作",
     "add": "添加",
+    "assignedId": "分配的編號",
     "audits": "操作歷史",
     "author": "作者",
     "authorizer": "授權人",

package/lib/mjs/result/ActionResultError.js

@@ -2,18 +2,6 @@
  * Action result error
  */
 export class ActionResultError extends Error {
-    /**
-     * Constructor
-     * @param result Result
-     */
-    constructor(result) {
-        // Super
-        super(ActionResultError.format(result));
-        // Name
-        this.name = 'ActionResultError';
-        // Hold the result
-        this.result = result;
-    }
     /**
      * Format the result to a meaningful string
      * @param result Result
@@ -30,4 +18,16 @@ export class ActionResultError extends Error {
         var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }
+    /**
+     * Constructor
+     * @param result Result
+     */
+    constructor(result) {
+        // Super
+        super(ActionResultError.format(result));
+        // Name
+        this.name = 'ActionResultError';
+        // Hold the result
+        this.result = result;
+    }
 }

package/lib/mjs/result/IActionResult.d.ts

@@ -50,10 +50,10 @@ export interface IActionResult<D extends object = {}> {
 /**
  * Action result with id data
  */
-export declare type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
+export type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
     id: T;
 }>;
 /**
  * Action result with dynamic data
  */
-export declare type DynamicActionResult = IActionResult<Record<string, any>>;
+export type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/mjs/result/InitCallResult.d.ts

@@ -27,4 +27,4 @@ export interface InitCallResultData {
 /**
  * Init call result
  */
-export declare type InitCallResult = IActionResult<InitCallResultData>;
+export type InitCallResult = IActionResult<InitCallResultData>;

package/lib/mjs/state/User.d.ts

@@ -35,7 +35,7 @@ export interface IUserData {
 /**
  * User data property keys
  */
-export declare type UserKey = keyof IUserData;
+export type UserKey = keyof IUserData;
 /**
  * User interface
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.33",
+    "version": "1.3.35",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.16",
-        "@etsoo/restclient": "^1.0.78",
-        "@etsoo/shared": "^1.1.77",
+        "@etsoo/notificationbase": "^1.1.18",
+        "@etsoo/restclient": "^1.0.79",
+        "@etsoo/shared": "^1.1.78",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -64,15 +64,15 @@
         "@babel/plugin-transform-runtime": "^7.19.6",
         "@babel/preset-env": "^7.20.2",
         "@babel/runtime-corejs3": "^7.20.1",
-        "@types/jest": "^29.2.2",
-        "@typescript-eslint/eslint-plugin": "^5.42.1",
-        "@typescript-eslint/parser": "^5.42.1",
-        "eslint": "^8.27.0",
+        "@types/jest": "^29.2.3",
+        "@typescript-eslint/eslint-plugin": "^5.43.0",
+        "@typescript-eslint/parser": "^5.43.0",
+        "eslint": "^8.28.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.3.1",
         "jest-environment-jsdom": "^29.3.1",
         "ts-jest": "^29.0.3",
-        "typescript": "^4.8.4"
+        "typescript": "^4.9.3"
     }
 }

package/src/address/AddressRegion.ts

@@ -36,6 +36,12 @@ export interface AddressRegionDb {
      */
     readonly exitCode: string;
 
+    /**
+     * National (truck) prefix
+     * 国内呼叫的拨号
+     */
+    readonly nationalPrefix?: string;
+
     /**
      * Area code for international dial, like 86 for China
      * 国际电话区号
@@ -85,7 +91,8 @@ export class AddressRegion implements IAddressRegion {
         '156',
         AddressContinent.AS,
         '00',
-        '86',
+        '+86',
+        '0',
         'CNY',
         ['zh-CN']
     );
@@ -100,7 +107,8 @@ export class AddressRegion implements IAddressRegion {
         '344',
         AddressContinent.AS,
         '001',
-        '852',
+        '+852',
+        undefined,
         'HKD',
         ['zh-HK', 'en-HK']
     );
@@ -115,7 +123,8 @@ export class AddressRegion implements IAddressRegion {
         '702',
         AddressContinent.AS,
         '000',
-        '65',
+        '+65',
+        undefined,
         'SGD',
         ['zh-SG', 'en-SG']
     );
@@ -130,7 +139,8 @@ export class AddressRegion implements IAddressRegion {
         '392',
         AddressContinent.AS,
         '010',
-        '81',
+        '+81',
+        '0',
         'JPY',
         ['ja-JP']
     );
@@ -145,6 +155,7 @@ export class AddressRegion implements IAddressRegion {
         '840',
         AddressContinent.NA,
         '011',
+        '+1',
         '1',
         'USD',
         ['en-US']
@@ -160,6 +171,7 @@ export class AddressRegion implements IAddressRegion {
         '124',
         AddressContinent.NA,
         '011',
+        '+1',
         '1',
         'CAD',
         ['en-CA', 'fr-CA']
@@ -175,7 +187,8 @@ export class AddressRegion implements IAddressRegion {
         '036',
         AddressContinent.OC,
         '0011',
-        '61',
+        '+61',
+        '0',
         'AUD',
         ['en-AU']
     );
@@ -190,7 +203,8 @@ export class AddressRegion implements IAddressRegion {
         '554',
         AddressContinent.OC,
         '00',
-        '64',
+        '+64',
+        '0',
         'NZD',
         ['en-NZ', 'mi-NZ']
     );
@@ -205,7 +219,8 @@ export class AddressRegion implements IAddressRegion {
         '826',
         AddressContinent.EU,
         '00',
-        '44',
+        '+44',
+        '0',
         'GBP',
         ['en-GB']
     );
@@ -220,7 +235,8 @@ export class AddressRegion implements IAddressRegion {
         '372',
         AddressContinent.EU,
         '00',
-        '353',
+        '+353',
+        '0',
         'EUR',
         ['en-IE']
     );
@@ -235,7 +251,8 @@ export class AddressRegion implements IAddressRegion {
         '276',
         AddressContinent.EU,
         '00',
-        '49',
+        '+49',
+        '0',
         'EUR',
         ['de-DE']
     );
@@ -250,7 +267,8 @@ export class AddressRegion implements IAddressRegion {
         '250',
         AddressContinent.EU,
         '00',
-        '33',
+        '+33',
+        '0',
         'EUR',
         ['fr-FR']
     );
@@ -295,6 +313,7 @@ export class AddressRegion implements IAddressRegion {
         public continent: AddressContinent,
         public exitCode: string,
         public idd: string,
+        public nationalPrefix: string | undefined,
         public currency: Currency,
         public languages: string[],
         public label: string = id

package/src/bridges/FlutterHost.ts

@@ -108,4 +108,6 @@ export class FlutterHost implements IBridgeHost {
     }
 
     onUpdate(func: (app: string, version: string) => void) {}
+
+    setTitle(title: string) {}
 }

package/src/bridges/IBridgeHost.ts

@@ -49,4 +49,10 @@ export interface IBridgeHost {
      * @param func Callback function
      */
     onUpdate(func: (app: string, version: string) => void): void;
+
+    /**
+     * Set window title
+     * @param title Title
+     */
+    setTitle(title: string): void;
 }