@etsoo/appscript 1.3.70 → 1.3.71

package/__tests__/app/CoreApp.ts

@@ -228,6 +228,33 @@ test('Tests for addressApi', async () => {
     expect(regionFailed).toBeUndefined();
 
     /*
+    const results1 = await app.addressApi.autocomplete({
+        query: '青岛市玫瑰庭院',
+        region: 'CN',
+        language: 'zh-CN'
+    });
+
+    const results2 = await app.addressApi.autocomplete({
+        query: '青岛市玫瑰庭院',
+        language: 'zh-CN'
+    });
+
+    const results1 = await app.addressApi.searchPlace({
+        query: '青岛市玫瑰庭院',
+        region: 'CN',
+        language: 'zh-CN'
+    });
+
+    const result = await app.addressApi.GetPlaceDetails(
+        'ChIJczySyo1qljUR1Jnq4Uqak2I',
+        'zh-CN'
+    );
+
+    const results2 = await app.addressApi.searchPlace({
+        query: '青岛市玫瑰庭院',
+        language: 'zh-CN'
+    });
+
     const cities = await app.addressApi.cities('CNHN');
     console.log(cities);
 

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

@@ -0,0 +1,22 @@
+import { AddressPlaceBase } from './AddressPlaceBase';
+/**
+ * Address autocomplete
+ * 地点自动填充
+ */
+export type AddressAutocomplete = {
+    /**
+     * Place id
+     * 地点编号
+     */
+    placeId: string;
+    /**
+     * Name
+     * 名称
+     */
+    name: string;
+    /**
+     * Place data
+     * 地点数据
+     */
+    place?: AddressPlaceBase;
+};

package/lib/cjs/address/AddressAutocomplete.js

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

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

@@ -0,0 +1,14 @@
+/**
+ * Address location
+ * 地理位置
+ */
+export type AddressLocation = {
+    /**
+     * Latitude, 纬度
+     */
+    lat: number;
+    /**
+     * Longitude, 经度
+     */
+    lng: number;
+};

package/lib/cjs/address/AddressLocation.js

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

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

@@ -0,0 +1,28 @@
+import { AddressLocation } from './AddressLocation';
+import { AddressPlaceBase } from './AddressPlaceBase';
+/**
+ * Address place
+ * 地点
+ */
+export type AddressPlace = Omit<AddressPlaceBase, 'location'> & {
+    /**
+     * Place id
+     * 地点编号
+     */
+    placeId: string;
+    /**
+     * Name
+     * 名称
+     */
+    name: string;
+    /**
+     * Location
+     * 位置
+     */
+    location: AddressLocation;
+    /**
+     * Formatted address
+     * 格式化地址
+     */
+    formattedAddress: string;
+};

package/lib/cjs/address/AddressPlace.js

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

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

@@ -0,0 +1,37 @@
+import { AddressLocation } from './AddressLocation';
+/**
+ * Address place base
+ * 基础地点
+ */
+export type AddressPlaceBase = {
+    /**
+     * Location
+     * 位置
+     */
+    location?: AddressLocation;
+    /**
+     * Region or country, like CN = China
+     * 地区或国家，比如 CN 表示中国
+     */
+    region?: string;
+    /**
+     * State or province
+     * 州 / 省
+     */
+    state?: string;
+    /**
+     * City
+     * 城市
+     */
+    city?: string;
+    /**
+     * District
+     * 区县
+     */
+    district?: string;
+    /**
+     * Postcode
+     * 邮编
+     */
+    postcode?: string;
+};

package/lib/cjs/address/AddressPlaceBase.js

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

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

@@ -7,10 +7,20 @@ 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';
 /**
  * Address Api
  */
 export declare class AddressApi extends BaseApi {
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    autocomplete(rq: PlaceQueryRQ, payload?: IApiPayload<AddressAutocomplete[]>): Promise<AddressAutocomplete[] | undefined>;
     /**
      * Get all continents
      * @param isNumberKey Is number key or key as id
@@ -65,25 +75,44 @@ export declare class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>, culture?: string): Promise<AddressState[] | undefined>;
+    states(regionId: string, favoredIds?: string[], payload?: IApiPayload<AddressState[]>, culture?: string): Promise<AddressState[] | undefined>;
     /**
      * Get city list
      * @param stateId State id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
+     *
      * @returns Result
      */
-    cities(stateId: string, payload?: IApiPayload<AddressCity[]>, culture?: string): Promise<AddressCity[] | undefined>;
+    cities(stateId: string, favoredIds?: number[], payload?: IApiPayload<AddressCity[]>, culture?: string): Promise<AddressCity[] | undefined>;
     /**
      * Get district list
      * @param cityId City id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    districts(cityId: number, payload?: IApiPayload<AddressDistrict[]>, culture?: string): Promise<AddressDistrict[] | undefined>;
+    districts(cityId: number, favoredIds?: number[], payload?: IApiPayload<AddressDistrict[]>, culture?: string): Promise<AddressDistrict[] | undefined>;
+    /**
+     * Get place details
+     * @param placeId Place id
+     * @param language Language
+     * @param payload Payload
+     * @returns Result
+     */
+    GetPlaceDetails(placeId: string, language?: string, payload?: IApiPayload<AddressPlace>): Promise<AddressPlace | undefined>;
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    searchPlace(rq: PlaceQueryRQ, payload?: IApiPayload<AddressPlace[]>): Promise<AddressPlace[] | undefined>;
 }

package/lib/cjs/erp/AddressApi.js

@@ -10,6 +10,15 @@ const cachedRegions = {};
  * Address Api
  */
 class AddressApi extends BaseApi_1.BaseApi {
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    autocomplete(rq, payload) {
+        return this.api.post('Address/Autocomplete', rq, payload);
+    }
     /**
      * Get all continents
      * @param isNumberKey Is number key or key as id
@@ -94,17 +103,7 @@ class AddressApi extends BaseApi_1.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 = shared_1.Utils.sortByFieldFavor([...regions], 'id', favoredIds);
         }
         // Return the top items
         return regions.slice(0, items);
@@ -143,38 +142,71 @@ class AddressApi extends BaseApi_1.BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    states(regionId, payload, culture) {
+    async states(regionId, favoredIds = [], 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/StateList?regionId=${regionId}&language=${culture}`, undefined, payload);
+        var items = await this.api.get(`Address/StateList?regionId=${regionId}&language=${culture}`, undefined, payload);
+        if (items == null || favoredIds.length === 0)
+            return items;
+        return shared_1.Utils.sortByFieldFavor(items, 'id', favoredIds);
     }
     /**
      * Get city list
      * @param stateId State id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
+     *
      * @returns Result
      */
-    cities(stateId, payload, culture) {
+    async cities(stateId, favoredIds = [], 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);
+        const items = await this.api.get(`Address/CityList?stateId=${stateId}&language=${culture}`, undefined, payload);
+        if (items == null || favoredIds.length === 0)
+            return items;
+        return shared_1.Utils.sortByFieldFavor(items, 'id', favoredIds);
     }
     /**
      * Get district list
      * @param cityId City id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    districts(cityId, payload, culture) {
+    async districts(cityId, favoredIds = [], 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);
+        const items = await this.api.get(`Address/DistrictList?cityId=${cityId}&language=${culture}`, undefined, payload);
+        if (items == null || favoredIds.length === 0)
+            return items;
+        return shared_1.Utils.sortByFieldFavor(items, 'id', favoredIds);
+    }
+    /**
+     * Get place details
+     * @param placeId Place id
+     * @param language Language
+     * @param payload Payload
+     * @returns Result
+     */
+    GetPlaceDetails(placeId, language, payload) {
+        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, payload) {
+        return this.api.post('Address/SearchPlace', rq, payload);
     }
 }
 exports.AddressApi = AddressApi;

package/lib/cjs/erp/rq/PlaceQueryRQ.d.ts

@@ -0,0 +1,45 @@
+import { AddressLocation } from '../../address/AddressLocation';
+/**
+ * Place query output type
+ * 地址查询输出类型
+ */
+export declare enum PlaceQueryOutput {
+    JSON = 0,
+    XML = 1
+}
+/**
+ * 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/lib/cjs/erp/rq/PlaceQueryRQ.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlaceQueryOutput = void 0;
+/**
+ * Place query output type
+ * 地址查询输出类型
+ */
+var PlaceQueryOutput;
+(function (PlaceQueryOutput) {
+    PlaceQueryOutput[PlaceQueryOutput["JSON"] = 0] = "JSON";
+    PlaceQueryOutput[PlaceQueryOutput["XML"] = 1] = "XML";
+})(PlaceQueryOutput = exports.PlaceQueryOutput || (exports.PlaceQueryOutput = {}));

package/lib/cjs/index.d.ts

@@ -1,6 +1,10 @@
+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';
@@ -36,6 +40,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';

package/lib/cjs/index.js

@@ -16,9 +16,13 @@ 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/AddressAutocomplete"), exports);
 __exportStar(require("./address/AddressCity"), exports);
 __exportStar(require("./address/AddressContinent"), exports);
 __exportStar(require("./address/AddressDistrict"), exports);
+__exportStar(require("./address/AddressLocation"), exports);
+__exportStar(require("./address/AddressPlace"), exports);
+__exportStar(require("./address/AddressPlaceBase"), exports);
 __exportStar(require("./address/AddressRegion"), exports);
 __exportStar(require("./address/AddressState"), exports);
 __exportStar(require("./address/AddressUtils"), exports);
@@ -60,6 +64,7 @@ __exportStar(require("./erp/rq/LoginRQ"), exports);
 __exportStar(require("./erp/rq/MemberListRQ"), exports);
 __exportStar(require("./erp/rq/OrgListRQ"), exports);
 __exportStar(require("./erp/rq/OrgQueryRQ"), exports);
+__exportStar(require("./erp/rq/PlaceQueryRQ"), exports);
 __exportStar(require("./erp/rq/QueryRQ"), exports);
 __exportStar(require("./erp/rq/RefreshTokenRQ"), exports);
 __exportStar(require("./erp/rq/RegionsRQ"), exports);

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

@@ -0,0 +1,22 @@
+import { AddressPlaceBase } from './AddressPlaceBase';
+/**
+ * Address autocomplete
+ * 地点自动填充
+ */
+export type AddressAutocomplete = {
+    /**
+     * Place id
+     * 地点编号
+     */
+    placeId: string;
+    /**
+     * Name
+     * 名称
+     */
+    name: string;
+    /**
+     * Place data
+     * 地点数据
+     */
+    place?: AddressPlaceBase;
+};

package/lib/mjs/address/AddressAutocomplete.js

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

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

@@ -0,0 +1,14 @@
+/**
+ * Address location
+ * 地理位置
+ */
+export type AddressLocation = {
+    /**
+     * Latitude, 纬度
+     */
+    lat: number;
+    /**
+     * Longitude, 经度
+     */
+    lng: number;
+};

package/lib/mjs/address/AddressLocation.js

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

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

@@ -0,0 +1,28 @@
+import { AddressLocation } from './AddressLocation';
+import { AddressPlaceBase } from './AddressPlaceBase';
+/**
+ * Address place
+ * 地点
+ */
+export type AddressPlace = Omit<AddressPlaceBase, 'location'> & {
+    /**
+     * Place id
+     * 地点编号
+     */
+    placeId: string;
+    /**
+     * Name
+     * 名称
+     */
+    name: string;
+    /**
+     * Location
+     * 位置
+     */
+    location: AddressLocation;
+    /**
+     * Formatted address
+     * 格式化地址
+     */
+    formattedAddress: string;
+};

package/lib/mjs/address/AddressPlace.js

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

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

@@ -0,0 +1,37 @@
+import { AddressLocation } from './AddressLocation';
+/**
+ * Address place base
+ * 基础地点
+ */
+export type AddressPlaceBase = {
+    /**
+     * Location
+     * 位置
+     */
+    location?: AddressLocation;
+    /**
+     * Region or country, like CN = China
+     * 地区或国家，比如 CN 表示中国
+     */
+    region?: string;
+    /**
+     * State or province
+     * 州 / 省
+     */
+    state?: string;
+    /**
+     * City
+     * 城市
+     */
+    city?: string;
+    /**
+     * District
+     * 区县
+     */
+    district?: string;
+    /**
+     * Postcode
+     * 邮编
+     */
+    postcode?: string;
+};

package/lib/mjs/address/AddressPlaceBase.js

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

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

@@ -7,10 +7,20 @@ 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';
 /**
  * Address Api
  */
 export declare class AddressApi extends BaseApi {
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    autocomplete(rq: PlaceQueryRQ, payload?: IApiPayload<AddressAutocomplete[]>): Promise<AddressAutocomplete[] | undefined>;
     /**
      * Get all continents
      * @param isNumberKey Is number key or key as id
@@ -65,25 +75,44 @@ export declare class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>, culture?: string): Promise<AddressState[] | undefined>;
+    states(regionId: string, favoredIds?: string[], payload?: IApiPayload<AddressState[]>, culture?: string): Promise<AddressState[] | undefined>;
     /**
      * Get city list
      * @param stateId State id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
+     *
      * @returns Result
      */
-    cities(stateId: string, payload?: IApiPayload<AddressCity[]>, culture?: string): Promise<AddressCity[] | undefined>;
+    cities(stateId: string, favoredIds?: number[], payload?: IApiPayload<AddressCity[]>, culture?: string): Promise<AddressCity[] | undefined>;
     /**
      * Get district list
      * @param cityId City id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    districts(cityId: number, payload?: IApiPayload<AddressDistrict[]>, culture?: string): Promise<AddressDistrict[] | undefined>;
+    districts(cityId: number, favoredIds?: number[], payload?: IApiPayload<AddressDistrict[]>, culture?: string): Promise<AddressDistrict[] | undefined>;
+    /**
+     * Get place details
+     * @param placeId Place id
+     * @param language Language
+     * @param payload Payload
+     * @returns Result
+     */
+    GetPlaceDetails(placeId: string, language?: string, payload?: IApiPayload<AddressPlace>): Promise<AddressPlace | undefined>;
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    searchPlace(rq: PlaceQueryRQ, payload?: IApiPayload<AddressPlace[]>): Promise<AddressPlace[] | undefined>;
 }

package/lib/mjs/erp/AddressApi.js

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, Utils } from '@etsoo/shared';
 import { AddressContinent } from '../address/AddressContinent';
 import { AddressRegion } from '../address/AddressRegion';
 import { BaseApi } from './BaseApi';
@@ -7,6 +7,15 @@ const cachedRegions = {};
  * Address Api
  */
 export class AddressApi extends BaseApi {
+    /**
+     * Place autocomplete
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    autocomplete(rq, payload) {
+        return this.api.post('Address/Autocomplete', rq, payload);
+    }
     /**
      * Get all continents
      * @param isNumberKey Is number key or key as id
@@ -91,17 +100,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
         return regions.slice(0, items);
@@ -140,37 +139,70 @@ export class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param favoredIds Favored ids
      * @param payload Payload
      * @param culture Culture
      * @returns Result
      */
-    states(regionId, payload, culture) {
+    async states(regionId, favoredIds = [], 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/StateList?regionId=${regionId}&language=${culture}`, undefined, payload);
+        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
      */
-    cities(stateId, payload, culture) {
+    async cities(stateId, favoredIds = [], 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);
+        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
      */
-    districts(cityId, payload, culture) {
+    async districts(cityId, favoredIds = [], 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);
+        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, language, payload) {
+        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, payload) {
+        return this.api.post('Address/SearchPlace', rq, payload);
     }
 }

package/lib/mjs/erp/rq/PlaceQueryRQ.d.ts

@@ -0,0 +1,45 @@
+import { AddressLocation } from '../../address/AddressLocation';
+/**
+ * Place query output type
+ * 地址查询输出类型
+ */
+export declare enum PlaceQueryOutput {
+    JSON = 0,
+    XML = 1
+}
+/**
+ * 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/lib/mjs/erp/rq/PlaceQueryRQ.js

@@ -0,0 +1,9 @@
+/**
+ * Place query output type
+ * 地址查询输出类型
+ */
+export var PlaceQueryOutput;
+(function (PlaceQueryOutput) {
+    PlaceQueryOutput[PlaceQueryOutput["JSON"] = 0] = "JSON";
+    PlaceQueryOutput[PlaceQueryOutput["XML"] = 1] = "XML";
+})(PlaceQueryOutput || (PlaceQueryOutput = {}));

package/lib/mjs/index.d.ts

@@ -1,6 +1,10 @@
+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';
@@ -36,6 +40,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';

package/lib/mjs/index.js

@@ -1,7 +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';
@@ -43,6 +47,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';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.70",
+    "version": "1.3.71",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.24",
         "@etsoo/restclient": "^1.0.87",
-        "@etsoo/shared": "^1.1.89",
+        "@etsoo/shared": "^1.1.90",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -65,8 +65,8 @@
         "@babel/preset-env": "^7.20.2",
         "@babel/runtime-corejs3": "^7.21.0",
         "@types/jest": "^29.4.0",
-        "jest": "^29.4.3",
-        "jest-environment-jsdom": "^29.4.3",
+        "jest": "^29.5.0",
+        "jest-environment-jsdom": "^29.5.0",
         "ts-jest": "^29.0.5",
         "typescript": "^4.9.5"
     }

package/src/address/AddressAutocomplete.ts

@@ -0,0 +1,25 @@
+import { AddressPlaceBase } from './AddressPlaceBase';
+
+/**
+ * Address autocomplete
+ * 地点自动填充
+ */
+export type AddressAutocomplete = {
+    /**
+     * Place id
+     * 地点编号
+     */
+    placeId: string;
+
+    /**
+     * Name
+     * 名称
+     */
+    name: string;
+
+    /**
+     * Place data
+     * 地点数据
+     */
+    place?: AddressPlaceBase;
+};

package/src/address/AddressLocation.ts

@@ -0,0 +1,15 @@
+/**
+ * Address location
+ * 地理位置
+ */
+export type AddressLocation = {
+    /**
+     * Latitude, 纬度
+     */
+    lat: number;
+
+    /**
+     * Longitude, 经度
+     */
+    lng: number;
+};

package/src/address/AddressPlace.ts

@@ -0,0 +1,32 @@
+import { AddressLocation } from './AddressLocation';
+import { AddressPlaceBase } from './AddressPlaceBase';
+
+/**
+ * Address place
+ * 地点
+ */
+export type AddressPlace = Omit<AddressPlaceBase, 'location'> & {
+    /**
+     * Place id
+     * 地点编号
+     */
+    placeId: string;
+
+    /**
+     * Name
+     * 名称
+     */
+    name: string;
+
+    /**
+     * Location
+     * 位置
+     */
+    location: AddressLocation;
+
+    /**
+     * Formatted address
+     * 格式化地址
+     */
+    formattedAddress: string;
+};

package/src/address/AddressPlaceBase.ts

@@ -0,0 +1,43 @@
+import { AddressLocation } from './AddressLocation';
+
+/**
+ * Address place base
+ * 基础地点
+ */
+export type AddressPlaceBase = {
+    /**
+     * Location
+     * 位置
+     */
+    location?: AddressLocation;
+
+    /**
+     * Region or country, like CN = China
+     * 地区或国家，比如 CN 表示中国
+     */
+    region?: string;
+
+    /**
+     * State or province
+     * 州 / 省
+     */
+    state?: string;
+
+    /**
+     * City
+     * 城市
+     */
+    city?: string;
+
+    /**
+     * District
+     * 区县
+     */
+    district?: string;
+
+    /**
+     * Postcode
+     * 邮编
+     */
+    postcode?: string;
+};

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';
@@ -8,6 +8,9 @@ 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 } = {};
 
@@ -15,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
@@ -108,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
@@ -171,66 +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
      */
-    states(
+    async states(
         regionId: string,
+        favoredIds: string[] = [],
         payload?: IApiPayload<AddressState[]>,
         culture?: string
     ) {
         payload ??= { defaultValue: [], showLoading: false };
         culture ??= this.app.culture;
 
-        return this.api.get(
+        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
      */
-    cities(
+    async cities(
         stateId: string,
+        favoredIds: number[] = [],
         payload?: IApiPayload<AddressCity[]>,
         culture?: string
     ) {
         payload ??= { defaultValue: [], showLoading: false };
         culture ??= this.app.culture;
 
-        return this.api.get(
+        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
      */
-    districts(
+    async districts(
         cityId: number,
+        favoredIds: number[] = [],
         payload?: IApiPayload<AddressDistrict[]>,
         culture?: string
     ) {
         payload ??= { defaultValue: [], showLoading: false };
         culture ??= this.app.culture;
 
-        return this.api.get(
+        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/index.ts

@@ -1,7 +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';
@@ -49,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';