@etsoo/appscript 1.6.38 → 1.6.40

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/");
 
@@ -157,7 +159,7 @@ test("Tests for getRoleLabel", () => {
 test("Tests for getRoles", () => {
   const roles = app.getRoles(UserRole.User | UserRole.Manager | UserRole.Admin);
   expect(roles.length).toBe(3);
-  expect(roles.map((r) => r.id)).toEqual([16, 128, 8192]);
+  expect(roles.map((r) => r.id)).toEqual([16, 64, 8192]);
 });
 
 test("Tests for getStatusList", () => {

package/lib/cjs/app/CoreApp.d.ts

@@ -596,20 +596,30 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
     /**
-     * Is admin user
+     * Is admin roles
      * @returns Result
      */
     isAdminUser(): boolean;
     /**
-     * Is Finance user
+     * Is Finance roles
      * @returns Result
      */
     isFinanceUser(): boolean;
     /**
-     * Is Manager user
+     * Is HR manager roles
+     * @returns Result
+     */
+    isHRUser(): boolean;
+    /**
+     * Is Manager roles, exclude API user from frontend
      * @returns Result
      */
     isManagerUser(): boolean;
+    /**
+     * Is user roles
+     * @returns Result
+     */
+    isUser(): boolean;
     /**
      * Load URL
      * @param url URL

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 });
             });
@@ -1416,25 +1418,48 @@ class CoreApp {
         return false;
     }
     /**
-     * Is admin user
+     * Is admin roles
      * @returns Result
      */
     isAdminUser() {
-        return this.hasMinPermission(UserRole_1.UserRole.Admin);
+        return this.hasPermission([
+            UserRole_1.UserRole.Executive,
+            UserRole_1.UserRole.Admin,
+            UserRole_1.UserRole.Founder
+        ]);
     }
     /**
-     * Is Finance user
+     * Is Finance roles
      * @returns Result
      */
     isFinanceUser() {
         return this.hasPermission(UserRole_1.UserRole.Finance) || this.isAdminUser();
     }
     /**
-     * Is Manager user
+     * Is HR manager roles
+     * @returns Result
+     */
+    isHRUser() {
+        return this.hasPermission(UserRole_1.UserRole.HRManager) || this.isAdminUser();
+    }
+    /**
+     * Is Manager roles, exclude API user from frontend
      * @returns Result
      */
     isManagerUser() {
-        return this.hasMinPermission(UserRole_1.UserRole.Manager);
+        return (this.hasPermission([
+            UserRole_1.UserRole.Manager,
+            UserRole_1.UserRole.HRManager,
+            UserRole_1.UserRole.Director
+        ]) || this.isFinanceUser());
+    }
+    /**
+     * Is user roles
+     * @returns Result
+     */
+    isUser() {
+        return (this.hasPermission([UserRole_1.UserRole.User, UserRole_1.UserRole.Leader]) ||
+            this.isManagerUser());
     }
     /**
      * Load URL

package/lib/cjs/app/IApp.d.ts

@@ -532,20 +532,30 @@ export interface IApp {
      */
     initCall(callback?: (result: boolean) => void, resetKeys?: boolean): Promise<void>;
     /**
-     * Is admin user
+     * Is admin roles
      * @returns Result
      */
     isAdminUser(): boolean;
     /**
-     * Is Finance user
+     * Is Finance roles
      * @returns Result
      */
     isFinanceUser(): boolean;
     /**
-     * Is Manager user
+     * Is HR manager roles
+     * @returns Result
+     */
+    isHRUser(): boolean;
+    /**
+     * Is Manager roles
      * @returns Result
      */
     isManagerUser(): boolean;
+    /**
+     * Is user roles
+     * @returns Result
+     */
+    isUser(): boolean;
     /**
      * Is valid password, override to implement custom check
      * @param password Input password

package/lib/cjs/app/UserRole.d.ts

@@ -8,11 +8,6 @@ export declare enum UserRole {
      * 访客
      */
     Guest = 1,
-    /**
-     * Outsourcing
-     * 外包
-     */
-    Outsourcing = 2,
     /**
      * Operator
      * 操作员
@@ -32,27 +27,32 @@ export declare enum UserRole {
      * Team leader
      * 团队负责人
      */
-    Leader = 64,
+    Leader = 32,
     /**
      * Manager
      * 经理
      */
-    Manager = 128,
+    Manager = 64,
+    /**
+     * HR Manager
+     * 人事经理
+     */
+    HRManager = 128,
     /**
      * Finance
      * 财务
      */
     Finance = 256,
     /**
-     * Executives
-     * 高管
+     * Director
+     * 总监
      */
-    Executive = 512,
+    Director = 512,
     /**
-     * Shareholder
-     * 股东
+     * Executives
+     * 高管
      */
-    Shareholder = 1024,
+    Executive = 1024,
     /**
      * API
      * 接口

package/lib/cjs/app/UserRole.js

@@ -12,11 +12,6 @@ var UserRole;
      * 访客
      */
     UserRole[UserRole["Guest"] = 1] = "Guest";
-    /**
-     * Outsourcing
-     * 外包
-     */
-    UserRole[UserRole["Outsourcing"] = 2] = "Outsourcing";
     /**
      * Operator
      * 操作员
@@ -36,27 +31,32 @@ var UserRole;
      * Team leader
      * 团队负责人
      */
-    UserRole[UserRole["Leader"] = 64] = "Leader";
+    UserRole[UserRole["Leader"] = 32] = "Leader";
     /**
      * Manager
      * 经理
      */
-    UserRole[UserRole["Manager"] = 128] = "Manager";
+    UserRole[UserRole["Manager"] = 64] = "Manager";
+    /**
+     * HR Manager
+     * 人事经理
+     */
+    UserRole[UserRole["HRManager"] = 128] = "HRManager";
     /**
      * Finance
      * 财务
      */
     UserRole[UserRole["Finance"] = 256] = "Finance";
     /**
-     * Executives
-     * 高管
+     * Director
+     * 总监
      */
-    UserRole[UserRole["Executive"] = 512] = "Executive";
+    UserRole[UserRole["Director"] = 512] = "Director";
     /**
-     * Shareholder
-     * 股东
+     * Executives
+     * 高管
      */
-    UserRole[UserRole["Shareholder"] = 1024] = "Shareholder";
+    UserRole[UserRole["Executive"] = 1024] = "Executive";
     /**
      * API
      * 接口

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

@@ -1,6 +1,5 @@
 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
@@ -24,7 +23,7 @@ export declare namespace BusinessUtils {
         ids?: T[] | undefined;
         excludedIds?: T[] | undefined;
         keyword?: string;
-        queryPaging: QueryPagingData | undefined;
+        queryPaging: import("..").QueryPagingData | undefined;
     };
     /**
      * Get 12-month items

package/lib/mjs/app/CoreApp.d.ts

@@ -596,20 +596,30 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
     /**
-     * Is admin user
+     * Is admin roles
      * @returns Result
      */
     isAdminUser(): boolean;
     /**
-     * Is Finance user
+     * Is Finance roles
      * @returns Result
      */
     isFinanceUser(): boolean;
     /**
-     * Is Manager user
+     * Is HR manager roles
+     * @returns Result
+     */
+    isHRUser(): boolean;
+    /**
+     * Is Manager roles, exclude API user from frontend
      * @returns Result
      */
     isManagerUser(): boolean;
+    /**
+     * Is user roles
+     * @returns Result
+     */
+    isUser(): boolean;
     /**
      * Load URL
      * @param url URL

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 });
             });
@@ -1413,25 +1415,48 @@ export class CoreApp {
         return false;
     }
     /**
-     * Is admin user
+     * Is admin roles
      * @returns Result
      */
     isAdminUser() {
-        return this.hasMinPermission(UserRole.Admin);
+        return this.hasPermission([
+            UserRole.Executive,
+            UserRole.Admin,
+            UserRole.Founder
+        ]);
     }
     /**
-     * Is Finance user
+     * Is Finance roles
      * @returns Result
      */
     isFinanceUser() {
         return this.hasPermission(UserRole.Finance) || this.isAdminUser();
     }
     /**
-     * Is Manager user
+     * Is HR manager roles
+     * @returns Result
+     */
+    isHRUser() {
+        return this.hasPermission(UserRole.HRManager) || this.isAdminUser();
+    }
+    /**
+     * Is Manager roles, exclude API user from frontend
      * @returns Result
      */
     isManagerUser() {
-        return this.hasMinPermission(UserRole.Manager);
+        return (this.hasPermission([
+            UserRole.Manager,
+            UserRole.HRManager,
+            UserRole.Director
+        ]) || this.isFinanceUser());
+    }
+    /**
+     * Is user roles
+     * @returns Result
+     */
+    isUser() {
+        return (this.hasPermission([UserRole.User, UserRole.Leader]) ||
+            this.isManagerUser());
     }
     /**
      * Load URL

package/lib/mjs/app/IApp.d.ts

@@ -532,20 +532,30 @@ export interface IApp {
      */
     initCall(callback?: (result: boolean) => void, resetKeys?: boolean): Promise<void>;
     /**
-     * Is admin user
+     * Is admin roles
      * @returns Result
      */
     isAdminUser(): boolean;
     /**
-     * Is Finance user
+     * Is Finance roles
      * @returns Result
      */
     isFinanceUser(): boolean;
     /**
-     * Is Manager user
+     * Is HR manager roles
+     * @returns Result
+     */
+    isHRUser(): boolean;
+    /**
+     * Is Manager roles
      * @returns Result
      */
     isManagerUser(): boolean;
+    /**
+     * Is user roles
+     * @returns Result
+     */
+    isUser(): boolean;
     /**
      * Is valid password, override to implement custom check
      * @param password Input password

package/lib/mjs/app/UserRole.d.ts

@@ -8,11 +8,6 @@ export declare enum UserRole {
      * 访客
      */
     Guest = 1,
-    /**
-     * Outsourcing
-     * 外包
-     */
-    Outsourcing = 2,
     /**
      * Operator
      * 操作员
@@ -32,27 +27,32 @@ export declare enum UserRole {
      * Team leader
      * 团队负责人
      */
-    Leader = 64,
+    Leader = 32,
     /**
      * Manager
      * 经理
      */
-    Manager = 128,
+    Manager = 64,
+    /**
+     * HR Manager
+     * 人事经理
+     */
+    HRManager = 128,
     /**
      * Finance
      * 财务
      */
     Finance = 256,
     /**
-     * Executives
-     * 高管
+     * Director
+     * 总监
      */
-    Executive = 512,
+    Director = 512,
     /**
-     * Shareholder
-     * 股东
+     * Executives
+     * 高管
      */
-    Shareholder = 1024,
+    Executive = 1024,
     /**
      * API
      * 接口

package/lib/mjs/app/UserRole.js

@@ -9,11 +9,6 @@ export var UserRole;
      * 访客
      */
     UserRole[UserRole["Guest"] = 1] = "Guest";
-    /**
-     * Outsourcing
-     * 外包
-     */
-    UserRole[UserRole["Outsourcing"] = 2] = "Outsourcing";
     /**
      * Operator
      * 操作员
@@ -33,27 +28,32 @@ export var UserRole;
      * Team leader
      * 团队负责人
      */
-    UserRole[UserRole["Leader"] = 64] = "Leader";
+    UserRole[UserRole["Leader"] = 32] = "Leader";
     /**
      * Manager
      * 经理
      */
-    UserRole[UserRole["Manager"] = 128] = "Manager";
+    UserRole[UserRole["Manager"] = 64] = "Manager";
+    /**
+     * HR Manager
+     * 人事经理
+     */
+    UserRole[UserRole["HRManager"] = 128] = "HRManager";
     /**
      * Finance
      * 财务
      */
     UserRole[UserRole["Finance"] = 256] = "Finance";
     /**
-     * Executives
-     * 高管
+     * Director
+     * 总监
      */
-    UserRole[UserRole["Executive"] = 512] = "Executive";
+    UserRole[UserRole["Director"] = 512] = "Director";
     /**
-     * Shareholder
-     * 股东
+     * Executives
+     * 高管
      */
-    UserRole[UserRole["Shareholder"] = 1024] = "Shareholder";
+    UserRole[UserRole["Executive"] = 1024] = "Executive";
     /**
      * API
      * 接口

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

@@ -1,6 +1,5 @@
 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
@@ -24,7 +23,7 @@ export declare namespace BusinessUtils {
         ids?: T[] | undefined;
         excludedIds?: T[] | undefined;
         keyword?: string;
-        queryPaging: QueryPagingData | undefined;
+        queryPaging: import("..").QueryPagingData | undefined;
     };
     /**
      * Get 12-month items

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.6.38",
+  "version": "1.6.40",
   "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/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 });
       });
@@ -1941,15 +1942,19 @@ export abstract class CoreApp<
   }
 
   /**
-   * Is admin user
+   * Is admin roles
    * @returns Result
    */
   isAdminUser() {
-    return this.hasMinPermission(UserRole.Admin);
+    return this.hasPermission([
+      UserRole.Executive,
+      UserRole.Admin,
+      UserRole.Founder
+    ]);
   }
 
   /**
-   * Is Finance user
+   * Is Finance roles
    * @returns Result
    */
   isFinanceUser() {
@@ -1957,11 +1962,36 @@ export abstract class CoreApp<
   }
 
   /**
-   * Is Manager user
+   * Is HR manager roles
+   * @returns Result
+   */
+  isHRUser() {
+    return this.hasPermission(UserRole.HRManager) || this.isAdminUser();
+  }
+
+  /**
+   * Is Manager roles, exclude API user from frontend
    * @returns Result
    */
   isManagerUser() {
-    return this.hasMinPermission(UserRole.Manager);
+    return (
+      this.hasPermission([
+        UserRole.Manager,
+        UserRole.HRManager,
+        UserRole.Director
+      ]) || this.isFinanceUser()
+    );
+  }
+
+  /**
+   * Is user roles
+   * @returns Result
+   */
+  isUser() {
+    return (
+      this.hasPermission([UserRole.User, UserRole.Leader]) ||
+      this.isManagerUser()
+    );
   }
 
   /**

package/src/app/IApp.ts

@@ -705,23 +705,35 @@ export interface IApp {
   ): Promise<void>;
 
   /**
-   * Is admin user
+   * Is admin roles
    * @returns Result
    */
   isAdminUser(): boolean;
 
   /**
-   * Is Finance user
+   * Is Finance roles
    * @returns Result
    */
   isFinanceUser(): boolean;
 
   /**
-   * Is Manager user
+   * Is HR manager roles
+   * @returns Result
+   */
+  isHRUser(): boolean;
+
+  /**
+   * Is Manager roles
    * @returns Result
    */
   isManagerUser(): boolean;
 
+  /**
+   * Is user roles
+   * @returns Result
+   */
+  isUser(): boolean;
+
   /**
    * Is valid password, override to implement custom check
    * @param password Input password

package/src/app/UserRole.ts

@@ -9,12 +9,6 @@ export enum UserRole {
    */
   Guest = 1,
 
-  /**
-   * Outsourcing
-   * 外包
-   */
-  Outsourcing = 2,
-
   /**
    * Operator
    * 操作员
@@ -37,13 +31,19 @@ export enum UserRole {
    * Team leader
    * 团队负责人
    */
-  Leader = 64,
+  Leader = 32,
 
   /**
    * Manager
    * 经理
    */
-  Manager = 128,
+  Manager = 64,
+
+  /**
+   * HR Manager
+   * 人事经理
+   */
+  HRManager = 128,
 
   /**
    * Finance
@@ -52,16 +52,16 @@ export enum UserRole {
   Finance = 256,
 
   /**
-   * Executives
-   * 高管
+   * Director
+   * 总监
    */
-  Executive = 512,
+  Director = 512,
 
   /**
-   * Shareholder
-   * 股东
+   * Executives
+   * 高管
    */
-  Shareholder = 1024,
+  Executive = 1024,
 
   /**
    * API

package/src/business/BusinessUtils.ts

@@ -1,6 +1,5 @@
 import { DataTypes, IdType, ListType } from "@etsoo/shared";
 import { CustomCultureData } from "../def/CustomCulture";
-import { QueryPagingData } from "../api/rq/QueryPagingData";
 import { QueryRQ } from "../api/rq/QueryRQ";
 
 /**