@etsoo/appscript 1.2.21 → 1.2.25

package/lib/mjs/business/RepeatOption.js

@@ -0,0 +1,57 @@
+/**
+ * Repeat options
+ * Part of ProductUnit, range 10 - 39
+ */
+export var RepeatOption;
+(function (RepeatOption) {
+    /**
+     * Hour
+     * 小时
+     */
+    RepeatOption[RepeatOption["HOUR"] = 10] = "HOUR";
+    /**
+     * Day
+     * 天
+     */
+    RepeatOption[RepeatOption["DAY"] = 11] = "DAY";
+    /**
+     * Year
+     * 年
+     */
+    RepeatOption[RepeatOption["YEAR"] = 12] = "YEAR";
+    /**
+     * Week
+     * 周
+     */
+    RepeatOption[RepeatOption["WEEK"] = 21] = "WEEK";
+    /**
+     * Two weeks
+     * 两周
+     */
+    RepeatOption[RepeatOption["FORTNIGHT"] = 22] = "FORTNIGHT";
+    /**
+     * Four weeks
+     * 四周
+     */
+    RepeatOption[RepeatOption["FOURWEEK"] = 24] = "FOURWEEK";
+    /**
+     * Month
+     * 月
+     */
+    RepeatOption[RepeatOption["MONTH"] = 31] = "MONTH";
+    /**
+     * Two months
+     * 两月
+     */
+    RepeatOption[RepeatOption["BIMONTH"] = 32] = "BIMONTH";
+    /**
+     * Quater(3 months)
+     * 季(三个月)
+     */
+    RepeatOption[RepeatOption["QUATER"] = 33] = "QUATER";
+    /**
+     * Half a year
+     * 半年
+     */
+    RepeatOption[RepeatOption["HALFYEAR"] = 36] = "HALFYEAR";
+})(RepeatOption || (RepeatOption = {}));

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

@@ -12,6 +12,7 @@
     "creation": "Creation",
     "currency": "Currency",
     "delete": "Delete",
+    "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
     "done": "Done",
     "edit": "Edit",
@@ -43,6 +44,7 @@
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
+    "record": "Record",
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
@@ -63,13 +65,35 @@
     "showIt": "Show it",
     "signout": "Sign out",
     "smartERP": "SmartERP",
+    "sortTip": "Drag and drop items to sort",
     "status": "Status",
+    "statusArchived": "Archived",
+    "statusDeleted": "Deleted",
+    "statusFlaged": "Flaged",
+    "statusNormal": "Normla",
+    "statusInactivated": "Inactivated",
     "submit": "Submit",
     "success": "Success",
     "timeDifferenceInvalid": "The time difference between the device and the server is {0}, which exceeds the limit of {1} seconds. Please adjust the device time. If it is abnormal, please inform the administrator",
     "tokenExpiry": "Your session is about to expire. Click the Cancel button to continue",
     "yes": "Yes",
     "unknownError": "Unknown Error",
+    "unitJoin": "per {0}",
+    "unitPC": "PC",
+    "unitSET": "SET",
+    "unitHOUR": "Hour",
+    "unitDAY": "Day",
+    "unitYEAR": "Year",
+    "unitWEEK": "Week",
+    "unitFORTNIGHT": "Fortnight",
+    "unitFOURWEEK": "4-week",
+    "unitMONTH": "Month",
+    "unitBIMONTH": "2-month",
+    "unitQUATER": "Quater",
+    "unitHALFYEAR": "6-month",
+    "unitGRAM": "g",
+    "unitJIN": "½Kg",
+    "unitKILOGRAM": "Kg",
     "warning": "Warning",
     "welcome": "{0}, welcome!"
 }

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

@@ -12,12 +12,13 @@
     "creation": "登记时间",
     "currency": "币种",
     "delete": "删除",
+    "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
     "done": "完成",
     "edit": "修改",
     "email": "电子邮箱",
     "emailAddresses": "电子邮箱",
-    "enabled": "启用",
+    "enabled": "已启用",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",
@@ -43,6 +44,7 @@
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
+    "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "释放刷新",
@@ -63,13 +65,36 @@
     "showIt": "显示",
     "signout": "退出",
     "smartERP": "司友云ERP",
+    "sortTip": "拖拽项目进行排序",
     "status": "状态",
+    "statusArchived": "已归档",
+    "statusDeleted": "已删除",
+    "statusFlaged": "已标记",
+    "statusNormal": "正常",
+    "statusInactivated": "已停用",
     "submit": "提交",
     "success": "成功",
     "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
     "yes": "是",
     "unknownError": "未知错误",
+    "unitJoin": "每{0}",
+    "unitPC": "件",
+    "unitSET": "套",
+    "unitHOUR": "小时",
+    "unitDAY": "天",
+    "unitYEAR": "年",
+    "unitWEEK": "周",
+    "unitFORTNIGHT": "两周",
+    "unitFOURWEEK": "四周",
+    "unitMONTH": "月",
+    "unitBIMONTH": "两月",
+    "unitQUATER": "季度",
+    "unitHALFYEAR": "半年",
+    "unitGRAM": "克",
+    "unitJIN": "斤",
+    "unitKILOGRAM": "公斤",
+    "unitTON": "吨",
     "warning": "警告",
     "welcome": "{0}, 欢迎光临！"
 }

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

@@ -12,12 +12,13 @@
     "creation": "登記時間",
     "currency": "幣種",
     "delete": "刪除",
+    "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
     "done": "完成",
     "edit": "修改",
     "email": "電子郵箱",
     "emailAddresses": "電子郵箱",
-    "enabled": "啟用",
+    "enabled": "已啟用",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",
@@ -43,6 +44,7 @@
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
+    "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "釋放刷新",
@@ -63,13 +65,35 @@
     "showIt": "顯示",
     "signout": "退出",
     "smartERP": "司友雲ERP",
+    "sortTip": "拖拽項目進行排序",
     "status": "狀態",
+    "statusArchived": "已歸檔",
+    "statusDeleted": "已刪除",
+    "statusFlaged": "已標記",
+    "statusNormal": "正常",
+    "statusInactivated": "已停用",
     "submit": "提交",
     "success": "成功",
     "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
     "yes": "是",
     "unknownError": "未知錯誤",
+    "unitJoin": "每{0}",
+    "unitPC": "件",
+    "unitSET": "套",
+    "unitHOUR": "小時",
+    "unitDAY": "天",
+    "unitYEAR": "年",
+    "unitWEEK": "週",
+    "unitFORTNIGHT": "兩週",
+    "unitFOURWEEK": "四周",
+    "unitMONTH": "月",
+    "unitBIMONTH": "兩月",
+    "unitQUATER": "季度",
+    "unitHALFYEAR": "半年",
+    "unitGRAM": "克",
+    "unitJIN": "斤",
+    "unitKILOGRAM": "公斤",
     "warning": "警告",
     "welcome": "{0}, 歡迎光臨！"
 }

package/lib/mjs/index.d.ts

@@ -12,6 +12,7 @@ export * from './business/BusinessTax';
 export * from './business/BusinessUtils';
 export * from './business/EntityStatus';
 export * from './business/ProductUnit';
+export * from './business/RepeatOption';
 export * from './def/ListItem';
 export * from './dto/IdDto';
 export * from './dto/IdLabelDto';

package/lib/mjs/index.js

@@ -16,6 +16,7 @@ export * from './business/BusinessTax';
 export * from './business/BusinessUtils';
 export * from './business/EntityStatus';
 export * from './business/ProductUnit';
+export * from './business/RepeatOption';
 // def
 export * from './def/ListItem';
 // dto

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.21",
+    "version": "1.2.25",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,24 +54,24 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/restclient": "^1.0.64",
-        "@etsoo/shared": "^1.1.1",
+        "@etsoo/shared": "^1.1.5",
         "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.16.7",
+        "@babel/cli": "^7.16.8",
         "@babel/core": "^7.16.7",
-        "@babel/plugin-transform-runtime": "^7.16.7",
-        "@babel/preset-env": "^7.16.7",
-        "@babel/runtime-corejs3": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.16.8",
+        "@babel/preset-env": "^7.16.8",
+        "@babel/runtime-corejs3": "^7.16.8",
         "@types/jest": "^27.4.0",
-        "@typescript-eslint/eslint-plugin": "^5.9.0",
-        "@typescript-eslint/parser": "^5.9.0",
-        "eslint": "^8.6.0",
+        "@typescript-eslint/eslint-plugin": "^5.10.0",
+        "@typescript-eslint/parser": "^5.10.0",
+        "eslint": "^8.7.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",
         "jest": "^27.4.7",
-        "ts-jest": "^27.1.2",
+        "ts-jest": "^27.1.3",
         "typescript": "^4.5.4"
     }
 }

package/src/app/CoreApp.ts

@@ -29,6 +29,8 @@ import {
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
+import { BusinessUtils } from '../business/BusinessUtils';
+import { ProductUnit } from '../business/ProductUnit';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
@@ -330,6 +332,12 @@ 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
@@ -349,6 +357,13 @@ export interface ICoreApp<
      */
     getTimeZone(): string | undefined;
 
+    /**
+     * Get product unit and repeat option label
+     * @param unit Product unit or repeat option
+     * @param isJoined Add the join label like 'per Kg' for Kg
+     */
+    getUnitLabel(unit?: ProductUnit, isJoined?: boolean): string;
+
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/
@@ -1386,6 +1401,18 @@ export abstract class CoreApp<
         });
     }
 
+    /**
+     * Get entity status label
+     * @param data Input data
+     */
+    getEntityStatusLabel<D extends { entityStatus?: number }>(data: D) {
+        if (data == null || data.entityStatus == null) return '';
+        return BusinessUtils.getEntityStatusLabel(
+            data.entityStatus,
+            this.labelDelegate
+        );
+    }
+
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -1408,6 +1435,16 @@ export abstract class CoreApp<
         return this.settings.timeZone ?? this.ipData?.timezone;
     }
 
+    /**
+     * Get product unit and repeat option label
+     * @param unit Product unit or repeat option
+     * @param isJoined Add the join label like 'per Kg' for Kg
+     */
+    getUnitLabel(unit?: ProductUnit, isJoined?: boolean): string {
+        if (unit == null) return '';
+        return BusinessUtils.getUnitLabel(unit, this.labelDelegate, isJoined);
+    }
+
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
      * https://cryptojs.gitbook.io/docs/

package/src/business/BusinessUtils.ts

@@ -1,4 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
+import { RepeatOption } from '..';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
 import { EntityStatus } from './EntityStatus';
@@ -27,7 +28,7 @@ export namespace BusinessUtils {
 
     /**
      * Get product unit's label
-     * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
+     * Please define the label in culture with key 'statusNormal' for Normal status
      * @param unit Unit
      * @param func Label delegate
      * @returns Label
@@ -62,11 +63,21 @@ export namespace BusinessUtils {
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
      * @param unit Unit
      * @param func Label delegate
+     * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Label
      */
-    export function getUnitLabel(unit: ProductUnit, func: ICultureGet) {
+    export function getUnitLabel(
+        unit: ProductUnit,
+        func: ICultureGet,
+        isJoined?: boolean
+    ) {
         const key = ProductUnit[unit];
-        return func('unit' + key) ?? key;
+        const label = func('unit' + key) ?? key;
+        if (isJoined) {
+            const jLabel = func('unitJoin');
+            if (jLabel) return jLabel.format(label);
+        }
+        return label;
     }
 
     /**
@@ -74,13 +85,61 @@ export namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    export function getUnits(func: ICultureGet): IdLabelDto[] {
-        return DataTypes.getEnumKeys(ProductUnit).map((key) => {
-            const id = DataTypes.getEnumByKey(ProductUnit, key)!;
+    export function getUnits(func: ICultureGet): IdLabelDto[];
+
+    /**
+     *
+     * Get all product units
+     * @param func Label delegate
+     * @param options Define the order and limit the items
+     * @param isJoined Add the join label like 'per Kg' for Kg
+     * @returns Units
+     */
+    export function getUnits(
+        func: ICultureGet,
+        options?: string[],
+        isJoined?: boolean
+    ): IdLabelDto[];
+
+    /**
+     *
+     * Get all product units
+     * @param func Label delegate
+     * @param options Define the order and limit the items
+     * @param isJoined Add the join label like 'per Kg' for Kg
+     * @returns Units
+     */
+    export function getUnits(
+        func: ICultureGet,
+        options?: string[],
+        isJoined?: boolean
+    ): IdLabelDto[] {
+        options ??= DataTypes.getEnumKeys(ProductUnit);
+        return options.map((key) => {
+            const id = DataTypes.getEnumByKey(ProductUnit, key)! as number;
             return {
                 id,
-                label: getUnitLabel(id, func)
+                label: getUnitLabel(id, func, isJoined).formatInitial(true)
             };
         });
     }
+
+    /**
+     *
+     * Get all repeat options
+     * @param func Label delegate
+     * @param options Define the order and limit the items
+     * @param isJoined Add the join label like 'per Kg' for Kg
+     * @returns Units
+     */
+    export function getRepeatOptions(
+        func: ICultureGet,
+        options?: string[],
+        isJoined: boolean = true
+    ): IdLabelDto[] {
+        options ??= DataTypes.getEnumKeys(RepeatOption);
+        isJoined ??= true;
+
+        return getUnits(func, options, isJoined);
+    }
 }

package/src/business/EntityStatus.ts

@@ -1,6 +1,7 @@
 /**
  * Standard entity status enum
  * com.etsoo.SmartERP.Dto.EntityStatus
+ * Labels also included within i18n
  */
 export enum EntityStatus {
     /**

package/src/business/ProductUnit.ts

@@ -1,77 +1,61 @@
+import { RepeatOption } from './RepeatOption';
+
 /**
- * Product units enum
- * See com.etsoo.CoreFramework.Business.ProductUnit
+ * Product base units
+ * 1 - 9
  */
-export enum ProductUnit {
+export enum ProductBaseUnit {
     /**
      * Picese
      * 件
      */
-    PC = 0,
+    PC = 1,
 
     /**
      * Set
      * 套
      */
-    SET = 1,
-
-    /**
-     * Year
-     * 年
-     */
-    YEAR = 10,
-
-    /**
-     * Quater
-     * 季
-     */
-    QUATER = 11,
-
-    /**
-     * Month
-     * 月
-     */
-    MONTH = 12,
-
-    /**
-     * Fortnight
-     * 两周
-     */
-    FORNIGHT = 13,
-
-    /**
-     * Week
-     * 周
-     */
-    WEEK = 14,
-
-    /**
-     * Day
-     * 天
-     */
-    DAY = 15,
+    SET = 2
+}
 
+/**
+ * Product weight units
+ * Range 40 - 49
+ */
+export enum ProductWeightUnit {
     /**
-     * Hour
-     * 小时
+     * Gram
+     * 克
      */
-    HOUR = 16,
+    GRAM = 40,
 
     /**
-     * Ton
-     * 吨
+     * Half Kg
+     * 斤
      */
-    TON = 31,
+    JIN = 41,
 
     /**
      * Kilogram
      * 千克
      */
-    KILOGRAM = 32,
+    KILOGRAM = 42,
 
     /**
-     * Gram
-     * 克
+     * Ton
+     * 吨
      */
-    GRAM = 33
+    TON = 49
 }
+
+/**
+ * Product units enum
+ * Repeat options take range 10 - 39
+ * See com.etsoo.CoreFramework.Business.ProductUnit
+ */
+export const ProductUnit = {
+    ...ProductBaseUnit,
+    ...RepeatOption,
+    ...ProductWeightUnit
+};
+export type ProductUnit = ProductBaseUnit | RepeatOption | ProductWeightUnit;

package/src/business/RepeatOption.ts

@@ -0,0 +1,65 @@
+/**
+ * Repeat options
+ * Part of ProductUnit, range 10 - 39
+ */
+export enum RepeatOption {
+    /**
+     * Hour
+     * 小时
+     */
+    HOUR = 10,
+
+    /**
+     * Day
+     * 天
+     */
+    DAY = 11,
+
+    /**
+     * Year
+     * 年
+     */
+    YEAR = 12,
+
+    /**
+     * Week
+     * 周
+     */
+    WEEK = 21,
+
+    /**
+     * Two weeks
+     * 两周
+     */
+    FORTNIGHT = 22,
+
+    /**
+     * Four weeks
+     * 四周
+     */
+    FOURWEEK = 24,
+
+    /**
+     * Month
+     * 月
+     */
+    MONTH = 31,
+
+    /**
+     * Two months
+     * 两月
+     */
+    BIMONTH = 32,
+
+    /**
+     * Quater(3 months)
+     * 季(三个月)
+     */
+    QUATER = 33,
+
+    /**
+     * Half a year
+     * 半年
+     */
+    HALFYEAR = 36
+}