@etsoo/appscript 1.4.29 → 1.4.31

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

@@ -526,8 +526,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/lib/cjs/app/CoreApp.js

@@ -1292,16 +1292,16 @@ class CoreApp {
         // Clear
         this.userLogout();
         // Go to login page
-        this.toLoginPage();
+        this.toLoginPage(false, true);
     }
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin) {
-        const url = '/?url=' +
-            encodeURIComponent(location.href) +
-            (tryLogin ? '' : '&tryLogin=false');
+    toLoginPage(tryLogin, removeUrl) {
+        const url = `/?tryLogin=${tryLogin !== null && tryLogin !== void 0 ? tryLogin : false}` +
+            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
         this.navigate(url);
     }
     /**

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

@@ -459,8 +459,9 @@ export interface IApp {
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/lib/cjs/i18n/en.json

@@ -11,6 +11,7 @@
     "back": "Back",
     "cancel": "Cancel",
     "changePassword": "Change password",
+    "changeReload": "{0} has just changed data, do you want to reload? Reloading will cause the current modification to be lost!",
     "clickForDetails": "Click for details",
     "city": "City",
     "clear": "Clear",

package/lib/cjs/i18n/zh-Hans.json

@@ -11,6 +11,7 @@
     "back": "后退",
     "cancel": "取消",
     "changePassword": "修改密码",
+    "changeReload": "{0} 刚更改了数据，是否重新加载？重新加载将导致当前的修改丢失！",
     "clickForDetails": "点击查看详情",
     "city": "城市",
     "clear": "清除",

package/lib/cjs/i18n/zh-Hant.json

@@ -11,6 +11,7 @@
     "back": "後退",
     "cancel": "取消",
     "changePassword": "修改密碼",
+    "changeReload": "{0} 剛更改了數據，是否重新加載？重新加載將導致當前的修改丟失！",
     "clickForDetails": "點擊查看詳情",
     "city": "城市",
     "clear": "清除",

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

@@ -9,26 +9,32 @@ export interface IUserData {
     readonly deviceId: string;
     /**
      * User name
+     * 用户姓名
      */
     readonly name: string;
     /**
      * User avatar
+     * 用户头像
      */
     readonly avatar?: string;
     /**
      * Organization id
+     * 机构编号
      */
     readonly organization?: number;
     /**
      * User role value
+     * 用户角色值
      */
     readonly role: number;
     /**
      * Refresh seconds
+     * 刷新间隔秒数
      */
     readonly seconds: number;
     /**
      * Access token
+     * 访问令牌
      */
     readonly token: string;
 }

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

@@ -526,8 +526,9 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/lib/mjs/app/CoreApp.js

@@ -1266,16 +1266,16 @@ export class CoreApp {
         // Clear
         this.userLogout();
         // Go to login page
-        this.toLoginPage();
+        this.toLoginPage(false, true);
     }
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin) {
-        const url = '/?url=' +
-            encodeURIComponent(location.href) +
-            (tryLogin ? '' : '&tryLogin=false');
+    toLoginPage(tryLogin, removeUrl) {
+        const url = `/?tryLogin=${tryLogin !== null && tryLogin !== void 0 ? tryLogin : false}` +
+            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
         this.navigate(url);
     }
     /**

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

@@ -459,8 +459,9 @@ export interface IApp {
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended

package/lib/mjs/i18n/en.json

@@ -11,6 +11,7 @@
     "back": "Back",
     "cancel": "Cancel",
     "changePassword": "Change password",
+    "changeReload": "{0} has just changed data, do you want to reload? Reloading will cause the current modification to be lost!",
     "clickForDetails": "Click for details",
     "city": "City",
     "clear": "Clear",

package/lib/mjs/i18n/zh-Hans.json

@@ -11,6 +11,7 @@
     "back": "后退",
     "cancel": "取消",
     "changePassword": "修改密码",
+    "changeReload": "{0} 刚更改了数据，是否重新加载？重新加载将导致当前的修改丢失！",
     "clickForDetails": "点击查看详情",
     "city": "城市",
     "clear": "清除",

package/lib/mjs/i18n/zh-Hant.json

@@ -11,6 +11,7 @@
     "back": "後退",
     "cancel": "取消",
     "changePassword": "修改密碼",
+    "changeReload": "{0} 剛更改了數據，是否重新加載？重新加載將導致當前的修改丟失！",
     "clickForDetails": "點擊查看詳情",
     "city": "城市",
     "clear": "清除",

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

@@ -9,26 +9,32 @@ export interface IUserData {
     readonly deviceId: string;
     /**
      * User name
+     * 用户姓名
      */
     readonly name: string;
     /**
      * User avatar
+     * 用户头像
      */
     readonly avatar?: string;
     /**
      * Organization id
+     * 机构编号
      */
     readonly organization?: number;
     /**
      * User role value
+     * 用户角色值
      */
     readonly role: number;
     /**
      * Refresh seconds
+     * 刷新间隔秒数
      */
     readonly seconds: number;
     /**
      * Access token
+     * 访问令牌
      */
     readonly token: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.29",
+    "version": "1.4.31",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,7 +52,7 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.25",
+        "@etsoo/notificationbase": "^1.1.26",
         "@etsoo/restclient": "^1.0.89",
         "@etsoo/shared": "^1.2.8",
         "crypto-js": "^4.1.1"

package/src/app/CoreApp.ts

@@ -1659,18 +1659,19 @@ export abstract class CoreApp<
         this.userLogout();
 
         // Go to login page
-        this.toLoginPage();
+        this.toLoginPage(false, true);
     }
 
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean) {
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
         const url =
-            '/?url=' +
-            encodeURIComponent(location.href) +
-            (tryLogin ? '' : '&tryLogin=false');
+            `/?tryLogin=${tryLogin ?? false}` +
+            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
+
         this.navigate(url);
     }
 

package/src/app/IApp.ts

@@ -619,8 +619,9 @@ export interface IApp {
     /**
      * Go to the login page
      * @param tryLogin Try to login again
+     * @param removeUrl Remove current URL for reuse
      */
-    toLoginPage(tryLogin?: boolean): void;
+    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
 
     /**
      * Try login, returning false means is loading

package/src/i18n/en.json

@@ -11,6 +11,7 @@
     "back": "Back",
     "cancel": "Cancel",
     "changePassword": "Change password",
+    "changeReload": "{0} has just changed data, do you want to reload? Reloading will cause the current modification to be lost!",
     "clickForDetails": "Click for details",
     "city": "City",
     "clear": "Clear",

package/src/i18n/zh-Hans.json

@@ -11,6 +11,7 @@
     "back": "后退",
     "cancel": "取消",
     "changePassword": "修改密码",
+    "changeReload": "{0} 刚更改了数据，是否重新加载？重新加载将导致当前的修改丢失！",
     "clickForDetails": "点击查看详情",
     "city": "城市",
     "clear": "清除",

package/src/i18n/zh-Hant.json

@@ -11,6 +11,7 @@
     "back": "後退",
     "cancel": "取消",
     "changePassword": "修改密碼",
+    "changeReload": "{0} 剛更改了數據，是否重新加載？重新加載將導致當前的修改丟失！",
     "clickForDetails": "點擊查看詳情",
     "city": "城市",
     "clear": "清除",

package/src/state/User.ts

@@ -11,31 +11,37 @@ export interface IUserData {
 
     /**
      * User name
+     * 用户姓名
      */
     readonly name: string;
 
     /**
      * User avatar
+     * 用户头像
      */
     readonly avatar?: string;
 
     /**
      * Organization id
+     * 机构编号
      */
     readonly organization?: number;
 
     /**
      * User role value
+     * 用户角色值
      */
     readonly role: number;
 
     /**
      * Refresh seconds
+     * 刷新间隔秒数
      */
     readonly seconds: number;
 
     /**
      * Access token
+     * 访问令牌
      */
     readonly token: string;
 }