@etsoo/appscript 1.3.91 → 1.3.93

package/__tests__/app/CoreApp.ts

@@ -215,7 +215,7 @@ test('Tests for getStatusList', () => {
         EntityStatus.Deleted
     ]);
     expect(statuses.length).toBe(5);
-    expect(statuses.some((s) => s.id === EntityStatus.Doing)).toBeTruthy();
+    expect(statuses.map((s) => s.id)).toStrictEqual([0, 100, 110, 250, 255]);
 
     expect(app.getStatusList().length).toBe(9);
 });

package/lib/cjs/app/CoreApp.d.ts

@@ -376,7 +376,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
+    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum

package/lib/cjs/app/CoreApp.js

@@ -908,19 +908,31 @@ class CoreApp {
     getEnumList(em, prefix, filter) {
         var _a;
         const list = [];
-        const keys = shared_1.DataTypes.getEnumKeys(em);
-        for (const key of keys) {
-            let id = em[key];
-            if (filter) {
-                const fid = filter(id, key);
-                if (fid == null)
+        if (Array.isArray(filter)) {
+            filter.forEach((id) => {
+                var _a;
+                if (typeof id !== 'number')
+                    return;
+                const key = shared_1.DataTypes.getEnumKey(em, id);
+                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                list.push({ id, label });
+            });
+        }
+        else {
+            const keys = shared_1.DataTypes.getEnumKeys(em);
+            for (const key of keys) {
+                let id = em[key];
+                if (filter) {
+                    const fid = filter(id, key);
+                    if (fid == null)
+                        continue;
+                    id = fid;
+                }
+                if (typeof id !== 'number')
                     continue;
-                id = fid;
+                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                list.push({ id, label });
             }
-            if (typeof id !== 'number')
-                continue;
-            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
-            list.push({ id, label });
         }
         return list;
     }
@@ -981,10 +993,8 @@ class CoreApp {
      * @param ids Limited ids
      * @returns list
      */
-    getStatusList(ids = []) {
-        return this.getEnumList(EntityStatus_1.EntityStatus, 'status', ids.length > 0
-            ? (id, _key) => (ids.includes(id) ? id : undefined)
-            : undefined);
+    getStatusList(ids) {
+        return this.getEnumList(EntityStatus_1.EntityStatus, 'status', ids);
     }
     /**
      * Get status label

package/lib/cjs/app/IApp.d.ts

@@ -320,7 +320,7 @@ export interface IApp {
      * @param filter Filter
      * @returns List
      */
-    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType1[];
     /**
      * Get region label
      * @param id Region id

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

@@ -110,9 +110,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: string): string;
+    static createKey(currency: string, key?: string): string;
     /**
      * Clear shopping cart
      * 清除购物篮
@@ -197,15 +198,17 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
+     * @param key Additional key
      */
-    constructor(currency: string, storage?: IStorage);
+    constructor(currency: string, storage?: IStorage, key?: string);
     /**
      * Constructor
      * 构造函数
      * @param state Initialization state
      * @param storage Data storage
+     * @param key Additional key
      */
-    constructor(state: ShoppingCartData<T>, storage?: IStorage);
+    constructor(state: ShoppingCartData<T>, storage?: IStorage, key?: string);
     private doChange;
     /**
      * Add item

package/lib/cjs/business/ShoppingCart.js

@@ -11,10 +11,11 @@ class ShoppingCart {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param key Additional key
      * @returns Result
      */
-    static createKey(currency) {
-        return `ETSOO-CART-${currency}`;
+    static createKey(currency, key = 'KEY') {
+        return `ETSOO-CART-${key}-${currency}`;
     }
     /**
      * Clear shopping cart
@@ -78,9 +79,9 @@ class ShoppingCart {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param state Initialization state
+     * @param key Additional key
      */
-    constructor(currencyOrState, storage = new shared_1.WindowStorage()) {
+    constructor(currencyOrState, storage = new shared_1.WindowStorage(), key) {
         var _a;
         this.storage = storage;
         /**
@@ -90,14 +91,14 @@ class ShoppingCart {
         this.prices = {};
         const isCurrency = typeof currencyOrState === 'string';
         this.currency = isCurrency ? currencyOrState : currencyOrState.currency;
-        const key = ShoppingCart.createKey(this.currency);
-        this.identifier = key;
+        const id = ShoppingCart.createKey(this.currency, key);
+        this.identifier = id;
         this.symbol = shared_1.NumberUtils.getCurrencySymbol(this.currency);
         let state;
         if (isCurrency) {
             try {
                 state =
-                    (_a = storage.getPersistedObject(key)) !== null && _a !== void 0 ? _a : storage.getObject(key);
+                    (_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id);
             }
             catch (error) {
                 console.log('ShoppingCart constructor', error);

package/lib/mjs/app/CoreApp.d.ts

@@ -376,7 +376,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType[];
+    getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType[];
     /**
      * Get enum item string id list
      * @param em Enum

package/lib/mjs/app/CoreApp.js

@@ -905,19 +905,31 @@ export class CoreApp {
     getEnumList(em, prefix, filter) {
         var _a;
         const list = [];
-        const keys = DataTypes.getEnumKeys(em);
-        for (const key of keys) {
-            let id = em[key];
-            if (filter) {
-                const fid = filter(id, key);
-                if (fid == null)
+        if (Array.isArray(filter)) {
+            filter.forEach((id) => {
+                var _a;
+                if (typeof id !== 'number')
+                    return;
+                const key = DataTypes.getEnumKey(em, id);
+                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                list.push({ id, label });
+            });
+        }
+        else {
+            const keys = DataTypes.getEnumKeys(em);
+            for (const key of keys) {
+                let id = em[key];
+                if (filter) {
+                    const fid = filter(id, key);
+                    if (fid == null)
+                        continue;
+                    id = fid;
+                }
+                if (typeof id !== 'number')
                     continue;
-                id = fid;
+                var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
+                list.push({ id, label });
             }
-            if (typeof id !== 'number')
-                continue;
-            var label = (_a = this.get(prefix + key)) !== null && _a !== void 0 ? _a : key;
-            list.push({ id, label });
         }
         return list;
     }
@@ -978,10 +990,8 @@ export class CoreApp {
      * @param ids Limited ids
      * @returns list
      */
-    getStatusList(ids = []) {
-        return this.getEnumList(EntityStatus, 'status', ids.length > 0
-            ? (id, _key) => (ids.includes(id) ? id : undefined)
-            : undefined);
+    getStatusList(ids) {
+        return this.getEnumList(EntityStatus, 'status', ids);
     }
     /**
      * Get status label

package/lib/mjs/app/IApp.d.ts

@@ -320,7 +320,7 @@ export interface IApp {
      * @param filter Filter
      * @returns List
      */
-    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: ((id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined) | E[keyof E][]): ListType1[];
     /**
      * Get region label
      * @param id Region id

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

@@ -110,9 +110,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: string): string;
+    static createKey(currency: string, key?: string): string;
     /**
      * Clear shopping cart
      * 清除购物篮
@@ -197,15 +198,17 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
+     * @param key Additional key
      */
-    constructor(currency: string, storage?: IStorage);
+    constructor(currency: string, storage?: IStorage, key?: string);
     /**
      * Constructor
      * 构造函数
      * @param state Initialization state
      * @param storage Data storage
+     * @param key Additional key
      */
-    constructor(state: ShoppingCartData<T>, storage?: IStorage);
+    constructor(state: ShoppingCartData<T>, storage?: IStorage, key?: string);
     private doChange;
     /**
      * Add item

package/lib/mjs/business/ShoppingCart.js

@@ -8,10 +8,11 @@ export class ShoppingCart {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param key Additional key
      * @returns Result
      */
-    static createKey(currency) {
-        return `ETSOO-CART-${currency}`;
+    static createKey(currency, key = 'KEY') {
+        return `ETSOO-CART-${key}-${currency}`;
     }
     /**
      * Clear shopping cart
@@ -75,9 +76,9 @@ export class ShoppingCart {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param state Initialization state
+     * @param key Additional key
      */
-    constructor(currencyOrState, storage = new WindowStorage()) {
+    constructor(currencyOrState, storage = new WindowStorage(), key) {
         var _a;
         this.storage = storage;
         /**
@@ -87,14 +88,14 @@ export class ShoppingCart {
         this.prices = {};
         const isCurrency = typeof currencyOrState === 'string';
         this.currency = isCurrency ? currencyOrState : currencyOrState.currency;
-        const key = ShoppingCart.createKey(this.currency);
-        this.identifier = key;
+        const id = ShoppingCart.createKey(this.currency, key);
+        this.identifier = id;
         this.symbol = NumberUtils.getCurrencySymbol(this.currency);
         let state;
         if (isCurrency) {
             try {
                 state =
-                    (_a = storage.getPersistedObject(key)) !== null && _a !== void 0 ? _a : storage.getObject(key);
+                    (_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id);
             }
             catch (error) {
                 console.log('ShoppingCart constructor', error);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.91",
+    "version": "1.3.93",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.24",
         "@etsoo/restclient": "^1.0.87",
-        "@etsoo/shared": "^1.2.0",
+        "@etsoo/shared": "^1.2.1",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },

package/src/app/CoreApp.ts

@@ -1237,23 +1237,35 @@ export abstract class CoreApp<
     getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
         em: E,
         prefix: string,
-        filter?: (
-            id: E[keyof E],
-            key: keyof E & string
-        ) => E[keyof E] | undefined
+        filter?:
+            | ((
+                  id: E[keyof E],
+                  key: keyof E & string
+              ) => E[keyof E] | undefined)
+            | E[keyof E][]
     ): ListType[] {
         const list: ListType[] = [];
-        const keys = DataTypes.getEnumKeys(em);
-        for (const key of keys) {
-            let id = em[key as keyof E];
-            if (filter) {
-                const fid = filter(id, key);
-                if (fid == null) continue;
-                id = fid;
+
+        if (Array.isArray(filter)) {
+            filter.forEach((id) => {
+                if (typeof id !== 'number') return;
+                const key = DataTypes.getEnumKey(em, id);
+                var label = this.get<string>(prefix + key) ?? key;
+                list.push({ id, label });
+            });
+        } else {
+            const keys = DataTypes.getEnumKeys(em);
+            for (const key of keys) {
+                let id = em[key as keyof E];
+                if (filter) {
+                    const fid = filter(id, key);
+                    if (fid == null) continue;
+                    id = fid;
+                }
+                if (typeof id !== 'number') continue;
+                var label = this.get<string>(prefix + key) ?? key;
+                list.push({ id, label });
             }
-            if (typeof id !== 'number') continue;
-            var label = this.get<string>(prefix + key) ?? key;
-            list.push({ id, label });
         }
         return list;
     }
@@ -1322,14 +1334,8 @@ export abstract class CoreApp<
      * @param ids Limited ids
      * @returns list
      */
-    getStatusList(ids: EntityStatus[] = []) {
-        return this.getEnumList(
-            EntityStatus,
-            'status',
-            ids.length > 0
-                ? (id, _key) => (ids.includes(id) ? id : undefined)
-                : undefined
-        );
+    getStatusList(ids?: EntityStatus[]) {
+        return this.getEnumList(EntityStatus, 'status', ids);
     }
 
     /**

package/src/app/IApp.ts

@@ -434,10 +434,12 @@ export interface IApp {
     getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(
         em: E,
         prefix: string,
-        filter?: (
-            id: E[keyof E],
-            key: keyof E & string
-        ) => E[keyof E] | undefined
+        filter?:
+            | ((
+                  id: E[keyof E],
+                  key: keyof E & string
+              ) => E[keyof E] | undefined)
+            | E[keyof E][]
     ): ListType1[];
 
     /**

package/src/business/ShoppingCart.ts

@@ -130,10 +130,11 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: string) {
-        return `ETSOO-CART-${currency}`;
+    static createKey(currency: string, key: string = 'KEY') {
+        return `ETSOO-CART-${key}-${currency}`;
     }
 
     /**
@@ -262,41 +263,44 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
+     * @param key Additional key
      */
-    constructor(currency: string, storage?: IStorage);
+    constructor(currency: string, storage?: IStorage, key?: string);
 
     /**
      * Constructor
      * 构造函数
      * @param state Initialization state
      * @param storage Data storage
+     * @param key Additional key
      */
-    constructor(state: ShoppingCartData<T>, storage?: IStorage);
+    constructor(state: ShoppingCartData<T>, storage?: IStorage, key?: string);
 
     /**
      * Constructor
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param state Initialization state
+     * @param key Additional key
      */
     constructor(
         currencyOrState: string | ShoppingCartData<T>,
-        private readonly storage: IStorage = new WindowStorage()
+        private readonly storage: IStorage = new WindowStorage(),
+        key?: string
     ) {
         const isCurrency = typeof currencyOrState === 'string';
         this.currency = isCurrency ? currencyOrState : currencyOrState.currency;
 
-        const key = ShoppingCart.createKey(this.currency);
-        this.identifier = key;
+        const id = ShoppingCart.createKey(this.currency, key);
+        this.identifier = id;
         this.symbol = NumberUtils.getCurrencySymbol(this.currency);
 
         let state: ShoppingCartData<T> | undefined;
         if (isCurrency) {
             try {
                 state =
-                    storage.getPersistedObject<ShoppingCartData<T>>(key) ??
-                    storage.getObject<ShoppingCartData<T>>(key);
+                    storage.getPersistedObject<ShoppingCartData<T>>(id) ??
+                    storage.getObject<ShoppingCartData<T>>(id);
             } catch (error) {
                 console.log('ShoppingCart constructor', error);
             }