@etsoo/smarterp-core 1.0.48 → 1.0.49

package/__tests__/OrgApi.ts

@@ -15,6 +15,7 @@ if (isLocalTest) {
 
   const api = new OrgApi(app);
 
+  /*
   test("Test for create, delete", async () => {
     const guid = Utils.newGUID().slice(0, 20);
     const random = Date.now() % 2 == 0;
@@ -55,6 +56,7 @@ if (isLocalTest) {
 
     expect(deleteResult?.ok).toBeTruthy();
   });
+  */
 
   test("Test for query zero return", async () => {
     const result = await api.query({
@@ -82,8 +84,7 @@ if (isLocalTest) {
       enabled: true,
       excludedIds: [1, 2, 3],
       queryPaging: {
-        keysets: ["青岛亿速", 1100],
-        batchSize: 5,
+        batchSize: 2,
         orderBy: [{ field: "name" }, { field: "id", desc: true, unique: true }]
       }
     });

package/__tests__/PublicApi.ts

@@ -40,6 +40,12 @@ if (isLocalTest) {
     expect(result?.startsWith("data:image/png;base64")).toBeTruthy();
   });
 
+  test("Test for getCultures", async () => {
+    const result = await api.getCultures(["zh-CN", "en-US", "fr-FR"]);
+    expect(result).not.toBeNull();
+    expect(result?.length).toBe(3);
+  });
+
   test("Test for getCurrencies all", async () => {
     const result = await api.getCurrencies();
 

package/__tests__/UserApi.ts

@@ -20,7 +20,7 @@ if (isLocalTest) {
     const core = result.find((a) => a.id === 1);
     expect(core).not.toBeNull();
 
-    expect(core?.name).toBe("司友云ERP主控制台");
+    expect(core?.name).toBe("司友云ERP管理中心");
   });
 } else {
   test("Skip the test", () => {

package/lib/cjs/OrgApi.d.ts

@@ -6,7 +6,7 @@ import { OrgQueryDto } from "./dto/org/OrgQueryDto";
 import { OrgReadDto } from "./dto/org/OrgReadDto";
 import { OrgUpdateReadDto } from "./dto/org/OrgUpdateReadDto";
 import { OrgListDto } from "./dto/org/OrgListDto";
-import { AntiforgeryRequestToken, EntityApi, IApp, IdResultPayload, ResultPayload, StringIdResultPayload } from "@etsoo/appscript";
+import { AntiforgeryRequestToken, CustomCulture, EntityApi, IApp, IdResultPayload, ResultPayload, StringIdResultPayload } from "@etsoo/appscript";
 import { OrgListRQ } from "./rq/org/OrgListRQ";
 import { OrgGetMyRQ } from "./rq/org/OrgGetMyRQ";
 import { OrgGetMyData } from "./dto/org/OrgGetMyData";
@@ -54,6 +54,13 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     formatHtmlContent(content: string, payload?: IApiPayload<string>): Promise<string | undefined>;
+    /**
+     * Get current organization's custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture: string, payload?: IApiPayload<CustomCulture[]>): Promise<CustomCulture[] | undefined>;
     /**
      * Get user's latest accessed organizations
      * @param rq Request data

package/lib/cjs/OrgApi.js

@@ -64,6 +64,15 @@ class OrgApi extends appscript_1.EntityApi {
     formatHtmlContent(content, payload) {
         return this.api.post(`${this.flag}/FormatHtmlContent`, content, payload);
     }
+    /**
+     * Get current organization's custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture, payload) {
+        return this.api.get(`${this.flag}/GetCustomResources/${culture}`, undefined, payload);
+    }
     /**
      * Get user's latest accessed organizations
      * @param rq Request data

package/lib/cjs/PublicApi.d.ts

@@ -6,7 +6,7 @@ import { CurrencyItem } from "./dto/public/CurrencyItem";
 import { RegionData } from "./dto/public/RegionData";
 import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
-import { BaseApi, Currency, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
+import { BaseApi, CultureItem, Currency, CustomCulture, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
 import { MemberInvitationDto } from "./dto/public/MemberInvitationDto";
 import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
 import { ChinaPinData } from "./dto/public/ChinaPinData";
@@ -41,6 +41,13 @@ export declare class PublicApi extends BaseApi {
      * @returns Label
      */
     getCurrencyLabel(currency: Currency | string): string;
+    /**
+     * Get cultures
+     * @param ids Culture ids to include and order by
+     * @param payload Payload
+     * @returns Result
+     */
+    getCultures(ids: string[], payload?: IApiPayload<CultureItem[]>): Promise<CultureItem[] | undefined>;
     /**
      * Get currencies
      * @param ids Currency ids to include and order by
@@ -48,6 +55,13 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     getCurrencies(ids?: string[], payload?: IApiPayload<CurrencyItem[]>): Promise<CurrencyItem[] | undefined>;
+    /**
+     * Get custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture: string, payload?: IApiPayload<CustomCulture[]>): Promise<CustomCulture[] | undefined>;
     /**
      * Get Pinyin
      * @param rq Request data

package/lib/cjs/PublicApi.js

@@ -44,6 +44,18 @@ class PublicApi extends appscript_1.BaseApi {
         const c = `currency${currency}`;
         return this.app.get(c) ?? c;
     }
+    /**
+     * Get cultures
+     * @param ids Culture ids to include and order by
+     * @param payload Payload
+     * @returns Result
+     */
+    getCultures(ids, payload) {
+        return this.api.post("Public/GetCultures", ids, {
+            ...payload,
+            contentType: "application/json"
+        });
+    }
     /**
      * Get currencies
      * @param ids Currency ids to include and order by
@@ -51,7 +63,19 @@ class PublicApi extends appscript_1.BaseApi {
      * @returns Result
      */
     getCurrencies(ids, payload) {
-        return this.api.post("Public/GetCurrencies", ids, payload);
+        return this.api.post("Public/GetCurrencies", ids, {
+            ...payload,
+            contentType: "application/json"
+        });
+    }
+    /**
+     * Get custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture, payload) {
+        return this.api.get(`Public/GetCustomResources/${culture}`, undefined, payload);
     }
     /**
      * Get Pinyin
@@ -69,7 +93,10 @@ class PublicApi extends appscript_1.BaseApi {
      * @returns Result
      */
     getRegions(ids, payload) {
-        return this.api.post("Public/GetRegions", ids, payload);
+        return this.api.post("Public/GetRegions", ids, {
+            ...payload,
+            contentType: "application/json"
+        });
     }
     /**
      * Get product unit's label

package/lib/mjs/OrgApi.d.ts

@@ -6,7 +6,7 @@ import { OrgQueryDto } from "./dto/org/OrgQueryDto";
 import { OrgReadDto } from "./dto/org/OrgReadDto";
 import { OrgUpdateReadDto } from "./dto/org/OrgUpdateReadDto";
 import { OrgListDto } from "./dto/org/OrgListDto";
-import { AntiforgeryRequestToken, EntityApi, IApp, IdResultPayload, ResultPayload, StringIdResultPayload } from "@etsoo/appscript";
+import { AntiforgeryRequestToken, CustomCulture, EntityApi, IApp, IdResultPayload, ResultPayload, StringIdResultPayload } from "@etsoo/appscript";
 import { OrgListRQ } from "./rq/org/OrgListRQ";
 import { OrgGetMyRQ } from "./rq/org/OrgGetMyRQ";
 import { OrgGetMyData } from "./dto/org/OrgGetMyData";
@@ -54,6 +54,13 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     formatHtmlContent(content: string, payload?: IApiPayload<string>): Promise<string | undefined>;
+    /**
+     * Get current organization's custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture: string, payload?: IApiPayload<CustomCulture[]>): Promise<CustomCulture[] | undefined>;
     /**
      * Get user's latest accessed organizations
      * @param rq Request data

package/lib/mjs/OrgApi.js

@@ -61,6 +61,15 @@ export class OrgApi extends EntityApi {
     formatHtmlContent(content, payload) {
         return this.api.post(`${this.flag}/FormatHtmlContent`, content, payload);
     }
+    /**
+     * Get current organization's custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture, payload) {
+        return this.api.get(`${this.flag}/GetCustomResources/${culture}`, undefined, payload);
+    }
     /**
      * Get user's latest accessed organizations
      * @param rq Request data

package/lib/mjs/PublicApi.d.ts

@@ -6,7 +6,7 @@ import { CurrencyItem } from "./dto/public/CurrencyItem";
 import { RegionData } from "./dto/public/RegionData";
 import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
-import { BaseApi, Currency, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
+import { BaseApi, CultureItem, Currency, CustomCulture, IApp, ProductUnit, ResultPayload } from "@etsoo/appscript";
 import { MemberInvitationDto } from "./dto/public/MemberInvitationDto";
 import { AcceptInvitationRQ } from "./rq/public/AcceptInvitationRQ";
 import { ChinaPinData } from "./dto/public/ChinaPinData";
@@ -41,6 +41,13 @@ export declare class PublicApi extends BaseApi {
      * @returns Label
      */
     getCurrencyLabel(currency: Currency | string): string;
+    /**
+     * Get cultures
+     * @param ids Culture ids to include and order by
+     * @param payload Payload
+     * @returns Result
+     */
+    getCultures(ids: string[], payload?: IApiPayload<CultureItem[]>): Promise<CultureItem[] | undefined>;
     /**
      * Get currencies
      * @param ids Currency ids to include and order by
@@ -48,6 +55,13 @@ export declare class PublicApi extends BaseApi {
      * @returns Result
      */
     getCurrencies(ids?: string[], payload?: IApiPayload<CurrencyItem[]>): Promise<CurrencyItem[] | undefined>;
+    /**
+     * Get custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture: string, payload?: IApiPayload<CustomCulture[]>): Promise<CustomCulture[] | undefined>;
     /**
      * Get Pinyin
      * @param rq Request data

package/lib/mjs/PublicApi.js

@@ -41,6 +41,18 @@ export class PublicApi extends BaseApi {
         const c = `currency${currency}`;
         return this.app.get(c) ?? c;
     }
+    /**
+     * Get cultures
+     * @param ids Culture ids to include and order by
+     * @param payload Payload
+     * @returns Result
+     */
+    getCultures(ids, payload) {
+        return this.api.post("Public/GetCultures", ids, {
+            ...payload,
+            contentType: "application/json"
+        });
+    }
     /**
      * Get currencies
      * @param ids Currency ids to include and order by
@@ -48,7 +60,19 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     getCurrencies(ids, payload) {
-        return this.api.post("Public/GetCurrencies", ids, payload);
+        return this.api.post("Public/GetCurrencies", ids, {
+            ...payload,
+            contentType: "application/json"
+        });
+    }
+    /**
+     * Get custom resources
+     * @param culture Culture
+     * @param payload Payload
+     * @returns Result
+     */
+    getCustomResources(culture, payload) {
+        return this.api.get(`Public/GetCustomResources/${culture}`, undefined, payload);
     }
     /**
      * Get Pinyin
@@ -66,7 +90,10 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     getRegions(ids, payload) {
-        return this.api.post("Public/GetRegions", ids, payload);
+        return this.api.post("Public/GetRegions", ids, {
+            ...payload,
+            contentType: "application/json"
+        });
     }
     /**
      * Get product unit's label

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -53,8 +53,8 @@
     "vitest": "^3.1.2"
   },
   "dependencies": {
-    "@etsoo/appscript": "^1.6.26",
-    "@etsoo/materialui": "^1.5.32",
+    "@etsoo/appscript": "^1.6.29",
+    "@etsoo/materialui": "^1.5.35",
     "@etsoo/react": "^1.8.40",
     "@etsoo/shared": "^1.2.69",
     "@etsoo/toolpad": "^1.0.26",

package/src/OrgApi.ts

@@ -8,6 +8,7 @@ import { OrgUpdateReadDto } from "./dto/org/OrgUpdateReadDto";
 import { OrgListDto } from "./dto/org/OrgListDto";
 import {
   AntiforgeryRequestToken,
+  CustomCulture,
   EntityApi,
   IApp,
   IdResultPayload,
@@ -96,6 +97,20 @@ export class OrgApi extends EntityApi {
     return this.api.post(`${this.flag}/FormatHtmlContent`, content, payload);
   }
 
+  /**
+   * Get current organization's custom resources
+   * @param culture Culture
+   * @param payload Payload
+   * @returns Result
+   */
+  getCustomResources(culture: string, payload?: IApiPayload<CustomCulture[]>) {
+    return this.api.get(
+      `${this.flag}/GetCustomResources/${culture}`,
+      undefined,
+      payload
+    );
+  }
+
   /**
    * Get user's latest accessed organizations
    * @param rq Request data

package/src/PublicApi.ts

@@ -8,7 +8,9 @@ import { PlaceQueryRQ } from "./rq/public/PlaceQueryRQ";
 import { PlaceCommon } from "./dto/public/PlaceCommon";
 import {
   BaseApi,
+  CultureItem,
   Currency,
+  CustomCulture,
   IApp,
   ProductUnit,
   RepeatOption,
@@ -64,6 +66,19 @@ export class PublicApi extends BaseApi {
     return this.app.get(c) ?? c;
   }
 
+  /**
+   * Get cultures
+   * @param ids Culture ids to include and order by
+   * @param payload Payload
+   * @returns Result
+   */
+  getCultures(ids: string[], payload?: IApiPayload<CultureItem[]>) {
+    return this.api.post("Public/GetCultures", ids, {
+      ...payload,
+      contentType: "application/json"
+    });
+  }
+
   /**
    * Get currencies
    * @param ids Currency ids to include and order by
@@ -71,7 +86,24 @@ export class PublicApi extends BaseApi {
    * @returns Result
    */
   getCurrencies(ids?: string[], payload?: IApiPayload<CurrencyItem[]>) {
-    return this.api.post("Public/GetCurrencies", ids, payload);
+    return this.api.post("Public/GetCurrencies", ids, {
+      ...payload,
+      contentType: "application/json"
+    });
+  }
+
+  /**
+   * Get custom resources
+   * @param culture Culture
+   * @param payload Payload
+   * @returns Result
+   */
+  getCustomResources(culture: string, payload?: IApiPayload<CustomCulture[]>) {
+    return this.api.get(
+      `Public/GetCustomResources/${culture}`,
+      undefined,
+      payload
+    );
   }
 
   /**
@@ -91,7 +123,10 @@ export class PublicApi extends BaseApi {
    * @returns Result
    */
   getRegions(ids?: string[], payload?: IApiPayload<RegionData[]>) {
-    return this.api.post("Public/GetRegions", ids, payload);
+    return this.api.post("Public/GetRegions", ids, {
+      ...payload,
+      contentType: "application/json"
+    });
   }
 
   /**