@pisell/pisellos 0.0.15 → 0.0.16

package/lib/modules/Cart/index.d.ts

@@ -11,6 +11,9 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     private request;
     private window;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     /**
      * 初始化购物车模块
@@ -56,4 +59,5 @@ export declare class CartModule extends BaseModule implements Module, CartModule
      * 清除购物车
      */
     clear(): void;
+    storeChange(): void;
 }

package/lib/modules/Cart/index.js

@@ -33,14 +33,27 @@ var CartModule = class extends import_BaseModule.BaseModule {
     // 提供给 baseModule 用的默认名称 和 默认版本
     this.defaultName = "cart";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   /**
    * 初始化购物车模块
    */
   async initialize(core, options) {
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
-    this.store.list = [];
+    if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
+      this.store.list = options.initialState.list;
+    } else {
+      this.store.list = [];
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_c = options.otherParams) == null ? void 0 : _c.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
@@ -172,6 +185,11 @@ var CartModule = class extends import_BaseModule.BaseModule {
   clear() {
     this.store.list = [];
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["list"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Date/index.d.ts

@@ -6,6 +6,9 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     protected defaultVersion: string;
     private store;
     private request;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     setDateRange(dateRange: ITime[]): void;
@@ -13,4 +16,6 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getMonthDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     getDateList(): Promise<ITime[]>;
     getAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
+    clearDateRange(): void;
+    storeChange(): void;
 }

package/lib/modules/Date/index.js

@@ -40,14 +40,27 @@ var DateModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "date";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
+    if (options.initialState) {
+      this.store.dateRange = options.initialState.dateRange;
+      this.store.dateList = options.initialState.dateList;
+    }
     if (!this.request) {
       throw new Error("DateModule 需要 request 插件支持");
     }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
   }
   setDateRange(dateRange) {
     this.store.dateRange = dateRange;
@@ -90,6 +103,14 @@ var DateModule = class extends import_BaseModule.BaseModule {
       return (0, import_utils.disableAllDates)(dates);
     }
   }
+  clearDateRange() {
+    this.store.dateRange = [];
+  }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["dateRange", "dateList"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Discount/index.d.ts

@@ -7,6 +7,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     private request;
     private window;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setDiscountList(discountList: Discount[]): Promise<void>;
@@ -23,4 +26,5 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     calcDiscountApplicableProductTotalPrice(discount: Discount): number;
     destroy(): Promise<void>;
     clear(): Promise<void>;
+    storeChange(): void;
 }

package/lib/modules/Discount/index.js

@@ -30,10 +30,24 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "discount";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b, _c;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
+    if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.discountList)) {
+      this.store.discountList = options == null ? void 0 : options.initialState.discountList;
+    } else {
+      this.store.discountList = [];
+    }
+    if ((_b = options == null ? void 0 : options.otherParams) == null ? void 0 : _b.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
@@ -111,6 +125,11 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     this.store.discountList = [];
     console.log("[Discount] clear");
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["discountList"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Discount/types.d.ts

@@ -47,6 +47,9 @@ export interface Discount {
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;
+    discount?: {
+        resource_id: number;
+    };
     isManualSelect?: boolean;
     isDisabled?: boolean;
     isSelected?: boolean;

package/lib/modules/Rules/index.js

@@ -71,7 +71,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const { discount_list } = this.hooks.getProduct(product);
       if (discount_list && discount_list.length > 0) {
         const usedNewDiscount = discount_list.some(
-          (discount) => newDiscountIds.includes(discount.resource_id)
+          (discount) => {
+            var _a;
+            return newDiscountIds.includes((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id);
+          }
         );
         if (usedNewDiscount) {
           hasApplicableDiscount = true;
@@ -135,9 +138,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           applicableProducts.push({
             amount: product.price,
             type: discount.tag,
-            resource_id: discount.id,
-            title: discount.format_title,
-            original_amount: product.origin_total
+            discount: {
+              resource_id: discount.id,
+              title: discount.format_title,
+              original_amount: product.origin_total
+            }
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }

package/lib/modules/Step/index.d.ts

@@ -5,6 +5,9 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     init(steps: IStep[]): void;
@@ -16,4 +19,5 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     prevStep(): void;
     nextStep(): void;
     gotoStep(stepIndex: number): void;
+    storeChange(): void;
 }

package/lib/modules/Step/index.js

@@ -28,10 +28,24 @@ var StepModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "step";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options.store;
+    if (options.initialState) {
+      this.store.stepList = options.initialState.stepList;
+      this.store.currentStep = options.initialState.currentStep;
+      this.store.currentStepIndex = options.initialState.currentStepIndex;
+    }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
   }
   init(steps) {
     this.setSteps(steps);
@@ -69,6 +83,11 @@ var StepModule = class extends import_BaseModule.BaseModule {
   gotoStep(stepIndex) {
     this.setCurrentStep(stepIndex);
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["currentStepIndex", "currentStep", "stepList"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Summary/index.d.ts

@@ -7,7 +7,11 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     protected defaultVersion: string;
     private shopStore;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    storeChange(): void;
 }

package/lib/modules/Summary/index.js

@@ -29,11 +29,23 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "summary";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options.store;
     this.shopStore = this.core.getPlugin("shopStore");
+    if (options.initialState) {
+      this.store.summary = options.initialState.summary;
+    }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
     if (!this.shopStore) {
       throw new Error("SummaryModule 需要 shopStore 插件支持");
     }
@@ -45,6 +57,11 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.summary = summary;
     return this.store.summary;
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["summary"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/BookingByStep/index.d.ts

@@ -38,7 +38,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getActiveAccount(): Account | null;
     removeAccount(id: string): void;
     setDateRange(dateRange: ITime[]): Promise<void>;
-    getRangeDate(): Promise<string>;
+    clearDateRange(): void;
+    getDateRange(): Promise<ITime[]>;
     getCart(): Promise<CartItem[]>;
     getAvailableDate(params?: {
         products?: ProductData[];
@@ -79,6 +80,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     deleteCartItemInfo(types: "resource" | "time"): void;
     destory(): void;
     getResourcesList(): any[];
+    getResourcesListByCartItem(id: string | number): {
+        id: number | undefined;
+        _id: string;
+        product: ProductData | undefined;
+        resources: import("./utils/resources").ResourceItem[];
+        holder_id: string | number | undefined;
+        holder_name: string | undefined;
+    } | undefined;
     getResourceTimeSlot({ product, resources, currentResourceId, }: {
         product: ProductData;
         resources: any[];
@@ -111,4 +120,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     getTimeSlotByAllResources(resources_code: string): any[];
     submitTimeSlot(timeSlots: TimeSliceItem): void;
+    clearCache(): void;
+    clearCacheByModule(module: string): void;
 }

package/lib/solution/BookingByStep/index.js

@@ -48,6 +48,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
   }
   async initialize(core, options) {
+    var _a;
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
@@ -58,22 +59,35 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
+    let targetCacheData = {};
+    if ((_a = this.otherParams) == null ? void 0 : _a.cacheId) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        const data = JSON.parse(sessionData);
+        targetCacheData = data[this.otherParams.cacheId];
+      }
+    }
     const moduleArr = [
       "cart",
       "summary",
       "step",
       "products",
-      "guests",
       "date",
       "accountList",
       "order",
       "payment"
     ];
     moduleArr.forEach((step) => {
+      var _a2, _b;
       const targetModule = (0, import_types.createModule)(step, this.name);
       if (targetModule) {
         this.store[step] = targetModule;
-        this.core.registerModule(targetModule);
+        this.core.registerModule(targetModule, { initialState: targetCacheData[targetModule.name], otherParams: {
+          ...this.otherParams,
+          fatherModule: this.name,
+          openCache: ((_a2 = this.otherParams) == null ? void 0 : _a2.cacheId) ? true : false,
+          cacheId: (_b = this.otherParams) == null ? void 0 : _b.cacheId
+        } });
       } else {
         throw new Error(`模块 ${step} 不存在`);
       }
@@ -126,7 +140,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       category_ids,
       ids: product_ids,
       collection
-    });
+    }, { useCache: true });
     this.store.products.addProduct(productsData.data.list);
     return productsData.data.list;
   }
@@ -174,9 +188,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async setDateRange(dateRange) {
     this.store.date.setDateRange(dateRange);
   }
+  clearDateRange() {
+    this.store.date.clearDateRange();
+  }
   // 获取日期模块里选中的日期
-  async getRangeDate() {
-    return "2024-01-01";
+  async getDateRange() {
+    return this.store.date.getDateRange();
   }
   async getCart() {
     return this.store.cart.getItems();
@@ -337,6 +354,35 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return arr;
   }
+  // 给单个购物车里的商品获取资源列表
+  getResourcesListByCartItem(id) {
+    const cartItems = this.store.cart.getItems();
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    dateRange.forEach((n) => {
+      if (n.resource)
+        resources.push(...n.resource);
+    });
+    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const arr = [];
+    const targetCartItem = cartItems.find((n) => n._id === id);
+    if (!targetCartItem) {
+      throw new Error(`没有找到${id}购物车商品`);
+    }
+    const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, targetCartItem, cartItems);
+    if (productResources) {
+      return {
+        id: targetCartItem.id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        _id: targetCartItem._id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        product: targetCartItem._productOrigin,
+        resources: productResources,
+        holder_id: targetCartItem.holder_id,
+        holder_name: targetCartItem.holder_title
+      };
+    }
+  }
   // 通过资源列表和指定的资源 id，获取指定资源的时间切片
   getResourceTimeSlot({
     product,
@@ -612,6 +658,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
+  clearCache() {
+  }
+  clearCacheByModule(module2) {
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/BookingByStep/types.js

@@ -26,7 +26,6 @@ module.exports = __toCommonJS(types_exports);
 var import_modules = require("../../modules");
 var import_AccountList = require("../../modules/AccountList");
 var import_Date = require("../../modules/Date");
-var import_Guests = require("../../modules/Guests");
 var import_Order = require("../../modules/Order");
 var import_Payment = require("../../modules/Payment");
 var import_Step = require("../../modules/Step");
@@ -41,8 +40,6 @@ function createModule(moduleName, solutionName, name, version) {
       return new import_Step.StepModule(`${solutionName}_${name || moduleName}`, version);
     case "products":
       return new import_modules.ProductList(`${solutionName}_${name || moduleName}`, version);
-    case "guests":
-      return new import_Guests.GuestListModule(`${solutionName}_${name || moduleName}`, version);
     case "date":
       return new import_Date.DateModule(`${solutionName}_${name || moduleName}`, version);
     case "accountList":

package/lib/solution/ShopDiscount/index.js

@@ -82,15 +82,29 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     }
   }
   registerDependentModules() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
+    let targetCacheData = {};
+    if ((_a = this.options.otherParams) == null ? void 0 : _a.cacheId) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        const data = JSON.parse(sessionData);
+        targetCacheData = data[this.options.otherParams.cacheId];
+      }
+    }
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
     this.core.registerModule(discount, {
-      hooks: (_b = (_a = this.options.otherParams) == null ? void 0 : _a.discount) == null ? void 0 : _b.hooks
+      initialState: targetCacheData[discount.name],
+      hooks: (_c = (_b = this.options.otherParams) == null ? void 0 : _b.discount) == null ? void 0 : _c.hooks,
+      otherParams: {
+        fatherModule: this.name,
+        openCache: ((_d = this.options.otherParams) == null ? void 0 : _d.cacheId) ? true : false,
+        cacheId: (_e = this.options.otherParams) == null ? void 0 : _e.cacheId
+      }
     });
     this.store.discount = discount;
     const rules = new import_Rules.RulesModule(`${this.name}_rules`);
     this.core.registerModule(rules, {
-      hooks: (_d = (_c = this.options.otherParams) == null ? void 0 : _c.rules) == null ? void 0 : _d.hooks
+      hooks: (_g = (_f = this.options.otherParams) == null ? void 0 : _f.rules) == null ? void 0 : _g.hooks
     });
     this.store.rules = rules;
   }
@@ -98,6 +112,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.core.effects.on(
       import_types.ShopDiscountHooks.onCustomerChange,
       (customer) => {
+        var _a;
+        if (((_a = this.options.otherParams) == null ? void 0 : _a.cacheId) && this.getDiscountList().length) {
+          return;
+        }
         this.loadPrepareConfig({
           customerId: customer.id,
           action: "create",

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",