@etsoo/appscript 1.2.24 → 1.2.25

package/lib/mjs/app/CoreApp.js

@@ -740,6 +740,16 @@ export class CoreApp {
         // settings.timeZone = Utils.getTimeZone()
         return (_a = this.settings.timeZone) !== null && _a !== void 0 ? _a : (_b = this.ipData) === null || _b === void 0 ? void 0 : _b.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, isJoined) {
+        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/lib/mjs/business/BusinessUtils.d.ts

@@ -16,7 +16,7 @@ export declare namespace BusinessUtils {
     function addIdLabelBlankItem<T extends DataTypes.IdType = number>(input: IdLabelDto<T>[], copy?: boolean): IdLabelDto<T>[];
     /**
      * 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
@@ -38,13 +38,32 @@ export declare 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
      */
-    function getUnitLabel(unit: ProductUnit, func: ICultureGet): string;
+    function getUnitLabel(unit: ProductUnit, func: ICultureGet, isJoined?: boolean): string;
     /**
      * Get all product units
      * @param func Label delegate
      * @returns Units
      */
     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
+     */
+    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    /**
+     *
+     * 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
+     */
+    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
 }

package/lib/mjs/business/BusinessUtils.js

@@ -1,4 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
+import { RepeatOption } from '..';
 import { EntityStatus } from './EntityStatus';
 import { ProductUnit } from './ProductUnit';
 /**
@@ -22,7 +23,7 @@ export var BusinessUtils;
     BusinessUtils.addIdLabelBlankItem = addIdLabelBlankItem;
     /**
      * 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
@@ -55,27 +56,52 @@ export var 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
      */
-    function getUnitLabel(unit, func) {
+    function getUnitLabel(unit, func, isJoined) {
         var _a;
         const key = ProductUnit[unit];
-        return (_a = func('unit' + key)) !== null && _a !== void 0 ? _a : key;
+        const label = (_a = func('unit' + key)) !== null && _a !== void 0 ? _a : key;
+        if (isJoined) {
+            const jLabel = func('unitJoin');
+            if (jLabel)
+                return jLabel.format(label);
+        }
+        return label;
     }
     BusinessUtils.getUnitLabel = getUnitLabel;
     /**
+     *
      * 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
      */
-    function getUnits(func) {
-        return DataTypes.getEnumKeys(ProductUnit).map((key) => {
+    function getUnits(func, options, isJoined) {
+        options !== null && options !== void 0 ? options : (options = DataTypes.getEnumKeys(ProductUnit));
+        return options.map((key) => {
             const id = DataTypes.getEnumByKey(ProductUnit, key);
             return {
                 id,
-                label: getUnitLabel(id, func)
+                label: getUnitLabel(id, func, isJoined).formatInitial(true)
             };
         });
     }
     BusinessUtils.getUnits = getUnits;
+    /**
+     *
+     * 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
+     */
+    function getRepeatOptions(func, options, isJoined = true) {
+        options !== null && options !== void 0 ? options : (options = DataTypes.getEnumKeys(RepeatOption));
+        isJoined !== null && isJoined !== void 0 ? isJoined : (isJoined = true);
+        return getUnits(func, options, isJoined);
+    }
+    BusinessUtils.getRepeatOptions = getRepeatOptions;
 })(BusinessUtils || (BusinessUtils = {}));

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

@@ -1,66 +1,68 @@
+import { RepeatOption } from './RepeatOption';
 /**
- * Product units enum
- * See com.etsoo.CoreFramework.Business.ProductUnit
+ * Product base units
+ * 1 - 9
  */
-export declare enum ProductUnit {
+export declare 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 declare 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 declare const ProductUnit: {
+    [x: number]: string;
+    GRAM: ProductWeightUnit.GRAM;
+    JIN: ProductWeightUnit.JIN;
+    KILOGRAM: ProductWeightUnit.KILOGRAM;
+    TON: ProductWeightUnit.TON;
+    HOUR: RepeatOption.HOUR;
+    DAY: RepeatOption.DAY;
+    YEAR: RepeatOption.YEAR;
+    WEEK: RepeatOption.WEEK;
+    FORTNIGHT: RepeatOption.FORTNIGHT;
+    FOURWEEK: RepeatOption.FOURWEEK;
+    MONTH: RepeatOption.MONTH;
+    BIMONTH: RepeatOption.BIMONTH;
+    QUATER: RepeatOption.QUATER;
+    HALFYEAR: RepeatOption.HALFYEAR;
+    PC: ProductBaseUnit.PC;
+    SET: ProductBaseUnit.SET;
+};
+export declare type ProductUnit = ProductBaseUnit | RepeatOption | ProductWeightUnit;

package/lib/mjs/business/ProductUnit.js

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

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

@@ -0,0 +1,56 @@
+/**
+ * Repeat options
+ * Part of ProductUnit, range 10 - 39
+ */
+export declare 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
+}

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

@@ -44,6 +44,7 @@
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
+    "record": "Record",
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
@@ -77,6 +78,22 @@
     "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

@@ -44,6 +44,7 @@
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
+    "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "释放刷新",
@@ -77,6 +78,23 @@
     "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

@@ -44,6 +44,7 @@
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
+    "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "釋放刷新",
@@ -77,6 +78,22 @@
     "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.24",
+    "version": "1.2.25",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/restclient": "^1.0.64",
-        "@etsoo/shared": "^1.1.3",
+        "@etsoo/shared": "^1.1.5",
         "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
@@ -65,13 +65,13 @@
         "@babel/preset-env": "^7.16.8",
         "@babel/runtime-corejs3": "^7.16.8",
         "@types/jest": "^27.4.0",
-        "@typescript-eslint/eslint-plugin": "^5.9.1",
-        "@typescript-eslint/parser": "^5.9.1",
-        "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

@@ -30,6 +30,7 @@ import {
 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';
@@ -356,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/
@@ -1427,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/