@etsoo/appscript 1.2.47 → 1.2.51

package/src/app/CoreApp.ts

@@ -83,6 +83,22 @@ export interface RefreshTokenProps<D extends {}> {
     showLoading?: boolean;
 }
 
+/**
+ * App fields
+ */
+const appFields = [
+    'headerToken',
+    'serversideDeviceId',
+    'deviceId',
+    'devices',
+    'devicePassphrase'
+] as const;
+
+/**
+ * Basic type template
+ */
+export type IAppFields = { [key in typeof appFields[number]]: string };
+
 /**
  * Core application interface
  */
@@ -96,6 +112,11 @@ export interface ICoreApp<
      */
     readonly settings: S;
 
+    /**
+     * Fields
+     */
+    readonly fields: IAppFields;
+
     /**
      * API
      */
@@ -502,6 +523,11 @@ export abstract class CoreApp<
      */
     readonly settings: S;
 
+    /**
+     * Fields
+     */
+    readonly fields: IAppFields;
+
     /**
      * API
      */
@@ -632,10 +658,10 @@ export abstract class CoreApp<
      */
     protected get persistedFields() {
         return [
-            this.addIdentifier(CoreApp.deviceIdField),
-            this.addIdentifier(CoreApp.devicePassphraseField),
-            this.addIdentifier(CoreApp.serversideDeviceIdField),
-            this.addIdentifier(CoreApp.headerTokenField)
+            this.fields.deviceId,
+            this.fields.devicePassphrase,
+            this.fields.serversideDeviceId,
+            this.fields.headerToken
         ];
     }
 
@@ -660,12 +686,15 @@ export abstract class CoreApp<
         this.storage = storage;
         this.name = name;
 
-        // Device id
-        this._deviceId = storage.getData(
-            this.addIdentifier(CoreApp.deviceIdField),
-            ''
+        // Fields, attach with the name identifier
+        this.fields = appFields.reduce(
+            (a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }),
+            {} as any
         );
 
+        // Device id
+        this._deviceId = storage.getData(this.fields.deviceId, '');
+
         // Restore
         this.restore();
 
@@ -687,22 +716,31 @@ export abstract class CoreApp<
     private resetKeys() {
         this.storage.clear(
             [
-                this.addIdentifier(CoreApp.devicePassphraseField),
-                this.addIdentifier(CoreApp.headerTokenField),
-                this.addIdentifier(CoreApp.serversideDeviceIdField)
+                this.fields.devicePassphrase,
+                this.fields.headerToken,
+                this.fields.serversideDeviceId
             ],
             false
         );
         this.passphrase = '';
     }
 
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string) {
+        return field + '-' + this.name;
+    }
+
     /**
      * Restore settings from persisted source
      */
     protected restore() {
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
-            CoreApp.devicesField,
+            this.fields.devices,
             []
         );
 
@@ -711,10 +749,7 @@ export abstract class CoreApp<
             this.storage.copyFrom(this.persistedFields, false);
 
             // Reset device id
-            this._deviceId = this.storage.getData(
-                this.addIdentifier(CoreApp.deviceIdField),
-                ''
-            );
+            this._deviceId = this.storage.getData(this.fields.deviceId, '');
 
             // Totally new, no data restored
             if (this._deviceId === '') return false;
@@ -731,7 +766,7 @@ export abstract class CoreApp<
 
         // this.name to identifier different app's secret
         const passphraseEncrypted = this.storage.getData<string>(
-            this.addIdentifier(CoreApp.devicePassphraseField)
+            this.fields.devicePassphrase
         );
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(
@@ -741,7 +776,7 @@ export abstract class CoreApp<
             if (passphraseDecrypted != null) {
                 // Add the device to the list
                 devices.push(d);
-                this.storage.setPersistedData(CoreApp.devicesField, devices);
+                this.storage.setPersistedData(this.fields.devices, devices);
 
                 this.passphrase = passphraseDecrypted;
 
@@ -761,14 +796,14 @@ export abstract class CoreApp<
     persist() {
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
-            CoreApp.devicesField
+            this.fields.devices
         );
         if (devices != null) {
             const index = devices.indexOf(this.getDeviceId());
             if (index !== -1) {
                 // Remove current device from the list
                 devices.splice(index, 1);
-                this.storage.setPersistedData(CoreApp.devicesField, devices);
+                this.storage.setPersistedData(this.fields.devices, devices);
             }
         }
 
@@ -776,15 +811,6 @@ export abstract class CoreApp<
         this.storage.copyTo(this.persistedFields);
     }
 
-    /**
-     * Add app name as identifier
-     * @param field Field
-     * @returns Result
-     */
-    protected addIdentifier(field: string) {
-        return field + '-' + this.name;
-    }
-
     /**
      * Setup Api
      * @param api Api
@@ -845,7 +871,7 @@ export abstract class CoreApp<
 
         // Serverside encrypted device id
         const identifier = this.storage.getData<string>(
-            this.addIdentifier(CoreApp.serversideDeviceIdField)
+            this.fields.serversideDeviceId
         );
 
         // Timestamp
@@ -890,10 +916,7 @@ export abstract class CoreApp<
             if (callback) callback(false);
 
             // Clear device id
-            this.storage.setData(
-                this.addIdentifier(CoreApp.deviceIdField),
-                undefined
-            );
+            this.storage.setData(this.fields.deviceId, undefined);
 
             return;
         }
@@ -919,23 +942,20 @@ export abstract class CoreApp<
 
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(
-            this.addIdentifier(CoreApp.deviceIdField),
-            this._deviceId
-        );
+        this.storage.setData(this.fields.deviceId, this._deviceId);
 
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
-            CoreApp.devicesField,
+            this.fields.devices,
             []
         );
         devices.push(this.getDeviceId());
-        this.storage.setPersistedData(CoreApp.devicesField, devices);
+        this.storage.setPersistedData(this.fields.devices, devices);
 
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(
-            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.fields.devicePassphrase,
             this.encrypt(passphrase, this.name)
         );
 
@@ -981,7 +1001,7 @@ export abstract class CoreApp<
      * @returns Fields
      */
     protected initCallEncryptedUpdateFields(): string[] {
-        return [this.addIdentifier(CoreApp.headerTokenField)];
+        return [this.fields.headerToken];
     }
 
     /**
@@ -1009,10 +1029,7 @@ export abstract class CoreApp<
         // Cover the current value
         if (refreshToken !== '') {
             if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(
-                this.addIdentifier(CoreApp.headerTokenField),
-                refreshToken
-            );
+            this.storage.setData(this.fields.headerToken, refreshToken);
         }
 
         // Reset tryLogin state
@@ -1100,10 +1117,7 @@ export abstract class CoreApp<
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(
-            this.addIdentifier(CoreApp.devicePassphraseField),
-            undefined
-        );
+        this.storage.setData(this.fields.devicePassphrase, undefined);
     }
 
     /**
@@ -1111,10 +1125,7 @@ export abstract class CoreApp<
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setPersistedData(
-            this.addIdentifier(CoreApp.headerTokenField),
-            undefined
-        );
+        this.storage.setPersistedData(this.fields.headerToken, undefined);
     }
 
     /**
@@ -1426,9 +1437,7 @@ export abstract class CoreApp<
     getCacheToken(): string | undefined {
         // Temp refresh token
         if (this.cachedRefreshToken) return this.cachedRefreshToken;
-        return this.storage.getData<string>(
-            this.addIdentifier(CoreApp.headerTokenField)
-        );
+        return this.storage.getData<string>(this.fields.headerToken);
     }
 
     /**
@@ -1462,7 +1471,7 @@ export abstract class CoreApp<
         const response = this.api.transformResponse(rawResponse);
         return this.api.getHeaderValue(
             response.headers,
-            CoreApp.headerTokenField
+            'SmartERPRefreshToken'
         );
     }
 
@@ -1697,8 +1706,9 @@ export abstract class CoreApp<
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
      * @param data Additional request data
+     * @param showLoading Show loading bar or not during call
      */
-    async tryLogin<D extends {} = {}>(_data?: D) {
+    async tryLogin<D extends {} = {}>(_data?: D, _showLoading?: boolean) {
         if (this._isTryingLogin) return false;
         this._isTryingLogin = true;
         return true;
@@ -1714,10 +1724,7 @@ export abstract class CoreApp<
         this.userData = user;
 
         // Cache the encrypted serverside device id
-        this.storage.setData(
-            this.addIdentifier(CoreApp.serversideDeviceIdField),
-            user.deviceId
-        );
+        this.storage.setData(this.fields.serversideDeviceId, user.deviceId);
 
         if (keep) {
             this.authorize(user.token, refreshToken);
@@ -1764,30 +1771,3 @@ export abstract class CoreApp<
         );
     }
 }
-
-export namespace CoreApp {
-    /**
-     * Response token header field name
-     */
-    export const headerTokenField = 'SmartERPRefreshToken';
-
-    /**
-     * Serverside device id encrypted field name
-     */
-    export const serversideDeviceIdField = 'SmartERPServersideDeviceId';
-
-    /**
-     * Device id field name
-     */
-    export const deviceIdField = 'SmartERPDeviceId';
-
-    /**
-     * Devices field name
-     */
-    export const devicesField = 'SmartERPDevices';
-
-    /**
-     * Device passphrase field name
-     */
-    export const devicePassphraseField = 'SmartERPDevicePassphrase';
-}

package/src/bridges/BridgeUtils.ts

@@ -1,48 +1,19 @@
+import { FlutterHost } from './FlutterHost';
 import { IBridgeHost } from './IBridgeHost';
 
 /**
  * Bridge utils
  */
 export namespace BridgeUtils {
-    /**
-     * Is electron client
-     * @returns Result
-     */
-    export function isElectronClient() {
-        // Renderer process
-        if (
-            typeof window !== 'undefined' &&
-            typeof window.process === 'object' &&
-            (window.process as any).type === 'renderer'
-        ) {
-            return true;
-        }
-
-        // Main process
-        if (
-            typeof process !== 'undefined' &&
-            typeof process.versions === 'object' &&
-            !!process.versions.electron
-        ) {
-            return true;
-        }
-
-        // Detect the user agent when the `nodeIntegration` option is set to true
-        if (
-            typeof navigator === 'object' &&
-            typeof navigator.userAgent === 'string' &&
-            navigator.userAgent.indexOf('Electron') >= 0
-        ) {
-            return true;
-        }
-
-        return false;
-    }
+    const g: any = globalThis;
 
     /**
      * Bridge host
      */
-    export const host = isElectronClient()
-        ? ((globalThis as any).electron as IBridgeHost)
-        : undefined;
+    export const host =
+        typeof g.flutter_inappwebview?.callHandler === 'function'
+            ? new FlutterHost(g.flutter_inappwebview.callHandler)
+            : typeof g.electron === 'object'
+            ? (g.electron as IBridgeHost)
+            : undefined;
 }

package/src/bridges/FlutterHost.ts

@@ -0,0 +1,40 @@
+import { IBridgeHost } from './IBridgeHost';
+
+/**
+ * Flutter JavaScript Host
+ * https://inappwebview.dev/docs/javascript/communication/
+ */
+export class FlutterHost implements IBridgeHost {
+    /**
+     * Start Url
+     */
+    private startUrl: string | null | undefined;
+
+    /**
+     * Constructor
+     * @param callHandler Call handler
+     */
+    constructor(
+        public callHandler: (
+            name: string,
+            ...args: unknown[]
+        ) => PromiseLike<{} | void>
+    ) {}
+
+    changeCulture(locale: string): void {
+        this.callHandler('changeCulture', locale);
+    }
+
+    exit(): void {
+        this.callHandler('exit');
+    }
+
+    getStartUrl(): string | null | undefined {
+        return this.startUrl;
+    }
+
+    loadApp(name: string, startUrl?: string): void {
+        this.startUrl = startUrl;
+        this.callHandler('loadApp', name, startUrl);
+    }
+}

package/src/bridges/IBridgeHost.ts

@@ -13,10 +13,15 @@ export interface IBridgeHost {
      */
     exit(): void;
 
+    /**
+     * Get app start Url / router Url
+     */
+    getStartUrl(): string | undefined | null;
+
     /**
      * Load application
      * @param name App name
-     * @param startUrl Start Url
+     * @param startUrl Start Url / router Url
      */
     loadApp(name: string, startUrl?: string): void;
 }

package/src/business/BusinessUtils.ts

@@ -56,6 +56,26 @@ export namespace BusinessUtils {
         });
     }
 
+    /**
+     * Get 12-month items
+     * @param monthLabels Month labels
+     * @param startMonth Start month, 0 as Jan.
+     * @returns 12 months
+     */
+    export function getMonths(monthLabels: string[], startMonth: number = 0) {
+        const months: DataTypes.IdLabelItem[] = [];
+
+        for (let i = 0; i < 12; i++) {
+            if (startMonth >= 12) startMonth = 0;
+
+            months.push({ id: startMonth, label: monthLabels[startMonth] });
+
+            startMonth++;
+        }
+
+        return months;
+    }
+
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that

package/src/i18n/en-US.json

@@ -50,6 +50,20 @@
     "message": "Message",
     "mobile": "Mobile number",
     "mobilePhones": "Mobile numbers",
+    "months": [
+        "Jan.",
+        "Feb.",
+        "Mar.",
+        "Apr.",
+        "May.",
+        "Jun.",
+        "Jul.",
+        "Aug.",
+        "Sep.",
+        "Oct.",
+        "Nov.",
+        "Dec."
+    ],
     "more": "More",
     "moreTag": "{0} more",
     "name": "Name",
@@ -67,6 +81,7 @@
     "pageNotFound": "Page Not Found",
     "prompt": "Input",
     "pullToRefresh": "Pull down to refresh",
+    "quarters": ["Q1", "Q2", "Q3", "Q4"],
     "record": "Record",
     "refresh": "Refresh",
     "refreshing": "Refreshing",

package/src/i18n/zh-CN.json

@@ -50,6 +50,20 @@
     "message": "留言",
     "mobile": "手机号码",
     "mobilePhones": "手机号码",
+    "months": [
+        "1月",
+        "2月",
+        "3月",
+        "4月",
+        "5月",
+        "6月",
+        "7月",
+        "8月",
+        "9月",
+        "10月",
+        "11月",
+        "12月"
+    ],
     "more": "更多",
     "moreTag": "({0}+)",
     "name": "姓名",
@@ -67,6 +81,7 @@
     "pageNotFound": "找不到页面",
     "prompt": "输入",
     "pullToRefresh": "下拉刷新",
+    "quarters": ["一季度", "二季度", "三季度", "四季度"],
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",

package/src/i18n/zh-HK.json

@@ -50,6 +50,20 @@
     "message": "留言",
     "mobilePhone": "手機號碼",
     "mobilePhones": "手機號碼",
+    "months": [
+        "1月",
+        "2月",
+        "3月",
+        "4月",
+        "5月",
+        "6月",
+        "7月",
+        "8月",
+        "9月",
+        "10月",
+        "11月",
+        "12月"
+    ],
     "more": "更多",
     "moreTag": "({0}+)",
     "name": "姓名",
@@ -67,6 +81,7 @@
     "pageNotFound": "找不到頁面",
     "prompt": "輸入",
     "pullToRefresh": "下拉刷新",
+    "quarters": ["一季度", "二季度", "三季度", "四季度"],
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",