@etsoo/smarterp-core 1.1.3 → 1.1.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2004-2025 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
+Copyright (c) 2004-2026 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/__tests__/PublicApi.ts

@@ -1,7 +1,7 @@
 import { isLocalTest, TestApp } from "./app/TestApp";
 import { PublicApi } from "../src/PublicApi";
 import { PinyinFormatType } from "../src/rq/public/PinyinRQ";
-import { ApiProvider } from "../src/rq/public/PlaceQueryRQ";
+import { MapApiProvider } from "@etsoo/appscript";
 
 const app = new TestApp();
 
@@ -111,7 +111,7 @@ if (isLocalTest) {
   });
 
   test("Test for CN queryPlace", async () => {
-    const result = await api.queryPlace({
+    const [provider, result] = await api.queryPlace({
       query: "山东省青岛李沧清溪路88号玫瑰庭院10号楼二单元501室",
       region: "CN"
     });
@@ -119,6 +119,8 @@ if (isLocalTest) {
     expect(result).not.toBeNull();
     if (result == null) return;
 
+    expect(provider).toBe(MapApiProvider.Amap);
+
     const first = result.filter((x) => x.district === "李沧区")[0];
     expect(first.region).toBe("CN");
     expect(first.state).toBe("山东省");
@@ -129,14 +131,16 @@ if (isLocalTest) {
   });
 
   test("Test for world queryPlace", async () => {
-    const result = await api.queryPlace({
+    const [provider, result] = await api.queryPlace({
       query: "14A Cranbrook Place, Glendowie, Auckland 1071",
-      provider: ApiProvider.Google
+      provider: MapApiProvider.Google
     });
 
     expect(result).not.toBeNull();
     if (result == null) return;
 
+    expect(provider).toBe(MapApiProvider.Google);
+
     const first = result[0];
     expect(first.region).toBe("NZ");
     expect(first.state).toBe("Auckland");

package/lib/cjs/PublicApi.d.ts

@@ -6,7 +6,7 @@ import { CurrencyItem } from "./dto/public/CurrencyItem";
 import { RegionData } from "./dto/public/RegionData";
 import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
-import { BaseApi, CultureItem, Currency, CustomCulture, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
+import { BaseApi, CultureItem, Currency, CustomCulture, IApp, MapApiProvider, ProductUnit, ResultPayload } from "@etsoo/appscript";
 import { MemberInvitationDto } from "./dto/public/MemberInvitationDto";
 import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
 import { ChinaPinData } from "./dto/public/ChinaPinData";
@@ -114,7 +114,7 @@ export declare class PublicApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>): Promise<PlaceCommon[] | undefined>;
+    queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>): Promise<[MapApiProvider, PlaceCommon[] | undefined]>;
     /**
      * Read member invitation
      * @param id Id

package/lib/cjs/PublicApi.js

@@ -154,8 +154,35 @@ class PublicApi extends appscript_1.BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    queryPlace(rq, payload) {
-        return this.api.post("Public/QueryPlace", rq, payload);
+    async queryPlace(rq, payload) {
+        // For simplified Chinese, or CN region, use China map
+        if (rq.provider === null &&
+            (rq.language === "zh-Hans" ||
+                rq.language === "zh-CN" ||
+                rq.region === "CN")) {
+            // Amap first
+            const amapRq = {
+                ...rq,
+                region: undefined,
+                provider: appscript_1.MapApiProvider.Amap
+            };
+            const amapResult = await this.api.post("Public/QueryPlace", amapRq, payload);
+            if (amapResult && amapResult.length > 0)
+                return [appscript_1.MapApiProvider.Amap, amapResult];
+            // Baidu
+            const baiduRq = {
+                ...rq,
+                region: undefined,
+                provider: appscript_1.MapApiProvider.Baidu
+            };
+            const baiduResult = await this.api.post("Public/QueryPlace", baiduRq, payload);
+            if (baiduResult && baiduResult.length > 0)
+                return [appscript_1.MapApiProvider.Baidu, baiduResult];
+        }
+        return [
+            rq.provider ?? appscript_1.MapApiProvider.Google,
+            await this.api.post("Public/QueryPlace", rq, payload)
+        ];
     }
     /**
      * Read member invitation

package/lib/cjs/components/public/AddressTiplist.d.ts

@@ -1,9 +1,17 @@
 import { TiplistProps } from "@etsoo/materialui";
 import { PlaceCommon } from "../../dto/public/PlaceCommon";
+import { MapApiProvider } from "@etsoo/appscript";
 /**
  * Address tiplist component props
  */
-export type AddressTiplistProps = Omit<TiplistProps<PlaceCommon, "placeId">, "idField" | "loadData" | "name" | "label"> & Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {};
+export type AddressTiplistProps = Omit<TiplistProps<PlaceCommon, "placeId">, "idField" | "loadData" | "name" | "label" | "onValueChange"> & Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {
+    /**
+     * Value change handler
+     * @param value New value
+     * @param provider Map API provider
+     */
+    onValueChange?: (value: PlaceCommon | null, provider: MapApiProvider) => void;
+};
 /**
  * Address tiplist component
  * @param props Properties

package/lib/cjs/components/public/AddressTiplist.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddressTiplist = AddressTiplist;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const materialui_1 = require("@etsoo/materialui");
 const ICoreServiceApp_1 = require("../../ICoreServiceApp");
+const react_1 = __importDefault(require("react"));
+const appscript_1 = require("@etsoo/appscript");
 /**
  * Address tiplist component
  * @param props Properties
@@ -13,12 +18,22 @@ function AddressTiplist(props) {
     // App
     const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
     // Destruct
-    const { fullWidth = true, getOptionLabel = (option) => `${option.name} - ${option.formattedAddress} (${option.postalCode})`, name = "address", label = app.get("address") ?? "Address", maxItems = 10, ...rest } = props;
-    return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { fullWidth: fullWidth, getOptionLabel: getOptionLabel, idField: "placeId", label: label, loadData: (keyword, _, maxItems) => keyword
-            ? app.core.publicApi.queryPlace({
-                language: app.culture,
-                query: keyword,
-                pageSize: maxItems
-            }, { showLoading: false })
-            : Promise.resolve([]), name: name, ...rest }));
+    const { fullWidth = true, getOptionLabel = (option) => `${option.name} - ${option.formattedAddress} (${option.postalCode})`, name = "address", label = app.get("address") ?? "Address", maxItems = 10, onValueChange, ...rest } = props;
+    // Provider
+    const providerRef = react_1.default.useRef(appscript_1.MapApiProvider.Google);
+    return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { fullWidth: fullWidth, getOptionLabel: getOptionLabel, idField: "placeId", label: label, loadData: async (keyword, _, maxItems) => {
+            if (keyword && keyword.length > 2) {
+                const [provider, results] = await app.core.publicApi.queryPlace({
+                    language: app.culture,
+                    query: keyword,
+                    pageSize: maxItems
+                }, { showLoading: false });
+                // Save provider
+                providerRef.current = provider;
+                return results;
+            }
+            else {
+                return [];
+            }
+        }, name: name, onValueChange: (value) => onValueChange?.(value, providerRef.current), ...rest }));
 }

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

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "@etsoo/appscript";
+import { MapApiProvider, PlaceLocation } from "@etsoo/appscript";
 /**
  * API output type
  * API输出类型
@@ -7,14 +7,6 @@ export declare enum ApiOutput {
     JSON = 0,
     XML = 1
 }
-/**
- * API provider
- * 接口供应商
- */
-export declare enum ApiProvider {
-    Google = 0,
-    Baidu = 1
-}
 /**
  * Place query request
  * 地点查询请求
@@ -34,7 +26,7 @@ export type PlaceQueryRQ = {
      * API provider
      * 接口供应商
      */
-    provider?: ApiProvider;
+    provider?: MapApiProvider;
     /**
      * Language, like zh-CN
      * 语言

package/lib/cjs/rq/public/PlaceQueryRQ.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiProvider = exports.ApiOutput = void 0;
+exports.ApiOutput = void 0;
 /**
  * API output type
  * API输出类型
@@ -10,12 +10,3 @@ var ApiOutput;
     ApiOutput[ApiOutput["JSON"] = 0] = "JSON";
     ApiOutput[ApiOutput["XML"] = 1] = "XML";
 })(ApiOutput || (exports.ApiOutput = ApiOutput = {}));
-/**
- * API provider
- * 接口供应商
- */
-var ApiProvider;
-(function (ApiProvider) {
-    ApiProvider[ApiProvider["Google"] = 0] = "Google";
-    ApiProvider[ApiProvider["Baidu"] = 1] = "Baidu";
-})(ApiProvider || (exports.ApiProvider = ApiProvider = {}));

package/lib/mjs/PublicApi.d.ts

@@ -6,7 +6,7 @@ import { CurrencyItem } from "./dto/public/CurrencyItem";
 import { RegionData } from "./dto/public/RegionData";
 import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
-import { BaseApi, CultureItem, Currency, CustomCulture, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
+import { BaseApi, CultureItem, Currency, CustomCulture, IApp, MapApiProvider, ProductUnit, ResultPayload } from "@etsoo/appscript";
 import { MemberInvitationDto } from "./dto/public/MemberInvitationDto";
 import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
 import { ChinaPinData } from "./dto/public/ChinaPinData";
@@ -114,7 +114,7 @@ export declare class PublicApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>): Promise<PlaceCommon[] | undefined>;
+    queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>): Promise<[MapApiProvider, PlaceCommon[] | undefined]>;
     /**
      * Read member invitation
      * @param id Id

package/lib/mjs/PublicApi.js

@@ -1,5 +1,5 @@
 import { DataTypes } from "@etsoo/shared";
-import { BaseApi, ProductUnit, RepeatOption } from "@etsoo/appscript";
+import { BaseApi, MapApiProvider, ProductUnit, RepeatOption } from "@etsoo/appscript";
 const unitPrefix = "unit";
 /**
  * Public API
@@ -151,8 +151,35 @@ export class PublicApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    queryPlace(rq, payload) {
-        return this.api.post("Public/QueryPlace", rq, payload);
+    async queryPlace(rq, payload) {
+        // For simplified Chinese, or CN region, use China map
+        if (rq.provider === null &&
+            (rq.language === "zh-Hans" ||
+                rq.language === "zh-CN" ||
+                rq.region === "CN")) {
+            // Amap first
+            const amapRq = {
+                ...rq,
+                region: undefined,
+                provider: MapApiProvider.Amap
+            };
+            const amapResult = await this.api.post("Public/QueryPlace", amapRq, payload);
+            if (amapResult && amapResult.length > 0)
+                return [MapApiProvider.Amap, amapResult];
+            // Baidu
+            const baiduRq = {
+                ...rq,
+                region: undefined,
+                provider: MapApiProvider.Baidu
+            };
+            const baiduResult = await this.api.post("Public/QueryPlace", baiduRq, payload);
+            if (baiduResult && baiduResult.length > 0)
+                return [MapApiProvider.Baidu, baiduResult];
+        }
+        return [
+            rq.provider ?? MapApiProvider.Google,
+            await this.api.post("Public/QueryPlace", rq, payload)
+        ];
     }
     /**
      * Read member invitation

package/lib/mjs/components/public/AddressTiplist.d.ts

@@ -1,9 +1,17 @@
 import { TiplistProps } from "@etsoo/materialui";
 import { PlaceCommon } from "../../dto/public/PlaceCommon";
+import { MapApiProvider } from "@etsoo/appscript";
 /**
  * Address tiplist component props
  */
-export type AddressTiplistProps = Omit<TiplistProps<PlaceCommon, "placeId">, "idField" | "loadData" | "name" | "label"> & Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {};
+export type AddressTiplistProps = Omit<TiplistProps<PlaceCommon, "placeId">, "idField" | "loadData" | "name" | "label" | "onValueChange"> & Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {
+    /**
+     * Value change handler
+     * @param value New value
+     * @param provider Map API provider
+     */
+    onValueChange?: (value: PlaceCommon | null, provider: MapApiProvider) => void;
+};
 /**
  * Address tiplist component
  * @param props Properties

package/lib/mjs/components/public/AddressTiplist.js

@@ -1,6 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Tiplist } from "@etsoo/materialui";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
+import React from "react";
+import { MapApiProvider } from "@etsoo/appscript";
 /**
  * Address tiplist component
  * @param props Properties
@@ -10,12 +12,22 @@ export function AddressTiplist(props) {
     // App
     const app = useRequiredAppContext();
     // Destruct
-    const { fullWidth = true, getOptionLabel = (option) => `${option.name} - ${option.formattedAddress} (${option.postalCode})`, name = "address", label = app.get("address") ?? "Address", maxItems = 10, ...rest } = props;
-    return (_jsx(Tiplist, { fullWidth: fullWidth, getOptionLabel: getOptionLabel, idField: "placeId", label: label, loadData: (keyword, _, maxItems) => keyword
-            ? app.core.publicApi.queryPlace({
-                language: app.culture,
-                query: keyword,
-                pageSize: maxItems
-            }, { showLoading: false })
-            : Promise.resolve([]), name: name, ...rest }));
+    const { fullWidth = true, getOptionLabel = (option) => `${option.name} - ${option.formattedAddress} (${option.postalCode})`, name = "address", label = app.get("address") ?? "Address", maxItems = 10, onValueChange, ...rest } = props;
+    // Provider
+    const providerRef = React.useRef(MapApiProvider.Google);
+    return (_jsx(Tiplist, { fullWidth: fullWidth, getOptionLabel: getOptionLabel, idField: "placeId", label: label, loadData: async (keyword, _, maxItems) => {
+            if (keyword && keyword.length > 2) {
+                const [provider, results] = await app.core.publicApi.queryPlace({
+                    language: app.culture,
+                    query: keyword,
+                    pageSize: maxItems
+                }, { showLoading: false });
+                // Save provider
+                providerRef.current = provider;
+                return results;
+            }
+            else {
+                return [];
+            }
+        }, name: name, onValueChange: (value) => onValueChange?.(value, providerRef.current), ...rest }));
 }

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

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "@etsoo/appscript";
+import { MapApiProvider, PlaceLocation } from "@etsoo/appscript";
 /**
  * API output type
  * API输出类型
@@ -7,14 +7,6 @@ export declare enum ApiOutput {
     JSON = 0,
     XML = 1
 }
-/**
- * API provider
- * 接口供应商
- */
-export declare enum ApiProvider {
-    Google = 0,
-    Baidu = 1
-}
 /**
  * Place query request
  * 地点查询请求
@@ -34,7 +26,7 @@ export type PlaceQueryRQ = {
      * API provider
      * 接口供应商
      */
-    provider?: ApiProvider;
+    provider?: MapApiProvider;
     /**
      * Language, like zh-CN
      * 语言

package/lib/mjs/rq/public/PlaceQueryRQ.js

@@ -7,12 +7,3 @@ export var ApiOutput;
     ApiOutput[ApiOutput["JSON"] = 0] = "JSON";
     ApiOutput[ApiOutput["XML"] = 1] = "XML";
 })(ApiOutput || (ApiOutput = {}));
-/**
- * API provider
- * 接口供应商
- */
-export var ApiProvider;
-(function (ApiProvider) {
-    ApiProvider[ApiProvider["Google"] = 0] = "Google";
-    ApiProvider[ApiProvider["Baidu"] = 1] = "Baidu";
-})(ApiProvider || (ApiProvider = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -53,9 +53,9 @@
     "vitest": "^4.0.16"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.49",
-    "@etsoo/materialui": "^1.5.92",
-    "@etsoo/react": "^1.8.65",
+    "@etsoo/appscript": "^1.6.50",
+    "@etsoo/materialui": "^1.5.93",
+    "@etsoo/react": "^1.8.66",
     "@etsoo/shared": "^1.2.80",
     "@etsoo/toolpad": "^1.0.42",
     "@mui/material": "^7.3.6",

package/src/PublicApi.ts

@@ -12,6 +12,7 @@ import {
   Currency,
   CustomCulture,
   IApp,
+  MapApiProvider,
   ProductUnit,
   RepeatOption,
   ResultPayload
@@ -192,8 +193,54 @@ export class PublicApi extends BaseApi {
    * @param payload Payload
    * @returns Result
    */
-  queryPlace(rq: PlaceQueryRQ, payload?: IApiPayload<PlaceCommon[]>) {
-    return this.api.post("Public/QueryPlace", rq, payload);
+  async queryPlace(
+    rq: PlaceQueryRQ,
+    payload?: IApiPayload<PlaceCommon[]>
+  ): Promise<[MapApiProvider, PlaceCommon[] | undefined]> {
+    // For simplified Chinese, or CN region, use China map
+    if (
+      rq.provider === null &&
+      (rq.language === "zh-Hans" ||
+        rq.language === "zh-CN" ||
+        rq.region === "CN")
+    ) {
+      // Amap first
+      const amapRq: PlaceQueryRQ = {
+        ...rq,
+        region: undefined,
+        provider: MapApiProvider.Amap
+      };
+
+      const amapResult = await this.api.post(
+        "Public/QueryPlace",
+        amapRq,
+        payload
+      );
+
+      if (amapResult && amapResult.length > 0)
+        return [MapApiProvider.Amap, amapResult];
+
+      // Baidu
+      const baiduRq: PlaceQueryRQ = {
+        ...rq,
+        region: undefined,
+        provider: MapApiProvider.Baidu
+      };
+
+      const baiduResult = await this.api.post(
+        "Public/QueryPlace",
+        baiduRq,
+        payload
+      );
+
+      if (baiduResult && baiduResult.length > 0)
+        return [MapApiProvider.Baidu, baiduResult];
+    }
+
+    return [
+      rq.provider ?? MapApiProvider.Google,
+      await this.api.post("Public/QueryPlace", rq, payload)
+    ];
   }
 
   /**

package/src/components/public/AddressTiplist.tsx

@@ -1,15 +1,27 @@
 import { Tiplist, TiplistProps } from "@etsoo/materialui";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 import { PlaceCommon } from "../../dto/public/PlaceCommon";
+import React from "react";
+import { MapApiProvider } from "@etsoo/appscript";
 
 /**
  * Address tiplist component props
  */
 export type AddressTiplistProps = Omit<
   TiplistProps<PlaceCommon, "placeId">,
-  "idField" | "loadData" | "name" | "label"
+  "idField" | "loadData" | "name" | "label" | "onValueChange"
 > &
-  Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {};
+  Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {
+    /**
+     * Value change handler
+     * @param value New value
+     * @param provider Map API provider
+     */
+    onValueChange?: (
+      value: PlaceCommon | null,
+      provider: MapApiProvider
+    ) => void;
+  };
 
 /**
  * Address tiplist component
@@ -28,28 +40,40 @@ export function AddressTiplist(props: AddressTiplistProps) {
     name = "address",
     label = app.get("address") ?? "Address",
     maxItems = 10,
+    onValueChange,
     ...rest
   } = props;
 
+  // Provider
+  const providerRef = React.useRef<MapApiProvider>(MapApiProvider.Google);
+
   return (
     <Tiplist<PlaceCommon>
       fullWidth={fullWidth}
       getOptionLabel={getOptionLabel}
       idField="placeId"
       label={label}
-      loadData={(keyword, _, maxItems) =>
-        keyword
-          ? app.core.publicApi.queryPlace(
-              {
-                language: app.culture,
-                query: keyword,
-                pageSize: maxItems
-              },
-              { showLoading: false }
-            )
-          : Promise.resolve([])
-      }
+      loadData={async (keyword, _, maxItems) => {
+        if (keyword && keyword.length > 2) {
+          const [provider, results] = await app.core.publicApi.queryPlace(
+            {
+              language: app.culture,
+              query: keyword,
+              pageSize: maxItems
+            },
+            { showLoading: false }
+          );
+
+          // Save provider
+          providerRef.current = provider;
+
+          return results;
+        } else {
+          return [];
+        }
+      }}
       name={name}
+      onValueChange={(value) => onValueChange?.(value, providerRef.current)}
       {...rest}
     />
   );

package/src/rq/public/PlaceQueryRQ.ts

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "@etsoo/appscript";
+import { MapApiProvider, PlaceLocation } from "@etsoo/appscript";
 
 /**
  * API output type
@@ -9,15 +9,6 @@ export enum ApiOutput {
   XML
 }
 
-/**
- * API provider
- * 接口供应商
- */
-export enum ApiProvider {
-  Google,
-  Baidu
-}
-
 /**
  * Place query request
  * 地点查询请求
@@ -39,7 +30,7 @@ export type PlaceQueryRQ = {
    * API provider
    * 接口供应商
    */
-  provider?: ApiProvider;
+  provider?: MapApiProvider;
 
   /**
    * Language, like zh-CN