@etsoo/smarterp-core 1.0.93 → 1.0.95

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/public/ButtonCultures.d.ts

@@ -1,3 +1,3 @@
 import { ButtonPopupCheckboxProps } from "@etsoo/materialui";
 import { CultureItem } from "@etsoo/appscript";
-export declare function ButtonCultures(props: Omit<ButtonPopupCheckboxProps<CultureItem>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element | undefined;
+export declare function ButtonCultures(props: Omit<ButtonPopupCheckboxProps<CultureItem>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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

@@ -30,9 +30,8 @@ function ButtonCultures(props) {
     // 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))
-            return;
-        defaultCultures.unshift(c.name);
+        if (!defaultCultures.includes(c.name))
+            defaultCultures.unshift(c.name);
     }
     defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
     // Load data

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

@@ -1,3 +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 | undefined;
+export declare function ButtonRadioRegions(props: Omit<ButtonPopupRadioProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

package/lib/cjs/components/public/ButtonRadioRegions.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 ButtonRadioRegions(props) {
     // App
     const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
@@ -30,12 +31,7 @@ function ButtonRadioRegions(props) {
         "HK"
     ];
     // Add application regions, starting from the end
-    for (let i = app.settings.regions.length - 1; i >= 0; i--) {
-        const r = app.settings.regions[i];
-        if (defaultRegions.includes(r))
-            return;
-        defaultRegions.unshift(r);
-    }
+    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) => {

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

@@ -1,3 +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 | undefined;
+export declare function ButtonRegions(props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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)();
@@ -30,12 +31,7 @@ function ButtonRegions(props) {
         "HK"
     ];
     // Add application regions, starting from the end
-    for (let i = app.settings.regions.length - 1; i >= 0; i--) {
-        const r = app.settings.regions[i];
-        if (defaultRegions.includes(r))
-            return;
-        defaultRegions.unshift(r);
-    }
+    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/public/ButtonCultures.d.ts

@@ -1,3 +1,3 @@
 import { ButtonPopupCheckboxProps } from "@etsoo/materialui";
 import { CultureItem } from "@etsoo/appscript";
-export declare function ButtonCultures(props: Omit<ButtonPopupCheckboxProps<CultureItem>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element | undefined;
+export declare function ButtonCultures(props: Omit<ButtonPopupCheckboxProps<CultureItem>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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

@@ -24,9 +24,8 @@ export function ButtonCultures(props) {
     // 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))
-            return;
-        defaultCultures.unshift(c.name);
+        if (!defaultCultures.includes(c.name))
+            defaultCultures.unshift(c.name);
     }
     defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
     // Load data

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

@@ -1,3 +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 | undefined;
+export declare function ButtonRadioRegions(props: Omit<ButtonPopupRadioProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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

@@ -2,6 +2,7 @@ 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();
@@ -24,12 +25,7 @@ export function ButtonRadioRegions(props) {
         "HK"
     ];
     // Add application regions, starting from the end
-    for (let i = app.settings.regions.length - 1; i >= 0; i--) {
-        const r = app.settings.regions[i];
-        if (defaultRegions.includes(r))
-            return;
-        defaultRegions.unshift(r);
-    }
+    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) => {

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

@@ -1,3 +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 | undefined;
+export declare function ButtonRegions(props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element;

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();
@@ -24,12 +25,7 @@ export function ButtonRegions(props) {
         "HK"
     ];
     // Add application regions, starting from the end
-    for (let i = app.settings.regions.length - 1; i >= 0; i--) {
-        const r = app.settings.regions[i];
-        if (defaultRegions.includes(r))
-            return;
-        defaultRegions.unshift(r);
-    }
+    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.93",
+  "version": "1.0.95",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -47,14 +47,14 @@
     "@babel/runtime-corejs3": "^7.28.0",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
-    "@vitejs/plugin-react": "^4.6.0",
+    "@vitejs/plugin-react": "^4.7.0",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"
   },
   "dependencies": {
     "@etsoo/appscript": "^1.6.43",
-    "@etsoo/materialui": "^1.5.66",
+    "@etsoo/materialui": "^1.5.67",
     "@etsoo/react": "^1.8.49",
     "@etsoo/shared": "^1.2.75",
     "@etsoo/toolpad": "^1.0.40",

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/public/ButtonCultures.tsx

@@ -39,8 +39,7 @@ export function ButtonCultures(
   // 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)) return;
-    defaultCultures.unshift(c.name);
+    if (!defaultCultures.includes(c.name)) defaultCultures.unshift(c.name);
   }
 
   defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));

package/src/components/public/ButtonRadioRegions.tsx

@@ -2,6 +2,7 @@ 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">
@@ -36,11 +37,7 @@ export function ButtonRadioRegions(
   ];
 
   // Add application regions, starting from the end
-  for (let i = app.settings.regions.length - 1; i >= 0; i--) {
-    const r = app.settings.regions[i];
-    if (defaultRegions.includes(r)) return;
-    defaultRegions.unshift(r);
-  }
+  CoreUtils.mergeArray(defaultRegions, app.settings.regions);
 
   // Load data
   const loadData = React.useCallback(

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">
@@ -39,11 +40,7 @@ export function ButtonRegions(
   ];
 
   // Add application regions, starting from the end
-  for (let i = app.settings.regions.length - 1; i >= 0; i--) {
-    const r = app.settings.regions[i];
-    if (defaultRegions.includes(r)) return;
-    defaultRegions.unshift(r);
-  }
+  CoreUtils.mergeArray(defaultRegions, app.settings.regions);
 
   // Load data
   const loadData = React.useCallback(