@etsoo/appscript 1.2.72 → 1.2.75

package/.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v1
         with:
-          node-version: '14.18'
+          node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
 
       # Named after Continuous Integration, installs dependencies directly from package-lock.json

package/__tests__/app/CoreApp.ts

@@ -8,7 +8,7 @@ import {
 } from '@etsoo/notificationbase';
 import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
-import { BusinessUtils, IUser } from '../../src';
+import { BusinessUtils, IUser, UserRole } from '../../src';
 import { AddressUtils } from '../../src/address/AddressUtils';
 import { IAppSettings } from '../../src/app/AppSettings';
 import { CoreApp } from '../../src/app/CoreApp';
@@ -161,6 +161,12 @@ test('Tests for initCallUpdateLocal', () => {
     expect(passphrase).not.toBeNull();
 });
 
+test('Tests for getRoles', () => {
+    var roles = app.getRoles(UserRole.User | UserRole.Manager | UserRole.Admin);
+    expect(roles.length).toBe(3);
+    expect(roles.map((r) => r.id)).toEqual([8, 128, 8192]);
+});
+
 test('Tests for getUnitLabel', () => {
     expect(app.getUnitLabel(12, true)).toBe('每年');
 });

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

@@ -260,18 +260,26 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
-    /**
-     * Get entity status label
-     * @param data Input data
-     */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status: number | null | undefined): string;
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -702,18 +710,42 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto[];
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto<string>[];
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto<number>[];
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto<number>[];
+    /**
+     * Get status label
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getStatusLabel(status: number | null | undefined): string;
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

package/lib/cjs/app/CoreApp.js

@@ -9,7 +9,9 @@ const AddressRegion_1 = require("../address/AddressRegion");
 const AddressUtils_1 = require("../address/AddressUtils");
 const BridgeUtils_1 = require("../bridges/BridgeUtils");
 const BusinessUtils_1 = require("../business/BusinessUtils");
+const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
+const UserRole_1 = require("./UserRole");
 /**
  * App fields
  */
@@ -828,6 +830,56 @@ class CoreApp {
             return this.cachedRefreshToken;
         return this.storage.getData(this.fields.headerToken);
     }
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = shared_1.DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            if (typeof id !== 'number')
+                continue;
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id, label });
+        }
+        return list;
+    }
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumStrList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = shared_1.DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id: id.toString(), label });
+        }
+        return list;
+    }
     /**
      * Get all regions
      * @returns Regions
@@ -838,13 +890,32 @@ class CoreApp {
         });
     }
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
      */
-    getEntityStatusLabel(data) {
-        if (data == null || data.entityStatus == null)
+    getRoles(role) {
+        return this.getEnumList(UserRole_1.UserRole, 'role', (id, _key) => {
+            if ((id & role) > 0)
+                return id;
+        });
+    }
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList() {
+        return this.getEnumList(EntityStatus_1.EntityStatus, 'status');
+    }
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status) {
+        var _a;
+        if (status == null)
             return '';
-        return BusinessUtils_1.BusinessUtils.getEntityStatusLabel(data.entityStatus, this.labelDelegate);
+        const key = EntityStatus_1.EntityStatus[status];
+        return (_a = this.get('status' + key)) !== null && _a !== void 0 ? _a : key;
     }
     /**
      * Get refresh token from response headers

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

@@ -1,7 +1,6 @@
 import { DataTypes } from '@etsoo/shared';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
-import { EntityStatus } from './EntityStatus';
 import { ProductUnit } from './ProductUnit';
 /**
  * Business utils
@@ -14,31 +13,13 @@ export declare namespace BusinessUtils {
      * @returns Collection
      */
     function getCurrencies(currencyNames: string[], func: ICultureGet): IdLabelDto<string>[];
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatusLabel(status: EntityStatus, func: ICultureGet): string;
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatus(func: ICultureGet): {
-        id: EntityStatus;
-        label: string;
-    }[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
      * @param startMonth Start month, 0 as Jan.
      * @returns 12 months
      */
-    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem[];
+    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem<number>[];
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

package/lib/cjs/business/BusinessUtils.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BusinessUtils = void 0;
 const shared_1 = require("@etsoo/shared");
 const __1 = require("..");
-const EntityStatus_1 = require("./EntityStatus");
 const ProductUnit_1 = require("./ProductUnit");
 /**
  * Business utils
@@ -26,35 +25,6 @@ var BusinessUtils;
         });
     }
     BusinessUtils.getCurrencies = getCurrencies;
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatusLabel(status, func) {
-        var _a;
-        const key = EntityStatus_1.EntityStatus[status];
-        return (_a = func('status' + key)) !== null && _a !== void 0 ? _a : key;
-    }
-    BusinessUtils.getEntityStatusLabel = getEntityStatusLabel;
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatus(func) {
-        return shared_1.DataTypes.getEnumKeys(EntityStatus_1.EntityStatus).map((key) => {
-            const id = shared_1.DataTypes.getEnumByKey(EntityStatus_1.EntityStatus, key);
-            return {
-                id,
-                label: getEntityStatusLabel(id, func)
-            };
-        });
-    }
-    BusinessUtils.getEntityStatus = getEntityStatus;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/cjs/dto/IdLabelDto.d.ts

@@ -1,9 +1,8 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdDto } from './IdDto';
 /**
  * Dto with id and label field
  */
-export declare type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> & {
+export declare type IdLabelDto<T extends DataTypes.IdType = number> = DataTypes.IdItem<T> & {
     /**
      * Label
      */
@@ -12,4 +11,4 @@ export declare type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> &
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto[] : IdLabelDto<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto<number>[] : IdLabelDto<string>[];

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

@@ -36,12 +36,14 @@
     "description": "Description",
     "done": "Done",
     "download": "Download",
+    "dragIndicator": "Drag indicator",
     "edit": "Edit",
     "email": "Email",
     "emailAddresses": "Email addresses",
     "enabled": "Enabled",
     "entityStatus": "Status",
     "environmentChanged": "The operating environment has changed, please log in again",
+    "error": "Error",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",

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

@@ -36,12 +36,14 @@
     "description": "描述",
     "done": "完成",
     "download": "下载",
+    "dragIndicator": "拖动指示",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",
     "enabled": "已启用",
     "entityStatus": "状态",
     "environmentChanged": "运行环境已改变，请重新登录",
+    "error": "错误",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",

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

@@ -36,12 +36,14 @@
     "description": "描述",
     "done": "完成",
     "download": "下載",
+    "dragIndicator": "拖動指示",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",
     "enabled": "已啟用",
     "entityStatus": "狀態",
     "environmentChanged": "運行環境已改變，請重新登錄",
+    "error": "錯誤",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",

package/lib/cjs/index.d.ts

@@ -13,7 +13,6 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './def/ListItem';
-export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
 export * from './dto/InitCallDto';

package/lib/cjs/index.js

@@ -36,7 +36,6 @@ __exportStar(require("./business/RepeatOption"), exports);
 // def
 __exportStar(require("./def/ListItem"), exports);
 // dto
-__exportStar(require("./dto/IdDto"), exports);
 __exportStar(require("./dto/IdLabelDto"), exports);
 __exportStar(require("./dto/IdLabelPrimaryDto"), exports);
 __exportStar(require("./dto/InitCallDto"), exports);

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

@@ -260,18 +260,26 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
-    /**
-     * Get entity status label
-     * @param data Input data
-     */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status: number | null | undefined): string;
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -702,18 +710,42 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Cached token
      */
     getCacheToken(): string | undefined;
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto[];
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto<string>[];
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto<number>[];
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto<number>[];
+    /**
+     * Get status label
+     * @param status Status value
      */
-    getEntityStatusLabel<D extends {
-        entityStatus?: number;
-    }>(data?: D): string;
+    getStatusLabel(status: number | null | undefined): string;
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call

package/lib/mjs/app/CoreApp.js

@@ -1,12 +1,14 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
 import { ApiDataError } from '@etsoo/restclient';
-import { DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
+import { DataTypes, DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, SHA3 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
+import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
+import { UserRole } from './UserRole';
 /**
  * App fields
  */
@@ -825,6 +827,56 @@ export class CoreApp {
             return this.cachedRefreshToken;
         return this.storage.getData(this.fields.headerToken);
     }
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            if (typeof id !== 'number')
+                continue;
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id, label });
+        }
+        return list;
+    }
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    getEnumStrList(em, prefix, filter) {
+        var _a;
+        const list = [];
+        const keys = DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null)
+                    continue;
+                id = fid;
+            }
+            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+            list.push({ id: id.toString(), label });
+        }
+        return list;
+    }
     /**
      * Get all regions
      * @returns Regions
@@ -835,13 +887,32 @@ export class CoreApp {
         });
     }
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
      */
-    getEntityStatusLabel(data) {
-        if (data == null || data.entityStatus == null)
+    getRoles(role) {
+        return this.getEnumList(UserRole, 'role', (id, _key) => {
+            if ((id & role) > 0)
+                return id;
+        });
+    }
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList() {
+        return this.getEnumList(EntityStatus, 'status');
+    }
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status) {
+        var _a;
+        if (status == null)
             return '';
-        return BusinessUtils.getEntityStatusLabel(data.entityStatus, this.labelDelegate);
+        const key = EntityStatus[status];
+        return (_a = this.get('status' + key)) !== null && _a !== void 0 ? _a : key;
     }
     /**
      * Get refresh token from response headers

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

@@ -1,7 +1,6 @@
 import { DataTypes } from '@etsoo/shared';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
-import { EntityStatus } from './EntityStatus';
 import { ProductUnit } from './ProductUnit';
 /**
  * Business utils
@@ -14,31 +13,13 @@ export declare namespace BusinessUtils {
      * @returns Collection
      */
     function getCurrencies(currencyNames: string[], func: ICultureGet): IdLabelDto<string>[];
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatusLabel(status: EntityStatus, func: ICultureGet): string;
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatus(func: ICultureGet): {
-        id: EntityStatus;
-        label: string;
-    }[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
      * @param startMonth Start month, 0 as Jan.
      * @returns 12 months
      */
-    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem[];
+    function getMonths(monthLabels: string[], startMonth?: number): DataTypes.IdLabelItem<number>[];
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

package/lib/mjs/business/BusinessUtils.js

@@ -1,6 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
 import { RepeatOption } from '..';
-import { EntityStatus } from './EntityStatus';
 import { ProductUnit } from './ProductUnit';
 /**
  * Business utils
@@ -23,35 +22,6 @@ export var BusinessUtils;
         });
     }
     BusinessUtils.getCurrencies = getCurrencies;
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatusLabel(status, func) {
-        var _a;
-        const key = EntityStatus[status];
-        return (_a = func('status' + key)) !== null && _a !== void 0 ? _a : key;
-    }
-    BusinessUtils.getEntityStatusLabel = getEntityStatusLabel;
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    function getEntityStatus(func) {
-        return DataTypes.getEnumKeys(EntityStatus).map((key) => {
-            const id = DataTypes.getEnumByKey(EntityStatus, key);
-            return {
-                id,
-                label: getEntityStatusLabel(id, func)
-            };
-        });
-    }
-    BusinessUtils.getEntityStatus = getEntityStatus;
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/lib/mjs/dto/IdLabelDto.d.ts

@@ -1,9 +1,8 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdDto } from './IdDto';
 /**
  * Dto with id and label field
  */
-export declare type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> & {
+export declare type IdLabelDto<T extends DataTypes.IdType = number> = DataTypes.IdItem<T> & {
     /**
      * Label
      */
@@ -12,4 +11,4 @@ export declare type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> &
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto[] : IdLabelDto<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto<number>[] : IdLabelDto<string>[];

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

@@ -36,12 +36,14 @@
     "description": "Description",
     "done": "Done",
     "download": "Download",
+    "dragIndicator": "Drag indicator",
     "edit": "Edit",
     "email": "Email",
     "emailAddresses": "Email addresses",
     "enabled": "Enabled",
     "entityStatus": "Status",
     "environmentChanged": "The operating environment has changed, please log in again",
+    "error": "Error",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",

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

@@ -36,12 +36,14 @@
     "description": "描述",
     "done": "完成",
     "download": "下载",
+    "dragIndicator": "拖动指示",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",
     "enabled": "已启用",
     "entityStatus": "状态",
     "environmentChanged": "运行环境已改变，请重新登录",
+    "error": "错误",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",

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

@@ -36,12 +36,14 @@
     "description": "描述",
     "done": "完成",
     "download": "下載",
+    "dragIndicator": "拖動指示",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",
     "enabled": "已啟用",
     "entityStatus": "狀態",
     "environmentChanged": "運行環境已改變，請重新登錄",
+    "error": "錯誤",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",

package/lib/mjs/index.d.ts

@@ -13,7 +13,6 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './def/ListItem';
-export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
 export * from './dto/InitCallDto';

package/lib/mjs/index.js

@@ -19,7 +19,6 @@ export * from './business/RepeatOption';
 // def
 export * from './def/ListItem';
 // dto
-export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
 export * from './dto/InitCallDto';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.72",
+    "version": "1.2.75",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.5",
         "@etsoo/restclient": "^1.0.70",
-        "@etsoo/shared": "^1.1.41",
+        "@etsoo/shared": "^1.1.44",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -65,9 +65,9 @@
         "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
         "@types/jest": "^28.1.6",
-        "@typescript-eslint/eslint-plugin": "^5.32.0",
-        "@typescript-eslint/parser": "^5.32.0",
-        "eslint": "^8.21.0",
+        "@typescript-eslint/eslint-plugin": "^5.33.0",
+        "@typescript-eslint/parser": "^5.33.0",
+        "eslint": "^8.22.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^28.1.3",

package/src/app/CoreApp.ts

@@ -31,13 +31,14 @@ import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
+import { EntityStatus } from '../business/EntityStatus';
 import { ProductUnit } from '../business/ProductUnit';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
-import { IUser, IUserData } from '../state/User';
+import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
 
@@ -374,18 +375,30 @@ export interface ICoreApp<
      */
     getCacheToken(): string | undefined;
 
-    /**
-     * Get entity status label
-     * @param data Input data
-     */
-    getEntityStatusLabel<D extends { entityStatus?: number }>(data?: D): string;
-
     /**
      * Get all regions
      * @returns Regions
      */
     getRegions(): AddressRegion[];
 
+    /**
+     * Get roles
+     * @param role Combination role value
+     */
+    getRoles(role: number): IdLabelDto[];
+
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status: number | null | undefined): string;
+
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList(): IdLabelDto[];
+
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -1592,6 +1605,67 @@ export abstract class CoreApp<
         return this.storage.getData<string>(this.fields.headerToken);
     }
 
+    /**
+     * Get enum item number id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
+        em: E,
+        prefix: string,
+        filter?: (
+            id: E[keyof E],
+            key: keyof E & string
+        ) => E[keyof E] | undefined
+    ): IdLabelDto[] {
+        const list: IdLabelDto<number>[] = [];
+        const keys = DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key as keyof E];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null) continue;
+                id = fid;
+            }
+            if (typeof id !== 'number') continue;
+            var label = this.get<string>(prefix + key) ?? key;
+            list.push({ id, label });
+        }
+        return list;
+    }
+
+    /**
+     * Get enum item string id list
+     * @param em Enum
+     * @param prefix Label prefix
+     * @param filter Filter
+     * @returns List
+     */
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
+        em: E,
+        prefix: string,
+        filter?: (
+            id: E[keyof E],
+            key: keyof E & string
+        ) => E[keyof E] | undefined
+    ): IdLabelDto<string>[] {
+        const list: IdLabelDto<string>[] = [];
+        const keys = DataTypes.getEnumKeys(em);
+        for (const key of keys) {
+            let id = em[key as keyof E];
+            if (filter) {
+                const fid = filter(id, key);
+                if (fid == null) continue;
+                id = fid;
+            }
+            var label = this.get<string>(prefix + key) ?? key;
+            list.push({ id: id.toString(), label });
+        }
+        return list;
+    }
+
     /**
      * Get all regions
      * @returns Regions
@@ -1603,15 +1677,31 @@ export abstract class CoreApp<
     }
 
     /**
-     * Get entity status label
-     * @param data Input data
+     * Get roles
+     * @param role Combination role value
      */
-    getEntityStatusLabel<D extends { entityStatus?: number }>(data?: D) {
-        if (data == null || data.entityStatus == null) return '';
-        return BusinessUtils.getEntityStatusLabel(
-            data.entityStatus,
-            this.labelDelegate
-        );
+    getRoles(role: number) {
+        return this.getEnumList(UserRole, 'role', (id, _key) => {
+            if ((id & role) > 0) return id;
+        });
+    }
+
+    /**
+     * Get status list
+     * @returns list
+     */
+    getStatusList() {
+        return this.getEnumList(EntityStatus, 'status');
+    }
+
+    /**
+     * Get status label
+     * @param status Status value
+     */
+    getStatusLabel(status: number | null | undefined) {
+        if (status == null) return '';
+        const key = EntityStatus[status];
+        return this.get<string>('status' + key) ?? key;
     }
 
     /**

package/src/business/BusinessUtils.ts

@@ -2,7 +2,6 @@ import { DataTypes } from '@etsoo/shared';
 import { RepeatOption } from '..';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
-import { EntityStatus } from './EntityStatus';
 import { ProductUnit } from './ProductUnit';
 
 /**
@@ -25,37 +24,6 @@ export namespace BusinessUtils {
         }));
     }
 
-    /**
-     * Get entity status's label
-     * Please define the label with key 'statusNormal' for Normal status
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    export function getEntityStatusLabel(
-        status: EntityStatus,
-        func: ICultureGet
-    ) {
-        const key = EntityStatus[status];
-        return func('status' + key) ?? key;
-    }
-
-    /**
-     * Get entity status collection
-     * @param unit Unit
-     * @param func Label delegate
-     * @returns Label
-     */
-    export function getEntityStatus(func: ICultureGet) {
-        return DataTypes.getEnumKeys(EntityStatus).map((key) => {
-            const id = DataTypes.getEnumByKey(EntityStatus, key)!;
-            return {
-                id,
-                label: getEntityStatusLabel(id, func)
-            };
-        });
-    }
-
     /**
      * Get 12-month items
      * @param monthLabels Month labels

package/src/dto/IdLabelDto.ts

@@ -1,19 +1,19 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdDto } from './IdDto';
 
 /**
  * Dto with id and label field
  */
-export type IdLabelDto<T extends DataTypes.IdType = number> = IdDto<T> & {
-    /**
-     * Label
-     */
-    label: string;
-};
+export type IdLabelDto<T extends DataTypes.IdType = number> =
+    DataTypes.IdItem<T> & {
+        /**
+         * Label
+         */
+        label: string;
+    };
 
 /**
  * Conditional IdLabel type
  */
 export type IdLabelConditional<T extends boolean> = T extends true
-    ? IdLabelDto[]
+    ? IdLabelDto<number>[]
     : IdLabelDto<string>[];

package/src/i18n/en-US.json

@@ -36,12 +36,14 @@
     "description": "Description",
     "done": "Done",
     "download": "Download",
+    "dragIndicator": "Drag indicator",
     "edit": "Edit",
     "email": "Email",
     "emailAddresses": "Email addresses",
     "enabled": "Enabled",
     "entityStatus": "Status",
     "environmentChanged": "The operating environment has changed, please log in again",
+    "error": "Error",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",

package/src/i18n/zh-CN.json

@@ -36,12 +36,14 @@
     "description": "描述",
     "done": "完成",
     "download": "下载",
+    "dragIndicator": "拖动指示",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",
     "enabled": "已启用",
     "entityStatus": "状态",
     "environmentChanged": "运行环境已改变，请重新登录",
+    "error": "错误",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",

package/src/i18n/zh-HK.json

@@ -36,12 +36,14 @@
     "description": "描述",
     "done": "完成",
     "download": "下載",
+    "dragIndicator": "拖動指示",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",
     "enabled": "已啟用",
     "entityStatus": "狀態",
     "environmentChanged": "運行環境已改變，請重新登錄",
+    "error": "錯誤",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",

package/src/index.ts

@@ -24,7 +24,6 @@ export * from './business/RepeatOption';
 export * from './def/ListItem';
 
 // dto
-export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
 export * from './dto/InitCallDto';

package/lib/cjs/dto/IdDto.d.ts

@@ -1,10 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Dto with id field
- */
-export declare type IdDto<T extends DataTypes.IdType = number> = {
-    /**
-     * Id
-     */
-    readonly id: T;
-};

package/lib/cjs/dto/IdDto.js

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

package/lib/mjs/dto/IdDto.d.ts

@@ -1,10 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Dto with id field
- */
-export declare type IdDto<T extends DataTypes.IdType = number> = {
-    /**
-     * Id
-     */
-    readonly id: T;
-};

package/lib/mjs/dto/IdDto.js

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

package/src/dto/IdDto.ts

@@ -1,11 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-
-/**
- * Dto with id field
- */
-export type IdDto<T extends DataTypes.IdType = number> = {
-    /**
-     * Id
-     */
-    readonly id: T;
-};