@etsoo/smarterp-core 1.0.71 → 1.0.73

package/lib/cjs/components/app/ButtonIdentityTypes.d.ts

@@ -1,7 +1,7 @@
 import { ButtonPopupCheckboxProps } from "@etsoo/materialui";
 import { ListType } from "@etsoo/shared";
 import { IdentityTypeFlags } from "@etsoo/appscript";
-export type ButtonIdentityTypesProps = Omit<ButtonPopupCheckboxProps<ListType>, "labelField" | "loadData" | "ids" | "value" | "onValueChange"> & {
+export type ButtonIdentityTypesProps = Omit<ButtonPopupCheckboxProps<ListType>, "labelField" | "loadData" | "value" | "onValueChange"> & {
     /**
      * Base identity type
      */

package/lib/cjs/components/app/ButtonIdentityTypes.js

@@ -27,7 +27,7 @@ function ButtonIdentityTypes(props) {
             }
         }
     }
-    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => data.label, labelEnd: labelEnd, labelField: "label", loadData: async () => identities, ids: ids, onValueChange: (ids) => {
+    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => data.label, labelEnd: labelEnd, labelField: "label", loadData: async () => identities, value: ids, onValueChange: (ids) => {
             let newValue = appscript_1.IdentityTypeFlags.None;
             for (const id of ids) {
                 newValue |= id;

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

@@ -10,5 +10,6 @@ export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
+export * from "./public/ButtonRegions";
 export * from "./public/CultureList";
 export * from "./user/UserTiplist";

package/lib/cjs/components/index.js

@@ -30,6 +30,7 @@ __exportStar(require("./org/OrgTiplist"), exports);
 // public
 __exportStar(require("./public/ButtonCultures"), exports);
 __exportStar(require("./public/ButtonCurrencies"), exports);
+__exportStar(require("./public/ButtonRegions"), exports);
 __exportStar(require("./public/CultureList"), exports);
 // user
 __exportStar(require("./user/UserTiplist"), exports);

package/lib/cjs/components/org/OrgTiplist.d.ts

@@ -18,6 +18,11 @@ export type OrgTiplistProps = Omit<TiplistProps<OrgListDto, "id">, "loadData" |
      * Default request data
      */
     rq?: Partial<OrgListRQ>;
+    /**
+     * Load data handler
+     * @param rq Request data
+     */
+    onLoadData?: (rq: OrgListRQ) => OrgListRQ;
 };
 /**
  * Organization tiplist

package/lib/cjs/components/org/OrgTiplist.js

@@ -14,9 +14,9 @@ function OrgTiplist(props) {
     // App
     const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
     // Destruct
-    const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", name = "organizationId", rq = { enabled: true }, ...rest } = props;
+    const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", onLoadData = (rq) => rq, name = "organizationId", rq = { enabled: true }, ...rest } = props;
     // Layout
-    return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.orgApi.list({
+    return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.orgApi.list(onLoadData({
             ...rq,
             keyword,
             id,
@@ -24,5 +24,5 @@ function OrgTiplist(props) {
                 batchSize: maxItems,
                 orderBy: [{ field: "CoreOrganization.Name" }]
             }
-        }, { showLoading: false, defaultValue: [] }), ...rest }));
+        }), { showLoading: false, defaultValue: [] }), ...rest }));
 }

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ButtonCultures = ButtonCultures;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const materialui_1 = require("@etsoo/materialui");
-const shared_1 = require("@etsoo/shared");
 const ICoreServiceApp_1 = require("../../ICoreServiceApp");
 function ButtonCultures(props) {
     // App
@@ -25,11 +24,7 @@ function ButtonCultures(props) {
         "ar"
     ];
     defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
-    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name === data.id ? data.englishName : data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async (ids) => {
-            const queryIds = shared_1.ArrayUtils.mergeArrays(ids ?? [], defaultCultures);
-            const data = await app.core.publicApi.getCultures(queryIds);
-            return data ?? [];
-        }, onAdd: async (ids) => {
+    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name === data.id ? data.englishName : data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async () => (await app.core.publicApi.getCultures(defaultCultures)) ?? [], onAdd: async (ids) => {
             const data = await app.core.publicApi.getCultures(ids);
             if (data == null)
                 return false;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ButtonCurrencies = ButtonCurrencies;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const materialui_1 = require("@etsoo/materialui");
-const shared_1 = require("@etsoo/shared");
 const ICoreServiceApp_1 = require("../../ICoreServiceApp");
 function ButtonCurrencies(props) {
     // App
@@ -25,11 +24,7 @@ function ButtonCurrencies(props) {
         "NZD"
     ];
     defaultCurrencies.sort((a) => (a.startsWith(app.region) ? -1 : 0));
-    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async (ids) => {
-            const queryIds = shared_1.ArrayUtils.mergeArrays(ids ?? [], defaultCurrencies);
-            const data = await app.core.publicApi.getCurrencies(queryIds);
-            return data ?? [];
-        }, onAdd: async (ids) => {
+    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async () => (await app.core.publicApi.getCurrencies(defaultCurrencies)) ?? [], onAdd: async (ids) => {
             const data = await app.core.publicApi.getCurrencies(ids);
             if (data == null)
                 return false;

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

@@ -0,0 +1,3 @@
+import { ButtonPopupCheckboxProps } from "@etsoo/materialui";
+import { RegionData } from "../../dto/public/RegionData";
+export declare function ButtonRegions(props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtonRegions = ButtonRegions;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const materialui_1 = require("@etsoo/materialui");
+const ICoreServiceApp_1 = require("../../ICoreServiceApp");
+function ButtonRegions(props) {
+    // App
+    const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
+    // Labels
+    const labels = app.getLabels("clickToChoose", "regions");
+    // Destruct
+    const { inputName = "regions", label = labels.regions, labelEnd = labels.clickToChoose, ...rest } = props;
+    const defaultRegions = [
+        "CN",
+        "US",
+        "GB",
+        "IE",
+        "CA",
+        "AU",
+        "NZ",
+        "DE",
+        "FR",
+        "JP",
+        "SG",
+        "HK"
+    ];
+    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [], onAdd: async (ids) => {
+            const data = await app.core.publicApi.getRegions(ids);
+            if (data == null)
+                return false;
+            return data;
+        }, ...rest }));
+}

package/lib/cjs/components/user/UserTiplist.d.ts

@@ -18,6 +18,11 @@ export type UserTiplistProps = Omit<TiplistProps<MemberListDto, "id">, "loadData
      * Default request data
      */
     rq?: Partial<MemberListRQ>;
+    /**
+     * Load data handler
+     * @param rq Request data
+     */
+    onLoadData?: (rq: MemberListRQ) => MemberListRQ;
 };
 /**
  * User tiplist

package/lib/cjs/components/user/UserTiplist.js

@@ -14,14 +14,14 @@ function UserTiplist(props) {
     // App
     const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
     // Destruct
-    const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, name = "userId", rq = { enabled: true }, ...rest } = props;
+    const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, onLoadData = (rq) => rq, name = "userId", rq = { enabled: true }, ...rest } = props;
     // Layout
-    return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.memberApi.list({
+    return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.memberApi.list(onLoadData({
             ...rq,
             keyword,
             id,
             queryPaging: {
                 batchSize: maxItems
             }
-        }, { showLoading: false, defaultValue: [] }), ...rest }));
+        }), { showLoading: false, defaultValue: [] }), ...rest }));
 }

package/lib/cjs/i18n/zh-Hans.json

@@ -59,7 +59,7 @@
     "owner": "所有者",
     "parentOrg": "上级机构",
     "pin": "身份证号码",
-    "preferredName": "首选姓名",
+    "preferredName": "首选名称",
     "queryKeyword": "查询关键字",
     "refreshTime": "刷新时间",
     "relatedTarget": "关联对象",

package/lib/cjs/i18n/zh-Hant.json

@@ -59,7 +59,7 @@
     "owner": "所有者",
     "parentOrg": "上級機構",
     "pin": "身份證號碼",
-    "preferredName": "首選姓名",
+    "preferredName": "首選名稱",
     "queryKeyword": "查詢關鍵字",
     "refreshTime": "刷新時間",
     "relatedTarget": "關聯對象",

package/lib/mjs/components/app/ButtonIdentityTypes.d.ts

@@ -1,7 +1,7 @@
 import { ButtonPopupCheckboxProps } from "@etsoo/materialui";
 import { ListType } from "@etsoo/shared";
 import { IdentityTypeFlags } from "@etsoo/appscript";
-export type ButtonIdentityTypesProps = Omit<ButtonPopupCheckboxProps<ListType>, "labelField" | "loadData" | "ids" | "value" | "onValueChange"> & {
+export type ButtonIdentityTypesProps = Omit<ButtonPopupCheckboxProps<ListType>, "labelField" | "loadData" | "value" | "onValueChange"> & {
     /**
      * Base identity type
      */

package/lib/mjs/components/app/ButtonIdentityTypes.js

@@ -21,7 +21,7 @@ export function ButtonIdentityTypes(props) {
             }
         }
     }
-    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => data.label, labelEnd: labelEnd, labelField: "label", loadData: async () => identities, ids: ids, onValueChange: (ids) => {
+    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => data.label, labelEnd: labelEnd, labelField: "label", loadData: async () => identities, value: ids, onValueChange: (ids) => {
             let newValue = IdentityTypeFlags.None;
             for (const id of ids) {
                 newValue |= id;

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

@@ -10,5 +10,6 @@ export * from "./org/OrgSwitchPopover";
 export * from "./org/OrgTiplist";
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
+export * from "./public/ButtonRegions";
 export * from "./public/CultureList";
 export * from "./user/UserTiplist";

package/lib/mjs/components/index.js

@@ -14,6 +14,7 @@ export * from "./org/OrgTiplist";
 // public
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
+export * from "./public/ButtonRegions";
 export * from "./public/CultureList";
 // user
 export * from "./user/UserTiplist";

package/lib/mjs/components/org/OrgTiplist.d.ts

@@ -18,6 +18,11 @@ export type OrgTiplistProps = Omit<TiplistProps<OrgListDto, "id">, "loadData" |
      * Default request data
      */
     rq?: Partial<OrgListRQ>;
+    /**
+     * Load data handler
+     * @param rq Request data
+     */
+    onLoadData?: (rq: OrgListRQ) => OrgListRQ;
 };
 /**
  * Organization tiplist

package/lib/mjs/components/org/OrgTiplist.js

@@ -11,9 +11,9 @@ export function OrgTiplist(props) {
     // App
     const app = useRequiredAppContext();
     // Destruct
-    const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", name = "organizationId", rq = { enabled: true }, ...rest } = props;
+    const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", onLoadData = (rq) => rq, name = "organizationId", rq = { enabled: true }, ...rest } = props;
     // Layout
-    return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.orgApi.list({
+    return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.orgApi.list(onLoadData({
             ...rq,
             keyword,
             id,
@@ -21,5 +21,5 @@ export function OrgTiplist(props) {
                 batchSize: maxItems,
                 orderBy: [{ field: "CoreOrganization.Name" }]
             }
-        }, { showLoading: false, defaultValue: [] }), ...rest }));
+        }), { showLoading: false, defaultValue: [] }), ...rest }));
 }

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

@@ -1,6 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ButtonPopupCheckbox } from "@etsoo/materialui";
-import { ArrayUtils } from "@etsoo/shared";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 export function ButtonCultures(props) {
     // App
@@ -22,11 +21,7 @@ export function ButtonCultures(props) {
         "ar"
     ];
     defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
-    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name === data.id ? data.englishName : data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async (ids) => {
-            const queryIds = ArrayUtils.mergeArrays(ids ?? [], defaultCultures);
-            const data = await app.core.publicApi.getCultures(queryIds);
-            return data ?? [];
-        }, onAdd: async (ids) => {
+    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name === data.id ? data.englishName : data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async () => (await app.core.publicApi.getCultures(defaultCultures)) ?? [], onAdd: async (ids) => {
             const data = await app.core.publicApi.getCultures(ids);
             if (data == null)
                 return false;

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

@@ -1,6 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ButtonPopupCheckbox } from "@etsoo/materialui";
-import { ArrayUtils } from "@etsoo/shared";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 export function ButtonCurrencies(props) {
     // App
@@ -22,11 +21,7 @@ export function ButtonCurrencies(props) {
         "NZD"
     ];
     defaultCurrencies.sort((a) => (a.startsWith(app.region) ? -1 : 0));
-    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async (ids) => {
-            const queryIds = ArrayUtils.mergeArrays(ids ?? [], defaultCurrencies);
-            const data = await app.core.publicApi.getCurrencies(queryIds);
-            return data ?? [];
-        }, onAdd: async (ids) => {
+    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async () => (await app.core.publicApi.getCurrencies(defaultCurrencies)) ?? [], onAdd: async (ids) => {
             const data = await app.core.publicApi.getCurrencies(ids);
             if (data == null)
                 return false;

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

@@ -0,0 +1,3 @@
+import { ButtonPopupCheckboxProps } from "@etsoo/materialui";
+import { RegionData } from "../../dto/public/RegionData";
+export declare function ButtonRegions(props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,31 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ButtonPopupCheckbox } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+export function ButtonRegions(props) {
+    // App
+    const app = useRequiredAppContext();
+    // Labels
+    const labels = app.getLabels("clickToChoose", "regions");
+    // Destruct
+    const { inputName = "regions", label = labels.regions, labelEnd = labels.clickToChoose, ...rest } = props;
+    const defaultRegions = [
+        "CN",
+        "US",
+        "GB",
+        "IE",
+        "CA",
+        "AU",
+        "NZ",
+        "DE",
+        "FR",
+        "JP",
+        "SG",
+        "HK"
+    ];
+    return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [], onAdd: async (ids) => {
+            const data = await app.core.publicApi.getRegions(ids);
+            if (data == null)
+                return false;
+            return data;
+        }, ...rest }));
+}

package/lib/mjs/components/user/UserTiplist.d.ts

@@ -18,6 +18,11 @@ export type UserTiplistProps = Omit<TiplistProps<MemberListDto, "id">, "loadData
      * Default request data
      */
     rq?: Partial<MemberListRQ>;
+    /**
+     * Load data handler
+     * @param rq Request data
+     */
+    onLoadData?: (rq: MemberListRQ) => MemberListRQ;
 };
 /**
  * User tiplist

package/lib/mjs/components/user/UserTiplist.js

@@ -11,14 +11,14 @@ export function UserTiplist(props) {
     // App
     const app = useRequiredAppContext();
     // Destruct
-    const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, name = "userId", rq = { enabled: true }, ...rest } = props;
+    const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, onLoadData = (rq) => rq, name = "userId", rq = { enabled: true }, ...rest } = props;
     // Layout
-    return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.memberApi.list({
+    return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.memberApi.list(onLoadData({
             ...rq,
             keyword,
             id,
             queryPaging: {
                 batchSize: maxItems
             }
-        }, { showLoading: false, defaultValue: [] }), ...rest }));
+        }), { showLoading: false, defaultValue: [] }), ...rest }));
 }

package/lib/mjs/i18n/zh-Hans.json

@@ -59,7 +59,7 @@
     "owner": "所有者",
     "parentOrg": "上级机构",
     "pin": "身份证号码",
-    "preferredName": "首选姓名",
+    "preferredName": "首选名称",
     "queryKeyword": "查询关键字",
     "refreshTime": "刷新时间",
     "relatedTarget": "关联对象",

package/lib/mjs/i18n/zh-Hant.json

@@ -59,7 +59,7 @@
     "owner": "所有者",
     "parentOrg": "上級機構",
     "pin": "身份證號碼",
-    "preferredName": "首選姓名",
+    "preferredName": "首選名稱",
     "queryKeyword": "查詢關鍵字",
     "refreshTime": "刷新時間",
     "relatedTarget": "關聯對象",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.71",
+  "version": "1.0.73",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -41,24 +41,24 @@
   "homepage": "https://github.com/ETSOO/etsoo-smarterp-core#readme",
   "devDependencies": {
     "@babel/cli": "^7.27.2",
-    "@babel/core": "^7.27.1",
-    "@babel/plugin-transform-runtime": "^7.27.1",
+    "@babel/core": "^7.27.4",
+    "@babel/plugin-transform-runtime": "^7.27.4",
     "@babel/preset-env": "^7.27.2",
-    "@babel/runtime-corejs3": "^7.27.1",
+    "@babel/runtime-corejs3": "^7.27.6",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
-    "@vitejs/plugin-react": "^4.5.0",
+    "@vitejs/plugin-react": "^4.5.1",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.2"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.36",
-    "@etsoo/materialui": "^1.5.52",
+    "@etsoo/appscript": "^1.6.38",
+    "@etsoo/materialui": "^1.5.55",
     "@etsoo/react": "^1.8.45",
     "@etsoo/shared": "^1.2.74",
     "@etsoo/toolpad": "^1.0.39",
-    "@mui/material": "^7.1.0",
+    "@mui/material": "^7.1.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

package/src/components/app/ButtonIdentityTypes.tsx

@@ -9,7 +9,7 @@ import { useRequiredAppContext } from "../../ICoreServiceApp";
 
 export type ButtonIdentityTypesProps = Omit<
   ButtonPopupCheckboxProps<ListType>,
-  "labelField" | "loadData" | "ids" | "value" | "onValueChange"
+  "labelField" | "loadData" | "value" | "onValueChange"
 > & {
   /**
    * Base identity type
@@ -71,7 +71,7 @@ export function ButtonIdentityTypes(props: ButtonIdentityTypesProps) {
       labelEnd={labelEnd}
       labelField="label"
       loadData={async () => identities}
-      ids={ids}
+      value={ids}
       onValueChange={(ids) => {
         let newValue = IdentityTypeFlags.None;
         for (const id of ids) {

package/src/components/index.ts

@@ -17,6 +17,7 @@ export * from "./org/OrgTiplist";
 // public
 export * from "./public/ButtonCultures";
 export * from "./public/ButtonCurrencies";
+export * from "./public/ButtonRegions";
 export * from "./public/CultureList";
 
 // user

package/src/components/org/OrgTiplist.tsx

@@ -25,6 +25,12 @@ export type OrgTiplistProps = Omit<
    * Default request data
    */
   rq?: Partial<OrgListRQ>;
+
+  /**
+   * Load data handler
+   * @param rq Request data
+   */
+  onLoadData?: (rq: OrgListRQ) => OrgListRQ;
 };
 
 /**
@@ -43,6 +49,7 @@ export function OrgTiplist(props: OrgTiplistProps) {
     label = app.get("org")!,
     maxItems = 10,
     getOptionLabel = (data) => data.name + "(" + data.pin + ")",
+    onLoadData = (rq) => rq,
     name = "organizationId",
     rq = { enabled: true },
     ...rest
@@ -58,7 +65,7 @@ export function OrgTiplist(props: OrgTiplistProps) {
       maxItems={maxItems}
       loadData={(keyword, id, maxItems) =>
         app.core.orgApi.list(
-          {
+          onLoadData({
             ...rq,
             keyword,
             id,
@@ -66,7 +73,7 @@ export function OrgTiplist(props: OrgTiplistProps) {
               batchSize: maxItems,
               orderBy: [{ field: "CoreOrganization.Name" }]
             }
-          },
+          }),
           { showLoading: false, defaultValue: [] }
         )
       }

package/src/components/public/ButtonCultures.tsx

@@ -2,7 +2,6 @@ import {
   ButtonPopupCheckbox,
   ButtonPopupCheckboxProps
 } from "@etsoo/materialui";
-import { ArrayUtils } from "@etsoo/shared";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 import { CultureItem } from "@etsoo/appscript";
 
@@ -47,11 +46,9 @@ export function ButtonCultures(
       }
       labelEnd={labelEnd}
       labelField="name"
-      loadData={async (ids) => {
-        const queryIds = ArrayUtils.mergeArrays(ids ?? [], defaultCultures);
-        const data = await app.core.publicApi.getCultures(queryIds);
-        return data ?? [];
-      }}
+      loadData={async () =>
+        (await app.core.publicApi.getCultures(defaultCultures)) ?? []
+      }
       onAdd={async (ids) => {
         const data = await app.core.publicApi.getCultures(ids);
         if (data == null) return false;

package/src/components/public/ButtonCurrencies.tsx

@@ -3,7 +3,6 @@ import {
   ButtonPopupCheckboxProps
 } from "@etsoo/materialui";
 import { CurrencyItem } from "../../dto/public/CurrencyItem";
-import { ArrayUtils } from "@etsoo/shared";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 
 export function ButtonCurrencies(
@@ -45,11 +44,9 @@ export function ButtonCurrencies(
       labelFormatter={(data) => `${data.name} (${data.id})`}
       labelEnd={labelEnd}
       labelField="name"
-      loadData={async (ids) => {
-        const queryIds = ArrayUtils.mergeArrays(ids ?? [], defaultCurrencies);
-        const data = await app.core.publicApi.getCurrencies(queryIds);
-        return data ?? [];
-      }}
+      loadData={async () =>
+        (await app.core.publicApi.getCurrencies(defaultCurrencies)) ?? []
+      }
       onAdd={async (ids) => {
         const data = await app.core.publicApi.getCurrencies(ids);
         if (data == null) return false;

package/src/components/public/ButtonRegions.tsx

@@ -0,0 +1,58 @@
+import {
+  ButtonPopupCheckbox,
+  ButtonPopupCheckboxProps
+} from "@etsoo/materialui";
+import { RegionData } from "../../dto/public/RegionData";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+
+export function ButtonRegions(
+  props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">
+) {
+  // App
+  const app = useRequiredAppContext();
+
+  // Labels
+  const labels = app.getLabels("clickToChoose", "regions");
+
+  // Destruct
+  const {
+    inputName = "regions",
+    label = labels.regions,
+    labelEnd = labels.clickToChoose,
+    ...rest
+  } = props;
+
+  const defaultRegions = [
+    "CN",
+    "US",
+    "GB",
+    "IE",
+    "CA",
+    "AU",
+    "NZ",
+    "DE",
+    "FR",
+    "JP",
+    "SG",
+    "HK"
+  ];
+
+  return (
+    <ButtonPopupCheckbox<RegionData>
+      inputName={inputName}
+      label={label}
+      labelFormatter={(data) => `${data.name} (${data.id})`}
+      labelEnd={labelEnd}
+      labelField="name"
+      loadData={async () =>
+        (await app.core.publicApi.getRegions(defaultRegions)) ?? []
+      }
+      onAdd={async (ids) => {
+        const data = await app.core.publicApi.getRegions(ids);
+        if (data == null) return false;
+        return data;
+      }}
+      {...rest}
+    />
+  );
+}

package/src/components/user/UserTiplist.tsx

@@ -25,6 +25,12 @@ export type UserTiplistProps = Omit<
    * Default request data
    */
   rq?: Partial<MemberListRQ>;
+
+  /**
+   * Load data handler
+   * @param rq Request data
+   */
+  onLoadData?: (rq: MemberListRQ) => MemberListRQ;
 };
 
 /**
@@ -43,6 +49,7 @@ export function UserTiplist(props: UserTiplistProps) {
     label = app.get("user")!,
     maxItems = 10,
     getOptionLabel = (data) => data.name,
+    onLoadData = (rq) => rq,
     name = "userId",
     rq = { enabled: true },
     ...rest
@@ -58,14 +65,14 @@ export function UserTiplist(props: UserTiplistProps) {
       maxItems={maxItems}
       loadData={(keyword, id, maxItems) =>
         app.core.memberApi.list(
-          {
+          onLoadData({
             ...rq,
             keyword,
             id,
             queryPaging: {
               batchSize: maxItems
             }
-          },
+          }),
           { showLoading: false, defaultValue: [] }
         )
       }

package/src/i18n/zh-Hans.json

@@ -59,7 +59,7 @@
   "owner": "所有者",
   "parentOrg": "上级机构",
   "pin": "身份证号码",
-  "preferredName": "首选姓名",
+  "preferredName": "首选名称",
   "queryKeyword": "查询关键字",
   "refreshTime": "刷新时间",
   "relatedTarget": "关联对象",

package/src/i18n/zh-Hant.json

@@ -59,7 +59,7 @@
   "owner": "所有者",
   "parentOrg": "上級機構",
   "pin": "身份證號碼",
-  "preferredName": "首選姓名",
+  "preferredName": "首選名稱",
   "queryKeyword": "查詢關鍵字",
   "refreshTime": "刷新時間",
   "relatedTarget": "關聯對象",