@pisell/pisellos 0.0.108 → 0.0.110

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

@@ -15,6 +15,7 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateRange(): ITime[];
     getResourceDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     getDateList(): ITime[];
+    setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;

package/dist/modules/Date/index.js

@@ -112,6 +112,11 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     value: function getDateList() {
       return this.store.dateList;
     }
+  }, {
+    key: "setDateList",
+    value: function setDateList(dateList) {
+      this.store.dateList = dateList;
+    }
   }, {
     key: "fetchResourceDates",
     value: function () {

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Schedule/utils.js

@@ -143,7 +143,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
       var _end = _start.add(scheduleDiff, 'second');
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format('YYYY-MM-DD'))) {
-          startTmp = startTmp.day(1).add(frequency, 'week');
+          startTmp = startTmp.day(1).add(frequency, 'day');
           continue;
         }
         var arr = getDataRange({

package/dist/solution/BookingByStep/index.js

@@ -36,7 +36,7 @@ dayjs.extend(isSameOrAfter);
 import { getResourcesMap } from "../../modules/Resource/utils";
 import { cloneDeep } from 'lodash-es';
 import { calcCalendarDataByScheduleResult, calcMinTimeMaxTimeBySchedules, getAllSortedDateRanges } from "../../modules/Schedule/utils";
-import { disableAllDates, disableDatesBeforeOneDay, generateMonthDates } from "../../modules/Date/utils";
+import { disableAllDates, disableDatesBeforeOneDay, generateMonthDates, handleAvailableDateByResource } from "../../modules/Date/utils";
 export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BookingByStepImpl, _BaseModule);
   var _super = _createSuper(BookingByStepImpl);
@@ -2801,6 +2801,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _context30.next = 22;
               break;
             case 28:
+              // 最终把资源数据也加到日期内
+              dates = handleAvailableDateByResource(res.data, dates);
+              this.store.date.setDateList(dates);
+
               // 缓存这次结果，以防后面他小幅度范围内去修改天数
               (_this$store$currentPr6 = this.store.currentProduct) === null || _this$store$currentPr6 === void 0 || _this$store$currentPr6.setOtherParams('timeSlotBySchedule', {
                 dateList: dates,
@@ -2812,7 +2816,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 30:
+            case 32:
             case "end":
               return _context30.stop();
           }

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

@@ -15,6 +15,7 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateRange(): ITime[];
     getResourceDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     getDateList(): ITime[];
+    setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;

package/lib/modules/Date/index.js

@@ -65,6 +65,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
   getDateList() {
     return this.store.dateList;
   }
+  setDateList(dateList) {
+    this.store.dateList = dateList;
+  }
   async fetchResourceDates(params) {
     const { url, query } = params;
     const fetchUrl = url || "/schedule/resource/list";

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/Schedule/utils.js

@@ -143,7 +143,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
       const _end = _start.add(scheduleDiff, "second");
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format("YYYY-MM-DD"))) {
-          startTmp = startTmp.day(1).add(frequency, "week");
+          startTmp = startTmp.day(1).add(frequency, "day");
           continue;
         }
         const arr = getDataRange({

package/lib/solution/BookingByStep/index.js

@@ -1904,7 +1904,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resource_ids: tempResourceIds
       }
     });
-    const dates = [];
+    let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
     const openResources = ((_e = (_d = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.filter(
@@ -1995,6 +1995,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
       currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");
     }
+    dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
+    this.store.date.setDateList(dates);
     (_f = this.store.currentProduct) == null ? void 0 : _f.setOtherParams("timeSlotBySchedule", {
       dateList: dates,
       firstAvailableDate,

package/package.json

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