@etsoo/appscript 1.3.69 → 1.3.70

package/__tests__/app/CoreApp.ts

@@ -211,7 +211,7 @@ test('Tests for isValidPassword', () => {
     expect(app.isValidPassword('1234abcd')).toBeTruthy();
 });
 
-test('Tests for addressApi', () => {
+test('Tests for addressApi', async () => {
     const regions = app.addressApi.regions();
     const cn = regions.find((r) => r.id === 'CN');
     expect(cn?.label).toBe('中国大陆');
@@ -226,6 +226,14 @@ test('Tests for addressApi', () => {
     expect(region?.label).toBe('美国');
     const regionFailed = app.addressApi.region('ABC');
     expect(regionFailed).toBeUndefined();
+
+    /*
+    const cities = await app.addressApi.cities('CNHN');
+    console.log(cities);
+
+    const districts = await app.addressApi.districts(1181);
+    console.log(districts);
+    */
 });
 
 /*

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

@@ -0,0 +1,17 @@
+/**
+ * Address city
+ */
+export type AddressCity = {
+    /**
+     * Id
+     */
+    id: number;
+    /**
+     * Number id
+     */
+    num?: string;
+    /**
+     * Name
+     */
+    label: string;
+};

package/lib/cjs/address/AddressCity.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,17 @@
+/**
+ * Address district
+ */
+export type AddressDistrict = {
+    /**
+     * Id
+     */
+    id: number;
+    /**
+     * Number id
+     */
+    num?: string;
+    /**
+     * Name
+     */
+    label: string;
+};

package/lib/cjs/address/AddressDistrict.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -5,6 +5,8 @@ import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 import { IApiPayload } from '@etsoo/restclient';
 import { RegionsRQ } from './rq/RegionsRQ';
+import { AddressCity } from '../address/AddressCity';
+import { AddressDistrict } from '../address/AddressDistrict';
 /**
  * Address Api
  */
@@ -64,7 +66,24 @@ export declare class AddressApi extends BaseApi {
      * Get state list
      * @param regionId Region id
      * @param payload Payload
+     * @param culture Culture
      * @returns Result
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>): Promise<AddressState[] | undefined>;
+    states(regionId: string, payload?: IApiPayload<AddressState[]>, culture?: string): Promise<AddressState[] | undefined>;
+    /**
+     * Get city list
+     * @param stateId State id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    cities(stateId: string, payload?: IApiPayload<AddressCity[]>, culture?: string): Promise<AddressCity[] | undefined>;
+    /**
+     * Get district list
+     * @param cityId City id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    districts(cityId: number, payload?: IApiPayload<AddressDistrict[]>, culture?: string): Promise<AddressDistrict[] | undefined>;
 }

package/lib/cjs/erp/AddressApi.js

@@ -144,11 +144,37 @@ class AddressApi extends BaseApi_1.BaseApi {
      * Get state list
      * @param regionId Region id
      * @param payload Payload
+     * @param culture Culture
      * @returns Result
      */
-    states(regionId, payload) {
+    states(regionId, payload, culture) {
         payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
-        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, payload);
+        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        return this.api.get(`Address/StateList?regionId=${regionId}&language=${culture}`, undefined, payload);
+    }
+    /**
+     * Get city list
+     * @param stateId State id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    cities(stateId, payload, culture) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        return this.api.get(`Address/CityList?stateId=${stateId}&language=${culture}`, undefined, payload);
+    }
+    /**
+     * Get district list
+     * @param cityId City id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    districts(cityId, payload, culture) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        return this.api.get(`Address/DistrictList?cityId=${cityId}&language=${culture}`, undefined, payload);
     }
 }
 exports.AddressApi = AddressApi;

package/lib/cjs/i18n/en.json

@@ -11,6 +11,7 @@
     "back": "Back",
     "cancel": "Cancel",
     "changePassword": "Change password",
+    "city": "City",
     "clear": "Clear",
     "close": "Close",
     "confirm": "Confirm",
@@ -50,6 +51,7 @@
     "delete": "Delete",
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
+    "district": "District/County",
     "done": "Done",
     "download": "Download",
     "dragIndicator": "Drag indicator",
@@ -162,6 +164,7 @@
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "sortTip": "Drag and drop items to sort",
+    "state": "Province/State",
     "status": "Status",
     "statusApproved": "Approved",
     "statusArchived": "Archived",

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

@@ -11,6 +11,7 @@
     "back": "后退",
     "cancel": "取消",
     "changePassword": "修改密码",
+    "city": "城市",
     "clear": "清除",
     "close": "关闭",
     "confirm": "确认",
@@ -50,6 +51,7 @@
     "delete": "删除",
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
+    "district": "区/县",
     "done": "完成",
     "download": "下载",
     "dragIndicator": "拖动指示",
@@ -162,6 +164,7 @@
     "signout": "退出",
     "smartERP": "司友®云ERP",
     "sortTip": "拖拽项目进行排序",
+    "state": "省/州",
     "status": "状态",
     "statusApproved": "已批准",
     "statusArchived": "已归档",

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

@@ -11,6 +11,7 @@
     "back": "後退",
     "cancel": "取消",
     "changePassword": "修改密碼",
+    "city": "城市",
     "clear": "清除",
     "close": "關閉",
     "confirm": "確認",
@@ -50,6 +51,7 @@
     "delete": "刪除",
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
+    "district": "區/縣",
     "done": "完成",
     "download": "下載",
     "dragIndicator": "拖動指示",
@@ -162,6 +164,7 @@
     "signout": "退出",
     "smartERP": "司友®雲ERP",
     "sortTip": "拖拽項目進行排序",
+    "state": "省/州",
     "status": "狀態",
     "statusApproved": "已批准",
     "statusArchived": "已歸檔",

package/lib/cjs/index.d.ts

@@ -1,4 +1,6 @@
+export * from './address/AddressCity';
 export * from './address/AddressContinent';
+export * from './address/AddressDistrict';
 export * from './address/AddressRegion';
 export * from './address/AddressState';
 export * from './address/AddressUtils';

package/lib/cjs/index.js

@@ -16,7 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createClient = exports.ApiResponseType = exports.ApiMethod = exports.ApiAuthorizationScheme = void 0;
 // address
+__exportStar(require("./address/AddressCity"), exports);
 __exportStar(require("./address/AddressContinent"), exports);
+__exportStar(require("./address/AddressDistrict"), exports);
 __exportStar(require("./address/AddressRegion"), exports);
 __exportStar(require("./address/AddressState"), exports);
 __exportStar(require("./address/AddressUtils"), exports);

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

@@ -0,0 +1,17 @@
+/**
+ * Address city
+ */
+export type AddressCity = {
+    /**
+     * Id
+     */
+    id: number;
+    /**
+     * Number id
+     */
+    num?: string;
+    /**
+     * Name
+     */
+    label: string;
+};

package/lib/mjs/address/AddressCity.js

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

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

@@ -0,0 +1,17 @@
+/**
+ * Address district
+ */
+export type AddressDistrict = {
+    /**
+     * Id
+     */
+    id: number;
+    /**
+     * Number id
+     */
+    num?: string;
+    /**
+     * Name
+     */
+    label: string;
+};

package/lib/mjs/address/AddressDistrict.js

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

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

@@ -5,6 +5,8 @@ import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 import { IApiPayload } from '@etsoo/restclient';
 import { RegionsRQ } from './rq/RegionsRQ';
+import { AddressCity } from '../address/AddressCity';
+import { AddressDistrict } from '../address/AddressDistrict';
 /**
  * Address Api
  */
@@ -64,7 +66,24 @@ export declare class AddressApi extends BaseApi {
      * Get state list
      * @param regionId Region id
      * @param payload Payload
+     * @param culture Culture
      * @returns Result
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>): Promise<AddressState[] | undefined>;
+    states(regionId: string, payload?: IApiPayload<AddressState[]>, culture?: string): Promise<AddressState[] | undefined>;
+    /**
+     * Get city list
+     * @param stateId State id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    cities(stateId: string, payload?: IApiPayload<AddressCity[]>, culture?: string): Promise<AddressCity[] | undefined>;
+    /**
+     * Get district list
+     * @param cityId City id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    districts(cityId: number, payload?: IApiPayload<AddressDistrict[]>, culture?: string): Promise<AddressDistrict[] | undefined>;
 }

package/lib/mjs/erp/AddressApi.js

@@ -141,10 +141,36 @@ export class AddressApi extends BaseApi {
      * Get state list
      * @param regionId Region id
      * @param payload Payload
+     * @param culture Culture
      * @returns Result
      */
-    states(regionId, payload) {
+    states(regionId, payload, culture) {
         payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
-        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, payload);
+        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        return this.api.get(`Address/StateList?regionId=${regionId}&language=${culture}`, undefined, payload);
+    }
+    /**
+     * Get city list
+     * @param stateId State id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    cities(stateId, payload, culture) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        return this.api.get(`Address/CityList?stateId=${stateId}&language=${culture}`, undefined, payload);
+    }
+    /**
+     * Get district list
+     * @param cityId City id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    districts(cityId, payload, culture) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        return this.api.get(`Address/DistrictList?cityId=${cityId}&language=${culture}`, undefined, payload);
     }
 }

package/lib/mjs/i18n/en.json

@@ -11,6 +11,7 @@
     "back": "Back",
     "cancel": "Cancel",
     "changePassword": "Change password",
+    "city": "City",
     "clear": "Clear",
     "close": "Close",
     "confirm": "Confirm",
@@ -50,6 +51,7 @@
     "delete": "Delete",
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
+    "district": "District/County",
     "done": "Done",
     "download": "Download",
     "dragIndicator": "Drag indicator",
@@ -162,6 +164,7 @@
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "sortTip": "Drag and drop items to sort",
+    "state": "Province/State",
     "status": "Status",
     "statusApproved": "Approved",
     "statusArchived": "Archived",

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

@@ -11,6 +11,7 @@
     "back": "后退",
     "cancel": "取消",
     "changePassword": "修改密码",
+    "city": "城市",
     "clear": "清除",
     "close": "关闭",
     "confirm": "确认",
@@ -50,6 +51,7 @@
     "delete": "删除",
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
+    "district": "区/县",
     "done": "完成",
     "download": "下载",
     "dragIndicator": "拖动指示",
@@ -162,6 +164,7 @@
     "signout": "退出",
     "smartERP": "司友®云ERP",
     "sortTip": "拖拽项目进行排序",
+    "state": "省/州",
     "status": "状态",
     "statusApproved": "已批准",
     "statusArchived": "已归档",

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

@@ -11,6 +11,7 @@
     "back": "後退",
     "cancel": "取消",
     "changePassword": "修改密碼",
+    "city": "城市",
     "clear": "清除",
     "close": "關閉",
     "confirm": "確認",
@@ -50,6 +51,7 @@
     "delete": "刪除",
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
+    "district": "區/縣",
     "done": "完成",
     "download": "下載",
     "dragIndicator": "拖動指示",
@@ -162,6 +164,7 @@
     "signout": "退出",
     "smartERP": "司友®雲ERP",
     "sortTip": "拖拽項目進行排序",
+    "state": "省/州",
     "status": "狀態",
     "statusApproved": "已批准",
     "statusArchived": "已歸檔",

package/lib/mjs/index.d.ts

@@ -1,4 +1,6 @@
+export * from './address/AddressCity';
 export * from './address/AddressContinent';
+export * from './address/AddressDistrict';
 export * from './address/AddressRegion';
 export * from './address/AddressState';
 export * from './address/AddressUtils';

package/lib/mjs/index.js

@@ -1,5 +1,7 @@
 // address
+export * from './address/AddressCity';
 export * from './address/AddressContinent';
+export * from './address/AddressDistrict';
 export * from './address/AddressRegion';
 export * from './address/AddressState';
 export * from './address/AddressUtils';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.69",
+    "version": "1.3.70",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/address/AddressCity.ts

@@ -0,0 +1,19 @@
+/**
+ * Address city
+ */
+export type AddressCity = {
+    /**
+     * Id
+     */
+    id: number;
+
+    /**
+     * Number id
+     */
+    num?: string;
+
+    /**
+     * Name
+     */
+    label: string;
+};

package/src/address/AddressDistrict.ts

@@ -0,0 +1,19 @@
+/**
+ * Address district
+ */
+export type AddressDistrict = {
+    /**
+     * Id
+     */
+    id: number;
+
+    /**
+     * Number id
+     */
+    num?: string;
+
+    /**
+     * Name
+     */
+    label: string;
+};

package/src/erp/AddressApi.ts

@@ -6,6 +6,8 @@ import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
 import { IApiPayload } from '@etsoo/restclient';
 import { RegionsRQ } from './rq/RegionsRQ';
+import { AddressCity } from '../address/AddressCity';
+import { AddressDistrict } from '../address/AddressDistrict';
 
 const cachedRegions: { [P: string]: AddressRegionDb[] | undefined | null } = {};
 
@@ -170,13 +172,63 @@ export class AddressApi extends BaseApi {
      * Get state list
      * @param regionId Region id
      * @param payload Payload
+     * @param culture Culture
      * @returns Result
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>) {
+    states(
+        regionId: string,
+        payload?: IApiPayload<AddressState[]>,
+        culture?: string
+    ) {
         payload ??= { defaultValue: [], showLoading: false };
+        culture ??= this.app.culture;
 
         return this.api.get(
-            `Address/StateList?regionId=${regionId}&language=${this.app.culture}`,
+            `Address/StateList?regionId=${regionId}&language=${culture}`,
+            undefined,
+            payload
+        );
+    }
+
+    /**
+     * Get city list
+     * @param stateId State id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    cities(
+        stateId: string,
+        payload?: IApiPayload<AddressCity[]>,
+        culture?: string
+    ) {
+        payload ??= { defaultValue: [], showLoading: false };
+        culture ??= this.app.culture;
+
+        return this.api.get(
+            `Address/CityList?stateId=${stateId}&language=${culture}`,
+            undefined,
+            payload
+        );
+    }
+
+    /**
+     * Get district list
+     * @param cityId City id
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    districts(
+        cityId: number,
+        payload?: IApiPayload<AddressDistrict[]>,
+        culture?: string
+    ) {
+        payload ??= { defaultValue: [], showLoading: false };
+        culture ??= this.app.culture;
+
+        return this.api.get(
+            `Address/DistrictList?cityId=${cityId}&language=${culture}`,
             undefined,
             payload
         );

package/src/i18n/en.json

@@ -11,6 +11,7 @@
     "back": "Back",
     "cancel": "Cancel",
     "changePassword": "Change password",
+    "city": "City",
     "clear": "Clear",
     "close": "Close",
     "confirm": "Confirm",
@@ -50,6 +51,7 @@
     "delete": "Delete",
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
+    "district": "District/County",
     "done": "Done",
     "download": "Download",
     "dragIndicator": "Drag indicator",
@@ -162,6 +164,7 @@
     "signout": "Sign out",
     "smartERP": "SmartERP",
     "sortTip": "Drag and drop items to sort",
+    "state": "Province/State",
     "status": "Status",
     "statusApproved": "Approved",
     "statusArchived": "Archived",

package/src/i18n/zh-Hans.json

@@ -11,6 +11,7 @@
     "back": "后退",
     "cancel": "取消",
     "changePassword": "修改密码",
+    "city": "城市",
     "clear": "清除",
     "close": "关闭",
     "confirm": "确认",
@@ -50,6 +51,7 @@
     "delete": "删除",
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
+    "district": "区/县",
     "done": "完成",
     "download": "下载",
     "dragIndicator": "拖动指示",
@@ -162,6 +164,7 @@
     "signout": "退出",
     "smartERP": "司友®云ERP",
     "sortTip": "拖拽项目进行排序",
+    "state": "省/州",
     "status": "状态",
     "statusApproved": "已批准",
     "statusArchived": "已归档",

package/src/i18n/zh-Hant.json

@@ -11,6 +11,7 @@
     "back": "後退",
     "cancel": "取消",
     "changePassword": "修改密碼",
+    "city": "城市",
     "clear": "清除",
     "close": "關閉",
     "confirm": "確認",
@@ -50,6 +51,7 @@
     "delete": "刪除",
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
+    "district": "區/縣",
     "done": "完成",
     "download": "下載",
     "dragIndicator": "拖動指示",
@@ -162,6 +164,7 @@
     "signout": "退出",
     "smartERP": "司友®雲ERP",
     "sortTip": "拖拽項目進行排序",
+    "state": "省/州",
     "status": "狀態",
     "statusApproved": "已批准",
     "statusArchived": "已歸檔",

package/src/index.ts

@@ -1,5 +1,7 @@
 // address
+export * from './address/AddressCity';
 export * from './address/AddressContinent';
+export * from './address/AddressDistrict';
 export * from './address/AddressRegion';
 export * from './address/AddressState';
 export * from './address/AddressUtils';