@etsoo/appscript 1.2.76 → 1.2.79

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

@@ -235,8 +235,9 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Format result text
      * @param result Action result
      * @param forceToLocal Force to local labels
+     * @returns Message
      */
-    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    formatResult(result: IActionResult, forceToLocal?: boolean): string;
     /**
      * Fresh countdown UI
      * @param callback Callback
@@ -691,7 +692,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param result Action result
      * @param forceToLocal Force to local labels
      */
-    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    formatResult(result: IActionResult, forceToLocal?: boolean): string;
     /**
      * Get culture resource
      * @param key key

package/lib/cjs/app/CoreApp.js

@@ -421,8 +421,7 @@ class CoreApp {
      * @param callback Callback
      */
     alertResult(result, callback) {
-        this.formatResult(result);
-        this.notifier.alert(ActionResultError_1.ActionResultError.format(result), callback);
+        this.notifier.alert(this.formatResult(result), callback);
     }
     /**
      * Authorize
@@ -797,6 +796,7 @@ class CoreApp {
             if (fieldLabel)
                 result.title = result.title.format(fieldLabel);
         }
+        return ActionResultError_1.ActionResultError.format(result);
     }
     /**
      * Get culture resource

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

@@ -61,4 +61,13 @@ export declare namespace BusinessUtils {
      * @returns Units
      */
     function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue<T extends {
+        id?: number;
+        sid?: string;
+    }>(item: T, id?: DataTypes.IdType): void;
 }

package/lib/cjs/business/BusinessUtils.js

@@ -127,4 +127,18 @@ var BusinessUtils;
         return getUnits(func, options, isJoined);
     }
     BusinessUtils.getRepeatOptions = getRepeatOptions;
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue(item, id) {
+        if (id == null)
+            return;
+        if (typeof id === 'number')
+            item.id = id;
+        else
+            item.sid = id;
+    }
+    BusinessUtils.setIdValue = setIdValue;
 })(BusinessUtils = exports.BusinessUtils || (exports.BusinessUtils = {}));

package/lib/cjs/i18n/en-US.json

@@ -48,6 +48,7 @@
     "expiry": "Expiry",
     "failed": "Operation failed",
     "field": "Field",
+    "help": "Help",
     "id": "Number#",
     "info": "Info",
     "itemExists": "'{0}' already exists",

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

@@ -48,6 +48,7 @@
     "expiry": "到期时间",
     "failed": "操作失败",
     "field": "字段",
+    "help": "帮助",
     "id": "编号",
     "info": "信息",
     "itemExists": "'{0}'已经存在",

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

@@ -48,6 +48,7 @@
     "expiry": "到期時間",
     "failed": "操作失敗",
     "field": "字段",
+    "help": "幫助",
     "id": "編號",
     "info": "信息",
     "itemExists": "'{0}'已经存在",

package/lib/cjs/index.d.ts

@@ -27,6 +27,8 @@ export * from './result/IActionResult';
 export * from './result/InitCallResult';
 export * from './rq/LoginIdRQ';
 export * from './rq/LoginRQ';
+export * from './rq/QueryRQ';
+export * from './rq/TiplistRQ';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/cjs/index.js

@@ -55,6 +55,8 @@ __exportStar(require("./result/InitCallResult"), exports);
 // rq
 __exportStar(require("./rq/LoginIdRQ"), exports);
 __exportStar(require("./rq/LoginRQ"), exports);
+__exportStar(require("./rq/QueryRQ"), exports);
+__exportStar(require("./rq/TiplistRQ"), exports);
 // state
 __exportStar(require("./state/Culture"), exports);
 __exportStar(require("./state/State"), exports);

package/lib/cjs/rq/QueryRQ.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Query request data
+ * com.etsoo.CoreFramework.Models.QueryRQ
+ */
+export declare type QueryRQ = {
+    /**
+     * Number id
+     */
+    id?: number;
+    /**
+     * String id
+     */
+    sid?: number;
+    /**
+     * Current page
+     */
+    currentPage: number;
+    /**
+     * Batch size
+     */
+    batchSize: number;
+    /**
+     * Order by field name
+     */
+    orderBy?: string;
+    /**
+     * Order by ascending
+     */
+    orderByAsc?: boolean;
+};

package/lib/cjs/rq/QueryRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/rq/TiplistRQ.d.ts

@@ -0,0 +1,27 @@
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Tiplist request data
+ * com.etsoo.CoreFramework.Models.TiplistRQ
+ */
+export declare type TiplistRQ = {
+    /**
+     * number id
+     */
+    id?: number;
+    /**
+     * String id
+     */
+    sid?: string;
+    /**
+     * Excluded ids
+     */
+    excludedIds?: DataTypes.IdType[];
+    /**
+     * Filter keyword
+     */
+    keyword?: string;
+    /**
+     * Max items to return
+     */
+    items?: number;
+};

package/lib/cjs/rq/TiplistRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -235,8 +235,9 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Format result text
      * @param result Action result
      * @param forceToLocal Force to local labels
+     * @returns Message
      */
-    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    formatResult(result: IActionResult, forceToLocal?: boolean): string;
     /**
      * Fresh countdown UI
      * @param callback Callback
@@ -691,7 +692,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param result Action result
      * @param forceToLocal Force to local labels
      */
-    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    formatResult(result: IActionResult, forceToLocal?: boolean): string;
     /**
      * Get culture resource
      * @param key key

package/lib/mjs/app/CoreApp.js

@@ -418,8 +418,7 @@ export class CoreApp {
      * @param callback Callback
      */
     alertResult(result, callback) {
-        this.formatResult(result);
-        this.notifier.alert(ActionResultError.format(result), callback);
+        this.notifier.alert(this.formatResult(result), callback);
     }
     /**
      * Authorize
@@ -794,6 +793,7 @@ export class CoreApp {
             if (fieldLabel)
                 result.title = result.title.format(fieldLabel);
         }
+        return ActionResultError.format(result);
     }
     /**
      * Get culture resource

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

@@ -61,4 +61,13 @@ export declare namespace BusinessUtils {
      * @returns Units
      */
     function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue<T extends {
+        id?: number;
+        sid?: string;
+    }>(item: T, id?: DataTypes.IdType): void;
 }

package/lib/mjs/business/BusinessUtils.js

@@ -124,4 +124,18 @@ export var BusinessUtils;
         return getUnits(func, options, isJoined);
     }
     BusinessUtils.getRepeatOptions = getRepeatOptions;
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue(item, id) {
+        if (id == null)
+            return;
+        if (typeof id === 'number')
+            item.id = id;
+        else
+            item.sid = id;
+    }
+    BusinessUtils.setIdValue = setIdValue;
 })(BusinessUtils || (BusinessUtils = {}));

package/lib/mjs/i18n/en-US.json

@@ -48,6 +48,7 @@
     "expiry": "Expiry",
     "failed": "Operation failed",
     "field": "Field",
+    "help": "Help",
     "id": "Number#",
     "info": "Info",
     "itemExists": "'{0}' already exists",

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

@@ -48,6 +48,7 @@
     "expiry": "到期时间",
     "failed": "操作失败",
     "field": "字段",
+    "help": "帮助",
     "id": "编号",
     "info": "信息",
     "itemExists": "'{0}'已经存在",

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

@@ -48,6 +48,7 @@
     "expiry": "到期時間",
     "failed": "操作失敗",
     "field": "字段",
+    "help": "幫助",
     "id": "編號",
     "info": "信息",
     "itemExists": "'{0}'已经存在",

package/lib/mjs/index.d.ts

@@ -27,6 +27,8 @@ export * from './result/IActionResult';
 export * from './result/InitCallResult';
 export * from './rq/LoginIdRQ';
 export * from './rq/LoginRQ';
+export * from './rq/QueryRQ';
+export * from './rq/TiplistRQ';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/mjs/index.js

@@ -36,6 +36,8 @@ export * from './result/InitCallResult';
 // rq
 export * from './rq/LoginIdRQ';
 export * from './rq/LoginRQ';
+export * from './rq/QueryRQ';
+export * from './rq/TiplistRQ';
 // state
 export * from './state/Culture';
 export * from './state/State';

package/lib/mjs/rq/QueryRQ.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Query request data
+ * com.etsoo.CoreFramework.Models.QueryRQ
+ */
+export declare type QueryRQ = {
+    /**
+     * Number id
+     */
+    id?: number;
+    /**
+     * String id
+     */
+    sid?: number;
+    /**
+     * Current page
+     */
+    currentPage: number;
+    /**
+     * Batch size
+     */
+    batchSize: number;
+    /**
+     * Order by field name
+     */
+    orderBy?: string;
+    /**
+     * Order by ascending
+     */
+    orderByAsc?: boolean;
+};

package/lib/mjs/rq/QueryRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/rq/TiplistRQ.d.ts

@@ -0,0 +1,27 @@
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Tiplist request data
+ * com.etsoo.CoreFramework.Models.TiplistRQ
+ */
+export declare type TiplistRQ = {
+    /**
+     * number id
+     */
+    id?: number;
+    /**
+     * String id
+     */
+    sid?: string;
+    /**
+     * Excluded ids
+     */
+    excludedIds?: DataTypes.IdType[];
+    /**
+     * Filter keyword
+     */
+    keyword?: string;
+    /**
+     * Max items to return
+     */
+    items?: number;
+};

package/lib/mjs/rq/TiplistRQ.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.76",
+    "version": "1.2.79",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,21 +52,21 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.5",
+        "@etsoo/notificationbase": "^1.1.6",
         "@etsoo/restclient": "^1.0.70",
-        "@etsoo/shared": "^1.1.45",
+        "@etsoo/shared": "^1.1.46",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.18.10",
-        "@babel/core": "^7.18.10",
+        "@babel/core": "^7.18.13",
         "@babel/plugin-transform-runtime": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
         "@types/jest": "^28.1.7",
-        "@typescript-eslint/eslint-plugin": "^5.33.1",
-        "@typescript-eslint/parser": "^5.33.1",
+        "@typescript-eslint/eslint-plugin": "^5.34.0",
+        "@typescript-eslint/parser": "^5.34.0",
         "eslint": "^8.22.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",

package/src/app/CoreApp.ts

@@ -347,8 +347,9 @@ export interface ICoreApp<
      * Format result text
      * @param result Action result
      * @param forceToLocal Force to local labels
+     * @returns Message
      */
-    formatResult(result: IActionResult, forceToLocal?: boolean): void;
+    formatResult(result: IActionResult, forceToLocal?: boolean): string;
 
     /**
      * Fresh countdown UI
@@ -1109,8 +1110,7 @@ export abstract class CoreApp<
      * @param callback Callback
      */
     alertResult(result: IActionResult, callback?: NotificationReturn<void>) {
-        this.formatResult(result);
-        this.notifier.alert(ActionResultError.format(result), callback);
+        this.notifier.alert(this.formatResult(result), callback);
     }
 
     /**
@@ -1566,6 +1566,8 @@ export abstract class CoreApp<
             const fieldLabel = this.get(result.field.formatInitial(false));
             if (fieldLabel) result.title = result.title.format(fieldLabel);
         }
+
+        return ActionResultError.format(result);
     }
 
     /**

package/src/business/BusinessUtils.ts

@@ -167,4 +167,18 @@ export namespace BusinessUtils {
 
         return getUnits(func, options, isJoined);
     }
+
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    export function setIdValue<T extends { id?: number; sid?: string }>(
+        item: T,
+        id?: DataTypes.IdType
+    ) {
+        if (id == null) return;
+        if (typeof id === 'number') item.id = id;
+        else item.sid = id;
+    }
 }

package/src/i18n/en-US.json

@@ -48,6 +48,7 @@
     "expiry": "Expiry",
     "failed": "Operation failed",
     "field": "Field",
+    "help": "Help",
     "id": "Number#",
     "info": "Info",
     "itemExists": "'{0}' already exists",

package/src/i18n/zh-CN.json

@@ -48,6 +48,7 @@
     "expiry": "到期时间",
     "failed": "操作失败",
     "field": "字段",
+    "help": "帮助",
     "id": "编号",
     "info": "信息",
     "itemExists": "'{0}'已经存在",

package/src/i18n/zh-HK.json

@@ -48,6 +48,7 @@
     "expiry": "到期時間",
     "failed": "操作失敗",
     "field": "字段",
+    "help": "幫助",
     "id": "編號",
     "info": "信息",
     "itemExists": "'{0}'已经存在",

package/src/index.ts

@@ -46,6 +46,8 @@ export * from './result/InitCallResult';
 // rq
 export * from './rq/LoginIdRQ';
 export * from './rq/LoginRQ';
+export * from './rq/QueryRQ';
+export * from './rq/TiplistRQ';
 
 // state
 export * from './state/Culture';

package/src/rq/QueryRQ.ts

@@ -0,0 +1,35 @@
+/**
+ * Query request data
+ * com.etsoo.CoreFramework.Models.QueryRQ
+ */
+export type QueryRQ = {
+    /**
+     * Number id
+     */
+    id?: number;
+
+    /**
+     * String id
+     */
+    sid?: number;
+
+    /**
+     * Current page
+     */
+    currentPage: number;
+
+    /**
+     * Batch size
+     */
+    batchSize: number;
+
+    /**
+     * Order by field name
+     */
+    orderBy?: string;
+
+    /**
+     * Order by ascending
+     */
+    orderByAsc?: boolean;
+};

package/src/rq/TiplistRQ.ts

@@ -0,0 +1,32 @@
+import { DataTypes } from '@etsoo/shared';
+
+/**
+ * Tiplist request data
+ * com.etsoo.CoreFramework.Models.TiplistRQ
+ */
+export type TiplistRQ = {
+    /**
+     * number id
+     */
+    id?: number;
+
+    /**
+     * String id
+     */
+    sid?: string;
+
+    /**
+     * Excluded ids
+     */
+    excludedIds?: DataTypes.IdType[];
+
+    /**
+     * Filter keyword
+     */
+    keyword?: string;
+
+    /**
+     * Max items to return
+     */
+    items?: number;
+};