@pisell/pisellos 3.0.5 → 3.0.7

package/dist/modules/Date/index.js

@@ -15,7 +15,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import dayjs from "dayjs";
 import { BaseModule } from "../BaseModule";
 import { disableAllDates, generateMonthDates, handleAvailableDateByResource, handleAvailableDatesByRules } from "./utils";
 export var DateModule = /*#__PURE__*/function (_BaseModule) {
@@ -25,8 +24,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     var _this;
     _classCallCheck(this, DateModule);
     _this = _super.call(this, name, version);
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "date");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'date');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
@@ -44,7 +43,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
-              this.request = this.core.getPlugin("request");
+              this.request = this.core.getPlugin('request');
               if (options.initialState) {
                 this.store.dateRange = options.initialState.dateRange;
                 this.store.dateList = options.initialState.dateList;
@@ -53,7 +52,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 _context.next = 6;
                 break;
               }
-              throw new Error("DateModule 需要 request 插件支持");
+              throw new Error('DateModule 需要 request 插件支持');
             case 6:
               if ((_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
@@ -84,15 +83,15 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.dateRange;
     }
   }, {
-    key: "getMonthDates",
+    key: "getResourceDates",
     value: function () {
-      var _getMonthDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var _getResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
         var dates;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.getAvailableTimeList(params);
+              return this.getResourceAvailableTimeList(params);
             case 2:
               dates = _context2.sent;
               this.store.dateList = dates;
@@ -103,72 +102,56 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee2, this);
       }));
-      function getMonthDates(_x3) {
-        return _getMonthDates.apply(this, arguments);
+      function getResourceDates(_x3) {
+        return _getResourceDates.apply(this, arguments);
       }
-      return getMonthDates;
+      return getResourceDates;
     }()
   }, {
     key: "getDateList",
+    value: function getDateList() {
+      return this.store.dateList;
+    }
+  }, {
+    key: "getResourceAvailableTimeList",
     value: function () {
-      var _getDateList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _getResourceAvailableTimeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+        var url, query, rules, type, fetchUrl, _ref, start_date, end_date, resource_ids, dates, _res$data, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              return _context3.abrupt("return", this.store.dateList);
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function getDateList() {
-        return _getDateList.apply(this, arguments);
-      }
-      return getDateList;
-    }()
-  }, {
-    key: "getAvailableTimeList",
-    value: function () {
-      var _getAvailableTimeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var url, query, rules, fetchUrl, _ref, start_date, end_date, resource_ids, dates, _res$data, res;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              url = params.url, query = params.query, rules = params.rules;
-              fetchUrl = url || "/schedule/resource/list";
+              url = params.url, query = params.query, rules = params.rules, type = params.type;
+              fetchUrl = url || '/schedule/resource/list';
               _ref = query || {}, start_date = _ref.start_date, end_date = _ref.end_date, resource_ids = _ref.resource_ids;
               if (!(!start_date || !end_date)) {
-                _context4.next = 5;
+                _context3.next = 5;
                 break;
               }
-              return _context4.abrupt("return", []);
+              return _context3.abrupt("return", []);
             case 5:
               // 1.生成当前月份的所有日期，默认都是可用的
-              dates = generateMonthDates(start_date, end_date); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
-              if (!(!(resource_ids !== null && resource_ids !== void 0 && resource_ids.length) || dayjs(end_date).isBefore(dayjs().startOf('day')))) {
-                _context4.next = 8;
+              dates = generateMonthDates(start_date, end_date, type); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
+              if (resource_ids !== null && resource_ids !== void 0 && resource_ids.length) {
+                _context3.next = 8;
                 break;
               }
-              return _context4.abrupt("return", disableAllDates(dates));
+              return _context3.abrupt("return", disableAllDates(dates));
             case 8:
-              _context4.prev = 8;
-              _context4.next = 11;
+              _context3.prev = 8;
+              _context3.next = 11;
               return this.request.get(fetchUrl, {
                 start_date: start_date,
                 end_date: end_date,
                 resource_ids: resource_ids,
                 front_end_cache_id: this.cacheId
-              }, {
-                useCache: true
               });
             case 11:
-              res = _context4.sent;
+              res = _context3.sent;
               if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.length) {
-                _context4.next = 14;
+                _context3.next = 14;
                 break;
               }
-              return _context4.abrupt("return", disableAllDates(dates));
+              return _context3.abrupt("return", disableAllDates(dates));
             case 14:
               // 2.根据资源times判定哪些日期内存在可用资源
               dates = handleAvailableDateByResource(res.data, dates);
@@ -177,22 +160,22 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               if (rules !== null && rules !== void 0 && rules.length) {
                 dates = handleAvailableDatesByRules(dates, rules);
               }
-              return _context4.abrupt("return", dates);
+              return _context3.abrupt("return", dates);
             case 19:
-              _context4.prev = 19;
-              _context4.t0 = _context4["catch"](8);
-              console.log("getAvailableTimeList_error", _context4.t0);
-              return _context4.abrupt("return", disableAllDates(dates));
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](8);
+              console.log('getAvailableTimeList_error', _context3.t0);
+              return _context3.abrupt("return", disableAllDates(dates));
             case 23:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this, [[8, 19]]);
+        }, _callee3, this, [[8, 19]]);
       }));
-      function getAvailableTimeList(_x4) {
-        return _getAvailableTimeList.apply(this, arguments);
+      function getResourceAvailableTimeList(_x4) {
+        return _getResourceAvailableTimeList.apply(this, arguments);
       }
-      return getAvailableTimeList;
+      return getResourceAvailableTimeList;
     }()
   }, {
     key: "clearDateRange",
@@ -207,7 +190,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: this.store,
-          cacheKey: ["dateRange", "dateList"]
+          cacheKey: ['dateRange', 'dateList']
         });
       }
     }

package/dist/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/dist/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/dist/modules/Date/utils.js

@@ -2,9 +2,10 @@ var _excluded = ["form_id", "id", "times"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -13,26 +14,28 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 /**
  * 生成当前月份的所有日期
  * @param startDate 开始日期
  * @param endDate 结束日期
+ * @param type 类型：按月查 ｜ 按周查
  * @returns 日期列表
  */
-export var generateMonthDates = function generateMonthDates(startDate, endDate) {
-  var start = dayjs(startDate).format("YYYY-MM-01");
-  var end = dayjs(endDate).format("YYYY-MM-DD");
+export var generateMonthDates = function generateMonthDates(startDate, endDate, type) {
+  // 如果是按月查询需要从01号开始，如果是按周查询以开始结束时间为准
+  var start = type === 'day' ? dayjs(startDate).format('YYYY-MM-DD') : dayjs(startDate).format('YYYY-MM-01');
+  var end = dayjs(endDate).format('YYYY-MM-DD');
   var dates = [];
   var currentDate = dayjs(start);
-  while (dayjs(currentDate).isBefore(dayjs(end)) || dayjs(currentDate).isSame(dayjs(end))) {
+  while (dayjs(currentDate).isBefore(dayjs(end), 'day') || dayjs(currentDate).isSame(dayjs(end), 'day')) {
     dates.push({
-      date: dayjs(currentDate).format("YYYY-MM-DD"),
-      week: dayjs(currentDate).format("ddd"),
+      date: dayjs(currentDate).format('YYYY-MM-DD'),
+      week: dayjs(currentDate).format('ddd'),
       weekNum: dayjs(currentDate).day(),
-      status: "available"
+      status: 'available'
     });
-    currentDate = dayjs(currentDate).add(1, "day");
+    currentDate = dayjs(currentDate).add(1, 'day');
   }
   return dates;
 };
@@ -45,7 +48,7 @@ export var generateMonthDates = function generateMonthDates(startDate, endDate)
 export var disableAllDates = function disableAllDates(dates) {
   return dates.map(function (date) {
     return _objectSpread(_objectSpread({}, date), {}, {
-      status: "unavailable"
+      status: 'unavailable'
     });
   });
 };
@@ -57,11 +60,11 @@ export var disableAllDates = function disableAllDates(dates) {
  * @returns 日期列表
  */
 export var disableDatesBeforeOneDay = function disableDatesBeforeOneDay(dates, oneDay) {
-  var day = oneDay ? dayjs(oneDay).format("YYYY-MM-DD") : dayjs().format("YYYY-MM-DD");
+  var day = oneDay ? dayjs(oneDay).format('YYYY-MM-DD') : dayjs().format('YYYY-MM-DD');
   return dates.map(function (date) {
-    if (dayjs(date.date).isBefore(day)) {
+    if (dayjs(date.date).isBefore(day, 'day')) {
       return _objectSpread(_objectSpread({}, date), {}, {
-        status: "unavailable"
+        status: 'unavailable'
       });
     } else {
       return date;
@@ -84,7 +87,7 @@ export var handleAvailableDateByResource = function handleAvailableDateByResourc
       others = _objectWithoutProperties(resource, _excluded);
     times.forEach(function (time) {
       var start_at = time.start_at;
-      var date = dayjs(start_at).format("YYYY-MM-DD");
+      var date = dayjs(start_at).format('YYYY-MM-DD');
       if (!dateMap[date]) {
         dateMap[date] = [_objectSpread(_objectSpread({
           form_id: form_id,
@@ -118,7 +121,7 @@ export var handleAvailableDateByResource = function handleAvailableDateByResourc
       });
     } else {
       return _objectSpread(_objectSpread({}, date), {}, {
-        status: "unavailable",
+        status: 'unavailable',
         resource: []
       });
     }
@@ -136,33 +139,64 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
   if (!(rules !== null && rules !== void 0 && rules.length)) {
     return newDates;
   }
-  var latestStartDate = ""; // 最晚开始日期
-  var earliestEndDate = ""; // 最早结束日期
+  var scheduleMap = {}; // 日程列表
+  var latestStartDate = ''; // 最晚开始日期
+  var earliestEndDate = ''; // 最早结束日期
   var resourceFormIds = [];
   rules.forEach(function (rule) {
-    var _rule$resourceFormIds;
+    var _rule$schedule, _rule$resourceFormIds;
+    // 如果有日程列表，需要将它去重加入到scheduleMap
+    if (rule !== null && rule !== void 0 && (_rule$schedule = rule.schedule) !== null && _rule$schedule !== void 0 && _rule$schedule.length) {
+      var _iterator = _createForOfIteratorHelper(rule.schedule),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var item = _step.value;
+          // 判断item.date是否在dates的开始和结束日期范围内，如果不在则跳过
+          if (dayjs(item.date).isBefore(dayjs(newDates[0].date), 'day')) {
+            continue;
+          }
+          // 判断日程日期是否超过了dates中的最后一个日期，如果超过了则循环break
+          if (dayjs(item.date).isAfter(dayjs(newDates[newDates.length - 1].date), 'day')) {
+            break;
+          }
+          // 在范围内的日程如果scheduleMap中不存在，则加入到scheduleMap
+          if (!scheduleMap[item.date]) {
+            scheduleMap[item.date] = item;
+          } else {
+            if (!item.isExcluded) {
+              scheduleMap[item.date].isExcluded = false;
+            }
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
     var _ref = (rule === null || rule === void 0 ? void 0 : rule.cut_off_time) || {},
       future_day = _ref.future_day,
       unit = _ref.unit,
       unit_type = _ref.unit_type;
     // 预定天数存在，则开始计算从当前时间开始往后推预定天数作为结束时间
     if (future_day) {
-      var endDate = dayjs().add(future_day, "day");
-      if (!earliestEndDate || endDate.isBefore(dayjs(earliestEndDate))) {
-        earliestEndDate = endDate.format("YYYY-MM-DD");
+      var endDate = dayjs().add(future_day, 'day');
+      if (!earliestEndDate || endDate.isBefore(dayjs(earliestEndDate), 'day')) {
+        earliestEndDate = endDate.format('YYYY-MM-DD');
       }
     } else if (future_day === 0) {
       var _endDate = dayjs();
-      if (!earliestEndDate || _endDate.isBefore(dayjs(earliestEndDate))) {
-        earliestEndDate = _endDate.format("YYYY-MM-DD");
+      if (!earliestEndDate || _endDate.isBefore(dayjs(earliestEndDate), 'day')) {
+        earliestEndDate = _endDate.format('YYYY-MM-DD');
       }
     }
 
     // 如果存在提前预约时间，则开始计算从当前时间开始往后推提前预约时间作为开始时间
     if (unit && unit_type) {
-      var startDate = dayjs(dayjs().add(unit, unit_type).format("YYYY-MM-DD"));
-      if (!latestStartDate || startDate.isAfter(dayjs(latestStartDate))) {
-        latestStartDate = startDate.format("YYYY-MM-DD");
+      var startDate = dayjs(dayjs().add(unit, unit_type).format('YYYY-MM-DD'));
+      if (!latestStartDate || startDate.isAfter(dayjs(latestStartDate), 'day')) {
+        latestStartDate = startDate.format('YYYY-MM-DD');
       }
     }
     if (rule !== null && rule !== void 0 && (_rule$resourceFormIds = rule.resourceFormIds) !== null && _rule$resourceFormIds !== void 0 && _rule$resourceFormIds.length) {
@@ -173,18 +207,35 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
   newDates = newDates.map(function (date) {
     var _date$resource, _resourceFormIds;
     var disabledDate = _objectSpread(_objectSpread({}, date), {}, {
-      status: "unavailable"
+      status: 'unavailable'
     });
+
+    // 根据日程判断日期是否可用
+    if (Object.keys(scheduleMap).length) {
+      var schedule = scheduleMap[date.date];
+      // 如果日程不存在 或者 日程存在但是需要排除，则设置为不可用
+      if (!schedule || schedule !== null && schedule !== void 0 && schedule.isExcluded) {
+        return _objectSpread(_objectSpread({}, date), {}, {
+          color: schedule === null || schedule === void 0 ? void 0 : schedule.color,
+          status: 'unavailable'
+        });
+      } else {
+        date.color = schedule === null || schedule === void 0 ? void 0 : schedule.color;
+        disabledDate.color = schedule === null || schedule === void 0 ? void 0 : schedule.color;
+      }
+    }
+
+    // 如果资源不存在，则设置为不可用
     if (!(date !== null && date !== void 0 && (_date$resource = date.resource) !== null && _date$resource !== void 0 && _date$resource.length)) {
       return disabledDate;
     }
     if (latestStartDate || earliestEndDate) {
       // 如果时间在最早开始时间之前，则设置为不可用
-      if (latestStartDate && dayjs(date.date).isBefore(latestStartDate)) {
+      if (latestStartDate && dayjs(date.date).isBefore(latestStartDate, 'day')) {
         return disabledDate;
       }
       // 如果时间在最早结束时间之后，则设置为不可用
-      if (earliestEndDate && dayjs(date.date).isAfter(earliestEndDate)) {
+      if (earliestEndDate && dayjs(date.date).isAfter(earliestEndDate, 'day')) {
         return disabledDate;
       }
     }

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

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { Discount, DiscountModuleAPI } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { Discount, DiscountModuleAPI } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -15,7 +15,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setDiscountList(discountList: Discount[]): Promise<void>;
     getDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: "create";
+        action?: 'create';
         with_good_pass: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;

package/dist/modules/Discount/index.js

@@ -25,8 +25,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     var _this;
     _classCallCheck(this, DiscountModule);
     _this = _super.call(this, name, version);
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "discount");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'discount');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
@@ -59,19 +59,19 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 获取依赖的插件
-              this.request = core.getPlugin("request");
-              this.window = core.getPlugin("window");
+              this.request = core.getPlugin('request');
+              this.window = core.getPlugin('window');
               if (this.request) {
                 _context.next = 9;
                 break;
               }
-              throw new Error("discount模块需要 request 插件支持");
+              throw new Error('discount模块需要 request 插件支持');
             case 9:
               if (this.window) {
                 _context.next = 11;
                 break;
               }
-              throw new Error("discount模块需要 window 插件支持");
+              throw new Error('discount模块需要 window 插件支持');
             case 11:
             case "end":
               return _context.stop();
@@ -147,7 +147,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/machinecode/batch-search", {
                 code: code,
                 translate_flag: 1,
-                tag: "good_pass",
+                tag: 'good_pass',
                 available: 1,
                 relation_product: 1
               });
@@ -170,7 +170,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
       return discountList.filter(function (discount) {
-        return discount.limit_status === "enable" && Number((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0) - Number((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0) > 0;
+        return discount.limit_status === 'enable' && Number((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0) - Number((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0) > 0;
       });
     }
 
@@ -178,7 +178,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "uniqueByProductId",
     value: function uniqueByProductId(discountList) {
-      return uniqueById(discountList, "product_id");
+      return uniqueById(discountList, 'product_id');
     }
   }, {
     key: "filterDiscountListByProductIds",
@@ -215,7 +215,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               _context5.next = 4;
               return this.core.effects.emit(DiscountHooks.OnDestroy, {});
             case 4:
-              console.log("[Discount] 已销毁");
+              console.log('[Discount] 已销毁');
             case 5:
             case "end":
               return _context5.stop();
@@ -235,7 +235,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.discountList = [];
-              console.log("[Discount] clear");
+              console.log('[Discount] clear');
             case 2:
             case "end":
               return _context6.stop();

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

@@ -1,6 +1,7 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { OrderModuleAPI, CommitOrderParams } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { OrderModuleAPI, CommitOrderParams } from './types';
+import { CartItem } from '../Cart/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -8,7 +9,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private request;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    createOrder(params: CommitOrderParams["query"]): {
+    createOrder(params: CommitOrderParams['query']): {
         type: string;
         platform: string;
         sales_channel: string;
@@ -16,6 +17,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         bookings: any[];
         shop_note: string;
         schedule_date: string;
+        is_deposit: number;
     };
-    commitOrder(order: CommitOrderParams): Promise<void>;
+    checkBeforeSubmitOrder(params: {
+        cartItems: CartItem[];
+        type: 'holder' | 'account';
+    }): boolean;
+    submitOrder(order: CommitOrderParams): Promise<void>;
 }