@etsoo/smarterp-core 1.1.2 → 1.1.4

package/lib/cjs/PublicApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicApi = void 0;
 const shared_1 = require("@etsoo/shared");
+const PlaceQueryRQ_1 = require("./rq/public/PlaceQueryRQ");
 const appscript_1 = require("@etsoo/appscript");
 const unitPrefix = "unit";
 /**
@@ -154,8 +155,32 @@ 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: PlaceQueryRQ_1.ApiProvider.Amap
+            };
+            const amapResult = await this.api.post("Public/QueryPlace", amapRq, payload);
+            if (amapResult && amapResult.length > 0)
+                return amapResult;
+            // Baidu
+            const baiduRq = {
+                ...rq,
+                region: undefined,
+                provider: PlaceQueryRQ_1.ApiProvider.Baidu
+            };
+            const baiduResult = await this.api.post("Public/QueryPlace", baiduRq, payload);
+            if (baiduResult && baiduResult.length > 0)
+                return baiduResult;
+        }
+        return await this.api.post("Public/QueryPlace", rq, payload);
     }
     /**
      * Read member invitation

package/lib/cjs/components/index.d.ts

@@ -9,6 +9,7 @@ export * from "./app/UserRoleList";
 export * from "./org/ButtonApiServices";
 export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";
+export * from "./public/AddressTiplist";
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
 export * from "./public/ButtonRadioRegions";

package/lib/cjs/components/index.js

@@ -29,6 +29,7 @@ __exportStar(require("./org/ButtonApiServices"), exports);
 __exportStar(require("./org/OrgSwitchPopover"), exports);
 __exportStar(require("./org/OrgTiplist"), exports);
 // public
+__exportStar(require("./public/AddressTiplist"), exports);
 __exportStar(require("./public/ButtonCultures"), exports);
 __exportStar(require("./public/ButtonCurrencies"), exports);
 __exportStar(require("./public/ButtonRadioRegions"), exports);

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

@@ -0,0 +1,12 @@
+import { TiplistProps } from "@etsoo/materialui";
+import { PlaceCommon } from "../../dto/public/PlaceCommon";
+/**
+ * Address tiplist component props
+ */
+export type AddressTiplistProps = Omit<TiplistProps<PlaceCommon, "placeId">, "idField" | "loadData" | "name" | "label"> & Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {};
+/**
+ * Address tiplist component
+ * @param props Properties
+ * @returns Component
+ */
+export declare function AddressTiplist(props: AddressTiplistProps): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,24 @@
+"use strict";
+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");
+/**
+ * Address tiplist component
+ * @param props Properties
+ * @returns Component
+ */
+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 }));
+}

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

@@ -12,8 +12,21 @@ export declare enum ApiOutput {
  * 接口供应商
  */
 export declare enum ApiProvider {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     Google = 0,
-    Baidu = 1
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
+    Baidu = 1,
+    /**
+     * Amap
+     * 高德地图
+     */
+    Amap = 2
 }
 /**
  * Place query request
@@ -55,4 +68,9 @@ export type PlaceQueryRQ = {
      * 方圆距离，单位为米
      */
     radius?: number;
+    /**
+     * Page size, 1 - 20 suggested
+     * 每页记录数，建议1-20
+     */
+    pageSize?: number;
 };

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

@@ -16,6 +16,19 @@ var ApiOutput;
  */
 var ApiProvider;
 (function (ApiProvider) {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     ApiProvider[ApiProvider["Google"] = 0] = "Google";
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
     ApiProvider[ApiProvider["Baidu"] = 1] = "Baidu";
+    /**
+     * Amap
+     * 高德地图
+     */
+    ApiProvider[ApiProvider["Amap"] = 2] = "Amap";
 })(ApiProvider || (exports.ApiProvider = ApiProvider = {}));

package/lib/mjs/PublicApi.js

@@ -1,4 +1,5 @@
 import { DataTypes } from "@etsoo/shared";
+import { ApiProvider } from "./rq/public/PlaceQueryRQ";
 import { BaseApi, ProductUnit, RepeatOption } from "@etsoo/appscript";
 const unitPrefix = "unit";
 /**
@@ -151,8 +152,32 @@ 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: ApiProvider.Amap
+            };
+            const amapResult = await this.api.post("Public/QueryPlace", amapRq, payload);
+            if (amapResult && amapResult.length > 0)
+                return amapResult;
+            // Baidu
+            const baiduRq = {
+                ...rq,
+                region: undefined,
+                provider: ApiProvider.Baidu
+            };
+            const baiduResult = await this.api.post("Public/QueryPlace", baiduRq, payload);
+            if (baiduResult && baiduResult.length > 0)
+                return baiduResult;
+        }
+        return await this.api.post("Public/QueryPlace", rq, payload);
     }
     /**
      * Read member invitation

package/lib/mjs/components/index.d.ts

@@ -9,6 +9,7 @@ export * from "./app/UserRoleList";
 export * from "./org/ButtonApiServices";
 export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";
+export * from "./public/AddressTiplist";
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
 export * from "./public/ButtonRadioRegions";

package/lib/mjs/components/index.js

@@ -13,6 +13,7 @@ export * from "./org/ButtonApiServices";
 export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";
 // public
+export * from "./public/AddressTiplist";
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
 export * from "./public/ButtonRadioRegions";

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

@@ -0,0 +1,12 @@
+import { TiplistProps } from "@etsoo/materialui";
+import { PlaceCommon } from "../../dto/public/PlaceCommon";
+/**
+ * Address tiplist component props
+ */
+export type AddressTiplistProps = Omit<TiplistProps<PlaceCommon, "placeId">, "idField" | "loadData" | "name" | "label"> & Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {};
+/**
+ * Address tiplist component
+ * @param props Properties
+ * @returns Component
+ */
+export declare function AddressTiplist(props: AddressTiplistProps): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,21 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Tiplist } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+/**
+ * Address tiplist component
+ * @param props Properties
+ * @returns Component
+ */
+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 }));
+}

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

@@ -12,8 +12,21 @@ export declare enum ApiOutput {
  * 接口供应商
  */
 export declare enum ApiProvider {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     Google = 0,
-    Baidu = 1
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
+    Baidu = 1,
+    /**
+     * Amap
+     * 高德地图
+     */
+    Amap = 2
 }
 /**
  * Place query request
@@ -55,4 +68,9 @@ export type PlaceQueryRQ = {
      * 方圆距离，单位为米
      */
     radius?: number;
+    /**
+     * Page size, 1 - 20 suggested
+     * 每页记录数，建议1-20
+     */
+    pageSize?: number;
 };

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

@@ -13,6 +13,19 @@ export var ApiOutput;
  */
 export var ApiProvider;
 (function (ApiProvider) {
+    /**
+     * Google Maps
+     * 谷歌地图
+     */
     ApiProvider[ApiProvider["Google"] = 0] = "Google";
+    /**
+     * Baidu Maps
+     * 百度地图
+     */
     ApiProvider[ApiProvider["Baidu"] = 1] = "Baidu";
+    /**
+     * Amap
+     * 高德地图
+     */
+    ApiProvider[ApiProvider["Amap"] = 2] = "Amap";
 })(ApiProvider || (ApiProvider = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -50,18 +50,18 @@
     "@vitejs/plugin-react": "^5.1.2",
     "jsdom": "^27.3.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "vitest": "^4.0.16"
   },
   "dependencies": {
     "@etsoo/appscript": "^1.6.49",
-    "@etsoo/materialui": "^1.5.90",
-    "@etsoo/react": "^1.8.64",
+    "@etsoo/materialui": "^1.5.92",
+    "@etsoo/react": "^1.8.65",
     "@etsoo/shared": "^1.2.80",
     "@etsoo/toolpad": "^1.0.42",
     "@mui/material": "^7.3.6",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "react": "^19.2.1",
-    "react-dom": "^19.2.1"
+    "react": "^19.2.3",
+    "react-dom": "^19.2.3"
   }
 }

package/src/PublicApi.ts

@@ -4,7 +4,7 @@ import { PinyinRQ } from "./rq/public/PinyinRQ";
 import { CreateBarcodeRQ } from "./rq/public/CreateBarcodeRQ";
 import { CurrencyItem } from "./dto/public/CurrencyItem";
 import { RegionData } from "./dto/public/RegionData";
-import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
+import { ApiProvider, PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
 import {
   BaseApi,
@@ -192,8 +192,46 @@ 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[]>) {
+    // 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: ApiProvider.Amap
+      };
+
+      const amapResult = await this.api.post(
+        "Public/QueryPlace",
+        amapRq,
+        payload
+      );
+
+      if (amapResult && amapResult.length > 0) return amapResult;
+
+      // Baidu
+      const baiduRq: PlaceQueryRQ = {
+        ...rq,
+        region: undefined,
+        provider: ApiProvider.Baidu
+      };
+
+      const baiduResult = await this.api.post(
+        "Public/QueryPlace",
+        baiduRq,
+        payload
+      );
+
+      if (baiduResult && baiduResult.length > 0) return baiduResult;
+    }
+
+    return await this.api.post("Public/QueryPlace", rq, payload);
   }
 
   /**

package/src/components/index.ts

@@ -16,6 +16,7 @@ export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";
 
 // public
+export * from "./public/AddressTiplist";
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
 export * from "./public/ButtonRadioRegions";

package/src/components/public/AddressTiplist.tsx

@@ -0,0 +1,56 @@
+import { Tiplist, TiplistProps } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+import { PlaceCommon } from "../../dto/public/PlaceCommon";
+
+/**
+ * Address tiplist component props
+ */
+export type AddressTiplistProps = Omit<
+  TiplistProps<PlaceCommon, "placeId">,
+  "idField" | "loadData" | "name" | "label"
+> &
+  Partial<Pick<TiplistProps<PlaceCommon, "placeId">, "name" | "label">> & {};
+
+/**
+ * Address tiplist component
+ * @param props Properties
+ * @returns Component
+ */
+export function AddressTiplist(props: AddressTiplistProps) {
+  // 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 (
+    <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([])
+      }
+      name={name}
+      {...rest}
+    />
+  );
+}

package/src/rq/public/PlaceQueryRQ.ts

@@ -14,8 +14,23 @@ export enum ApiOutput {
  * 接口供应商
  */
 export enum ApiProvider {
+  /**
+   * Google Maps
+   * 谷歌地图
+   */
   Google,
-  Baidu
+
+  /**
+   * Baidu Maps
+   * 百度地图
+   */
+  Baidu,
+
+  /**
+   * Amap
+   * 高德地图
+   */
+  Amap
 }
 
 /**
@@ -64,4 +79,10 @@ export type PlaceQueryRQ = {
    * 方圆距离，单位为米
    */
   radius?: number;
+
+  /**
+   * Page size, 1 - 20 suggested
+   * 每页记录数，建议1-20
+   */
+  pageSize?: number;
 };