@pisell/pisellos 0.0.33 → 0.0.34

package/dist/modules/Date/index.js

@@ -157,7 +157,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.get(fetchUrl, {
                 start_date: start_date,
                 end_date: end_date,
-                resource_ids: resource_ids
+                resource_ids: resource_ids,
+                front_end_cache_id: this.cacheId
               }, {
                 useCache: true
               });
@@ -206,7 +207,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: this.store,
-          cacheKey: ['dateRange', 'dateList']
+          cacheKey: ["dateRange", "dateList"]
         });
       }
     }

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

@@ -16,6 +16,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private shopStore;
     private store;
     private otherParams;
+    private cacheId;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {
@@ -106,7 +107,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         timeSlots: any[];
         selectedResource: any;
     } | undefined;
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap }: {
+    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, }: {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;

package/dist/solution/BookingByStep/index.js

@@ -49,6 +49,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "shopStore", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
+    _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     return _this;
   }
   _createClass(BookingByStepImpl, [{
@@ -56,6 +57,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
         var _this$otherParams,
+          _this$otherParams2,
           _this2 = this;
         var targetCacheData, sessionData, data, moduleArr;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -78,7 +80,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 如果有传 cacheid，默认需要收集上面这些模块里用户操作选中的数据
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
               targetCacheData = {};
-              if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.cacheId) {
+              this.cacheId = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.cacheId;
+              if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.cacheId) {
                 sessionData = this.window.sessionStorage.getItem(this.name);
                 if (sessionData) {
                   data = JSON.parse(sessionData); // 匹配 cacheid，如果匹配不到，直接把 sessionData 清掉即可
@@ -105,7 +108,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -183,7 +186,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 skip: 1,
                 category_ids: category_ids,
                 ids: product_ids,
-                collection: collection
+                collection: collection,
+                front_end_cache_id: this.cacheId
               }, {
                 useCache: true
               });
@@ -368,7 +372,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getAvailableDate",
     value: function () {
       var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$otherParams2, _this$otherParams3;
+        var _this$otherParams3, _this$otherParams4;
         var params,
           products,
           startDate,
@@ -391,8 +395,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               tempProducts = products || this.store.cart.getItems().map(function (p) {
                 return p._productOrigin;
               });
-              tempStartDate = startDate || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 || (_this$otherParams2 = _this$otherParams2.dateRange) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2[0]);
-              tempEndDate = endDate || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 || (_this$otherParams3 = _this$otherParams3.dateRange) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3[1]);
+              tempStartDate = startDate || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 || (_this$otherParams3 = _this$otherParams3.dateRange) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3[0]);
+              tempEndDate = endDate || ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 || (_this$otherParams4 = _this$otherParams4.dateRange) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4[1]);
               if (tempProducts.length) {
                 _context8.next = 7;
                 break;
@@ -1055,7 +1059,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               timeSlots: recordTimeSlots,
               countMap: selectResourcesMap
             });
-            // // 如果购物车里已经有同类型的 form_id 的资源了，则不处理  
+            // // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
             // if (item._origin.resources?.some((n: any) => n.form_id === res?.selectedResource?.form_id)) {
             //   return
             // }
@@ -1089,7 +1093,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             })) === null || _productResources$fin === void 0 ? void 0 : _productResources$fin.renderList;
             if (targetRenderList && targetRenderList.length > 0) {
               var _item$_origin$resourc2;
-              // 如果购物车里已经有同类型的 form_id 的资源了，则不处理  
+              // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
               if ((_item$_origin$resourc2 = item._origin.resources) !== null && _item$_origin$resourc2 !== void 0 && _item$_origin$resourc2.some(function (n) {
                 return n.form_id === targetRenderList[0].form_id;
               })) {

package/lib/modules/Date/index.js

@@ -89,7 +89,16 @@ var DateModule = class extends import_BaseModule.BaseModule {
       return (0, import_utils.disableAllDates)(dates);
     }
     try {
-      const res = await this.request.get(fetchUrl, { start_date, end_date, resource_ids }, { useCache: true });
+      const res = await this.request.get(
+        fetchUrl,
+        {
+          start_date,
+          end_date,
+          resource_ids,
+          front_end_cache_id: this.cacheId
+        },
+        { useCache: true }
+      );
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);
       }
@@ -108,7 +117,12 @@ var DateModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["dateRange", "dateList"] });
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store: this.store,
+        cacheKey: ["dateRange", "dateList"]
+      });
     }
   }
 };

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

@@ -16,6 +16,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private shopStore;
     private store;
     private otherParams;
+    private cacheId;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {
@@ -106,7 +107,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         timeSlots: any[];
         selectedResource: any;
     } | undefined;
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap }: {
+    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, }: {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;

package/lib/solution/BookingByStep/index.js

@@ -48,7 +48,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     this.otherParams = {};
   }
   async initialize(core, options) {
-    var _a;
+    var _a, _b;
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
@@ -60,34 +60,29 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
     let targetCacheData = {};
-    if ((_a = this.otherParams) == null ? void 0 : _a.cacheId) {
+    this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
+    if ((_b = this.otherParams) == null ? void 0 : _b.cacheId) {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (sessionData) {
         const data = JSON.parse(sessionData);
         targetCacheData = data[this.otherParams.cacheId];
       }
     }
-    const moduleArr = [
-      "accountList",
-      "cart",
-      "summary",
-      "step",
-      "products",
-      "date",
-      "order",
-      "payment"
-    ];
+    const moduleArr = ["accountList", "cart", "summary", "step", "products", "date", "order", "payment"];
     moduleArr.forEach((step) => {
-      var _a2, _b;
+      var _a2, _b2;
       const targetModule = (0, import_types.createModule)(step, this.name);
       if (targetModule) {
         this.store[step] = targetModule;
-        this.core.registerModule(targetModule, { initialState: targetCacheData == null ? void 0 : 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
-        } });
+        this.core.registerModule(targetModule, {
+          initialState: targetCacheData == null ? void 0 : targetCacheData[targetModule.name],
+          otherParams: {
+            ...this.otherParams,
+            fatherModule: this.name,
+            openCache: ((_a2 = this.otherParams) == null ? void 0 : _a2.cacheId) ? true : false,
+            cacheId: (_b2 = this.otherParams) == null ? void 0 : _b2.cacheId
+          }
+        });
       } else {
         throw new Error(`模块 ${step} 不存在`);
       }
@@ -130,18 +125,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     product_ids = [],
     collection = []
   }) {
-    const productsData = await this.request.post(`/product/query`, {
-      open_quotation: 1,
-      open_bundle: 1,
-      extension_type: ["product_appointment", "appointment_ticket"],
-      with: ["category", "collection"],
-      status: "published",
-      num: 500,
-      skip: 1,
-      category_ids,
-      ids: product_ids,
-      collection
-    }, { useCache: true });
+    const productsData = await this.request.post(
+      `/product/query`,
+      {
+        open_quotation: 1,
+        open_bundle: 1,
+        extension_type: ["product_appointment", "appointment_ticket"],
+        with: ["category", "collection"],
+        status: "published",
+        num: 500,
+        skip: 1,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: this.cacheId
+      },
+      { useCache: true }
+    );
     this.store.products.addProduct(productsData.data.list);
     return productsData.data.list;
   }
@@ -560,8 +560,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         if (timeSlots) {
           if (index !== 0 && recordTimeSlots) {
-            let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0, ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes");
-            let end_at = start_at.add(((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) ?? 0, ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.type) ?? "minutes");
+            let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
+              ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+              ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
+            );
+            let end_at = start_at.add(
+              ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) ?? 0,
+              ((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.type) ?? "minutes"
+            );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
               end_time: end_at.format("HH:mm"),
@@ -680,7 +686,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         newResources.forEach((resource) => {
           var _a, _b, _c, _d;
           resource.startTime = currentStartTime;
-          resource.endTime = (0, import_dayjs.default)(currentStartTime).add(((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0, ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes").format("YYYY-MM-DD HH:mm");
+          resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
+            ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+            ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
+          ).format("YYYY-MM-DD HH:mm");
           delete resource.times;
         });
         this.store.cart.updateItem({

package/package.json

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