@etsoo/appscript 1.1.15 → 1.1.19

package/__tests__/result/ActionResult.ts

@@ -22,5 +22,5 @@ test('Tests for ActionResultError.format', () => {
 
     // Assert
     expect(error.name).toBe('ActionResultError');
-    expect(error.message).toBe(`${message}(${status}, ApiError)`);
+    expect(error.message).toBe(`${message} (${status}, ApiError)`);
 });

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

@@ -109,6 +109,17 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    freshCountdownUI(callback: () => void): void;
     /**
      * Get culture resource
      * @param key key
@@ -147,11 +158,6 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Callback where exit a page
      */
     pageExit(): void;
-    /**
-     * Fresh countdown UI
-     * @param callback Callback
-     */
-    freshCountdownUI(callback: () => void): void;
     /**
      * Refresh token
      */
@@ -303,6 +309,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result: IActionResult, forceToLocal?: boolean): void;
     /**
      * Get culture resource
      * @param key key

package/lib/cjs/app/CoreApp.js

@@ -98,6 +98,7 @@ class CoreApp {
      * @param result Action result
      */
     alertResult(result) {
+        this.formatResult(result);
         this.notifier.alert(ActionResultError_1.ActionResultError.format(result));
     }
     /**
@@ -244,6 +245,17 @@ class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result, forceToLocal) {
+        if ((result.title == null || forceToLocal) && result.type != null) {
+            const key = shared_1.Utils.formatLowerLetter(result.type);
+            result.title = this.get(key);
+        }
+    }
     /**
      * Get culture resource
      * @param key key

package/lib/cjs/result/ActionResultError.js

@@ -28,7 +28,7 @@ class ActionResultError extends Error {
             addtions.push(result.status);
         if (result.type && result.type != 'about:blank')
             addtions.push(result.type);
-        var add = addtions.length > 0 ? `(${addtions.join(', ')})` : '';
+        var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }
 }

package/lib/cjs/result/IActionResult.d.ts

@@ -40,11 +40,11 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Title
      */
-    readonly title?: string;
+    title?: string;
     /**
      * Detail
      */
-    readonly detail?: string;
+    detail?: string;
     /**
      * Trace id
      */

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

@@ -109,6 +109,17 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    freshCountdownUI(callback: () => void): void;
     /**
      * Get culture resource
      * @param key key
@@ -147,11 +158,6 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Callback where exit a page
      */
     pageExit(): void;
-    /**
-     * Fresh countdown UI
-     * @param callback Callback
-     */
-    freshCountdownUI(callback: () => void): void;
     /**
      * Refresh token
      */
@@ -303,6 +309,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result: IActionResult, forceToLocal?: boolean): void;
     /**
      * Get culture resource
      * @param key key

package/lib/mjs/app/CoreApp.js

@@ -1,4 +1,4 @@
-import { DateUtils, DomUtils, NumberUtils, StorageUtils } from '@etsoo/shared';
+import { DateUtils, DomUtils, NumberUtils, StorageUtils, Utils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { ActionResultError } from '../result/ActionResultError';
 /**
@@ -95,6 +95,7 @@ export class CoreApp {
      * @param result Action result
      */
     alertResult(result) {
+        this.formatResult(result);
         this.notifier.alert(ActionResultError.format(result));
     }
     /**
@@ -241,6 +242,17 @@ export class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result, forceToLocal) {
+        if ((result.title == null || forceToLocal) && result.type != null) {
+            const key = Utils.formatLowerLetter(result.type);
+            result.title = this.get(key);
+        }
+    }
     /**
      * Get culture resource
      * @param key key

package/lib/mjs/result/ActionResultError.js

@@ -25,7 +25,7 @@ export class ActionResultError extends Error {
             addtions.push(result.status);
         if (result.type && result.type != 'about:blank')
             addtions.push(result.type);
-        var add = addtions.length > 0 ? `(${addtions.join(', ')})` : '';
+        var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
         return `${result.title || 'Error'}${add}`;
     }
 }

package/lib/mjs/result/IActionResult.d.ts

@@ -40,11 +40,11 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Title
      */
-    readonly title?: string;
+    title?: string;
     /**
      * Detail
      */
-    readonly detail?: string;
+    detail?: string;
     /**
      * Trace id
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.15",
+    "version": "1.1.19",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -34,22 +34,27 @@
     },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/ETSOO/NotificationBase.git"
+        "url": "git+https://github.com/ETSOO/AppScript.git"
     },
     "keywords": [
         "notification",
-        "TypeScript"
+        "TypeScript",
+        "ETSOO",
+        "SmartERP",
+        "司友云平台",
+        "青岛亿速思维",
+        "上海亿商"
     ],
     "author": "Garry Xiao",
     "license": "MIT",
     "bugs": {
-        "url": "https://github.com/ETSOO/NotificationBase/issues"
+        "url": "https://github.com/ETSOO/AppScript/issues"
     },
-    "homepage": "https://github.com/ETSOO/NotificationBase#readme",
+    "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.0.87",
-        "@etsoo/restclient": "^1.0.55",
-        "@etsoo/shared": "^1.0.53"
+        "@etsoo/notificationbase": "^1.0.88",
+        "@etsoo/restclient": "^1.0.56",
+        "@etsoo/shared": "^1.0.57"
     },
     "devDependencies": {
         "@babel/cli": "^7.15.7",
@@ -63,7 +68,7 @@
         "eslint": "^8.0.1",
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-plugin-import": "^2.25.2",
-        "jest": "^27.3.0",
+        "jest": "^27.3.1",
         "ts-jest": "^27.0.7",
         "typescript": "^4.4.4"
     }

package/src/app/CoreApp.ts

@@ -5,7 +5,8 @@ import {
     DateUtils,
     DomUtils,
     NumberUtils,
-    StorageUtils
+    StorageUtils,
+    Utils
 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { ActionResultError } from '../result/ActionResultError';
@@ -152,6 +153,19 @@ export interface ICoreApp<
         options?: Intl.NumberFormatOptions
     ): string | undefined;
 
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+
+    /**
+     * Fresh countdown UI
+     * @param callback Callback
+     */
+    freshCountdownUI(callback: () => void): void;
+
     /**
      * Get culture resource
      * @param key key
@@ -195,12 +209,6 @@ export interface ICoreApp<
      */
     pageExit(): void;
 
-    /**
-     * Fresh countdown UI
-     * @param callback Callback
-     */
-    freshCountdownUI(callback: () => void): void;
-
     /**
      * Refresh token
      */
@@ -382,6 +390,7 @@ export abstract class CoreApp<
      * @param result Action result
      */
     alertResult(result: IActionResult) {
+        this.formatResult(result);
         this.notifier.alert(ActionResultError.format(result));
     }
 
@@ -572,6 +581,18 @@ export abstract class CoreApp<
         return error.toString();
     }
 
+    /**
+     * Format result text
+     * @param result Action result
+     * @param forceToLocal Force to local labels
+     */
+    formatResult(result: IActionResult, forceToLocal?: boolean) {
+        if ((result.title == null || forceToLocal) && result.type != null) {
+            const key = Utils.formatLowerLetter(result.type);
+            result.title = this.get(key);
+        }
+    }
+
     /**
      * Get culture resource
      * @param key key

package/src/result/ActionResultError.ts

@@ -15,7 +15,7 @@ export class ActionResultError extends Error {
         if (result.type && result.type != 'about:blank')
             addtions.push(result.type);
 
-        var add = addtions.length > 0 ? `(${addtions.join(', ')})` : '';
+        var add = addtions.length > 0 ? ` (${addtions.join(', ')})` : '';
 
         return `${result.title || 'Error'}${add}`;
     }

package/src/result/IActionResult.ts

@@ -46,12 +46,12 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Title
      */
-    readonly title?: string;
+    title?: string;
 
     /**
      * Detail
      */
-    readonly detail?: string;
+    detail?: string;
 
     /**
      * Trace id