@etsoo/appscript 1.3.69 → 1.3.71

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,41 @@ test('Tests for addressApi', () => {
     expect(region?.label).toBe('美国');
     const regionFailed = app.addressApi.region('ABC');
     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);
+
+    const districts = await app.addressApi.districts(1181);
+    console.log(districts);
+    */
 });
 
 /*

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/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/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

@@ -5,10 +5,22 @@ 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';
 /**
  * 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
@@ -63,8 +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, 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, 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, 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
      */
-    states(regionId: string, payload?: IApiPayload<AddressState[]>): Promise<AddressState[] | undefined>;
+    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,12 +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
+     */
+    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);
+        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
+     */
+    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);
+        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
      */
-    states(regionId, payload) {
+    async districts(cityId, favoredIds = [], 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);
+        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/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,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';
@@ -34,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,7 +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);
@@ -58,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/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/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 {};