@etsoo/smarterp-core 1.0.92 → 1.0.94

package/lib/cjs/CoreUtils.d.ts

@@ -10,6 +10,13 @@ export declare namespace CoreUtils {
      * @returns Styles
      */
     function avatarStyles(isOrg?: boolean): React.CSSProperties;
+    /**
+     * Merge an array with another array, starting from the end
+     * 合并数组，从末尾开始
+     * @param source Source array
+     * @param target Target array
+     */
+    function mergeArray(source: string[], target: string[]): void;
     /**
      * Validate JSON input against a schema
      * 验证 JSON 输入是否符合架构

package/lib/cjs/CoreUtils.js

@@ -24,6 +24,20 @@ var CoreUtils;
         };
     }
     CoreUtils.avatarStyles = avatarStyles;
+    /**
+     * Merge an array with another array, starting from the end
+     * 合并数组，从末尾开始
+     * @param source Source array
+     * @param target Target array
+     */
+    function mergeArray(source, target) {
+        for (let i = target.length - 1; i >= 0; i--) {
+            const r = source[i];
+            if (!source.includes(r))
+                source.unshift(r);
+        }
+    }
+    CoreUtils.mergeArray = mergeArray;
     let ajv = null;
     /**
      * Validate JSON input against a schema

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

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

package/lib/cjs/components/index.js

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

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

@@ -27,6 +27,12 @@ function ButtonCultures(props) {
         "ru",
         "ar"
     ];
+    // Add application cultures, starting from the end
+    for (let i = app.settings.cultures.length - 1; i >= 0; i--) {
+        const c = app.settings.cultures[i];
+        if (!defaultCultures.includes(c.name))
+            defaultCultures.unshift(c.name);
+    }
     defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
     // Load data
     const loadData = react_1.default.useCallback(async () => (await app.core.publicApi.getCultures(defaultCultures)) ?? [], []);

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

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

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

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtonRadioRegions = ButtonRadioRegions;
+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 CoreUtils_1 = require("../../CoreUtils");
+function ButtonRadioRegions(props) {
+    // App
+    const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
+    // Labels
+    const labels = app.getLabels("clickToChoose", "region");
+    // Destruct
+    const { inputName = "region", label = labels.region, labelEnd = labels.clickToChoose, ...rest } = props;
+    const defaultRegions = [
+        "CN",
+        "US",
+        "GB",
+        "IE",
+        "CA",
+        "AU",
+        "NZ",
+        "DE",
+        "FR",
+        "JP",
+        "SG",
+        "HK"
+    ];
+    // Add application regions, starting from the end
+    CoreUtils_1.CoreUtils.mergeArray(defaultRegions, app.settings.regions);
+    // Load data
+    const loadData = react_1.default.useCallback(async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [], []);
+    return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupRadio, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: loadData, onAdd: async (ids) => {
+            const data = await app.core.publicApi.getRegions(ids);
+            if (data == null)
+                return false;
+            return data;
+        }, ...rest }));
+}

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

@@ -8,6 +8,7 @@ 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 CoreUtils_1 = require("../../CoreUtils");
 function ButtonRegions(props) {
     // App
     const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
@@ -29,6 +30,8 @@ function ButtonRegions(props) {
         "SG",
         "HK"
     ];
+    // Add application regions, starting from the end
+    CoreUtils_1.CoreUtils.mergeArray(defaultRegions, app.settings.regions);
     // Load data
     const loadData = react_1.default.useCallback(async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [], []);
     return ((0, jsx_runtime_1.jsx)(materialui_1.ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: loadData, onAdd: async (ids) => {

package/lib/mjs/CoreUtils.d.ts

@@ -10,6 +10,13 @@ export declare namespace CoreUtils {
      * @returns Styles
      */
     function avatarStyles(isOrg?: boolean): React.CSSProperties;
+    /**
+     * Merge an array with another array, starting from the end
+     * 合并数组，从末尾开始
+     * @param source Source array
+     * @param target Target array
+     */
+    function mergeArray(source: string[], target: string[]): void;
     /**
      * Validate JSON input against a schema
      * 验证 JSON 输入是否符合架构

package/lib/mjs/CoreUtils.js

@@ -18,6 +18,20 @@ export var CoreUtils;
         };
     }
     CoreUtils.avatarStyles = avatarStyles;
+    /**
+     * Merge an array with another array, starting from the end
+     * 合并数组，从末尾开始
+     * @param source Source array
+     * @param target Target array
+     */
+    function mergeArray(source, target) {
+        for (let i = target.length - 1; i >= 0; i--) {
+            const r = source[i];
+            if (!source.includes(r))
+                source.unshift(r);
+        }
+    }
+    CoreUtils.mergeArray = mergeArray;
     let ajv = null;
     /**
      * Validate JSON input against a schema

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

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

package/lib/mjs/components/index.js

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

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

@@ -21,6 +21,12 @@ export function ButtonCultures(props) {
         "ru",
         "ar"
     ];
+    // Add application cultures, starting from the end
+    for (let i = app.settings.cultures.length - 1; i >= 0; i--) {
+        const c = app.settings.cultures[i];
+        if (!defaultCultures.includes(c.name))
+            defaultCultures.unshift(c.name);
+    }
     defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
     // Load data
     const loadData = React.useCallback(async () => (await app.core.publicApi.getCultures(defaultCultures)) ?? [], []);

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

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

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

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

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

@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { ButtonPopupCheckbox } from "@etsoo/materialui";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 import React from "react";
+import { CoreUtils } from "../../CoreUtils";
 export function ButtonRegions(props) {
     // App
     const app = useRequiredAppContext();
@@ -23,6 +24,8 @@ export function ButtonRegions(props) {
         "SG",
         "HK"
     ];
+    // Add application regions, starting from the end
+    CoreUtils.mergeArray(defaultRegions, app.settings.regions);
     // Load data
     const loadData = React.useCallback(async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [], []);
     return (_jsx(ButtonPopupCheckbox, { inputName: inputName, label: label, labelFormatter: (data) => `${data.name} (${data.id})`, labelEnd: labelEnd, labelField: "name", loadData: loadData, onAdd: async (ids) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.92",
+  "version": "1.0.94",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",

package/src/CoreUtils.ts

@@ -20,6 +20,19 @@ export namespace CoreUtils {
     };
   }
 
+  /**
+   * Merge an array with another array, starting from the end
+   * 合并数组，从末尾开始
+   * @param source Source array
+   * @param target Target array
+   */
+  export function mergeArray(source: string[], target: string[]) {
+    for (let i = target.length - 1; i >= 0; i--) {
+      const r = source[i];
+      if (!source.includes(r)) source.unshift(r);
+    }
+  }
+
   let ajv: Ajv | null = null;
 
   /**

package/src/components/index.ts

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

package/src/components/public/ButtonCultures.tsx

@@ -36,6 +36,12 @@ export function ButtonCultures(
     "ar"
   ];
 
+  // Add application cultures, starting from the end
+  for (let i = app.settings.cultures.length - 1; i >= 0; i--) {
+    const c = app.settings.cultures[i];
+    if (!defaultCultures.includes(c.name)) defaultCultures.unshift(c.name);
+  }
+
   defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
 
   // Load data

package/src/components/public/ButtonRadioRegions.tsx

@@ -0,0 +1,64 @@
+import { ButtonPopupRadio, ButtonPopupRadioProps } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+import React from "react";
+import { RegionData } from "../../dto/public/RegionData";
+import { CoreUtils } from "../../CoreUtils";
+
+export function ButtonRadioRegions(
+  props: Omit<ButtonPopupRadioProps<RegionData>, "labelField" | "loadData">
+) {
+  // App
+  const app = useRequiredAppContext();
+
+  // Labels
+  const labels = app.getLabels("clickToChoose", "region");
+
+  // Destruct
+  const {
+    inputName = "region",
+    label = labels.region,
+    labelEnd = labels.clickToChoose,
+    ...rest
+  } = props;
+
+  const defaultRegions = [
+    "CN",
+    "US",
+    "GB",
+    "IE",
+    "CA",
+    "AU",
+    "NZ",
+    "DE",
+    "FR",
+    "JP",
+    "SG",
+    "HK"
+  ];
+
+  // Add application regions, starting from the end
+  CoreUtils.mergeArray(defaultRegions, app.settings.regions);
+
+  // Load data
+  const loadData = React.useCallback(
+    async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [],
+    []
+  );
+
+  return (
+    <ButtonPopupRadio<RegionData>
+      inputName={inputName}
+      label={label}
+      labelFormatter={(data) => `${data.name} (${data.id})`}
+      labelEnd={labelEnd}
+      labelField="name"
+      loadData={loadData}
+      onAdd={async (ids) => {
+        const data = await app.core.publicApi.getRegions(ids);
+        if (data == null) return false;
+        return data;
+      }}
+      {...rest}
+    />
+  );
+}

package/src/components/public/ButtonRegions.tsx

@@ -5,6 +5,7 @@ import {
 import { RegionData } from "../../dto/public/RegionData";
 import { useRequiredAppContext } from "../../ICoreServiceApp";
 import React from "react";
+import { CoreUtils } from "../../CoreUtils";
 
 export function ButtonRegions(
   props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">
@@ -38,6 +39,9 @@ export function ButtonRegions(
     "HK"
   ];
 
+  // Add application regions, starting from the end
+  CoreUtils.mergeArray(defaultRegions, app.settings.regions);
+
   // Load data
   const loadData = React.useCallback(
     async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [],