@etsoo/appscript 1.3.6 → 1.3.8

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,19 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "region": "Country or region",
+    "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,19 @@
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "region": "国家或地区",
+    "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,19 @@
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "region": "國家或地區",
+    "regionAU": "澳大利亞",
+    "regionCA": "加拿大",
+    "regionCN": "中國大陸",
+    "regionDE": "德國",
+    "regionFR": "法國",
+    "regionGB": "英國",
+    "regionHK": "中國香港",
+    "regionIE": "愛爾蘭",
+    "regionJP": "日本",
+    "regionNZ": "新西蘭",
+    "regionSG": "新加坡",
+    "regionUS": "美國",
     "releaseToRefresh": "釋放刷新",
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",

package/lib/mjs/index.d.ts

@@ -16,15 +16,19 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './def/ListItem';
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
 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/PublicProductDto';
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 export * from './i18n/enUS';
@@ -36,10 +40,6 @@ export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/mjs/index.js

@@ -21,17 +21,22 @@ export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 // def
 export * from './def/ListItem';
-// dto
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
-// erp
+// erp dto
 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/PublicProductDto';
+// erp rq
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
+// erp api
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 // i18n
@@ -45,11 +50,6 @@ export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
-// rq
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
 // state
 export * from './state/Culture';
 export * from './state/State';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.6",
+    "version": "1.3.8",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.12",
         "@etsoo/restclient": "^1.0.74",
-        "@etsoo/shared": "^1.1.60",
+        "@etsoo/shared": "^1.1.62",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -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

@@ -33,7 +33,7 @@ import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { EntityStatus } from '../business/EntityStatus';
-import { InitCallDto } from '../dto/InitCallDto';
+import { InitCallDto } from '../erp/dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
@@ -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,8 +2,7 @@ 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 { 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}`,
+            return (await this.api.get<AddressRegionDb[]>(
+                `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);
-        return this.app.api.get<AddressState[]>(
-            `Address/StateList?regionId=${regionId}&language=${language}`,
+    states(regionId: string) {
+        return this.api.get<AddressState[]>(
+            `Address/StateList?regionId=${regionId}&language=${this.app.culture}`,
             undefined,
             { defaultValue: [] }
         );

package/src/erp/BaseApi.ts

@@ -3,10 +3,11 @@ import { IApp } from '../app/IApp';
 /**
  * SmartERP base API
  */
-export class BaseApi {
+export class BaseApi<T extends IApp = IApp> {
     /**
      * Constructor
      * @param app Application
+     * @param api API
      */
-    constructor(protected app: IApp) {}
+    constructor(protected app: T, protected api = app.api) {}
 }

package/src/erp/EntityApi.ts

@@ -0,0 +1,142 @@
+import { IApi, IApiPayload } from '@etsoo/restclient';
+import { DataTypes } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { IActionResult } from '../result/IActionResult';
+import { BaseApi } from './BaseApi';
+import { QueryRQ } from './rq/QueryRQ';
+import { TiplistRQ } from './rq/TiplistRQ';
+
+/**
+ * Entity API
+ * Follow com.etsoo.CoreFramework.Services.EntityServiceBase
+ */
+export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
+    /**
+     * Constructor
+     * @param flag Identity flag, like 'Product' for product APIs
+     * @param app Application
+     */
+    constructor(protected flag: string, app: T, api?: IApi) {
+        super(app, api);
+    }
+
+    /**
+     * Create
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected createBase<R extends IActionResult>(
+        data: object,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.put<R>(`${this.flag}/Create`, data, payload);
+    }
+
+    /**
+     * Delete
+     * @param id Id or ids
+     * @param payload Payload
+     */
+    protected deleteBase<R extends IActionResult>(
+        id: DataTypes.IdType,
+        payload?: IApiPayload<R, any>
+    ): R;
+    protected deleteBase<R extends IActionResult>(
+        ids: DataTypes.IdType[],
+        payload?: IApiPayload<R, any>
+    ): R;
+    protected deleteBase<R extends IActionResult>(
+        id: DataTypes.IdType | DataTypes.IdType[],
+        payload?: IApiPayload<R, any>
+    ) {
+        const query = Array.isArray(id)
+            ? '?' + id.map((item) => `ids=${item}`).join('&')
+            : id;
+        return this.api.delete<R>(
+            `${this.flag}/Delete/${query}`,
+            undefined,
+            payload
+        );
+    }
+
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected listBase<RQ extends TiplistRQ, R extends object>(
+        rq: RQ,
+        payload?: IApiPayload<R[], any>
+    ) {
+        return this.api.post<R[]>(`${this.flag}/List`, rq, payload);
+    }
+
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected queryBase<RQ extends QueryRQ, R extends object>(
+        rq: RQ,
+        payload?: IApiPayload<R[], any>
+    ) {
+        return this.api.post<R[]>(`${this.flag}/Query`, rq, payload);
+    }
+
+    /**
+     * Read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    protected readBase<R extends object>(
+        id: DataTypes.IdType,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.get<R>(`${this.flag}/Read/${id}`, payload);
+    }
+
+    /**
+     * Sort
+     * @param items Items to sort
+     * @param payload Payload
+     * @returns Result
+     */
+    protected sortBase<RQ extends { id: DataTypes.IdType }>(
+        items: RQ[],
+        payload?: IApiPayload<number, any>
+    ) {
+        const rq: Record<DataTypes.IdType, number> = {};
+        items.forEach((item, index) => (rq[item.id] = index));
+        return this.api.put<number>(`${this.flag}/Sort`, rq, payload);
+    }
+
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected updateBase<R extends IActionResult>(
+        data: object,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.put<R>(`${this.flag}/Update`, data, payload);
+    }
+
+    /**
+     * Read for update
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    protected updateReadBase<R extends object>(
+        id: DataTypes.IdType,
+        payload?: IApiPayload<R, any>
+    ) {
+        return this.api.get<R>(`${this.flag}/UpdateRead/${id}`, payload);
+    }
+}