@pisell/pisellos 0.0.75 → 0.0.77

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

@@ -16,8 +16,18 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     getStepList(): IStep[];
     getCurrentStep(): IStep;
     getCurrentStepIndex(): number;
+    /**
+     * 上一个步骤
+     */
     prevStep(): void;
+    /**
+     * 下一个步骤
+     */
     nextStep(): void;
+    /**
+     * 跳转到指定步骤
+     * @param stepIndex 步骤的 index
+     */
     gotoStep(stepIndex: number): void;
     /**
      * 添加步骤
@@ -30,5 +40,11 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
      * @param key 步骤的 key
      */
     removeStep(key: string): void;
+    /**
+     * 更新步骤
+     * @param key 步骤的 key
+     * @param step 步骤
+     */
+    updateStep(key: string, step: IStep): void;
     storeChange(): void;
 }

package/dist/modules/Step/index.js

@@ -84,7 +84,8 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setCurrentStep",
     value: function setCurrentStep(stepIndex) {
-      if (stepIndex < 0 || stepIndex >= this.store.stepList.length) {
+      var _this$store$stepList;
+      if (stepIndex < 0 || stepIndex >= ((_this$store$stepList = this.store.stepList) === null || _this$store$stepList === void 0 ? void 0 : _this$store$stepList.length)) {
         return;
       }
       this.store.currentStepIndex = stepIndex;
@@ -105,20 +106,45 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
     value: function getCurrentStepIndex() {
       return this.store.currentStepIndex;
     }
+
+    /**
+     * 上一个步骤
+     */
   }, {
     key: "prevStep",
     value: function prevStep() {
-      if (this.store.currentStepIndex > 0) {
-        this.setCurrentStep(this.store.currentStepIndex - 1);
+      // 如果上一个步骤是跳过，则继续往前找，直到找到一个不是跳过的步骤
+      var prevStepIndex = this.store.currentStepIndex - 1;
+      while ((_this$store$stepList$ = this.store.stepList[prevStepIndex]) !== null && _this$store$stepList$ !== void 0 && _this$store$stepList$.isSkip) {
+        var _this$store$stepList$;
+        prevStepIndex--;
+      }
+      if (prevStepIndex >= 0) {
+        this.setCurrentStep(prevStepIndex);
       }
     }
+
+    /**
+     * 下一个步骤
+     */
   }, {
     key: "nextStep",
     value: function nextStep() {
-      if (this.store.currentStepIndex < this.store.stepList.length - 1) {
-        this.setCurrentStep(this.store.currentStepIndex + 1);
+      // 如果下一个步骤是跳过，则继续往后找，直到找到一个不是跳过的步骤
+      var nextStepIndex = this.store.currentStepIndex + 1;
+      while ((_this$store$stepList$2 = this.store.stepList[nextStepIndex]) !== null && _this$store$stepList$2 !== void 0 && _this$store$stepList$2.isSkip) {
+        var _this$store$stepList$2;
+        nextStepIndex++;
+      }
+      if (nextStepIndex < this.store.stepList.length) {
+        this.setCurrentStep(nextStepIndex);
       }
     }
+
+    /**
+     * 跳转到指定步骤
+     * @param stepIndex 步骤的 index
+     */
   }, {
     key: "gotoStep",
     value: function gotoStep(stepIndex) {
@@ -170,6 +196,29 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
       });
       this.store.stepList = _toConsumableArray(newStepList);
     }
+
+    /**
+     * 更新步骤
+     * @param key 步骤的 key
+     * @param step 步骤
+     */
+  }, {
+    key: "updateStep",
+    value: function updateStep(key, step) {
+      var _this$store$stepList2, _this$store$currentSt;
+      var newStepList = (_this$store$stepList2 = this.store.stepList) === null || _this$store$stepList2 === void 0 ? void 0 : _this$store$stepList2.map(function (n) {
+        if (n.key === key) {
+          return step;
+        }
+        return n;
+      });
+
+      // 如果更新的是当前步骤，则更新当前步骤
+      if (key === ((_this$store$currentSt = this.store.currentStep) === null || _this$store$currentSt === void 0 ? void 0 : _this$store$currentSt.key)) {
+        this.store.currentStep = step;
+      }
+      this.store.stepList = _toConsumableArray(newStepList || []);
+    }
   }, {
     key: "storeChange",
     value: function storeChange() {

package/dist/modules/Step/tyeps.d.ts

@@ -6,6 +6,8 @@ export interface IStepState {
 export interface IStep {
     index: number;
     key: string;
+    /** 是否跳过 */
+    isSkip?: boolean;
     [key: string]: any;
 }
 export interface IStepModuleAPI {

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

@@ -38,6 +38,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 删除step
      */
     removeStep(key: string): void;
+    /**
+     * 更新step
+     */
+    updateStep(key: string, step: IStep): void;
     loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
@@ -51,7 +55,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;

package/dist/solution/BookingByStep/index.js

@@ -182,6 +182,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function removeStep(key) {
       this.store.step.removeStep(key);
     }
+
+    /**
+     * 更新step
+     */
+  }, {
+    key: "updateStep",
+    value: function updateStep(key, step) {
+      this.store.step.updateStep(key, step);
+    }
+
     // 获取购物车里 temp.xxx的方法
     // async getStoreCart(key?: string) {
     //   return this.store.cart.getTemp(key);
@@ -1762,6 +1772,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       });
       var newScheduleArr = Object.values(newSchedule);
+      // newScheduleArr 需要做个排序，按日期从小到大
+      newScheduleArr.sort(function (a, b) {
+        return dayjs(a.date).diff(dayjs(b.date));
+      });
       return newScheduleArr;
     }
     // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约

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

@@ -16,8 +16,18 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     getStepList(): IStep[];
     getCurrentStep(): IStep;
     getCurrentStepIndex(): number;
+    /**
+     * 上一个步骤
+     */
     prevStep(): void;
+    /**
+     * 下一个步骤
+     */
     nextStep(): void;
+    /**
+     * 跳转到指定步骤
+     * @param stepIndex 步骤的 index
+     */
     gotoStep(stepIndex: number): void;
     /**
      * 添加步骤
@@ -30,5 +40,11 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
      * @param key 步骤的 key
      */
     removeStep(key: string): void;
+    /**
+     * 更新步骤
+     * @param key 步骤的 key
+     * @param step 步骤
+     */
+    updateStep(key: string, step: IStep): void;
     storeChange(): void;
 }

package/lib/modules/Step/index.js

@@ -55,7 +55,8 @@ var StepModule = class extends import_BaseModule.BaseModule {
     this.store.stepList = stepList;
   }
   setCurrentStep(stepIndex) {
-    if (stepIndex < 0 || stepIndex >= this.store.stepList.length) {
+    var _a;
+    if (stepIndex < 0 || stepIndex >= ((_a = this.store.stepList) == null ? void 0 : _a.length)) {
       return;
     }
     this.store.currentStepIndex = stepIndex;
@@ -70,16 +71,36 @@ var StepModule = class extends import_BaseModule.BaseModule {
   getCurrentStepIndex() {
     return this.store.currentStepIndex;
   }
+  /**
+   * 上一个步骤
+   */
   prevStep() {
-    if (this.store.currentStepIndex > 0) {
-      this.setCurrentStep(this.store.currentStepIndex - 1);
+    var _a;
+    let prevStepIndex = this.store.currentStepIndex - 1;
+    while ((_a = this.store.stepList[prevStepIndex]) == null ? void 0 : _a.isSkip) {
+      prevStepIndex--;
+    }
+    if (prevStepIndex >= 0) {
+      this.setCurrentStep(prevStepIndex);
     }
   }
+  /**
+   * 下一个步骤
+   */
   nextStep() {
-    if (this.store.currentStepIndex < this.store.stepList.length - 1) {
-      this.setCurrentStep(this.store.currentStepIndex + 1);
+    var _a;
+    let nextStepIndex = this.store.currentStepIndex + 1;
+    while ((_a = this.store.stepList[nextStepIndex]) == null ? void 0 : _a.isSkip) {
+      nextStepIndex++;
+    }
+    if (nextStepIndex < this.store.stepList.length) {
+      this.setCurrentStep(nextStepIndex);
     }
   }
+  /**
+   * 跳转到指定步骤
+   * @param stepIndex 步骤的 index
+   */
   gotoStep(stepIndex) {
     this.setCurrentStep(stepIndex);
   }
@@ -115,6 +136,24 @@ var StepModule = class extends import_BaseModule.BaseModule {
     const newStepList = this.store.stepList.filter((n) => n.key !== key);
     this.store.stepList = [...newStepList];
   }
+  /**
+   * 更新步骤
+   * @param key 步骤的 key
+   * @param step 步骤
+   */
+  updateStep(key, step) {
+    var _a, _b;
+    const newStepList = (_a = this.store.stepList) == null ? void 0 : _a.map((n) => {
+      if (n.key === key) {
+        return step;
+      }
+      return n;
+    });
+    if (key === ((_b = this.store.currentStep) == null ? void 0 : _b.key)) {
+      this.store.currentStep = step;
+    }
+    this.store.stepList = [...newStepList || []];
+  }
   storeChange() {
     if (this.openCache) {
       this.checkSaveCache({

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

@@ -6,6 +6,8 @@ export interface IStepState {
 export interface IStep {
     index: number;
     key: string;
+    /** 是否跳过 */
+    isSkip?: boolean;
     [key: string]: any;
 }
 export interface IStepModuleAPI {

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

@@ -38,6 +38,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 删除step
      */
     removeStep(key: string): void;
+    /**
+     * 更新step
+     */
+    updateStep(key: string, step: IStep): void;
     loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
@@ -51,7 +55,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;

package/lib/solution/BookingByStep/index.js

@@ -142,6 +142,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   removeStep(key) {
     this.store.step.removeStep(key);
   }
+  /**
+   * 更新step
+   */
+  updateStep(key, step) {
+    this.store.step.updateStep(key, step);
+  }
   // 获取购物车里 temp.xxx的方法
   // async getStoreCart(key?: string) {
   //   return this.store.cart.getTemp(key);
@@ -934,7 +940,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         } else {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
-          const resources2 = (0, import_lodash_es.cloneDeep)(((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []);
+          const resources2 = (0, import_lodash_es.cloneDeep)(
+            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
+          );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
             var _a3;
@@ -1030,7 +1038,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (item.resource_id) {
         resourceIds.push(item.resource_id);
       }
-      resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find((n) => n.code === resources_code)) == null ? void 0 : _g.id;
+      resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
+        (n) => n.code === resources_code
+      )) == null ? void 0 : _g.id;
     });
     if ((_b = (_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.resource) == null ? void 0 : _b.length) {
       dateRange[0].resource.forEach((n) => {
@@ -1146,6 +1156,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     });
     const newScheduleArr = Object.values(newSchedule);
+    newScheduleArr.sort((a, b) => {
+      return (0, import_dayjs.default)(a.date).diff((0, import_dayjs.default)(b.date));
+    });
     return newScheduleArr;
   }
   // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约

package/package.json

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