@etsoo/appscript 1.2.24 → 1.2.28

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

@@ -1,6 +1,10 @@
 {
+    "accountant": "Accountant",
     "actions": "Actions",
     "add": "Add",
+    "authorizer": "Authorizer",
+    "applicant": "Applicant",
+    "approve": "Approve it",
     "back": "Back",
     "cancel": "Cancel",
     "clear": "Clear",
@@ -11,6 +15,16 @@
     "copy": "Copy",
     "creation": "Creation",
     "currency": "Currency",
+    "currencyAUD": "Australia Dollar $",
+    "currencyCAD": "Canada Dollar $",
+    "currencyCNY": "Renminbi(RMB) ¥",
+    "currencyEUR": "Euro €",
+    "currencyGBP": "British Pound £",
+    "currencyHKD": "Hong Kong Dollar $",
+    "currencyJPY": "Japan Yen ¥",
+    "currencyNZD": "New Zealand Dollar $",
+    "currencySGD": "Singapore Dollar $",
+    "currencyUSD": "U.S. Dollar $",
     "delete": "Delete",
     "deleteConfirm": "Are you sure you want to permanently delete this {0}?",
     "description": "Description",
@@ -44,6 +58,7 @@
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
+    "record": "Record",
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
@@ -66,17 +81,45 @@
     "smartERP": "SmartERP",
     "sortTip": "Drag and drop items to sort",
     "status": "Status",
+    "statusApproved": "Approved",
     "statusArchived": "Archived",
+    "statusAudited": "Audited",
+    "statusCompleted": "Completed",
     "statusDeleted": "Deleted",
     "statusFlaged": "Flaged",
     "statusNormal": "Normla",
     "statusInactivated": "Inactivated",
     "submit": "Submit",
     "success": "Success",
+    "taxId": "Tax ID number",
+    "taxIdHelp": "Used for real-name authentication and invoicing",
+    "taxCABN": "Business number",
+    "taxCNUSCC": "Unified social credit code",
+    "taxHKBRN": "Business registration number",
+    "taxNZIRD": "IRD",
+    "taxUSEIN": "Employer identification number",
     "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",
+    "user": "User",
+    "view": "View",
     "warning": "Warning",
     "welcome": "{0}, welcome!"
 }

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

@@ -1,6 +1,10 @@
 {
+    "accountant": "会计",
     "actions": "操作",
     "add": "添加",
+    "authorizer": "授权人",
+    "applicant": "申请人",
+    "approve": "批准",
     "back": "后退",
     "cancel": "取消",
     "clear": "清除",
@@ -11,6 +15,16 @@
     "copy": "复制",
     "creation": "登记时间",
     "currency": "币种",
+    "currencyAUD": "澳元$",
+    "currencyCAD": "加元$",
+    "currencyCNY": "人民币¥",
+    "currencyEUR": "欧元€",
+    "currencyGBP": "英镑£",
+    "currencyHKD": "港币$",
+    "currencyJPY": "日元¥",
+    "currencyNZD": "纽币$",
+    "currencySGD": "新币$",
+    "currencyUSD": "美元$",
     "delete": "删除",
     "deleteConfirm": "确定要永久删除此{0}吗？",
     "description": "描述",
@@ -44,6 +58,7 @@
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
+    "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "释放刷新",
@@ -66,17 +81,46 @@
     "smartERP": "司友云ERP",
     "sortTip": "拖拽项目进行排序",
     "status": "状态",
+    "statusApproved": "已批准",
     "statusArchived": "已归档",
+    "statusAudited": "已审核",
+    "statusCompleted": "已完成",
     "statusDeleted": "已删除",
     "statusFlaged": "已标记",
     "statusNormal": "正常",
     "statusInactivated": "已停用",
     "submit": "提交",
     "success": "成功",
+    "taxId": "税号",
+    "taxIdHelp": "用于实名认证和开具发票",
+    "taxCABN": "营业编号(BN)",
+    "taxCNUSCC": "统一信用代码",
+    "taxHKBRN": "商业登记号码(BRN)",
+    "taxNZIRD": "IRD",
+    "taxUSEIN": "雇主识别号码(EIN)",
     "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
     "yes": "是",
     "unknownError": "未知错误",
+    "unitJoin": "每{0}",
+    "unitPC": "件",
+    "unitSET": "套",
+    "unitHOUR": "小时",
+    "unitDAY": "天",
+    "unitYEAR": "年",
+    "unitWEEK": "周",
+    "unitFORTNIGHT": "两周",
+    "unitFOURWEEK": "四周",
+    "unitMONTH": "月",
+    "unitBIMONTH": "两月",
+    "unitQUATER": "季度",
+    "unitHALFYEAR": "半年",
+    "unitGRAM": "克",
+    "unitJIN": "斤",
+    "unitKILOGRAM": "公斤",
+    "unitTON": "吨",
+    "user": "用户",
+    "view": "查看",
     "warning": "警告",
     "welcome": "{0}, 欢迎光临！"
 }

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

@@ -1,6 +1,10 @@
 {
+    "accountant": "會計",
     "actions": "操作",
     "add": "添加",
+    "authorizer": "授權人",
+    "applicant": "申請人",
+    "approve": "批准",
     "back": "後退",
     "cancel": "取消",
     "clear": "清除",
@@ -11,6 +15,16 @@
     "copy": "複製",
     "creation": "登記時間",
     "currency": "幣種",
+    "currencyAUD": "澳元$",
+    "currencyCAD": "加元$",
+    "currencyCNY": "人民幣¥",
+    "currencyEUR": "歐元€",
+    "currencyGBP": "英鎊£",
+    "currencyHKD": "港幣$",
+    "currencyJPY": "日元¥",
+    "currencyNZD": "紐幣$",
+    "currencySGD": "新幣$",
+    "currencyUSD": "美元$",
     "delete": "刪除",
     "deleteConfirm": "確定要永久刪除此{0}嗎？",
     "description": "描述",
@@ -44,6 +58,7 @@
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
+    "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
     "releaseToRefresh": "釋放刷新",
@@ -66,17 +81,45 @@
     "smartERP": "司友雲ERP",
     "sortTip": "拖拽項目進行排序",
     "status": "狀態",
+    "statusApproved": "已批准",
     "statusArchived": "已歸檔",
+    "statusAudited": "已審核",
+    "statusCompleted": "已完成",
     "statusDeleted": "已刪除",
     "statusFlaged": "已標記",
     "statusNormal": "正常",
     "statusInactivated": "已停用",
     "submit": "提交",
     "success": "成功",
+    "taxId": "稅號",
+    "taxIdHelp": "用於實名認證和開具發票",
+    "taxCABN": "營業編號(BN)",
+    "taxCNUSCC": "統一信用代碼",
+    "taxHKBRN": "商業登記號碼(BRN)",
+    "taxNZIRD": "IRD",
+    "taxUSEIN": "雇主識別號碼(EIN)",
     "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
     "yes": "是",
     "unknownError": "未知錯誤",
+    "unitJoin": "每{0}",
+    "unitPC": "件",
+    "unitSET": "套",
+    "unitHOUR": "小時",
+    "unitDAY": "天",
+    "unitYEAR": "年",
+    "unitWEEK": "週",
+    "unitFORTNIGHT": "兩週",
+    "unitFOURWEEK": "四周",
+    "unitMONTH": "月",
+    "unitBIMONTH": "兩月",
+    "unitQUATER": "季度",
+    "unitHALFYEAR": "半年",
+    "unitGRAM": "克",
+    "unitJIN": "斤",
+    "unitKILOGRAM": "公斤",
+    "user": "用戶",
+    "view": "查看",
     "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.28",
     "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.3",
+        "@etsoo/shared": "^1.1.6",
         "@types/crypto-js": "^4.1.0",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.16.8",
-        "@babel/core": "^7.16.7",
-        "@babel/plugin-transform-runtime": "^7.16.8",
-        "@babel/preset-env": "^7.16.8",
+        "@babel/core": "^7.16.12",
+        "@babel/plugin-transform-runtime": "^7.16.10",
+        "@babel/preset-env": "^7.16.11",
         "@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.1",
+        "@typescript-eslint/parser": "^5.10.1",
+        "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",
-        "typescript": "^4.5.4"
+        "ts-jest": "^27.1.3",
+        "typescript": "^4.5.5"
     }
 }

package/src/address/AddressRegion.ts

@@ -149,7 +149,7 @@ export class AddressRegion implements IAddressRegion {
         AddressContinent.NA,
         '011',
         '1',
-        'USD',
+        'CAD',
         ['en-CA', 'fr-CA']
     );
 
@@ -209,7 +209,7 @@ export class AddressRegion implements IAddressRegion {
         AddressContinent.EU,
         '00',
         '353',
-        'IEP',
+        'EUR',
         ['en-IE']
     );
 

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';
@@ -335,7 +336,7 @@ export interface ICoreApp<
      * Get entity status label
      * @param data Input data
      */
-    getEntityStatusLabel<D extends { entityStatus?: number }>(data: D): string;
+    getEntityStatusLabel<D extends { entityStatus?: number }>(data?: D): string;
 
     /**
      * Get all regions
@@ -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/
@@ -1397,7 +1405,7 @@ export abstract class CoreApp<
      * Get entity status label
      * @param data Input data
      */
-    getEntityStatusLabel<D extends { entityStatus?: number }>(data: D) {
+    getEntityStatusLabel<D extends { entityStatus?: number }>(data?: D) {
         if (data == null || data.entityStatus == null) return '';
         return BusinessUtils.getEntityStatusLabel(
             data.entityStatus,
@@ -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/