@etsoo/smarterp-core 1.0.91 → 1.0.93

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

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

@@ -27,6 +27,13 @@ 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))
+            return;
+        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 | undefined;

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

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

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

@@ -29,6 +29,13 @@ function ButtonRegions(props) {
         "SG",
         "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);
+    }
     // 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/cjs/dto/public/PlaceCommon.d.ts

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "./PlaceLocation";
+import { PlaceLocation } from "@etsoo/appscript";
 /**
  * Common place
  * 通用地点

package/lib/cjs/index.d.ts

@@ -27,7 +27,6 @@ export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
 export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/PlaceCommon";
-export * from "./dto/public/PlaceLocation";
 export * from "./dto/public/RegionData";
 export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";

package/lib/cjs/index.js

@@ -44,7 +44,6 @@ __exportStar(require("./dto/public/ChinaPinData"), exports);
 __exportStar(require("./dto/public/CurrencyItem"), exports);
 __exportStar(require("./dto/public/MemberInvitationDto"), exports);
 __exportStar(require("./dto/public/PlaceCommon"), exports);
-__exportStar(require("./dto/public/PlaceLocation"), exports);
 __exportStar(require("./dto/public/RegionData"), exports);
 __exportStar(require("./dto/user/AuditHistoryDto"), exports);
 __exportStar(require("./dto/user/DeviceListDto"), exports);

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

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "../../dto/public/PlaceLocation";
+import { PlaceLocation } from "@etsoo/appscript";
 /**
  * API output type
  * API输出类型

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

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

@@ -21,6 +21,13 @@ 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))
+            return;
+        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 | undefined;

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

@@ -0,0 +1,41 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ButtonPopupRadio } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+import React from "react";
+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
+    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);
+    }
+    // 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.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;
+export declare function ButtonRegions(props: Omit<ButtonPopupCheckboxProps<RegionData>, "labelField" | "loadData">): import("react/jsx-runtime").JSX.Element | undefined;

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

@@ -23,6 +23,13 @@ export function ButtonRegions(props) {
         "SG",
         "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);
+    }
     // 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/lib/mjs/dto/public/PlaceCommon.d.ts

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "./PlaceLocation";
+import { PlaceLocation } from "@etsoo/appscript";
 /**
  * Common place
  * 通用地点

package/lib/mjs/index.d.ts

@@ -27,7 +27,6 @@ export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
 export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/PlaceCommon";
-export * from "./dto/public/PlaceLocation";
 export * from "./dto/public/RegionData";
 export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";

package/lib/mjs/index.js

@@ -28,7 +28,6 @@ export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
 export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/PlaceCommon";
-export * from "./dto/public/PlaceLocation";
 export * from "./dto/public/RegionData";
 export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";

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

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "../../dto/public/PlaceLocation";
+import { PlaceLocation } from "@etsoo/appscript";
 /**
  * API output type
  * API输出类型

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.91",
+  "version": "1.0.93",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -53,7 +53,7 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.42",
+    "@etsoo/appscript": "^1.6.43",
     "@etsoo/materialui": "^1.5.66",
     "@etsoo/react": "^1.8.49",
     "@etsoo/shared": "^1.2.75",

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,13 @@ 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)) return;
+    defaultCultures.unshift(c.name);
+  }
+
   defaultCultures.sort((a) => (app.culture.startsWith(a) ? -1 : 0));
 
   // Load data

package/src/components/public/ButtonRadioRegions.tsx

@@ -0,0 +1,67 @@
+import { ButtonPopupRadio, ButtonPopupRadioProps } from "@etsoo/materialui";
+import { useRequiredAppContext } from "../../ICoreServiceApp";
+import React from "react";
+import { RegionData } from "../../dto/public/RegionData";
+
+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
+  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);
+  }
+
+  // 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

@@ -38,6 +38,13 @@ export function ButtonRegions(
     "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);
+  }
+
   // Load data
   const loadData = React.useCallback(
     async () => (await app.core.publicApi.getRegions(defaultRegions)) ?? [],

package/src/dto/public/PlaceCommon.ts

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "./PlaceLocation";
+import { PlaceLocation } from "@etsoo/appscript";
 
 /**
  * Common place

package/src/index.ts

@@ -32,7 +32,6 @@ export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
 export * from "./dto/public/MemberInvitationDto";
 export * from "./dto/public/PlaceCommon";
-export * from "./dto/public/PlaceLocation";
 export * from "./dto/public/RegionData";
 
 export * from "./dto/user/AuditHistoryDto";

package/src/rq/public/PlaceQueryRQ.ts

@@ -1,4 +1,4 @@
-import { PlaceLocation } from "../../dto/public/PlaceLocation";
+import { PlaceLocation } from "@etsoo/appscript";
 
 /**
  * API output type

package/lib/cjs/dto/public/PlaceLocation.d.ts

@@ -1,14 +0,0 @@
-/**
- * Place location
- * 地点位置
- */
-export type PlaceLocation = {
-    /**
-     * Latitude, 纬度
-     */
-    Lat: number;
-    /**
-     * Longitude, 经度
-     */
-    Lng: number;
-};

package/lib/cjs/dto/public/PlaceLocation.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/mjs/dto/public/PlaceLocation.d.ts

@@ -1,14 +0,0 @@
-/**
- * Place location
- * 地点位置
- */
-export type PlaceLocation = {
-    /**
-     * Latitude, 纬度
-     */
-    Lat: number;
-    /**
-     * Longitude, 经度
-     */
-    Lng: number;
-};

package/lib/mjs/dto/public/PlaceLocation.js

@@ -1 +0,0 @@
-export {};

package/src/dto/public/PlaceLocation.ts

@@ -1,15 +0,0 @@
-/**
- * Place location
- * 地点位置
- */
-export type PlaceLocation = {
-  /**
-   * Latitude, 纬度
-   */
-  Lat: number;
-
-  /**
-   * Longitude, 经度
-   */
-  Lng: number;
-};