@etsoo/appscript 1.4.63 → 1.4.65

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

@@ -5,7 +5,6 @@ import { Currency } from './Currency';
  * 购物篮所有人
  */
 export type ShoppingCartOwner = DataTypes.IdNameItem & {
-    isSupplier?: boolean;
     culture?: string;
     currency?: Currency;
 };
@@ -20,6 +19,7 @@ export type ShoppingCartData<T extends ShoppingCartItem> = {
     items: T[];
     promotions: ShoppingPromotion[];
     formData?: any;
+    cache?: Record<string, unknown>;
 };
 /**
  * Shopping promotion
@@ -122,7 +122,7 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: Currency, culture: string, key?: string): string;
+    static createKey(currency: Currency, culture: string, key: string): string;
     /**
      * Clear shopping cart
      * 清除购物篮
@@ -130,14 +130,6 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Storage
      */
     static clear(identifier: string, storage: IStorage): void;
-    /**
-     * Clear shopping cart
-     * 清除购物篮
-     * @param currency Currency
-     * @param culture Culture
-     * @param storage Storage
-     */
-    static clearWith(currency: Currency, culture: string, storage?: IStorage): void;
     /**
      * Get cart data
      * 获取购物篮数据
@@ -146,13 +138,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @returns Result
      */
     static getCartData<D extends ShoppingCartItem>(storage: IStorage, id: string): ShoppingCartData<D> | undefined;
-    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    get owner(): ShoppingCartOwner | undefined;
-    set owner(value: ShoppingCartOwner | undefined);
+    owner?: ShoppingCartOwner;
     _currency: Currency;
     /**
      * ISO currency id
@@ -186,6 +176,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 关联的表单数据
      */
     formData: any;
+    /**
+     * Cache
+     * 缓存对象
+     */
+    cache?: Record<string, unknown>;
     _symbol: string | undefined;
     /**
      * Currency symbol
@@ -193,6 +188,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      */
     get symbol(): string | undefined;
     private set symbol(value);
+    /**
+     * Key for identifier
+     */
+    readonly key: string;
     /**
      * Cart identifier
      * 购物篮标识
@@ -237,17 +236,20 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param init Currency & culture ISO code array
      * @param storage Data storage
      */
-    constructor(init: [Currency, string], storage?: IStorage);
+    constructor(key: string, init: [Currency, string], storage?: IStorage);
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param state Initialization state
      * @param storage Data storage
      */
-    constructor(state: ShoppingCartData<T>, storage?: IStorage);
+    constructor(key: string, state: ShoppingCartData<T>, storage?: IStorage);
+    private getCartData;
     private setCartData;
     private doChange;
     /**

package/lib/cjs/business/ShoppingCart.js

@@ -16,7 +16,7 @@ class ShoppingCart {
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency, culture, key = 'KEY') {
+    static createKey(currency, culture, key) {
         return `ETSOO-CART-${culture}-${key}-${currency}`;
     }
     /**
@@ -34,17 +34,6 @@ class ShoppingCart {
             console.log('ShoppingCart clear', error);
         }
     }
-    /**
-     * Clear shopping cart
-     * 清除购物篮
-     * @param currency Currency
-     * @param culture Culture
-     * @param storage Storage
-     */
-    static clearWith(currency, culture, storage = new shared_1.WindowStorage()) {
-        const identifier = this.createKey(currency, culture);
-        this.clear(identifier, storage);
-    }
     /**
      * Get cart data
      * 获取购物篮数据
@@ -61,24 +50,6 @@ class ShoppingCart {
             console.log('ShoppingCart constructor', error);
         }
     }
-    /**
-     * Owner data
-     * 所有者信息
-     */
-    get owner() {
-        return this._owner;
-    }
-    set owner(value) {
-        var _a;
-        if (((_a = this._owner) === null || _a === void 0 ? void 0 : _a.id) === (value === null || value === void 0 ? void 0 : value.id))
-            return;
-        this._owner = value;
-        if (value) {
-            const data = ShoppingCart.getCartData(this.storage, this.identifier);
-            if (data)
-                this.setCartData(data);
-        }
-    }
     /**
      * ISO currency id
      * 标准货币编号
@@ -135,7 +106,7 @@ class ShoppingCart {
      */
     get identifier() {
         const o = this.owner;
-        return ShoppingCart.createKey(this.currency, this.culture, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
+        return ShoppingCart.createKey(this.currency, this.culture, this.key);
     }
     /**
      * All data keys
@@ -182,10 +153,11 @@ class ShoppingCart {
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param currency Currency ISO code
      * @param storage Data storage
      */
-    constructor(currencyOrState, storage = new shared_1.WindowStorage()) {
+    constructor(key, currencyOrState, storage = new shared_1.WindowStorage()) {
         this.storage = storage;
         this._items = [];
         this._promotions = [];
@@ -194,9 +166,9 @@ class ShoppingCart {
          * 缓存的价格
          */
         this.prices = {};
+        this.key = key;
         if (Array.isArray(currencyOrState)) {
-            this.changeCurrency(currencyOrState[0]);
-            this.changeCulture(currencyOrState[1]);
+            this.reset(currencyOrState[0], currencyOrState[1]);
         }
         else {
             this.setCartData(currencyOrState);
@@ -204,12 +176,17 @@ class ShoppingCart {
             this.changeCulture(currencyOrState.culture);
         }
     }
+    getCartData() {
+        var _a;
+        return ((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+    }
     setCartData(state) {
-        const { owner, items = [], promotions = [], formData } = state !== null && state !== void 0 ? state : {};
+        const { owner, items = [], promotions = [], formData, cache } = state !== null && state !== void 0 ? state : {};
         this.owner = owner;
         this.items = items;
         this.promotions = promotions;
         this.formData = formData;
+        this.cache = cache;
     }
     doChange(reason, changedItems) {
         if (this.onChange)
@@ -315,9 +292,9 @@ class ShoppingCart {
      * @param culture New culture
      */
     reset(currency, culture) {
-        this.clear(true);
         this.changeCurrency(currency);
         this.changeCulture(culture);
+        this.setCartData(this.getCartData());
     }
     /**
      * Remove item from the index
@@ -343,14 +320,15 @@ class ShoppingCart {
     save(persisted = true) {
         if (this.owner == null)
             return;
-        const { currency, culture, owner, items, promotions, formData } = this;
+        const { currency, culture, owner, items, promotions, formData, cache } = this;
         const data = {
             currency,
             culture,
             owner,
             items,
             promotions,
-            formData
+            formData,
+            cache
         };
         try {
             if (persisted) {

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

@@ -5,7 +5,6 @@ import { Currency } from './Currency';
  * 购物篮所有人
  */
 export type ShoppingCartOwner = DataTypes.IdNameItem & {
-    isSupplier?: boolean;
     culture?: string;
     currency?: Currency;
 };
@@ -20,6 +19,7 @@ export type ShoppingCartData<T extends ShoppingCartItem> = {
     items: T[];
     promotions: ShoppingPromotion[];
     formData?: any;
+    cache?: Record<string, unknown>;
 };
 /**
  * Shopping promotion
@@ -122,7 +122,7 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: Currency, culture: string, key?: string): string;
+    static createKey(currency: Currency, culture: string, key: string): string;
     /**
      * Clear shopping cart
      * 清除购物篮
@@ -130,14 +130,6 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Storage
      */
     static clear(identifier: string, storage: IStorage): void;
-    /**
-     * Clear shopping cart
-     * 清除购物篮
-     * @param currency Currency
-     * @param culture Culture
-     * @param storage Storage
-     */
-    static clearWith(currency: Currency, culture: string, storage?: IStorage): void;
     /**
      * Get cart data
      * 获取购物篮数据
@@ -146,13 +138,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @returns Result
      */
     static getCartData<D extends ShoppingCartItem>(storage: IStorage, id: string): ShoppingCartData<D> | undefined;
-    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    get owner(): ShoppingCartOwner | undefined;
-    set owner(value: ShoppingCartOwner | undefined);
+    owner?: ShoppingCartOwner;
     _currency: Currency;
     /**
      * ISO currency id
@@ -186,6 +176,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 关联的表单数据
      */
     formData: any;
+    /**
+     * Cache
+     * 缓存对象
+     */
+    cache?: Record<string, unknown>;
     _symbol: string | undefined;
     /**
      * Currency symbol
@@ -193,6 +188,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      */
     get symbol(): string | undefined;
     private set symbol(value);
+    /**
+     * Key for identifier
+     */
+    readonly key: string;
     /**
      * Cart identifier
      * 购物篮标识
@@ -237,17 +236,20 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param init Currency & culture ISO code array
      * @param storage Data storage
      */
-    constructor(init: [Currency, string], storage?: IStorage);
+    constructor(key: string, init: [Currency, string], storage?: IStorage);
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param state Initialization state
      * @param storage Data storage
      */
-    constructor(state: ShoppingCartData<T>, storage?: IStorage);
+    constructor(key: string, state: ShoppingCartData<T>, storage?: IStorage);
+    private getCartData;
     private setCartData;
     private doChange;
     /**

package/lib/mjs/business/ShoppingCart.js

@@ -13,7 +13,7 @@ export class ShoppingCart {
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency, culture, key = 'KEY') {
+    static createKey(currency, culture, key) {
         return `ETSOO-CART-${culture}-${key}-${currency}`;
     }
     /**
@@ -31,17 +31,6 @@ export class ShoppingCart {
             console.log('ShoppingCart clear', error);
         }
     }
-    /**
-     * Clear shopping cart
-     * 清除购物篮
-     * @param currency Currency
-     * @param culture Culture
-     * @param storage Storage
-     */
-    static clearWith(currency, culture, storage = new WindowStorage()) {
-        const identifier = this.createKey(currency, culture);
-        this.clear(identifier, storage);
-    }
     /**
      * Get cart data
      * 获取购物篮数据
@@ -58,24 +47,6 @@ export class ShoppingCart {
             console.log('ShoppingCart constructor', error);
         }
     }
-    /**
-     * Owner data
-     * 所有者信息
-     */
-    get owner() {
-        return this._owner;
-    }
-    set owner(value) {
-        var _a;
-        if (((_a = this._owner) === null || _a === void 0 ? void 0 : _a.id) === (value === null || value === void 0 ? void 0 : value.id))
-            return;
-        this._owner = value;
-        if (value) {
-            const data = ShoppingCart.getCartData(this.storage, this.identifier);
-            if (data)
-                this.setCartData(data);
-        }
-    }
     /**
      * ISO currency id
      * 标准货币编号
@@ -132,7 +103,7 @@ export class ShoppingCart {
      */
     get identifier() {
         const o = this.owner;
-        return ShoppingCart.createKey(this.currency, this.culture, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
+        return ShoppingCart.createKey(this.currency, this.culture, this.key);
     }
     /**
      * All data keys
@@ -179,10 +150,11 @@ export class ShoppingCart {
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param currency Currency ISO code
      * @param storage Data storage
      */
-    constructor(currencyOrState, storage = new WindowStorage()) {
+    constructor(key, currencyOrState, storage = new WindowStorage()) {
         this.storage = storage;
         this._items = [];
         this._promotions = [];
@@ -191,9 +163,9 @@ export class ShoppingCart {
          * 缓存的价格
          */
         this.prices = {};
+        this.key = key;
         if (Array.isArray(currencyOrState)) {
-            this.changeCurrency(currencyOrState[0]);
-            this.changeCulture(currencyOrState[1]);
+            this.reset(currencyOrState[0], currencyOrState[1]);
         }
         else {
             this.setCartData(currencyOrState);
@@ -201,12 +173,17 @@ export class ShoppingCart {
             this.changeCulture(currencyOrState.culture);
         }
     }
+    getCartData() {
+        var _a;
+        return ((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+    }
     setCartData(state) {
-        const { owner, items = [], promotions = [], formData } = state !== null && state !== void 0 ? state : {};
+        const { owner, items = [], promotions = [], formData, cache } = state !== null && state !== void 0 ? state : {};
         this.owner = owner;
         this.items = items;
         this.promotions = promotions;
         this.formData = formData;
+        this.cache = cache;
     }
     doChange(reason, changedItems) {
         if (this.onChange)
@@ -312,9 +289,9 @@ export class ShoppingCart {
      * @param culture New culture
      */
     reset(currency, culture) {
-        this.clear(true);
         this.changeCurrency(currency);
         this.changeCulture(culture);
+        this.setCartData(this.getCartData());
     }
     /**
      * Remove item from the index
@@ -340,14 +317,15 @@ export class ShoppingCart {
     save(persisted = true) {
         if (this.owner == null)
             return;
-        const { currency, culture, owner, items, promotions, formData } = this;
+        const { currency, culture, owner, items, promotions, formData, cache } = this;
         const data = {
             currency,
             culture,
             owner,
             items,
             promotions,
-            formData
+            formData,
+            cache
         };
         try {
             if (persisted) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.63",
+    "version": "1.4.65",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/business/ShoppingCart.ts

@@ -6,7 +6,6 @@ import { Currency } from './Currency';
  * 购物篮所有人
  */
 export type ShoppingCartOwner = DataTypes.IdNameItem & {
-    isSupplier?: boolean;
     culture?: string;
     currency?: Currency;
 };
@@ -22,6 +21,7 @@ export type ShoppingCartData<T extends ShoppingCartItem> = {
     items: T[];
     promotions: ShoppingPromotion[];
     formData?: any;
+    cache?: Record<string, unknown>;
 };
 
 /**
@@ -145,7 +145,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: Currency, culture: string, key: string = 'KEY') {
+    static createKey(currency: Currency, culture: string, key: string) {
         return `ETSOO-CART-${culture}-${key}-${currency}`;
     }
 
@@ -164,22 +164,6 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         }
     }
 
-    /**
-     * Clear shopping cart
-     * 清除购物篮
-     * @param currency Currency
-     * @param culture Culture
-     * @param storage Storage
-     */
-    static clearWith(
-        currency: Currency,
-        culture: string,
-        storage: IStorage = new WindowStorage()
-    ) {
-        const identifier = this.createKey(currency, culture);
-        this.clear(identifier, storage);
-    }
-
     /**
      * Get cart data
      * 获取购物篮数据
@@ -201,25 +185,11 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         }
     }
 
-    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    get owner() {
-        return this._owner;
-    }
-    set owner(value) {
-        if (this._owner?.id === value?.id) return;
-        this._owner = value;
-        if (value) {
-            const data = ShoppingCart.getCartData<T>(
-                this.storage,
-                this.identifier
-            );
-            if (data) this.setCartData(data);
-        }
-    }
+    owner?: ShoppingCartOwner;
 
     _currency!: Currency;
 
@@ -277,6 +247,12 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      */
     formData: any;
 
+    /**
+     * Cache
+     * 缓存对象
+     */
+    cache?: Record<string, unknown>;
+
     _symbol: string | undefined;
     /**
      * Currency symbol
@@ -289,17 +265,18 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         this._symbol = value;
     }
 
+    /**
+     * Key for identifier
+     */
+    readonly key: string;
+
     /**
      * Cart identifier
      * 购物篮标识
      */
     get identifier() {
         const o = this.owner;
-        return ShoppingCart.createKey(
-            this.currency,
-            this.culture,
-            o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined
-        );
+        return ShoppingCart.createKey(this.currency, this.culture, this.key);
     }
 
     /**
@@ -369,45 +346,63 @@ export class ShoppingCart<T extends ShoppingCartItem> {
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param init Currency & culture ISO code array
      * @param storage Data storage
      */
-    constructor(init: [Currency, string], storage?: IStorage);
+    constructor(key: string, init: [Currency, string], storage?: IStorage);
 
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param state Initialization state
      * @param storage Data storage
      */
-    constructor(state: ShoppingCartData<T>, storage?: IStorage);
+    constructor(key: string, state: ShoppingCartData<T>, storage?: IStorage);
 
     /**
      * Constructor
      * 构造函数
+     * @param key Key for identifier
      * @param currency Currency ISO code
      * @param storage Data storage
      */
     constructor(
+        key: string,
         currencyOrState: [Currency, string] | ShoppingCartData<T>,
         private readonly storage: IStorage = new WindowStorage()
     ) {
+        this.key = key;
+
         if (Array.isArray(currencyOrState)) {
-            this.changeCurrency(currencyOrState[0]);
-            this.changeCulture(currencyOrState[1]);
+            this.reset(currencyOrState[0], currencyOrState[1]);
         } else {
             this.setCartData(currencyOrState);
             this.changeCurrency(currencyOrState.currency);
             this.changeCulture(currencyOrState.culture);
         }
     }
+    private getCartData(): ShoppingCartData<T> | undefined {
+        return (
+            this.storage.getPersistedObject(this.identifier) ??
+            this.storage.getObject(this.identifier)
+        );
+    }
 
     private setCartData(state: ShoppingCartData<T> | undefined) {
-        const { owner, items = [], promotions = [], formData } = state ?? {};
+        const {
+            owner,
+            items = [],
+            promotions = [],
+            formData,
+            cache
+        } = state ?? {};
         this.owner = owner;
         this.items = items;
         this.promotions = promotions;
         this.formData = formData;
+        this.cache = cache;
     }
 
     private doChange(reason: ShoppingCartChangeReason, changedItems: T[]) {
@@ -524,9 +519,9 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * @param culture New culture
      */
     reset(currency: Currency, culture: string) {
-        this.clear(true);
         this.changeCurrency(currency);
         this.changeCulture(culture);
+        this.setCartData(this.getCartData());
     }
 
     /**
@@ -555,14 +550,16 @@ export class ShoppingCart<T extends ShoppingCartItem> {
     save(persisted: boolean = true) {
         if (this.owner == null) return;
 
-        const { currency, culture, owner, items, promotions, formData } = this;
+        const { currency, culture, owner, items, promotions, formData, cache } =
+            this;
         const data: ShoppingCartData<T> = {
             currency,
             culture,
             owner,
             items,
             promotions,
-            formData
+            formData,
+            cache
         };
 
         try {