@aleen42/calendar 1.1.0-beta.10 → 1.1.0-beta.11

package/dist/calendar.css

@@ -6121,7 +6121,6 @@ table th {
 
 .u-schedule .schedule > .calendar .occupy,
 .u-schedule .schedule > .calendar .free {
-  border-radius: 4px;
   max-height: 33px /** border = */;
   position: absolute;
   top: 0;
@@ -6136,6 +6135,7 @@ table th {
 }
 
 .u-schedule .schedule > .calendar .occupy {
+  border-radius: 4px;
   z-index: 2;
 }
 

package/dist/calendar.js

@@ -36897,33 +36897,11 @@ const I18N = i18n.cal;
             if (current === target && !js_fn.isEmpty(result.freeBusy)) {
                 cache = result;
                 nodes.map(node => {
-                    /**
-                     * 存在重叠时间则进行合并
-                     * @examples
-                     *   [['2024-01-01 00:10:00', '2024-01-01 00:30:00'], ['2024-01-01 00:15:00', '2024-01-01 00:20:00']] -> [['2024-01-01 00:10:00', '2024-01-00 01:30:00']]
-                     *   [['2024-01-01 00:20:00', '2024-01-01 00:30:00'], ['2024-01-01 00:10:00', '2024-01-01 00:20:00']] -> [['2024-01-01 00:10:00', '2024-01-00 01:30:00']]
-                     *   [['2024-01-01 00:00:00', '2024-01-01 00:10:00'], ['2024-01-01 00:20:00', '2024-01-01 00:30:00']] -> [['2024-01-01 00:00:00', '2024-01-01 00:10:00'], ['2024-01-01 00:20:00', '2024-01-01 00:30:00']]
-                     */
                     const $row = external_$_(`tbody tr:eq(${node.getIndex()}) td:eq(0)`, $data.eq(node.getParentNode().getIndex()));
                     const fmtTime = t => fmtDateTime(t).replace(' 00:00', '');
 
                     // 忙闲状态
-                    $row.append((ranges => {
-                        while (ranges.sort((a, b) => schedule_mm(a[0]) - schedule_mm(b[0]))
-                            .some(([start, end], i) => ranges.slice(0, i).some(([prevStart, prevEnd], j) => {
-                                const mStart = schedule_mm(start), mPrevStart = schedule_mm(prevStart);
-                                const mEnd = schedule_mm(end), mPrevEnd = schedule_mm(prevEnd);
-                                if ((mStart >= mPrevStart && mStart <= mPrevEnd) || (mEnd >= mPrevStart && mEnd <= mPrevEnd)) {
-                                    ranges.splice(j, 1, [
-                                        mStart < mPrevStart ? start : prevStart,
-                                        mEnd > mPrevEnd ? end : prevEnd,
-                                    ]);
-                                    ranges.splice(i, 1);
-                                    return 1;
-                                }
-                            }))) {}
-                        return ranges;
-                    })(result.freeBusy[node.addr]).map(([start, end]) => {
+                    $row.append(result.freeBusy[node.addr].map(([start, end]) => {
                         start = schedule_mm(start);
                         end = schedule_mm(end);
                         return external_$_(`<div class="${OCCUPY_CLASS}">`)