@etsoo/appscript 1.3.24 → 1.3.26

package/__tests__/app/CoreApp.ts

@@ -208,7 +208,7 @@ test('Tests for addressApi', async () => {
     const continents = await app.addressApi.continents();
     expect(continents.length).toBe(7);
 
-    const regions = await app.addressApi.regions();
+    const regions = app.addressApi.regions();
     const cn = regions.find((r) => r.id === 'CN');
     expect(cn?.label).toBe('中国大陆');
 });

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

@@ -20,12 +20,8 @@ export declare class AddressApi extends BaseApi {
      * @returns Label
      */
     getContinentLabel(id: AddressContinent | string): string;
-    /**
-     * Get region list
-     * @param isLocal Is local version
-     * @returns Result
-     */
-    regions<T extends boolean = true>(isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
+    regions(isRemote: true): Promise<AddressRegionDb[] | undefined>;
+    regions(): AddressRegion[];
     /**
      * Get state list
      * @param regionId Region id

package/lib/cjs/erp/AddressApi.js

@@ -33,19 +33,19 @@ class AddressApi extends BaseApi_1.BaseApi {
     }
     /**
      * Get region list
-     * @param isLocal Is local version
+     * @param isRemote Is Remote version
      * @returns Result
      */
-    async regions(isLocal) {
-        if (isLocal == null || isLocal) {
+    regions(isRemote) {
+        if (isRemote) {
+            return this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false });
+        }
+        else {
             return AddressRegion_1.AddressRegion.all.map((region) => {
                 region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
         }
-        else {
-            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false }));
-        }
     }
     /**
      * Get state list

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

@@ -42,9 +42,10 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * Query
      * @param rq Request data
      * @param payload Payload
+     * @param queryKey Additional query key
      * @returns Result
      */
-    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
     /**
      * Read
      * @param id Id

package/lib/cjs/erp/EntityApi.js

@@ -44,10 +44,11 @@ class EntityApi extends BaseApi_1.BaseApi {
      * Query
      * @param rq Request data
      * @param payload Payload
+     * @param queryKey Additional query key
      * @returns Result
      */
-    queryBase(rq, payload) {
-        return this.api.post(`${this.flag}/Query`, rq, payload);
+    queryBase(rq, payload, queryKey = '') {
+        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
     }
     /**
      * Read

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

@@ -20,12 +20,8 @@ export declare class AddressApi extends BaseApi {
      * @returns Label
      */
     getContinentLabel(id: AddressContinent | string): string;
-    /**
-     * Get region list
-     * @param isLocal Is local version
-     * @returns Result
-     */
-    regions<T extends boolean = true>(isLocal?: T): Promise<T extends true | undefined ? AddressRegion[] : AddressRegionDb[] | undefined>;
+    regions(isRemote: true): Promise<AddressRegionDb[] | undefined>;
+    regions(): AddressRegion[];
     /**
      * Get state list
      * @param regionId Region id

package/lib/mjs/erp/AddressApi.js

@@ -30,19 +30,19 @@ export class AddressApi extends BaseApi {
     }
     /**
      * Get region list
-     * @param isLocal Is local version
+     * @param isRemote Is Remote version
      * @returns Result
      */
-    async regions(isLocal) {
-        if (isLocal == null || isLocal) {
+    regions(isRemote) {
+        if (isRemote) {
+            return this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false });
+        }
+        else {
             return AddressRegion.all.map((region) => {
                 region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
         }
-        else {
-            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false }));
-        }
     }
     /**
      * Get state list

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

@@ -42,9 +42,10 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * Query
      * @param rq Request data
      * @param payload Payload
+     * @param queryKey Additional query key
      * @returns Result
      */
-    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
     /**
      * Read
      * @param id Id

package/lib/mjs/erp/EntityApi.js

@@ -41,10 +41,11 @@ export class EntityApi extends BaseApi {
      * Query
      * @param rq Request data
      * @param payload Payload
+     * @param queryKey Additional query key
      * @returns Result
      */
-    queryBase(rq, payload) {
-        return this.api.post(`${this.flag}/Query`, rq, payload);
+    queryBase(rq, payload, queryKey = '') {
+        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
     }
     /**
      * Read

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.24",
+    "version": "1.3.26",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.13",
         "@etsoo/restclient": "^1.0.75",
-        "@etsoo/shared": "^1.1.67",
+        "@etsoo/shared": "^1.1.69",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -63,7 +63,7 @@
         "@babel/core": "^7.19.6",
         "@babel/plugin-transform-runtime": "^7.19.6",
         "@babel/preset-env": "^7.19.4",
-        "@babel/runtime-corejs3": "^7.19.6",
+        "@babel/runtime-corejs3": "^7.20.0",
         "@types/jest": "^29.2.0",
         "@typescript-eslint/eslint-plugin": "^5.41.0",
         "@typescript-eslint/parser": "^5.41.0",

package/src/erp/AddressApi.ts

@@ -37,29 +37,26 @@ 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 isLocal Is local version
+     * @param isRemote Is Remote version
      * @returns Result
      */
-    async regions<T extends boolean = true>(
-        isLocal?: T
-    ): Promise<
-        T extends true | undefined
-            ? AddressRegion[]
-            : AddressRegionDb[] | undefined
-    > {
-        if (isLocal == null || isLocal) {
+    regions(isRemote?: boolean) {
+        if (isRemote) {
+            return this.api.get<AddressRegionDb[]>(
+                `Address/RegionList?language=${this.app.culture}`,
+                undefined,
+                { defaultValue: [], showLoading: false }
+            );
+        } else {
             return AddressRegion.all.map((region) => {
                 region.label = this.app.getRegionLabel(region.id);
                 return { ...region };
             });
-        } else {
-            return (await this.api.get<AddressRegionDb[]>(
-                `Address/RegionList?language=${this.app.culture}`,
-                undefined,
-                { defaultValue: [], showLoading: false }
-            )) as any;
         }
     }
 

package/src/erp/EntityApi.ts

@@ -78,14 +78,15 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * Query
      * @param rq Request data
      * @param payload Payload
+     * @param queryKey Additional query key
      * @returns Result
      */
     protected queryBase<
         T extends DataTypes.IdType,
         RQ extends QueryRQ<T>,
         R extends object
-    >(rq: RQ, payload?: IApiPayload<R[]>) {
-        return this.api.post(`${this.flag}/Query`, rq, payload);
+    >(rq: RQ, payload?: IApiPayload<R[]>, queryKey: string = '') {
+        return this.api.post(`${this.flag}/Query${queryKey}`, rq, payload);
     }
 
     /**