@etsoo/appscript 1.3.69 → 1.3.71

package/src/erp/AddressApi.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, Utils } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
@@ -6,6 +6,11 @@ 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';
+import { PlaceQueryRQ } from './rq/PlaceQueryRQ';
+import { AddressAutocomplete } from '../address/AddressAutocomplete';
+import { AddressPlace } from '../address/AddressPlace';
 
 const cachedRegions: { [P: string]: AddressRegionDb[] | undefined | null } = {};
 
@@ -13,6 +18,19 @@ const cachedRegions: { [P: string]: AddressRegionDb[] | undefined | null } = {};
  * Address Api
  */
 export class AddressApi extends BaseApi {
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    autocomplete(
+        rq: PlaceQueryRQ,
+        payload?: IApiPayload<AddressAutocomplete[]>
+    ) {
+        return this.api.post('Address/Autocomplete', rq, payload);
+    }
+
     /**
      * Get all continents
      * @param isNumberKey Is number key or key as id
@@ -106,15 +124,7 @@ export class AddressApi extends BaseApi {
 
         // 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;
-            });
+            regions = Utils.sortByFieldFavor([...regions], 'id', favoredIds);
         }
 
         // Return the top items
@@ -169,16 +179,110 @@ export class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param favoredIds Favored ids
+     * @param payload Payload
+     * @param culture Culture
+     * @returns Result
+     */
+    async states(
+        regionId: string,
+        favoredIds: string[] = [],
+        payload?: IApiPayload<AddressState[]>,
+        culture?: string
+    ) {
+        payload ??= { defaultValue: [], showLoading: false };
+        culture ??= this.app.culture;
+
+        var items = await this.api.get(
+            `Address/StateList?regionId=${regionId}&language=${culture}`,
+            undefined,
+            payload
+        );
+
+        if (items == null || favoredIds.length === 0) return items;
+        return Utils.sortByFieldFavor(items, 'id', favoredIds);
+    }
+
+    /**
+     * Get city list
+     * @param stateId State id
+     * @param favoredIds Favored ids
+     * @param payload Payload
+     * @param culture Culture
+     *
+     * @returns Result
+     */
+    async cities(
+        stateId: string,
+        favoredIds: number[] = [],
+        payload?: IApiPayload<AddressCity[]>,
+        culture?: string
+    ) {
+        payload ??= { defaultValue: [], showLoading: false };
+        culture ??= this.app.culture;
+
+        const items = await this.api.get(
+            `Address/CityList?stateId=${stateId}&language=${culture}`,
+            undefined,
+            payload
+        );
+
+        if (items == null || favoredIds.length === 0) return items;
+        return Utils.sortByFieldFavor(items, 'id', favoredIds);
+    }
+
+    /**
+     * Get district list
+     * @param cityId City id
+     * @param favoredIds Favored ids
      * @param payload Payload
+     * @param culture Culture
      * @returns Result
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>) {
+    async districts(
+        cityId: number,
+        favoredIds: number[] = [],
+        payload?: IApiPayload<AddressDistrict[]>,
+        culture?: string
+    ) {
         payload ??= { defaultValue: [], showLoading: false };
+        culture ??= this.app.culture;
 
-        return this.api.get(
-            `Address/StateList?regionId=${regionId}&language=${this.app.culture}`,
+        const items = await this.api.get(
+            `Address/DistrictList?cityId=${cityId}&language=${culture}`,
             undefined,
             payload
         );
+
+        if (items == null || favoredIds.length === 0) return items;
+        return Utils.sortByFieldFavor(items, 'id', favoredIds);
+    }
+
+    /**
+     * Get place details
+     * @param placeId Place id
+     * @param language Language
+     * @param payload Payload
+     * @returns Result
+     */
+    GetPlaceDetails(
+        placeId: string,
+        language?: string,
+        payload?: IApiPayload<AddressPlace>
+    ) {
+        const url = `Address/GetPlaceDetails/${placeId}/${
+            language == null ? '' : language
+        }`;
+        return this.api.get(url, undefined, payload);
+    }
+
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    searchPlace(rq: PlaceQueryRQ, payload?: IApiPayload<AddressPlace[]>) {
+        return this.api.post('Address/SearchPlace', rq, payload);
     }
 }

package/src/erp/rq/PlaceQueryRQ.ts

@@ -0,0 +1,52 @@
+import { AddressLocation } from '../../address/AddressLocation';
+
+/**
+ * Place query output type
+ * 地址查询输出类型
+ */
+export enum PlaceQueryOutput {
+    JSON,
+    XML
+}
+
+/**
+ * Place query request data
+ * 地址查询请求数据
+ */
+export type PlaceQueryRQ = {
+    /**
+     * Query address
+     * 查询地址
+     */
+    query: string;
+
+    /**
+     * Output type
+     * 输出类型
+     */
+    output?: PlaceQueryOutput;
+
+    /**
+     * Language
+     * 语言
+     */
+    language?: string;
+
+    /**
+     * Limited region / country id, like CN
+     * 限定的地区获国家编号
+     */
+    region?: string;
+
+    /**
+     * Center location
+     * 中心位置
+     */
+    location?: AddressLocation;
+
+    /**
+     * Circle radius
+     * 方圆半径
+     */
+    radius?: number;
+};

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,11 @@
 // address
+export * from './address/AddressAutocomplete';
+export * from './address/AddressCity';
 export * from './address/AddressContinent';
+export * from './address/AddressDistrict';
+export * from './address/AddressLocation';
+export * from './address/AddressPlace';
+export * from './address/AddressPlaceBase';
 export * from './address/AddressRegion';
 export * from './address/AddressState';
 export * from './address/AddressUtils';
@@ -47,6 +53,7 @@ export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
+export * from './erp/rq/PlaceQueryRQ';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';