@etsoo/appscript 1.3.32 → 1.3.34

package/src/app/CoreApp.ts

@@ -30,7 +30,6 @@ import {
     SHA3
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
-import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
@@ -996,16 +995,6 @@ export abstract class CoreApp<
         return DateUtils.format(input, currentCulture.name, options, timeZone);
     }
 
-    formatMoney(
-        input: null | undefined,
-        isInteger?: boolean,
-        options?: Intl.NumberFormatOptions
-    ): undefined;
-    formatMoney(
-        input: number | bigint,
-        isInteger?: boolean,
-        options?: Intl.NumberFormatOptions
-    ): string;
     /**
      * Format money number
      * @param input Input money number
@@ -1014,11 +1003,10 @@ export abstract class CoreApp<
      * @returns Result
      */
     formatMoney(
-        input: number | bigint | null | undefined,
+        input: number | bigint,
         isInteger: boolean = false,
         options?: Intl.NumberFormatOptions
     ) {
-        if (input == null) return undefined;
         return NumberUtils.formatMoney(
             input,
             this.currency,
@@ -1028,25 +1016,13 @@ export abstract class CoreApp<
         );
     }
 
-    formatNumber(
-        input: null | undefined,
-        options?: Intl.NumberFormatOptions
-    ): undefined;
-    formatNumber(
-        input: number | bigint,
-        options?: Intl.NumberFormatOptions
-    ): string;
     /**
      * Format number
      * @param input Input number
      * @param options Options
      * @returns Result
      */
-    formatNumber(
-        input: number | bigint | null | undefined,
-        options?: Intl.NumberFormatOptions
-    ) {
-        if (input == null) return undefined;
+    formatNumber(input: number | bigint, options?: Intl.NumberFormatOptions) {
         return NumberUtils.format(input, this.culture, options);
     }
 

package/src/app/IApp.ts

@@ -8,7 +8,6 @@ import {
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { ProductUnit } from '../business/ProductUnit';
 import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
@@ -299,19 +298,6 @@ export interface IApp {
      */
     formatError(error: ApiDataError): string;
 
-    /**
-     * Format money number
-     * @param input Input money number
-     * @param isInteger Is integer
-     * @param options Options
-     * @returns Result
-     */
-    formatMoney(
-        input: null | undefined,
-        isInteger?: boolean,
-        options?: Intl.NumberFormatOptions
-    ): undefined;
-
     /**
      * Format money number
      * @param input Input money number
@@ -325,17 +311,6 @@ export interface IApp {
         options?: Intl.NumberFormatOptions
     ): string;
 
-    /**
-     * Format number
-     * @param input Input number
-     * @param options Options
-     * @returns Result
-     */
-    formatNumber(
-        input: null | undefined,
-        options?: Intl.NumberFormatOptions
-    ): undefined;
-
     /**
      * Format number
      * @param input Input number

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;
 }

package/src/erp/AddressApi.ts

@@ -5,6 +5,9 @@ import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 import { IApiPayload } from '@etsoo/restclient';
+import { RegionsRQ } from './rq/RegionsRQ';
+
+const cachedRegions: { [P: string]: AddressRegionDb[] | undefined | null } = {};
 
 /**
  * Address Api
@@ -13,19 +16,21 @@ 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<T extends boolean>(
-        isNumberKey = <T>false
-    ): Promise<IdLabelConditional<T>> {
-        return <IdLabelConditional<T>>DataTypes.getEnumKeys(
-            AddressContinent
-        ).map((key) => ({
-            id: isNumberKey
-                ? <number>DataTypes.getEnumByKey(AddressContinent, key)!
-                : key.toString(),
-            label: this.getContinentLabel(key)
-        }));
+    continents<T extends boolean>(
+        isNumberKey = <T>false,
+        includeAntarctica: boolean = false
+    ): IdLabelConditional<T> {
+        return <IdLabelConditional<T>>DataTypes.getEnumKeys(AddressContinent)
+            .filter((item) => includeAntarctica || item !== 'AN')
+            .map((key) => ({
+                id: isNumberKey
+                    ? <number>DataTypes.getEnumByKey(AddressContinent, key)!
+                    : key.toString(),
+                label: this.getContinentLabel(key)
+            }));
     }
 
     /**
@@ -37,27 +42,69 @@ export class AddressApi extends BaseApi {
         return this.app.get('continent' + id) ?? (id as string);
     }
 
-    regions(isRemote: true): Promise<AddressRegionDb[] | undefined>;
-    regions(): AddressRegion[];
-
     /**
-     * Get region list
-     * @param isRemote Is Remote version
-     * @returns Result
+     * Get all regions
+     * @param rq Rquest data
      */
-    regions(isRemote?: boolean) {
-        if (isRemote) {
-            return this.api.get<AddressRegionDb[]>(
-                `Address/RegionList?language=${this.app.culture}`,
+    async getRegions(rq?: RegionsRQ): Promise<AddressRegionDb[] | undefined> {
+        const culture = this.app.culture;
+        let regions = cachedRegions[culture];
+        if (regions == null) {
+            regions = await this.api.get<AddressRegionDb[]>(
+                `Address/RegionList?language=${culture}`,
                 undefined,
                 { defaultValue: [], showLoading: false }
             );
-        } else {
-            return AddressRegion.all.map((region) => {
-                region.label = this.app.getRegionLabel(region.id);
-                return { ...region };
+            if (regions == null) return undefined;
+            cachedRegions[culture] = regions;
+        }
+
+        const { favoredIds = [], items = 8, keyword } = 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);
+    }
+
+    /**
+     * Get all local regions
+     */
+    regions(): AddressRegion[];
+
+    /**
+     * Get all local regions limited to favored ids
+     * @param favoredIds Favored ids
+     */
+    regions(favoredIds: string[]): AddressRegion[];
+
+    regions(p?: string[]) {
+        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)
+        }));
     }
 
     /**

package/src/erp/rq/RegionsRQ.ts

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

package/src/i18n/en-US.json

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

package/src/i18n/zh-CN.json

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

package/src/i18n/zh-HK.json

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