@pisell/pisellos 2.1.3 → 2.1.4

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

@@ -17,6 +17,23 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateList(): ITime[];
     setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     *
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+    private roundUpToNext10Minutes;
+    /**
+     * 校正资源时间段数据
+     *
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     *
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+    private correctResourceTimeSlots;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;

package/dist/modules/Date/index.js

@@ -1,4 +1,6 @@
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }
@@ -21,6 +23,7 @@ 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";
 import cloneDeep from 'lodash-es/cloneDeep';
@@ -204,22 +207,107 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               res = _context3.sent;
+              // 校正资源时间段数据
+              if (res !== null && res !== void 0 && res.data && Array.isArray(res.data)) {
+                res.data = this.correctResourceTimeSlots(res.data);
+              }
               return _context3.abrupt("return", res);
-            case 10:
-              _context3.prev = 10;
+            case 11:
+              _context3.prev = 11;
               _context3.t0 = _context3["catch"](3);
               console.error(_context3.t0);
-            case 13:
+            case 14:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[3, 10]]);
+        }, _callee3, this, [[3, 11]]);
       }));
       function fetchResourceDates(_x4) {
         return _fetchResourceDates.apply(this, arguments);
       }
       return fetchResourceDates;
     }()
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     * 
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+  }, {
+    key: "roundUpToNext10Minutes",
+    value: function roundUpToNext10Minutes(time) {
+      var minutes = time.minute();
+      var remainder = minutes % 10;
+      if (remainder === 0) {
+        // 如果已经是10分钟的整数，保持不变
+        return time.format('YYYY-MM-DD HH:mm');
+      } else {
+        // 向上取整到下一个10分钟
+        var minutesToAdd = 10 - remainder;
+        var roundedTime = time.add(minutesToAdd, 'minute');
+        return roundedTime.format('YYYY-MM-DD HH:mm');
+      }
+    }
+
+    /**
+     * 校正资源时间段数据
+     * 
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     * 
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+  }, {
+    key: "correctResourceTimeSlots",
+    value: function correctResourceTimeSlots(resourcesData) {
+      var _this2 = this;
+      return resourcesData.map(function (resource) {
+        // 检查资源是否有 times 数组和 start_time
+        if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
+          return resource;
+        }
+        var resourceStartTime = dayjs(resource.start_time);
+
+        // 过滤和修正时间段
+        var correctedTimes = resource.times.map(function (timeSlot) {
+          if (!timeSlot.start_at || !timeSlot.end_at) {
+            return timeSlot;
+          }
+          var startAt = dayjs(timeSlot.start_at);
+          var endAt = dayjs(timeSlot.end_at);
+
+          // 如果 start_at 早于资源的 start_time，需要修正
+          if (startAt.isBefore(resourceStartTime)) {
+            // 将 start_time 向上取整到下一个10分钟整数
+            var roundedStartTime = _this2.roundUpToNext10Minutes(resourceStartTime);
+            var roundedStartTimeDayjs = dayjs(roundedStartTime);
+            console.log("[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ".concat(timeSlot.start_at, " -> ").concat(roundedStartTime, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u539F\u59CBstart_time: ").concat(resource.start_time, ")"));
+
+            // 将 start_at 修正为向上取整后的时间
+            var correctedTimeSlot = _objectSpread(_objectSpread({}, timeSlot), {}, {
+              start_at: roundedStartTime
+            });
+
+            // 检查修正后的 end_at 是否也早于修正后的 start_time
+            if (endAt.isBefore(roundedStartTimeDayjs)) {
+              console.log("[DateModule] \u65F6\u95F4\u6BB5\u65E0\u6548\uFF0C\u5C06\u88AB\u5220\u9664: ".concat(timeSlot.start_at, " - ").concat(timeSlot.end_at, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u4FEE\u6B63\u540Estart_time: ").concat(roundedStartTime, ")"));
+              return null; // 标记为删除
+            }
+            return correctedTimeSlot;
+          }
+
+          // 不需要修正的时间段直接返回
+          return timeSlot;
+        }).filter(function (timeSlot) {
+          return timeSlot !== null;
+        }); // 过滤掉被删除的时间段
+
+        return _objectSpread(_objectSpread({}, resource), {}, {
+          times: correctedTimes
+        });
+      });
+    }
   }, {
     key: "getResourceAvailableTimeList",
     value: function () {

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

@@ -17,6 +17,23 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateList(): ITime[];
     setDateList(dateList: ITime[]): void;
     fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
+    /**
+     * 将时间向上取整到下一个10分钟整数
+     *
+     * @param time dayjs 时间对象
+     * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+     */
+    private roundUpToNext10Minutes;
+    /**
+     * 校正资源时间段数据
+     *
+     * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+     * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+     *
+     * @param resourcesData 资源数据数组
+     * @returns 校正后的资源数据数组
+     */
+    private correctResourceTimeSlots;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;

package/lib/modules/Date/index.js

@@ -32,6 +32,7 @@ __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 import_cloneDeep = __toESM(require("lodash-es/cloneDeep"));
@@ -138,11 +139,74 @@ var DateModule = class extends import_BaseModule.BaseModule {
       }, {
         useCache
       });
+      if ((res == null ? void 0 : res.data) && Array.isArray(res.data)) {
+        res.data = this.correctResourceTimeSlots(res.data);
+      }
       return res;
     } catch (error) {
       console.error(error);
     }
   }
+  /**
+   * 将时间向上取整到下一个10分钟整数
+   * 
+   * @param time dayjs 时间对象
+   * @returns 向上取整后的时间字符串 (YYYY-MM-DD HH:mm 格式)
+   */
+  roundUpToNext10Minutes(time) {
+    const minutes = time.minute();
+    const remainder = minutes % 10;
+    if (remainder === 0) {
+      return time.format("YYYY-MM-DD HH:mm");
+    } else {
+      const minutesToAdd = 10 - remainder;
+      const roundedTime = time.add(minutesToAdd, "minute");
+      return roundedTime.format("YYYY-MM-DD HH:mm");
+    }
+  }
+  /**
+   * 校正资源时间段数据
+   * 
+   * 如果时间段的 start_at 早于资源的 start_time，将其同步为 start_time 的下一个10分钟整数
+   * 如果修正后 end_at 也早于修正后的 start_time，则删除该时间段
+   * 
+   * @param resourcesData 资源数据数组
+   * @returns 校正后的资源数据数组
+   */
+  correctResourceTimeSlots(resourcesData) {
+    return resourcesData.map((resource) => {
+      if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
+        return resource;
+      }
+      const resourceStartTime = (0, import_dayjs.default)(resource.start_time);
+      const correctedTimes = resource.times.map((timeSlot) => {
+        if (!timeSlot.start_at || !timeSlot.end_at) {
+          return timeSlot;
+        }
+        const startAt = (0, import_dayjs.default)(timeSlot.start_at);
+        const endAt = (0, import_dayjs.default)(timeSlot.end_at);
+        if (startAt.isBefore(resourceStartTime)) {
+          const roundedStartTime = this.roundUpToNext10Minutes(resourceStartTime);
+          const roundedStartTimeDayjs = (0, import_dayjs.default)(roundedStartTime);
+          console.log(`[DateModule] 修正时间段开始时间: ${timeSlot.start_at} -> ${roundedStartTime} (资源ID: ${resource.id}, 原始start_time: ${resource.start_time})`);
+          const correctedTimeSlot = {
+            ...timeSlot,
+            start_at: roundedStartTime
+          };
+          if (endAt.isBefore(roundedStartTimeDayjs)) {
+            console.log(`[DateModule] 时间段无效，将被删除: ${timeSlot.start_at} - ${timeSlot.end_at} (资源ID: ${resource.id}, 修正后start_time: ${roundedStartTime})`);
+            return null;
+          }
+          return correctedTimeSlot;
+        }
+        return timeSlot;
+      }).filter((timeSlot) => timeSlot !== null);
+      return {
+        ...resource,
+        times: correctedTimes
+      };
+    });
+  }
   async getResourceAvailableTimeList(params) {
     var _a;
     const { query, rules, type } = params;

package/package.json

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