@etsoo/appscript 1.3.6 → 1.3.7

package/__tests__/app/CoreApp.ts

@@ -143,6 +143,10 @@ const appClass = EnhanceApp(CoreAppTest);
 const app = new appClass();
 app.changeCulture(app.settings.cultures[0]);
 
+test('Test for properties', () => {
+    expect(app.settings.currentRegion.label).toBe('中国大陆');
+});
+
 test('Tests for addRootUrl', () => {
     expect(app.addRootUrl('/home')).toBe('/cms/home');
     expect(app.addRootUrl('./home')).toBe('/cms/./home');
@@ -201,10 +205,7 @@ test('Tests for addressApi', async () => {
     const continents = await app.addressApi.continents();
     expect(continents.length).toBe(7);
 
-    const labels = await AddressUtils.getLabels('en-US');
-    expect(labels['regionHK']).toBe('Hong Kong, China');
-
-    const regions = await app.addressApi.regions('zh-CN');
+    const regions = await app.addressApi.regions();
     const cn = regions.find((r) => r.id === 'CN');
     expect(cn?.label).toBe('中国大陆');
 });
@@ -217,16 +218,4 @@ test('Tests for publicApi', async () => {
 
     const currencies = await app.publicApi.currencies(['NZD', 'AUD', 'USD']);
     expect(currencies[1].id).toBe('AUD');
-
-    //const currenciesRemote = await app.publicApi.currencies();
-    //console.log(currenciesRemote);
-
-    //const history = await app.publicApi.exchangeRateHistory(['NZD', 'AUD'], 24);
-    //console.log(history);
-
-    //const qrcode = await app.publicApi.mobileQRCode('xz@etsoo.com');
-    //console.log(qrcode);
-
-    //const exchangeRate = await app.publicApi.exchangeRate('USD');
-    //console.log(exchangeRate);
 });

package/lib/cjs/address/AddressUtils.d.ts

@@ -1,15 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 /**
  * Address utils
  */
 export declare namespace AddressUtils {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    function getLabels(language: string): Promise<DataTypes.StringRecord>;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -17,17 +10,4 @@ export declare namespace AddressUtils {
      * @param detectedLanguage Detected language
      */
     function getRegion(regions: string[], detectedRegion?: string | null, detectedLanguage?: string | null): AddressRegion;
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    function getRegionLabel(id: string, labels: DataTypes.StringRecord): string;
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    function updateRegionLabel(region: AddressRegion, culture: string): Promise<void>;
 }

package/lib/cjs/address/AddressUtils.js

@@ -1,51 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressUtils = void 0;
 const AddressRegion_1 = require("./AddressRegion");
-const languageLabels = {};
 /**
  * Address utils
  */
 var AddressUtils;
 (function (AddressUtils) {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    async function getLabels(language) {
-        let labels = languageLabels[language];
-        if (labels == null) {
-            labels = await Promise.resolve().then(() => __importStar(require(`./../i18n/address.${language}.json`)));
-            // Cache
-            languageLabels[language] = labels;
-        }
-        return labels;
-    }
-    AddressUtils.getLabels = getLabels;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -71,25 +32,4 @@ var AddressUtils;
         return AddressRegion_1.AddressRegion.getById(regions[0]);
     }
     AddressUtils.getRegion = getRegion;
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    function getRegionLabel(id, labels) {
-        var _a;
-        return (_a = labels['region' + id]) !== null && _a !== void 0 ? _a : id;
-    }
-    AddressUtils.getRegionLabel = getRegionLabel;
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    async function updateRegionLabel(region, culture) {
-        const labels = await AddressUtils.getLabels(culture);
-        region.label = getRegionLabel(region.id, labels);
-    }
-    AddressUtils.updateRegionLabel = updateRegionLabel;
 })(AddressUtils = exports.AddressUtils || (exports.AddressUtils = {}));

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

@@ -216,6 +216,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Update current region label
+     */
+    protected updateRegionLabel(): void;
     /**
      * Check language is supported or not, return a valid language when supported
      * @param language Language
@@ -360,6 +364,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns List
      */
     protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

package/lib/cjs/app/CoreApp.js

@@ -6,7 +6,6 @@ const restclient_1 = require("@etsoo/restclient");
 const shared_1 = require("@etsoo/shared");
 const crypto_js_1 = require("crypto-js");
 const AddressRegion_1 = require("../address/AddressRegion");
-const AddressUtils_1 = require("../address/AddressUtils");
 const BridgeUtils_1 = require("../bridges/BridgeUtils");
 const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
@@ -487,8 +486,8 @@ class CoreApp {
         this._currency = regionItem.currency;
         this._region = regionId;
         // Hold the current country or region
-        AddressUtils_1.AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
+        this.updateRegionLabel();
     }
     /**
      * Change culture
@@ -509,6 +508,14 @@ class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
+        this.updateRegionLabel();
+    }
+    /**
+     * Update current region label
+     */
+    updateRegionLabel() {
+        const region = this.settings.currentRegion;
+        region.label = this.getRegionLabel(region.id);
     }
     /**
      * Check language is supported or not, return a valid language when supported
@@ -896,6 +903,15 @@ class CoreApp {
         }
         return list;
     }
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id) {
+        var _a;
+        return (_a = this.get('region' + id)) !== null && _a !== void 0 ? _a : id;
+    }
     /**
      * Get all regions
      * @returns Regions

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

@@ -284,6 +284,12 @@ export interface IApp {
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

package/lib/cjs/erp/AddressApi.d.ts

@@ -1,3 +1,4 @@
+import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from '../dto/IdLabelDto';
@@ -8,23 +9,26 @@ import { BaseApi } from './BaseApi';
 export declare class AddressApi extends BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
-    continents<T extends boolean>(language?: string, isNumberKey?: T): Promise<IdLabelConditional<T>>;
+    continents<T extends boolean>(isNumberKey?: T): Promise<IdLabelConditional<T>>;
     /**
-     * Get region list from database
-     * @param language Language
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id: AddressContinent | string): string;
+    /**
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
-    regions<T extends boolean = true>(language?: string, isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
+    regions<T extends boolean = true>(isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId: string, language?: string): Promise<AddressState[] | undefined>;
+    states(regionId: string): Promise<AddressState[] | undefined>;
 }

package/lib/cjs/erp/AddressApi.js

@@ -4,7 +4,6 @@ exports.AddressApi = void 0;
 const shared_1 = require("@etsoo/shared");
 const AddressContinent_1 = require("../address/AddressContinent");
 const AddressRegion_1 = require("../address/AddressRegion");
-const AddressUtils_1 = require("../address/AddressUtils");
 const BaseApi_1 = require("./BaseApi");
 /**
  * Address Api
@@ -12,50 +11,49 @@ const BaseApi_1 = require("./BaseApi");
 class AddressApi extends BaseApi_1.BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
-    async continents(language, isNumberKey = false) {
-        const labels = await AddressUtils_1.AddressUtils.getLabels(this.app.checkLanguage(language));
-        return shared_1.DataTypes.getEnumKeys(AddressContinent_1.AddressContinent).map((key) => {
-            var _a;
-            return ({
-                id: isNumberKey
-                    ? shared_1.DataTypes.getEnumByKey(AddressContinent_1.AddressContinent, key)
-                    : key.toString(),
-                label: (_a = labels['continent' + key]) !== null && _a !== void 0 ? _a : key
-            });
-        });
+    async continents(isNumberKey = false) {
+        return shared_1.DataTypes.getEnumKeys(AddressContinent_1.AddressContinent).map((key) => ({
+            id: isNumberKey
+                ? shared_1.DataTypes.getEnumByKey(AddressContinent_1.AddressContinent, key)
+                : key.toString(),
+            label: this.getContinentLabel(key)
+        }));
+    }
+    /**
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id) {
+        var _a;
+        return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
     }
     /**
-     * Get region list from database
-     * @param language Language
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
-    async regions(language, isLocal) {
-        language = this.app.checkLanguage(language);
+    async regions(isLocal) {
         if (isLocal == null || isLocal) {
-            const labels = await AddressUtils_1.AddressUtils.getLabels(language);
             return AddressRegion_1.AddressRegion.all.map((region) => {
-                region.label = AddressUtils_1.AddressUtils.getRegionLabel(region.id, labels);
+                region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
         }
         else {
-            return (await this.app.api.get(`Address/RegionList?language=${language}`, undefined, { defaultValue: [] }));
+            return (await this.app.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
         }
     }
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId, language) {
-        language = this.app.checkLanguage(language);
-        return this.app.api.get(`Address/StateList?regionId=${regionId}&language=${language}`, undefined, { defaultValue: [] });
+    states(regionId) {
+        return this.app.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, { defaultValue: [] });
     }
 }
 exports.AddressApi = AddressApi;

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

@@ -15,6 +15,13 @@
     "confirm": "Confirm",
     "confirmAction": "Are you sure you want to {0}?",
     "completeTip": "{0} completed",
+    "continentAF": "Africa",
+    "continentAN": "Antarctica",
+    "continentAS": "Asia",
+    "continentEU": "Europe",
+    "continentNA": "North America",
+    "continentOC": "Oceania",
+    "continentSA": "South America",
     "copy": "Copy",
     "creation": "Creation",
     "currentPassword": "Current password",
@@ -106,6 +113,18 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "regionAU": "Australia",
+    "regionCA": "Canada",
+    "regionCN": "Mainland China",
+    "regionDE": "Germany",
+    "regionFR": "France",
+    "regionGB": "United Kingdom",
+    "regionHK": "Hong Kong, China",
+    "regionIE": "Ireland",
+    "regionJP": "Japan",
+    "regionNZ": "New Zealand",
+    "regionSG": "Singapore",
+    "regionUS": "United States",
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",

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

@@ -15,6 +15,13 @@
     "confirm": "确认",
     "confirmAction": "确定要{0}吗？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南极洲",
+    "continentAS": "亚洲",
+    "continentEU": "欧洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "复制",
     "creation": "登记时间",
     "currentPassword": "当前密码",
@@ -105,6 +112,18 @@
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "regionAU": "澳大利亚",
+    "regionCA": "加拿大",
+    "regionCN": "中国大陆",
+    "regionDE": "德国",
+    "regionFR": "法国",
+    "regionGB": "英国",
+    "regionHK": "中国香港",
+    "regionIE": "爱尔兰",
+    "regionJP": "日本",
+    "regionNZ": "新西兰",
+    "regionSG": "新加坡",
+    "regionUS": "美国",
     "releaseToRefresh": "释放刷新",
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",

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

@@ -15,6 +15,13 @@
     "confirm": "確認",
     "confirmAction": "確定要{0}嗎？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南極洲",
+    "continentAS": "亞洲",
+    "continentEU": "歐洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "複製",
     "creation": "登記時間",
     "currentPassword": "當前密碼",
@@ -105,6 +112,18 @@
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "regionAU": "澳大利亞",
+    "regionCA": "加拿大",
+    "regionCN": "中國大陸",
+    "regionDE": "德國",
+    "regionFR": "法國",
+    "regionGB": "英國",
+    "regionHK": "中國香港",
+    "regionIE": "愛爾蘭",
+    "regionJP": "日本",
+    "regionNZ": "新西蘭",
+    "regionSG": "新加坡",
+    "regionUS": "美國",
     "releaseToRefresh": "釋放刷新",
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",

package/lib/mjs/address/AddressUtils.d.ts

@@ -1,15 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 /**
  * Address utils
  */
 export declare namespace AddressUtils {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    function getLabels(language: string): Promise<DataTypes.StringRecord>;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -17,17 +10,4 @@ export declare namespace AddressUtils {
      * @param detectedLanguage Detected language
      */
     function getRegion(regions: string[], detectedRegion?: string | null, detectedLanguage?: string | null): AddressRegion;
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    function getRegionLabel(id: string, labels: DataTypes.StringRecord): string;
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    function updateRegionLabel(region: AddressRegion, culture: string): Promise<void>;
 }

package/lib/mjs/address/AddressUtils.js

@@ -1,25 +1,9 @@
 import { AddressRegion } from './AddressRegion';
-const languageLabels = {};
 /**
  * Address utils
  */
 export var AddressUtils;
 (function (AddressUtils) {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    async function getLabels(language) {
-        let labels = languageLabels[language];
-        if (labels == null) {
-            labels = await import(`./../i18n/address.${language}.json`);
-            // Cache
-            languageLabels[language] = labels;
-        }
-        return labels;
-    }
-    AddressUtils.getLabels = getLabels;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -45,25 +29,4 @@ export var AddressUtils;
         return AddressRegion.getById(regions[0]);
     }
     AddressUtils.getRegion = getRegion;
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    function getRegionLabel(id, labels) {
-        var _a;
-        return (_a = labels['region' + id]) !== null && _a !== void 0 ? _a : id;
-    }
-    AddressUtils.getRegionLabel = getRegionLabel;
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    async function updateRegionLabel(region, culture) {
-        const labels = await AddressUtils.getLabels(culture);
-        region.label = getRegionLabel(region.id, labels);
-    }
-    AddressUtils.updateRegionLabel = updateRegionLabel;
 })(AddressUtils || (AddressUtils = {}));

package/lib/mjs/app/CoreApp.d.ts

@@ -216,6 +216,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Update current region label
+     */
+    protected updateRegionLabel(): void;
     /**
      * Check language is supported or not, return a valid language when supported
      * @param language Language
@@ -360,6 +364,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns List
      */
     protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

package/lib/mjs/app/CoreApp.js

@@ -3,7 +3,6 @@ import { ApiDataError } from '@etsoo/restclient';
 import { DataTypes, DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, 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 { ActionResultError } from '../result/ActionResultError';
@@ -484,8 +483,8 @@ export class CoreApp {
         this._currency = regionItem.currency;
         this._region = regionId;
         // Hold the current country or region
-        AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
+        this.updateRegionLabel();
     }
     /**
      * Change culture
@@ -506,6 +505,14 @@ export class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
+        this.updateRegionLabel();
+    }
+    /**
+     * Update current region label
+     */
+    updateRegionLabel() {
+        const region = this.settings.currentRegion;
+        region.label = this.getRegionLabel(region.id);
     }
     /**
      * Check language is supported or not, return a valid language when supported
@@ -893,6 +900,15 @@ export class CoreApp {
         }
         return list;
     }
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id) {
+        var _a;
+        return (_a = this.get('region' + id)) !== null && _a !== void 0 ? _a : id;
+    }
     /**
      * Get all regions
      * @returns Regions

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

@@ -284,6 +284,12 @@ export interface IApp {
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

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

@@ -1,3 +1,4 @@
+import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from '../dto/IdLabelDto';
@@ -8,23 +9,26 @@ import { BaseApi } from './BaseApi';
 export declare class AddressApi extends BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
-    continents<T extends boolean>(language?: string, isNumberKey?: T): Promise<IdLabelConditional<T>>;
+    continents<T extends boolean>(isNumberKey?: T): Promise<IdLabelConditional<T>>;
     /**
-     * Get region list from database
-     * @param language Language
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id: AddressContinent | string): string;
+    /**
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
-    regions<T extends boolean = true>(language?: string, isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
+    regions<T extends boolean = true>(isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId: string, language?: string): Promise<AddressState[] | undefined>;
+    states(regionId: string): Promise<AddressState[] | undefined>;
 }

package/lib/mjs/erp/AddressApi.js

@@ -1,7 +1,6 @@
 import { DataTypes } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion } from '../address/AddressRegion';
-import { AddressUtils } from '../address/AddressUtils';
 import { BaseApi } from './BaseApi';
 /**
  * Address Api
@@ -9,49 +8,48 @@ import { BaseApi } from './BaseApi';
 export class AddressApi extends BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
-    async continents(language, isNumberKey = false) {
-        const labels = await AddressUtils.getLabels(this.app.checkLanguage(language));
-        return DataTypes.getEnumKeys(AddressContinent).map((key) => {
-            var _a;
-            return ({
-                id: isNumberKey
-                    ? DataTypes.getEnumByKey(AddressContinent, key)
-                    : key.toString(),
-                label: (_a = labels['continent' + key]) !== null && _a !== void 0 ? _a : key
-            });
-        });
+    async continents(isNumberKey = false) {
+        return DataTypes.getEnumKeys(AddressContinent).map((key) => ({
+            id: isNumberKey
+                ? DataTypes.getEnumByKey(AddressContinent, key)
+                : key.toString(),
+            label: this.getContinentLabel(key)
+        }));
+    }
+    /**
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id) {
+        var _a;
+        return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
     }
     /**
-     * Get region list from database
-     * @param language Language
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
-    async regions(language, isLocal) {
-        language = this.app.checkLanguage(language);
+    async regions(isLocal) {
         if (isLocal == null || isLocal) {
-            const labels = await AddressUtils.getLabels(language);
             return AddressRegion.all.map((region) => {
-                region.label = AddressUtils.getRegionLabel(region.id, labels);
+                region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
         }
         else {
-            return (await this.app.api.get(`Address/RegionList?language=${language}`, undefined, { defaultValue: [] }));
+            return (await this.app.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
         }
     }
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId, language) {
-        language = this.app.checkLanguage(language);
-        return this.app.api.get(`Address/StateList?regionId=${regionId}&language=${language}`, undefined, { defaultValue: [] });
+    states(regionId) {
+        return this.app.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, { defaultValue: [] });
     }
 }

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

@@ -15,6 +15,13 @@
     "confirm": "Confirm",
     "confirmAction": "Are you sure you want to {0}?",
     "completeTip": "{0} completed",
+    "continentAF": "Africa",
+    "continentAN": "Antarctica",
+    "continentAS": "Asia",
+    "continentEU": "Europe",
+    "continentNA": "North America",
+    "continentOC": "Oceania",
+    "continentSA": "South America",
     "copy": "Copy",
     "creation": "Creation",
     "currentPassword": "Current password",
@@ -106,6 +113,18 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "regionAU": "Australia",
+    "regionCA": "Canada",
+    "regionCN": "Mainland China",
+    "regionDE": "Germany",
+    "regionFR": "France",
+    "regionGB": "United Kingdom",
+    "regionHK": "Hong Kong, China",
+    "regionIE": "Ireland",
+    "regionJP": "Japan",
+    "regionNZ": "New Zealand",
+    "regionSG": "Singapore",
+    "regionUS": "United States",
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",

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

@@ -15,6 +15,13 @@
     "confirm": "确认",
     "confirmAction": "确定要{0}吗？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南极洲",
+    "continentAS": "亚洲",
+    "continentEU": "欧洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "复制",
     "creation": "登记时间",
     "currentPassword": "当前密码",
@@ -105,6 +112,18 @@
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "regionAU": "澳大利亚",
+    "regionCA": "加拿大",
+    "regionCN": "中国大陆",
+    "regionDE": "德国",
+    "regionFR": "法国",
+    "regionGB": "英国",
+    "regionHK": "中国香港",
+    "regionIE": "爱尔兰",
+    "regionJP": "日本",
+    "regionNZ": "新西兰",
+    "regionSG": "新加坡",
+    "regionUS": "美国",
     "releaseToRefresh": "释放刷新",
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",

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

@@ -15,6 +15,13 @@
     "confirm": "確認",
     "confirmAction": "確定要{0}嗎？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南極洲",
+    "continentAS": "亞洲",
+    "continentEU": "歐洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "複製",
     "creation": "登記時間",
     "currentPassword": "當前密碼",
@@ -105,6 +112,18 @@
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "regionAU": "澳大利亞",
+    "regionCA": "加拿大",
+    "regionCN": "中國大陸",
+    "regionDE": "德國",
+    "regionFR": "法國",
+    "regionGB": "英國",
+    "regionHK": "中國香港",
+    "regionIE": "愛爾蘭",
+    "regionJP": "日本",
+    "regionNZ": "新西蘭",
+    "regionSG": "新加坡",
+    "regionUS": "美國",
     "releaseToRefresh": "釋放刷新",
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -70,8 +70,8 @@
         "eslint": "^8.25.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^29.1.2",
-        "jest-environment-jsdom": "^29.1.2",
+        "jest": "^29.2.0",
+        "jest-environment-jsdom": "^29.2.0",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
     }

package/src/address/AddressUtils.ts

@@ -1,28 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 
-const languageLabels: Record<string, DataTypes.StringRecord | undefined> = {};
-
 /**
  * Address utils
  */
 export namespace AddressUtils {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    export async function getLabels(language: string) {
-        let labels = languageLabels[language];
-        if (labels == null) {
-            labels = await import(`./../i18n/address.${language}.json`);
-
-            // Cache
-            languageLabels[language] = labels;
-        }
-        return labels!;
-    }
-
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -51,30 +32,4 @@ export namespace AddressUtils {
         // Default
         return AddressRegion.getById(regions[0])!;
     }
-
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    export function getRegionLabel(
-        id: string,
-        labels: DataTypes.StringRecord
-    ): string {
-        return (labels['region' + id] as string) ?? id;
-    }
-
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    export async function updateRegionLabel(
-        region: AddressRegion,
-        culture: string
-    ) {
-        const labels = await AddressUtils.getLabels(culture);
-        region.label = getRegionLabel(region.id, labels);
-    }
 }

package/src/app/CoreApp.ts

@@ -718,8 +718,8 @@ export abstract class CoreApp<
         this._region = regionId;
 
         // Hold the current country or region
-        AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
+        this.updateRegionLabel();
     }
 
     /**
@@ -745,6 +745,16 @@ export abstract class CoreApp<
 
         // Hold the current resources
         this.settings.currentCulture = culture;
+
+        this.updateRegionLabel();
+    }
+
+    /**
+     * Update current region label
+     */
+    protected updateRegionLabel() {
+        const region = this.settings.currentRegion;
+        region.label = this.getRegionLabel(region.id);
     }
 
     /**
@@ -1219,6 +1229,15 @@ export abstract class CoreApp<
         return list;
     }
 
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string) {
+        return this.get('region' + id) ?? id;
+    }
+
     /**
      * Get all regions
      * @returns Regions

package/src/app/IApp.ts

@@ -375,6 +375,13 @@ export interface IApp {
      */
     getCacheToken(): string | undefined;
 
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
+
     /**
      * Get all regions
      * @returns Regions

package/src/erp/AddressApi.ts

@@ -2,7 +2,6 @@ import { DataTypes } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
-import { AddressUtils } from '../address/AddressUtils';
 import { IdLabelConditional } from '../dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 
@@ -12,51 +11,51 @@ import { BaseApi } from './BaseApi';
 export class AddressApi extends BaseApi {
     /**
      * Get all continents
-     * @param language Language
      * @param isNumberKey Is number key or key as id
      * @returns Continents
      */
     async continents<T extends boolean>(
-        language?: string,
         isNumberKey = <T>false
     ): Promise<IdLabelConditional<T>> {
-        const labels = await AddressUtils.getLabels(
-            this.app.checkLanguage(language)
-        );
         return <IdLabelConditional<T>>DataTypes.getEnumKeys(
             AddressContinent
         ).map((key) => ({
             id: isNumberKey
                 ? <number>DataTypes.getEnumByKey(AddressContinent, key)!
                 : key.toString(),
-            label: labels['continent' + key] ?? key
+            label: this.getContinentLabel(key)
         }));
     }
 
     /**
-     * Get region list from database
-     * @param language Language
+     * Get continent label
+     * @param id Region id
+     * @returns Label
+     */
+    getContinentLabel(id: AddressContinent | string) {
+        return this.app.get('continent' + id) ?? (id as string);
+    }
+
+    /**
+     * Get region list
      * @param isLocal Is local version
      * @returns Result
      */
     async regions<T extends boolean = true>(
-        language?: string,
         isLocal?: T
     ): Promise<
         T extends true | undefined
             ? AddressRegion[]
             : AddressRegionDb[] | undefined
     > {
-        language = this.app.checkLanguage(language);
         if (isLocal == null || isLocal) {
-            const labels = await AddressUtils.getLabels(language);
             return AddressRegion.all.map((region) => {
-                region.label = AddressUtils.getRegionLabel(region.id, labels);
+                region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
         } else {
             return (await this.app.api.get<AddressRegionDb[]>(
-                `Address/RegionList?language=${language}`,
+                `Address/RegionList?language=${this.app.culture}`,
                 undefined,
                 { defaultValue: [] }
             )) as any;
@@ -64,15 +63,13 @@ export class AddressApi extends BaseApi {
     }
 
     /**
-     * Get state list from database
+     * Get state list
      * @param regionId Region id
-     * @param language Language
      * @returns Result
      */
-    states(regionId: string, language?: string) {
-        language = this.app.checkLanguage(language);
+    states(regionId: string) {
         return this.app.api.get<AddressState[]>(
-            `Address/StateList?regionId=${regionId}&language=${language}`,
+            `Address/StateList?regionId=${regionId}&language=${this.app.culture}`,
             undefined,
             { defaultValue: [] }
         );

package/src/i18n/en-US.json

@@ -15,6 +15,13 @@
     "confirm": "Confirm",
     "confirmAction": "Are you sure you want to {0}?",
     "completeTip": "{0} completed",
+    "continentAF": "Africa",
+    "continentAN": "Antarctica",
+    "continentAS": "Asia",
+    "continentEU": "Europe",
+    "continentNA": "North America",
+    "continentOC": "Oceania",
+    "continentSA": "South America",
     "copy": "Copy",
     "creation": "Creation",
     "currentPassword": "Current password",
@@ -106,6 +113,18 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "regionAU": "Australia",
+    "regionCA": "Canada",
+    "regionCN": "Mainland China",
+    "regionDE": "Germany",
+    "regionFR": "France",
+    "regionGB": "United Kingdom",
+    "regionHK": "Hong Kong, China",
+    "regionIE": "Ireland",
+    "regionJP": "Japan",
+    "regionNZ": "New Zealand",
+    "regionSG": "Singapore",
+    "regionUS": "United States",
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",

package/src/i18n/zh-CN.json

@@ -15,6 +15,13 @@
     "confirm": "确认",
     "confirmAction": "确定要{0}吗？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南极洲",
+    "continentAS": "亚洲",
+    "continentEU": "欧洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "复制",
     "creation": "登记时间",
     "currentPassword": "当前密码",
@@ -105,6 +112,18 @@
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "regionAU": "澳大利亚",
+    "regionCA": "加拿大",
+    "regionCN": "中国大陆",
+    "regionDE": "德国",
+    "regionFR": "法国",
+    "regionGB": "英国",
+    "regionHK": "中国香港",
+    "regionIE": "爱尔兰",
+    "regionJP": "日本",
+    "regionNZ": "新西兰",
+    "regionSG": "新加坡",
+    "regionUS": "美国",
     "releaseToRefresh": "释放刷新",
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",

package/src/i18n/zh-HK.json

@@ -15,6 +15,13 @@
     "confirm": "確認",
     "confirmAction": "確定要{0}嗎？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南極洲",
+    "continentAS": "亞洲",
+    "continentEU": "歐洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "複製",
     "creation": "登記時間",
     "currentPassword": "當前密碼",
@@ -105,6 +112,18 @@
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "regionAU": "澳大利亞",
+    "regionCA": "加拿大",
+    "regionCN": "中國大陸",
+    "regionDE": "德國",
+    "regionFR": "法國",
+    "regionGB": "英國",
+    "regionHK": "中國香港",
+    "regionIE": "愛爾蘭",
+    "regionJP": "日本",
+    "regionNZ": "新西蘭",
+    "regionSG": "新加坡",
+    "regionUS": "美國",
     "releaseToRefresh": "釋放刷新",
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",

package/src/i18n/address.en-US.json

@@ -1,21 +0,0 @@
-{
-    "continentAF": "Africa",
-    "continentAN": "Antarctica",
-    "continentAS": "Asia",
-    "continentEU": "Europe",
-    "continentNA": "North America",
-    "continentOC": "Oceania",
-    "continentSA": "South America",
-    "regionAU": "Australia",
-    "regionCA": "Canada",
-    "regionCN": "Mainland China",
-    "regionDE": "Germany",
-    "regionFR": "France",
-    "regionGB": "United Kingdom",
-    "regionHK": "Hong Kong, China",
-    "regionIE": "Ireland",
-    "regionJP": "Japan",
-    "regionNZ": "New Zealand",
-    "regionSG": "Singapore",
-    "regionUS": "United States"
-}

package/src/i18n/address.zh-CN.json

@@ -1,21 +0,0 @@
-{
-    "continentAF": "非洲",
-    "continentAN": "南极洲",
-    "continentAS": "亚洲",
-    "continentEU": "欧洲",
-    "continentNA": "北美洲",
-    "continentOC": "大洋洲",
-    "continentSA": "南美洲",
-    "regionAU": "澳大利亚",
-    "regionCA": "加拿大",
-    "regionCN": "中国大陆",
-    "regionDE": "德国",
-    "regionFR": "法国",
-    "regionGB": "英国",
-    "regionHK": "中国香港",
-    "regionIE": "爱尔兰",
-    "regionJP": "日本",
-    "regionNZ": "新西兰",
-    "regionSG": "新加坡",
-    "regionUS": "美国"
-}

package/src/i18n/address.zh-HK.json

@@ -1,21 +0,0 @@
-{
-    "continentAF": "非洲",
-    "continentAN": "南極洲",
-    "continentAS": "亞洲",
-    "continentEU": "歐洲",
-    "continentNA": "北美洲",
-    "continentOC": "大洋洲",
-    "continentSA": "南美洲",
-    "regionAU": "澳大利亞",
-    "regionCA": "加拿大",
-    "regionCN": "中國大陸",
-    "regionDE": "德國",
-    "regionFR": "法國",
-    "regionGB": "英國",
-    "regionHK": "中國香港",
-    "regionIE": "愛爾蘭",
-    "regionJP": "日本",
-    "regionNZ": "新西蘭",
-    "regionSG": "新加坡",
-    "regionUS": "美國"
-}