@pisell/pisellos 3.0.4 → 3.0.6

package/lib/modules/Cart/utils.js

@@ -30,12 +30,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   createCartItemOrigin: () => createCartItemOrigin,
+  deleteHolderFromCartItem: () => deleteHolderFromCartItem,
+  deleteRelationFormsFromCartItem: () => deleteRelationFormsFromCartItem,
   deleteResourceFromCartItem: () => deleteResourceFromCartItem,
   deleteTimeFromCartItem: () => deleteTimeFromCartItem,
   formatAccountToCartItem: () => formatAccountToCartItem,
   formatAccountToCartItemOrigin: () => formatAccountToCartItemOrigin,
   formatBundle: () => formatBundle,
   formatBundleToOrigin: () => formatBundleToOrigin,
+  formatDateToCartItem: () => formatDateToCartItem,
+  formatDateToCartItemOrigin: () => formatDateToCartItemOrigin,
   formatDiscountToCartItem: () => formatDiscountToCartItem,
   formatDiscountToCartItemOrigin: () => formatDiscountToCartItemOrigin,
   formatNoteToCartItem: () => formatNoteToCartItem,
@@ -44,15 +48,20 @@ __export(utils_exports, {
   formatOptionsToOrigin: () => formatOptionsToOrigin,
   formatProductToCartItem: () => formatProductToCartItem,
   formatProductToCartItemOrigin: () => formatProductToCartItemOrigin,
+  formatRelationFormsToCartItem: () => formatRelationFormsToCartItem,
+  formatRelationFormsToCartItemOrigin: () => formatRelationFormsToCartItemOrigin,
   formatResourceToCartItem: () => formatResourceToCartItem,
   formatResourceToCartItemOrigin: () => formatResourceToCartItemOrigin,
+  getProductDeposit: () => getProductDeposit,
   getProductOriginTotalPrice: () => getProductOriginTotalPrice,
   getProductTotalPrice: () => getProductTotalPrice,
   getUniqueId: () => getUniqueId,
+  handleProductDeposit: () => handleProductDeposit,
   isNormalProduct: () => isNormalProduct
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_decimal = __toESM(require("decimal.js"));
 var getUniqueId = (prefix = "", maxLength = 11) => {
   return prefix + (Math.random() + "").replace(/\D/g, "").substring(0, maxLength);
 };
@@ -77,8 +86,8 @@ var createCartItemOrigin = () => {
     // 资源相关
     // 资源状态 -固定
     like_status: "common",
-    // 资源类型
-    relation_type: "",
+    // 资源类型 - 固定--谭景琳备注：马天宇说现在平行资源是不传这个的
+    // relation_type: "form",
     // 所选资源
     resources: null,
     // 日程id - 固定
@@ -94,20 +103,27 @@ var createCartItemOrigin = () => {
     // 所选结束时间
     end_date: null,
     // 额外信息
-    metadata: {}
+    metadata: {},
     // holder相关
-    // holder: null,
+    holder: null
   };
 };
 var formatProductToCartItem = (params) => {
+  var _a;
   const { cartItem, product, bundle, options } = params;
+  const num = 1;
   if (product) {
     cartItem.id = product == null ? void 0 : product.id;
     cartItem.name = product == null ? void 0 : product.title;
     cartItem.price = product == null ? void 0 : product.price;
-    cartItem.total = getProductTotalPrice({ product, bundle, options });
-    cartItem.origin_total = getProductOriginTotalPrice({ product, bundle, options });
-    cartItem.num = 1;
+    cartItem.num = num;
+    cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.origin_total = getProductOriginTotalPrice({
+      product,
+      bundle,
+      options,
+      num
+    });
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
     cartItem.duration = product == null ? void 0 : product.duration;
@@ -120,6 +136,15 @@ var formatProductToCartItem = (params) => {
   if (options == null ? void 0 : options.length) {
     cartItem.options = formatOptions(options);
   }
+  if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
+    cartItem.deposit = getProductDeposit({
+      cartItem,
+      product,
+      bundle,
+      options,
+      num
+    });
+  }
   const oringin = formatProductToCartItemOrigin(params);
   cartItem._origin = oringin;
   return cartItem;
@@ -179,7 +204,16 @@ var formatAccountToCartItemOrigin = (params) => {
   const { cartItem, account } = params;
   let origin = cartItem._origin;
   if (account) {
-    origin.metadata.account = account;
+    if ((account == null ? void 0 : account.type) === "holder") {
+      const { customer_id, form_id, form_record_id } = (account == null ? void 0 : account._origin) || {};
+      origin.holder = {
+        customer_id,
+        form_id,
+        form_record: form_record_id ? [form_record_id] : null
+      };
+    } else {
+      origin.metadata.account = account;
+    }
   }
   return origin;
 };
@@ -213,18 +247,32 @@ var formatResourceToCartItemOrigin = (params) => {
   let origin = cartItem._origin;
   if (resources && (resources == null ? void 0 : resources.length)) {
     origin.resources = [];
-    resources.forEach((resource) => {
-      origin.resources.push({
-        relation_type: "form",
-        like_status: "common",
-        id: resource.id,
-        main_field: resource.main_field,
-        resourceType: resource.resourceType,
-        form_id: resource.form_id,
-        relation_id: resource.id,
-        capacity: (resource == null ? void 0 : resource.capacity) || 0
+    const checkResourcesFormat = (resources2, arr) => {
+      resources2.forEach((resource) => {
+        var _a;
+        const childArr = [];
+        if ((_a = resource == null ? void 0 : resource.children) == null ? void 0 : _a.length) {
+          checkResourcesFormat(resource.children, childArr);
+        }
+        const obj = {
+          relation_type: "form",
+          like_status: "common",
+          id: resource.id,
+          main_field: resource.main_field,
+          resourceType: resource.resourceType,
+          form_id: resource.form_id,
+          relation_id: resource.id,
+          capacity: (resource == null ? void 0 : resource.capacity) || 0,
+          metadata: (resource == null ? void 0 : resource.metadata) || {}
+          // 后端可以在这里挂一个前端用于计算的数据
+        };
+        if (childArr.length) {
+          obj.children = childArr;
+        }
+        arr.push(obj);
       });
-    });
+    };
+    checkResourcesFormat(resources, origin.resources);
     const { startTime, endTime } = resources[0];
     if (startTime && endTime) {
       origin.select_date = (0, import_dayjs.default)(startTime).format("YYYY-MM-DD");
@@ -243,34 +291,38 @@ var formatResourceToCartItemOrigin = (params) => {
   }
   return origin;
 };
-var deleteResourceFromCartItem = (cartItem) => {
-  cartItem.resource_id = void 0;
-  cartItem.relation_form_name = void 0;
-  cartItem.start_date = void 0;
-  cartItem.start_time = void 0;
-  cartItem.end_date = void 0;
-  cartItem.end_time = void 0;
-  delete cartItem._resourceOrigin;
-  cartItem._origin.resources = null;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
+var formatRelationFormsToCartItem = (params) => {
+  const { cartItem } = params;
+  const oringin = formatRelationFormsToCartItemOrigin(params);
+  cartItem._origin = oringin;
   return cartItem;
 };
-var deleteTimeFromCartItem = (cartItem) => {
-  cartItem.start_date = void 0;
-  cartItem.start_time = void 0;
-  cartItem.end_date = void 0;
-  cartItem.end_time = void 0;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
+var formatRelationFormsToCartItemOrigin = (params) => {
+  const { cartItem, relationForms } = params;
+  const origin = cartItem._origin;
+  origin.relation_forms = relationForms;
+  return origin;
+};
+var formatDateToCartItem = (params) => {
+  const { cartItem, date } = params;
+  cartItem.start_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
+  cartItem.start_time = (0, import_dayjs.default)(date.startTime).format("HH:mm");
+  cartItem.end_date = (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD");
+  cartItem.end_time = (0, import_dayjs.default)(date.endTime).format("HH:mm");
+  const oringin = formatDateToCartItemOrigin(params);
+  cartItem._origin = oringin;
   return cartItem;
 };
+var formatDateToCartItemOrigin = (params) => {
+  const { cartItem, date } = params;
+  const origin = cartItem._origin;
+  origin.select_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
+  origin.start_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
+  origin.start_time = (0, import_dayjs.default)(date.startTime).format("HH:mm");
+  origin.end_date = (0, import_dayjs.default)(date.endTime).format("YYYY-MM-DD");
+  origin.end_time = (0, import_dayjs.default)(date.endTime).format("HH:mm");
+  return origin;
+};
 var formatNoteToCartItem = (params) => {
   const { cartItem, note } = params;
   cartItem.note = note;
@@ -351,6 +403,7 @@ var isNormalProduct = (product) => {
 };
 var getProductTotalPrice = (params) => {
   const { product, bundle, options } = params;
+  const num = params.num || 1;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -362,10 +415,11 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return price * num;
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options } = params;
+  const num = (params == null ? void 0 : params.num) || 1;
   let price = Number(product.original_price);
   if (isNaN(price) || price === 0) {
     return void 0;
@@ -380,17 +434,102 @@ var getProductOriginTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return price * num;
+};
+var getProductDeposit = (params) => {
+  var _a;
+  const { cartItem, product, bundle, options } = params;
+  const num = (params == null ? void 0 : params.num) || 1;
+  if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
+    const protocols = [];
+    let total = new import_decimal.default(0);
+    const { deposit_fixed, deposit_percentage, deposit_policy_data } = (product == null ? void 0 : product.custom_deposit_data) || {};
+    protocols.push(...deposit_policy_data || []);
+    if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+      const { depositTotal, result } = handleProductDeposit({
+        depositData: product == null ? void 0 : product.custom_deposit_data,
+        total: cartItem.total || 0,
+        num
+      });
+      if (result) {
+        total = depositTotal;
+      }
+    } else {
+      if (bundle == null ? void 0 : bundle.length) {
+        total = bundle.reduce((accumulator, currentBundleProduct) => {
+          const { depositTotal, result } = handleProductDeposit({
+            depositData: currentBundleProduct == null ? void 0 : currentBundleProduct.custom_deposit_data,
+            total: currentBundleProduct.price,
+            num: currentBundleProduct.num
+          });
+          if (result) {
+            return accumulator.plus(depositTotal);
+          }
+          return accumulator;
+        }, new import_decimal.default(0));
+      }
+    }
+    return { total: total.toNumber(), protocols };
+  }
+  return null;
+};
+var handleProductDeposit = (params) => {
+  const { depositData, total, num } = params;
+  if (!depositData) {
+    return { result: false, depositTotal: new import_decimal.default(0) };
+  }
+  const { deposit_fixed, deposit_percentage } = depositData || {};
+  if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+    const depositFixed = (0, import_decimal.default)(deposit_fixed || 0);
+    const depositPercent = (0, import_decimal.default)(deposit_percentage || 0);
+    const productTotalPrice = (0, import_decimal.default)(total || 0);
+    const deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+    return { depositTotal: deposit.times(num), result: true };
+  }
+  return { result: false, depositTotal: new import_decimal.default(0) };
+};
+var deleteResourceFromCartItem = (cartItem) => {
+  cartItem.resource_id = void 0;
+  cartItem.relation_form_name = void 0;
+  delete cartItem._resourceOrigin;
+  cartItem._origin.resources = null;
+  return cartItem;
+};
+var deleteTimeFromCartItem = (cartItem) => {
+  cartItem.start_date = void 0;
+  cartItem.start_time = void 0;
+  cartItem.end_date = void 0;
+  cartItem.end_time = void 0;
+  cartItem._origin.select_date = null;
+  cartItem._origin.start_date = null;
+  cartItem._origin.start_time = null;
+  cartItem._origin.end_date = null;
+  cartItem._origin.end_time = null;
+  return cartItem;
+};
+var deleteRelationFormsFromCartItem = (cartItem) => {
+  cartItem._origin.relation_forms = null;
+  return cartItem;
+};
+var deleteHolderFromCartItem = (cartItem) => {
+  cartItem.holder_id = void 0;
+  cartItem.holder_title = void 0;
+  cartItem._origin.holder = null;
+  return cartItem;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createCartItemOrigin,
+  deleteHolderFromCartItem,
+  deleteRelationFormsFromCartItem,
   deleteResourceFromCartItem,
   deleteTimeFromCartItem,
   formatAccountToCartItem,
   formatAccountToCartItemOrigin,
   formatBundle,
   formatBundleToOrigin,
+  formatDateToCartItem,
+  formatDateToCartItemOrigin,
   formatDiscountToCartItem,
   formatDiscountToCartItemOrigin,
   formatNoteToCartItem,
@@ -399,10 +538,14 @@ var getProductOriginTotalPrice = (params) => {
   formatOptionsToOrigin,
   formatProductToCartItem,
   formatProductToCartItemOrigin,
+  formatRelationFormsToCartItem,
+  formatRelationFormsToCartItemOrigin,
   formatResourceToCartItem,
   formatResourceToCartItemOrigin,
+  getProductDeposit,
   getProductOriginTotalPrice,
   getProductTotalPrice,
   getUniqueId,
+  handleProductDeposit,
   isNormalProduct
 });

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

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { DateModuleAPI, IGetAvailableTimeListParams, ITime } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { DateModuleAPI, IGetAvailableTimeListParams, ITime } from './types';
 export declare class DateModule extends BaseModule implements Module, DateModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -13,9 +13,9 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     setDateRange(dateRange: ITime[]): void;
     getDateRange(): ITime[];
-    getMonthDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
-    getDateList(): Promise<ITime[]>;
-    getAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
+    getResourceDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
+    getDateList(): ITime[];
+    getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;
 }

package/lib/modules/Date/index.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Date/index.ts
@@ -32,7 +22,6 @@ __export(Date_exports, {
   DateModule: () => DateModule
 });
 module.exports = __toCommonJS(Date_exports);
-var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var DateModule = class extends import_BaseModule.BaseModule {
@@ -68,37 +57,33 @@ var DateModule = class extends import_BaseModule.BaseModule {
   getDateRange() {
     return this.store.dateRange;
   }
-  async getMonthDates(params) {
-    const dates = await this.getAvailableTimeList(params);
+  async getResourceDates(params) {
+    const dates = await this.getResourceAvailableTimeList(params);
     this.store.dateList = dates;
     return dates;
   }
-  async getDateList() {
+  getDateList() {
     return this.store.dateList;
   }
-  async getAvailableTimeList(params) {
+  async getResourceAvailableTimeList(params) {
     var _a;
-    const { url, query, rules } = params;
+    const { url, query, rules, type } = params;
     const fetchUrl = url || "/schedule/resource/list";
     const { start_date, end_date, resource_ids } = query || {};
     if (!start_date || !end_date) {
       return [];
     }
-    let dates = (0, import_utils.generateMonthDates)(start_date, end_date);
-    if (!(resource_ids == null ? void 0 : resource_ids.length) || (0, import_dayjs.default)(end_date).isBefore((0, import_dayjs.default)())) {
+    let dates = (0, import_utils.generateMonthDates)(start_date, end_date, type);
+    if (!(resource_ids == null ? void 0 : resource_ids.length)) {
       return (0, import_utils.disableAllDates)(dates);
     }
     try {
-      const res = await this.request.get(
-        fetchUrl,
-        {
-          start_date,
-          end_date,
-          resource_ids,
-          front_end_cache_id: this.cacheId
-        },
-        { useCache: true }
-      );
+      const res = await this.request.get(fetchUrl, {
+        start_date,
+        end_date,
+        resource_ids,
+        front_end_cache_id: this.cacheId
+      });
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);
       }

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

@@ -20,33 +20,39 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: "unavailable" | "available";
+    status: 'unavailable' | 'available';
     resource?: any[];
+    color?: string[];
 }
 /**
  * 日期模块 API
  */
 export interface DateModuleAPI {
     /**
-     * 获取可用时间列表
+     * 获取资源可用时间列表
      */
-    getAvailableTimeList: (params: IGetAvailableTimeListParams) => Promise<ITime[]>;
+    getResourceAvailableTimeList: (params: IGetAvailableTimeListParams) => Promise<ITime[]>;
     /**
      * 设置日期范围
      */
     setDateRange: (range: ITime[]) => void;
     /**
-     * 获取月份日期
+     * 获取资源日期
      */
-    getMonthDates: (params: IGetAvailableTimeListParams) => Promise<ITime[]>;
+    getResourceDates: (params: IGetAvailableTimeListParams) => Promise<ITime[]>;
 }
 export interface IGetAvailableTimeListParams {
     url?: string;
+    /** 查询参数 */
     query?: {
+        /** 开始日期 */
         start_date: string;
+        /** 结束日期 */
         end_date: string;
+        /** 资源ID */
         resource_ids?: Array<number | string>;
     };
+    /** 规则 */
     rules?: Array<{
         /**
          * 提前量
@@ -54,11 +60,21 @@ export interface IGetAvailableTimeListParams {
         cut_off_time?: {
             future_day?: number;
             unit?: number;
-            unit_type?: "minutes" | "hours" | "days";
+            unit_type?: 'minutes' | 'hours' | 'days';
         };
         /**
          * 资源ID
          */
         resourceFormIds?: number[];
+        /**
+         * 日程ID
+         */
+        schedule?: {
+            date: string;
+            color?: string[];
+            isExcluded: boolean;
+        }[];
     }>;
+    /** 类型：按月查 ｜ 按日查 */
+    type?: 'month' | 'day';
 }

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

@@ -1,11 +1,12 @@
-import { IGetAvailableTimeListParams, ITime } from "./types";
+import { IGetAvailableTimeListParams, ITime } from './types';
 /**
  * 生成当前月份的所有日期
  * @param startDate 开始日期
  * @param endDate 结束日期
+ * @param type 类型：按月查 ｜ 按周查
  * @returns 日期列表
  */
-export declare const generateMonthDates: (startDate: string, endDate: string) => ITime[];
+export declare const generateMonthDates: (startDate: string, endDate: string, type?: 'month' | 'day') => ITime[];
 /**
  * 禁用所有日期
  * @param dates 日期列表
@@ -32,4 +33,4 @@ export declare const handleAvailableDateByResource: (resources: any[], dates: IT
  * @param rules 提前量规则
  * @returns 日期列表
  */
-export declare const handleAvailableDatesByRules: (dates: ITime[], rules: IGetAvailableTimeListParams["rules"]) => ITime[];
+export declare const handleAvailableDatesByRules: (dates: ITime[], rules: IGetAvailableTimeListParams['rules']) => ITime[];

package/lib/modules/Date/utils.js

@@ -37,12 +37,12 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
-var generateMonthDates = (startDate, endDate) => {
-  const start = (0, import_dayjs.default)(startDate).format("YYYY-MM-01");
+var generateMonthDates = (startDate, endDate, type) => {
+  const start = type === "day" ? (0, import_dayjs.default)(startDate).format("YYYY-MM-DD") : (0, import_dayjs.default)(startDate).format("YYYY-MM-01");
   const end = (0, import_dayjs.default)(endDate).format("YYYY-MM-DD");
   const dates = [];
   let currentDate = (0, import_dayjs.default)(start);
-  while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(end)) || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(end))) {
+  while ((0, import_dayjs.default)(currentDate).isBefore((0, import_dayjs.default)(end), "day") || (0, import_dayjs.default)(currentDate).isSame((0, import_dayjs.default)(end), "day")) {
     dates.push({
       date: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD"),
       week: (0, import_dayjs.default)(currentDate).format("ddd"),
@@ -59,7 +59,7 @@ var disableAllDates = (dates) => {
 var disableDatesBeforeOneDay = (dates, oneDay) => {
   const day = oneDay ? (0, import_dayjs.default)(oneDay).format("YYYY-MM-DD") : (0, import_dayjs.default)().format("YYYY-MM-DD");
   return dates.map((date) => {
-    if ((0, import_dayjs.default)(date.date).isBefore(day)) {
+    if ((0, import_dayjs.default)(date.date).isBefore(day, "day")) {
       return { ...date, status: "unavailable" };
     } else {
       return date;
@@ -100,44 +100,78 @@ var handleAvailableDatesByRules = (dates, rules) => {
   if (!(rules == null ? void 0 : rules.length)) {
     return newDates;
   }
+  let scheduleMap = {};
   let latestStartDate = "";
   let earliestEndDate = "";
   let resourceFormIds = [];
   rules.forEach((rule) => {
-    var _a;
+    var _a, _b;
+    if ((_a = rule == null ? void 0 : rule.schedule) == null ? void 0 : _a.length) {
+      for (const item of rule.schedule) {
+        if ((0, import_dayjs.default)(item.date).isBefore((0, import_dayjs.default)(newDates[0].date), "day")) {
+          continue;
+        }
+        if ((0, import_dayjs.default)(item.date).isAfter(
+          (0, import_dayjs.default)(newDates[newDates.length - 1].date),
+          "day"
+        )) {
+          break;
+        }
+        if (!scheduleMap[item.date]) {
+          scheduleMap[item.date] = item;
+        } else {
+          if (!item.isExcluded) {
+            scheduleMap[item.date].isExcluded = false;
+          }
+        }
+      }
+    }
     const { future_day, unit, unit_type } = (rule == null ? void 0 : rule.cut_off_time) || {};
     if (future_day) {
       const endDate = (0, import_dayjs.default)().add(future_day, "day");
-      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate))) {
+      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate), "day")) {
         earliestEndDate = endDate.format("YYYY-MM-DD");
       }
     } else if (future_day === 0) {
       const endDate = (0, import_dayjs.default)();
-      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate))) {
+      if (!earliestEndDate || endDate.isBefore((0, import_dayjs.default)(earliestEndDate), "day")) {
         earliestEndDate = endDate.format("YYYY-MM-DD");
       }
     }
     if (unit && unit_type) {
-      const startDate = (0, import_dayjs.default)((0, import_dayjs.default)().add(unit, unit_type).format("YYYY-MM-DD"));
-      if (!latestStartDate || startDate.isAfter((0, import_dayjs.default)(latestStartDate))) {
+      const startDate = (0, import_dayjs.default)(
+        (0, import_dayjs.default)().add(unit, unit_type).format("YYYY-MM-DD")
+      );
+      if (!latestStartDate || startDate.isAfter((0, import_dayjs.default)(latestStartDate), "day")) {
         latestStartDate = startDate.format("YYYY-MM-DD");
       }
     }
-    if ((_a = rule == null ? void 0 : rule.resourceFormIds) == null ? void 0 : _a.length) {
-      resourceFormIds = [.../* @__PURE__ */ new Set([...resourceFormIds, ...rule == null ? void 0 : rule.resourceFormIds])];
+    if ((_b = rule == null ? void 0 : rule.resourceFormIds) == null ? void 0 : _b.length) {
+      resourceFormIds = [
+        .../* @__PURE__ */ new Set([...resourceFormIds, ...rule == null ? void 0 : rule.resourceFormIds])
+      ];
     }
   });
   newDates = newDates.map((date) => {
     var _a;
     const disabledDate = { ...date, status: "unavailable" };
+    if (Object.keys(scheduleMap).length) {
+      const schedule = scheduleMap[date.date];
+      if (!schedule || (schedule == null ? void 0 : schedule.isExcluded)) {
+        return { ...date, color: schedule == null ? void 0 : schedule.color, status: "unavailable" };
+      } else {
+        date.color = schedule == null ? void 0 : schedule.color;
+        disabledDate.color = schedule == null ? void 0 : schedule.color;
+      }
+    }
     if (!((_a = date == null ? void 0 : date.resource) == null ? void 0 : _a.length)) {
       return disabledDate;
     }
     if (latestStartDate || earliestEndDate) {
-      if (latestStartDate && (0, import_dayjs.default)(date.date).isBefore(latestStartDate)) {
+      if (latestStartDate && (0, import_dayjs.default)(date.date).isBefore(latestStartDate, "day")) {
         return disabledDate;
       }
-      if (earliestEndDate && (0, import_dayjs.default)(date.date).isAfter(earliestEndDate)) {
+      if (earliestEndDate && (0, import_dayjs.default)(date.date).isAfter(earliestEndDate, "day")) {
         return disabledDate;
       }
     }