@etsoo/appscript 1.5.60 → 1.5.62

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

@@ -635,8 +635,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected setupTasks(): void;
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Go to the login page
      * @param data Login parameters

package/lib/cjs/app/CoreApp.js

@@ -1632,8 +1632,9 @@ class CoreApp {
     }
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    async signout() {
+    async signout(action) {
         // Clear the keep login status
         this.keepLogin = false;
         // Reset all APIs
@@ -1656,8 +1657,10 @@ class CoreApp {
         }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
-        // Go to login page
-        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        if (action == null || action() !== false) {
+            // Go to login page
+            this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        }
     }
     /**
      * Go to the login page

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

@@ -571,8 +571,9 @@ export interface IApp {
     setupLogging(action?: (data: ErrorData) => void | Promise<void>, preventDefault?: ((type: ErrorType) => boolean) | boolean): void;
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Persist settings to source when application exit
      */

package/lib/cjs/state/User.d.ts

@@ -12,6 +12,26 @@ export interface IUserData {
      * 用户姓名
      */
     readonly name: string;
+    /**
+     * Given name
+     * 名
+     */
+    readonly givenName?: string;
+    /**
+     * Family name
+     * 姓
+     */
+    readonly familyName?: string;
+    /**
+     * Latin given name
+     * 拉丁名（拼音）
+     */
+    readonly latinGivenName?: string;
+    /**
+     * Latin family name
+     * 拉丁姓（拼音）
+     */
+    readonly latinFamilyName?: string;
     /**
      * User avatar
      * 用户头像

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

@@ -635,8 +635,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected setupTasks(): void;
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Go to the login page
      * @param data Login parameters

package/lib/mjs/app/CoreApp.js

@@ -1629,8 +1629,9 @@ export class CoreApp {
     }
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    async signout() {
+    async signout(action) {
         // Clear the keep login status
         this.keepLogin = false;
         // Reset all APIs
@@ -1653,8 +1654,10 @@ export class CoreApp {
         }
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
-        // Go to login page
-        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        if (action == null || action() !== false) {
+            // Go to login page
+            this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        }
     }
     /**
      * Go to the login page

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

@@ -571,8 +571,9 @@ export interface IApp {
     setupLogging(action?: (data: ErrorData) => void | Promise<void>, preventDefault?: ((type: ErrorType) => boolean) | boolean): void;
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
     /**
      * Persist settings to source when application exit
      */

package/lib/mjs/state/User.d.ts

@@ -12,6 +12,26 @@ export interface IUserData {
      * 用户姓名
      */
     readonly name: string;
+    /**
+     * Given name
+     * 名
+     */
+    readonly givenName?: string;
+    /**
+     * Family name
+     * 姓
+     */
+    readonly familyName?: string;
+    /**
+     * Latin given name
+     * 拉丁名（拼音）
+     */
+    readonly latinGivenName?: string;
+    /**
+     * Latin family name
+     * 拉丁姓（拼音）
+     */
+    readonly latinFamilyName?: string;
     /**
      * User avatar
      * 用户头像

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.60",
+    "version": "1.5.62",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -58,13 +58,13 @@
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.25.7",
-        "@babel/core": "^7.25.8",
-        "@babel/plugin-transform-runtime": "^7.25.7",
-        "@babel/preset-env": "^7.25.8",
-        "@babel/runtime-corejs3": "^7.25.7",
+        "@babel/cli": "^7.25.9",
+        "@babel/core": "^7.25.9",
+        "@babel/plugin-transform-runtime": "^7.25.9",
+        "@babel/preset-env": "^7.25.9",
+        "@babel/runtime-corejs3": "^7.25.9",
         "@types/crypto-js": "^4.2.2",
-        "@types/jest": "^29.5.13",
+        "@types/jest": "^29.5.14",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.2.5",

package/src/app/CoreApp.ts

@@ -2218,8 +2218,9 @@ export abstract class CoreApp<
 
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    async signout() {
+    async signout(action?: () => void | boolean) {
         // Clear the keep login status
         this.keepLogin = false;
 
@@ -2253,8 +2254,10 @@ export abstract class CoreApp<
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
 
-        // Go to login page
-        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        if (action == null || action() !== false) {
+            // Go to login page
+            this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
+        }
     }
 
     /**

package/src/app/IApp.ts

@@ -770,8 +770,9 @@ export interface IApp {
 
     /**
      * Signout, with userLogout and toLoginPage
+     * @param action Callback
      */
-    signout(): Promise<void>;
+    signout(action?: () => void | boolean): Promise<void>;
 
     /**
      * Persist settings to source when application exit

package/src/state/User.ts

@@ -15,6 +15,30 @@ export interface IUserData {
      */
     readonly name: string;
 
+    /**
+     * Given name
+     * 名
+     */
+    readonly givenName?: string;
+
+    /**
+     * Family name
+     * 姓
+     */
+    readonly familyName?: string;
+
+    /**
+     * Latin given name
+     * 拉丁名（拼音）
+     */
+    readonly latinGivenName?: string;
+
+    /**
+     * Latin family name
+     * 拉丁姓（拼音）
+     */
+    readonly latinFamilyName?: string;
+
     /**
      * User avatar
      * 用户头像