@etsoo/appscript 1.6.37 → 1.6.39

package/__tests__/app/CoreApp.ts

@@ -25,6 +25,8 @@ await ExtendUtils.sleep(50);
 // Then change the culture to the first one (here is 'zh-CN')
 await app.changeCulture(app.settings.cultures[0]);
 
+await ExtendUtils.sleep(50);
+
 test("Test for domain substitution", () => {
   expect(app.settings.endpoint).toBe("http://admin.etsoo.com:9000/api/");
 

package/lib/cjs/api/EntityApi.js

@@ -39,8 +39,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     listBase(rq, payload) {
-        let { queryPaging, ...rest } = rq;
-        return this.api.post(`${this.flag}/List`, { queryPaging: BusinessUtils_1.BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
+        return this.api.post(`${this.flag}/List`, BusinessUtils_1.BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Merge
@@ -59,8 +58,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     queryBase(rq, payload, queryKey = "") {
-        let { queryPaging, ...rest } = rq;
-        return this.api.post(`${this.flag}/Query${queryKey}`, { queryPaging: BusinessUtils_1.BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
+        return this.api.post(`${this.flag}/Query${queryKey}`, BusinessUtils_1.BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Query favored country ids

package/lib/cjs/app/CoreApp.js

@@ -1236,6 +1236,8 @@ class CoreApp {
                 if (typeof id !== "number")
                     return;
                 const key = shared_1.DataTypes.getEnumKey(em, id);
+                if (key == null)
+                    return;
                 const label = this.get(getKey(key)) ?? key;
                 list.push({ id, label });
             });

package/lib/cjs/business/BusinessUtils.d.ts

@@ -1,6 +1,6 @@
-import { DataTypes, ListType } from "@etsoo/shared";
+import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
-import { QueryPagingData } from "../api/rq/QueryPagingData";
+import { QueryRQ } from "../api/rq/QueryRQ";
 /**
  * Business utils
  */
@@ -14,11 +14,17 @@ export declare namespace BusinessUtils {
      */
     function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
     /**
-     * Format query paging data
-     * @param query Query paging data or batch size
+     * Format query, dealing with paging data
+     * @param rq Query
      * @returns Result
      */
-    function formatQueryPaging(query: QueryPagingData | number | undefined): QueryPagingData | undefined;
+    function formatQuery<T extends IdType>(rq: QueryRQ<T>): {
+        id?: T | undefined;
+        ids?: T[] | undefined;
+        excludedIds?: T[] | undefined;
+        keyword?: string;
+        queryPaging: import("..").QueryPagingData | undefined;
+    };
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/cjs/business/BusinessUtils.js

@@ -40,17 +40,18 @@ var BusinessUtils;
     }
     BusinessUtils.formatAvatarTitle = formatAvatarTitle;
     /**
-     * Format query paging data
-     * @param query Query paging data or batch size
+     * Format query, dealing with paging data
+     * @param rq Query
      * @returns Result
      */
-    function formatQueryPaging(query) {
-        if (typeof query === "number") {
-            query = { currentPage: 0, batchSize: query };
+    function formatQuery(rq) {
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === "number") {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
         }
-        return query;
+        return { queryPaging, ...rest };
     }
-    BusinessUtils.formatQueryPaging = formatQueryPaging;
+    BusinessUtils.formatQuery = formatQuery;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/mjs/api/EntityApi.js

@@ -36,8 +36,7 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     listBase(rq, payload) {
-        let { queryPaging, ...rest } = rq;
-        return this.api.post(`${this.flag}/List`, { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
+        return this.api.post(`${this.flag}/List`, BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Merge
@@ -56,8 +55,7 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     queryBase(rq, payload, queryKey = "") {
-        let { queryPaging, ...rest } = rq;
-        return this.api.post(`${this.flag}/Query${queryKey}`, { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest }, payload);
+        return this.api.post(`${this.flag}/Query${queryKey}`, BusinessUtils.formatQuery(rq), payload);
     }
     /**
      * Query favored country ids

package/lib/mjs/app/CoreApp.js

@@ -1233,6 +1233,8 @@ export class CoreApp {
                 if (typeof id !== "number")
                     return;
                 const key = DataTypes.getEnumKey(em, id);
+                if (key == null)
+                    return;
                 const label = this.get(getKey(key)) ?? key;
                 list.push({ id, label });
             });

package/lib/mjs/business/BusinessUtils.d.ts

@@ -1,6 +1,6 @@
-import { DataTypes, ListType } from "@etsoo/shared";
+import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
-import { QueryPagingData } from "../api/rq/QueryPagingData";
+import { QueryRQ } from "../api/rq/QueryRQ";
 /**
  * Business utils
  */
@@ -14,11 +14,17 @@ export declare namespace BusinessUtils {
      */
     function formatAvatarTitle(title?: string, maxChars?: number, defaultTitle?: string): string;
     /**
-     * Format query paging data
-     * @param query Query paging data or batch size
+     * Format query, dealing with paging data
+     * @param rq Query
      * @returns Result
      */
-    function formatQueryPaging(query: QueryPagingData | number | undefined): QueryPagingData | undefined;
+    function formatQuery<T extends IdType>(rq: QueryRQ<T>): {
+        id?: T | undefined;
+        ids?: T[] | undefined;
+        excludedIds?: T[] | undefined;
+        keyword?: string;
+        queryPaging: import("..").QueryPagingData | undefined;
+    };
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/mjs/business/BusinessUtils.js

@@ -37,17 +37,18 @@ export var BusinessUtils;
     }
     BusinessUtils.formatAvatarTitle = formatAvatarTitle;
     /**
-     * Format query paging data
-     * @param query Query paging data or batch size
+     * Format query, dealing with paging data
+     * @param rq Query
      * @returns Result
      */
-    function formatQueryPaging(query) {
-        if (typeof query === "number") {
-            query = { currentPage: 0, batchSize: query };
+    function formatQuery(rq) {
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === "number") {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
         }
-        return query;
+        return { queryPaging, ...rest };
     }
-    BusinessUtils.formatQueryPaging = formatQueryPaging;
+    BusinessUtils.formatQuery = formatQuery;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.37",
+  "version": "1.6.39",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -35,9 +35,9 @@
   },
   "homepage": "https://github.com/ETSOO/AppScript#readme",
   "dependencies": {
-    "@etsoo/notificationbase": "^1.1.62",
-    "@etsoo/restclient": "^1.1.29",
-    "@etsoo/shared": "^1.2.74",
+    "@etsoo/notificationbase": "^1.1.63",
+    "@etsoo/restclient": "^1.1.30",
+    "@etsoo/shared": "^1.2.75",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {
@@ -47,9 +47,9 @@
     "@babel/preset-env": "^7.27.2",
     "@babel/runtime-corejs3": "^7.27.6",
     "@types/crypto-js": "^4.2.2",
-    "@vitejs/plugin-react": "^4.5.1",
+    "@vitejs/plugin-react": "^4.5.2",
     "jsdom": "^26.1.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.2"
+    "vitest": "^3.2.3"
   }
 }

package/src/api/EntityApi.ts

@@ -67,10 +67,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
     rq: RQ,
     payload?: IApiPayload<R[]>
   ) {
-    let { queryPaging, ...rest } = rq;
     return this.api.post(
       `${this.flag}/List`,
-      { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest },
+      BusinessUtils.formatQuery(rq),
       payload
     );
   }
@@ -100,10 +99,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
     RQ extends QueryRQ<T>,
     R extends object
   >(rq: RQ, payload?: IApiPayload<R[]>, queryKey: string = "") {
-    let { queryPaging, ...rest } = rq;
     return this.api.post(
       `${this.flag}/Query${queryKey}`,
-      { queryPaging: BusinessUtils.formatQueryPaging(queryPaging), ...rest },
+      BusinessUtils.formatQuery(rq),
       payload
     );
   }

package/src/app/CoreApp.ts

@@ -1748,6 +1748,7 @@ export abstract class CoreApp<
       filter.forEach((id) => {
         if (typeof id !== "number") return;
         const key = DataTypes.getEnumKey(em, id);
+        if (key == null) return;
         const label = this.get<string>(getKey(key)) ?? key;
         list.push({ id, label });
       });

package/src/business/BusinessUtils.ts

@@ -1,6 +1,6 @@
-import { DataTypes, ListType } from "@etsoo/shared";
+import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
-import { QueryPagingData } from "../api/rq/QueryPagingData";
+import { QueryRQ } from "../api/rq/QueryRQ";
 
 /**
  * Business utils
@@ -48,17 +48,16 @@ export namespace BusinessUtils {
   }
 
   /**
-   * Format query paging data
-   * @param query Query paging data or batch size
+   * Format query, dealing with paging data
+   * @param rq Query
    * @returns Result
    */
-  export function formatQueryPaging(
-    query: QueryPagingData | number | undefined
-  ) {
-    if (typeof query === "number") {
-      query = { currentPage: 0, batchSize: query };
+  export function formatQuery<T extends IdType>(rq: QueryRQ<T>) {
+    let { queryPaging, ...rest } = rq;
+    if (typeof queryPaging === "number") {
+      queryPaging = { currentPage: 0, batchSize: queryPaging };
     }
-    return query;
+    return { queryPaging, ...rest };
   }
 
   /**