@pisell/materials 6.11.30 → 6.11.32

package/es/components/pisellRecordBoard/shellFrame/Calendar/BookingCalendarDemo.js

@@ -1619,55 +1619,47 @@ function buildGroupedCourtRows(courts) {
   var remainder = courts.filter(function (c) {
     return !consumedIds.has(c.id);
   });
-  var byType = new Map();
-  var _iterator = _createForOfIteratorHelper(remainder),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var court = _step.value;
-      var label = court.type && String(court.type).trim() !== "" ? String(court.type) : "Resource";
-      var list = byType.get(label) || [];
-      list.push(court);
-      byType.set(label, list);
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  var _iterator2 = _createForOfIteratorHelper(byType),
-    _step2;
-  try {
-    var _loop = function _loop() {
-      var _step2$value = _slicedToArray(_step2.value, 2),
-        label = _step2$value[0],
-        items = _step2$value[1];
-      if (!items.length) return 1; // continue
-      var idSafe = String(label).replace(/\s+/g, "-");
-      rows.push({
-        kind: "group",
-        id: "group-".concat(idSafe),
-        label: label,
-        count: items.length,
-        collapsed: !!collapsedGroups[label]
+  var byType = {};
+  remainder.forEach(function (court) {
+    var label = court.type && String(court.type).trim() !== "" ? String(court.type) : "Resource";
+    if (!byType[label]) byType[label] = [];
+    byType[label].push(court);
+  });
+  Object.keys(byType).forEach(function (label) {
+    var items = byType[label];
+    if (!items.length) return;
+    var idSafe = String(label).replace(/\s+/g, "-");
+    rows.push({
+      kind: "group",
+      id: "group-".concat(idSafe),
+      label: label,
+      count: items.length,
+      collapsed: !!collapsedGroups[label]
+    });
+    if (!collapsedGroups[label]) {
+      items.forEach(function (court) {
+        return rows.push(_objectSpread(_objectSpread({
+          kind: "court"
+        }, court), {}, {
+          group: label
+        }));
       });
-      if (!collapsedGroups[label]) {
-        items.forEach(function (court) {
-          return rows.push(_objectSpread(_objectSpread({
-            kind: "court"
-          }, court), {}, {
-            group: label
-          }));
-        });
-      }
-    };
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      if (_loop()) continue;
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
+  });
+  var courtRowsOnly = rows.filter(function (r) {
+    return r.kind === "court";
+  });
+  /** 全部分组折叠时只有 group 头、无 court 行 → 日视图 0/0 free 与空白主体；退化为平铺 */
+  if (courtRowsOnly.length === 0 && courts.length > 0) {
+    return courts.map(function (c) {
+      return {
+        kind: "court",
+        id: c.id,
+        name: c.name,
+        type: c.type,
+        group: c.type
+      };
+    });
   }
   return rows;
 }
@@ -1678,34 +1670,34 @@ function buildGroupedCourtRows(courts) {
  */
 function assignDayOverlapLanesInPlace(overlays) {
   var byCourt = new Map();
-  var _iterator3 = _createForOfIteratorHelper(overlays),
-    _step3;
+  var _iterator = _createForOfIteratorHelper(overlays),
+    _step;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var o = _step3.value;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var o = _step.value;
       var list = byCourt.get(o.courtId);
       if (list) list.push(o);else byCourt.set(o.courtId, [o]);
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator3.f();
+    _iterator.f();
   }
-  var _iterator4 = _createForOfIteratorHelper(byCourt.values()),
-    _step4;
+  var _iterator2 = _createForOfIteratorHelper(byCourt.values()),
+    _step2;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var _list = _step4.value;
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _list = _step2.value;
       _list.sort(function (a, b) {
         if (a.start !== b.start) return a.start - b.start;
         return b.span - a.span;
       });
       var laneEnds = [];
-      var _iterator5 = _createForOfIteratorHelper(_list),
-        _step5;
+      var _iterator3 = _createForOfIteratorHelper(_list),
+        _step3;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var _o = _step5.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _o = _step3.value;
           var oEnd = _o.start + _o.span;
           var lane = 0;
           while (lane < laneEnds.length && laneEnds[lane] > _o.start) {
@@ -1720,52 +1712,52 @@ function assignDayOverlapLanesInPlace(overlays) {
         }
         /** 仅用「实际占到的最大 lane+1」，避免 laneEnds 与真实条数不一致时多留空带 */
       } catch (err) {
-        _iterator5.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator5.f();
+        _iterator3.f();
       }
       var maxL = 0;
-      var _iterator6 = _createForOfIteratorHelper(_list),
-        _step6;
+      var _iterator4 = _createForOfIteratorHelper(_list),
+        _step4;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _o2 = _step6.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _o2 = _step4.value;
           maxL = Math.max(maxL, _o2.lane);
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator6.f();
+        _iterator4.f();
       }
       var laneCount = Math.max(1, maxL + 1);
-      var _iterator7 = _createForOfIteratorHelper(_list),
-        _step7;
+      var _iterator5 = _createForOfIteratorHelper(_list),
+        _step5;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var _o3 = _step7.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var _o3 = _step5.value;
           _o3.laneCount = laneCount;
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator7.f();
+        _iterator5.f();
       }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator4.f();
+    _iterator2.f();
   }
 }
 
 /** 扫描时间轴：同一 court 在任一时刻的最大并行条数（用于行高，与分 lane 一致） */
 function maxConcurrentBookingsOnCourt(overlays, courtId) {
   var ev = [];
-  var _iterator8 = _createForOfIteratorHelper(overlays),
-    _step8;
+  var _iterator6 = _createForOfIteratorHelper(overlays),
+    _step6;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var o = _step8.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var o = _step6.value;
       if (o.courtId !== courtId) continue;
       ev.push({
         t: o.start,
@@ -1777,9 +1769,9 @@ function maxConcurrentBookingsOnCourt(overlays, courtId) {
       });
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator8.f();
+    _iterator6.f();
   }
   ev.sort(function (a, b) {
     if (a.t !== b.t) return a.t - b.t;
@@ -1814,11 +1806,11 @@ function clusterDayCourtOverlaysByOverlap(overlays, courtId) {
   var clusters = [];
   var cur = [];
   var curMaxEnd = -Infinity;
-  var _iterator9 = _createForOfIteratorHelper(sorted),
-    _step9;
+  var _iterator7 = _createForOfIteratorHelper(sorted),
+    _step7;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var o = _step9.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var o = _step7.value;
       var oe = o.start + o.span;
       if (!cur.length) {
         cur = [o];
@@ -1835,9 +1827,9 @@ function clusterDayCourtOverlaysByOverlap(overlays, courtId) {
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator9.f();
+    _iterator7.f();
   }
   if (cur.length) clusters.push(cur);
   return clusters;
@@ -1901,19 +1893,19 @@ function buildOverlayBookings(visibleCourtRows, dayKey, bookings) {
   /** 同一 court + id 只保留一条 overlay，避免数据源重复时出现叠字/重影 */
   var seen = new Set();
   var out = [];
-  var _loop2 = function _loop2() {
+  var _loop = function _loop() {
     var _dayRowHeights$i;
     var row = visibleCourtRows[i];
     if (row.kind !== "court") return 1; // continue
     var rowHeight = (_dayRowHeights$i = dayRowHeights[i]) !== null && _dayRowHeights$i !== void 0 ? _dayRowHeights$i : dayRowHeight;
-    var _iterator10 = _createForOfIteratorHelper(bookings.filter(function (b) {
+    var _iterator8 = _createForOfIteratorHelper(bookings.filter(function (b) {
         return b.courtId === row.id;
       })),
-      _step10;
+      _step8;
     try {
-      for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
         var _item$id;
-        var item = _step10.value;
+        var item = _step8.value;
         var dedupeKey = "".concat(row.id, "\0").concat((_item$id = item.id) !== null && _item$id !== void 0 ? _item$id : "", "\0").concat(dayKey);
         if (seen.has(dedupeKey)) continue;
         var seg = getBookingSegmentForDate(item, dayKey);
@@ -1936,13 +1928,13 @@ function buildOverlayBookings(visibleCourtRows, dayKey, bookings) {
         });
       }
     } catch (err) {
-      _iterator10.e(err);
+      _iterator8.e(err);
     } finally {
-      _iterator10.f();
+      _iterator8.f();
     }
   };
   for (var i = 0; i < visibleCourtRows.length; i++) {
-    if (_loop2()) continue;
+    if (_loop()) continue;
   }
   assignDayOverlapLanesInPlace(out);
   return out;
@@ -2087,13 +2079,16 @@ export default function BookingCalendarDemo() {
   var courts = useMemo(function () {
     var r = props.resources;
     if (Array.isArray(r) && r.length > 0) {
-      return r.map(function (x) {
+      var mapped = r.filter(function (x) {
+        return x && x.id !== undefined && x.id !== null && String(x.id).trim() !== "";
+      }).map(function (x) {
         return {
-          id: x.id,
-          name: x.name,
+          id: String(x.id),
+          name: x.name != null && String(x.name).trim() !== "" ? String(x.name) : String(x.id),
           type: x.groupType && String(x.groupType).trim() !== "" ? String(x.groupType) : "Resource"
         };
       });
+      if (mapped.length > 0) return mapped;
     }
     return DEFAULT_COURTS;
   }, [props.resources]);
@@ -2465,21 +2460,21 @@ export default function BookingCalendarDemo() {
       var courtDayDisplayLaneCount = {};
       var hiddenDayOverlayIdSet = new Set();
       var dayOverlayOverflowPluses = [];
-      var _iterator11 = _createForOfIteratorHelper(visibleCourtRows),
-        _step11;
+      var _iterator9 = _createForOfIteratorHelper(visibleCourtRows),
+        _step9;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var row = _step11.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var row = _step9.value;
           if (row.kind !== "court") continue;
           var cid = row.id;
           var rawLc = maxConcurrentBookingsOnCourt(overlays, cid);
           courtDayDisplayLaneCount[cid] = effectiveDayOverlayDisplayLaneCount(rawLc);
           var clusters = clusterDayCourtOverlaysByOverlap(overlays, cid);
-          var _iterator12 = _createForOfIteratorHelper(clusters),
-            _step12;
+          var _iterator10 = _createForOfIteratorHelper(clusters),
+            _step10;
           try {
-            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-              var cluster = _step12.value;
+            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+              var cluster = _step10.value;
               if (cluster.length <= DAY_OVERLAY_VISIBLE_BOOKING_CAP) continue;
               var sortedByLane = _toConsumableArray(cluster).sort(function (a, b) {
                 return a.lane - b.lane || a.start - b.start;
@@ -2491,18 +2486,18 @@ export default function BookingCalendarDemo() {
               var hidden = sortedByLane.slice(DAY_OVERLAY_VISIBLE_BOOKING_CAP);
               var minS = Infinity;
               var maxE = -Infinity;
-              var _iterator13 = _createForOfIteratorHelper(cluster),
-                _step13;
+              var _iterator11 = _createForOfIteratorHelper(cluster),
+                _step11;
               try {
-                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                  var _o4 = _step13.value;
+                for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                  var _o4 = _step11.value;
                   minS = Math.min(minS, _o4.start);
                   maxE = Math.max(maxE, _o4.start + _o4.span);
                 }
               } catch (err) {
-                _iterator13.e(err);
+                _iterator11.e(err);
               } finally {
-                _iterator13.f();
+                _iterator11.f();
               }
               var anchor = hidden[0];
               dayOverlayOverflowPluses.push({
@@ -2519,15 +2514,15 @@ export default function BookingCalendarDemo() {
               });
             }
           } catch (err) {
-            _iterator12.e(err);
+            _iterator10.e(err);
           } finally {
-            _iterator12.f();
+            _iterator10.f();
           }
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator11.f();
+        _iterator9.f();
       }
       return {
         dayRowHeights: expandedHeights,
@@ -3234,7 +3229,6 @@ export default function BookingCalendarDemo() {
       return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, key, _objectSpread(_objectSpread({}, prev[key] || {}), {}, _defineProperty({}, filesSubtab, true))));
     });
   }, [detailItem, detailMode, detailTab, filesSubtab]);
-  console.log(visibleCourtRows, 'visibleCourtRows1234', visibleCourts, collapsedGroups);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: Boolean(props.loading),
     wrapperClassName: "pisell-rb-cal-spin-wrap flex min-h-0 flex-1 flex-col"

package/es/components/pisellReservationScheduleBand/PisellReservationScheduleBand.less

@@ -34,7 +34,8 @@
 /** 与中间日程条同一行：整行深色底，左标题 / 中选日 / 右操作 */
 .pisell-reservation-schedule-band-schedule-row {
   display: grid;
-  grid-template-columns: 1fr auto 1fr;
+  /** 左右按内容占位，剩余宽度给中间，避免「等分 1fr」把左侧挤窄后标题与 Segmented 被迫换行 */
+  grid-template-columns: auto minmax(0, 1fr) auto;
   align-items: center;
   width: 100%;
   min-width: 0;
@@ -61,7 +62,7 @@
 }
 
 .pisell-reservation-schedule-band-schedule {
-  justify-self: center;
+  justify-self: stretch;
   min-width: 0;
   display: flex;
   flex-direction: row;

package/lib/components/pisellRecordBoard/shellFrame/Calendar/BookingCalendarDemo.js

@@ -1540,15 +1540,15 @@ function buildGroupedCourtRows(courts, collapsedGroups = {}) {
     }
   });
   const remainder = courts.filter((c) => !consumedIds.has(c.id));
-  const byType = /* @__PURE__ */ new Map();
-  for (const court of remainder) {
+  const byType = {};
+  remainder.forEach((court) => {
     const label = court.type && String(court.type).trim() !== "" ? String(court.type) : "Resource";
-    const list = byType.get(label) || [];
-    list.push(court);
-    byType.set(label, list);
-  }
-  for (const [label, items] of byType) {
-    if (!items.length) continue;
+    if (!byType[label]) byType[label] = [];
+    byType[label].push(court);
+  });
+  Object.keys(byType).forEach((label) => {
+    const items = byType[label];
+    if (!items.length) return;
     const idSafe = String(label).replace(/\s+/g, "-");
     rows.push({
       kind: "group",
@@ -1560,6 +1560,16 @@ function buildGroupedCourtRows(courts, collapsedGroups = {}) {
     if (!collapsedGroups[label]) {
       items.forEach((court) => rows.push({ kind: "court", ...court, group: label }));
     }
+  });
+  const courtRowsOnly = rows.filter((r) => r.kind === "court");
+  if (courtRowsOnly.length === 0 && courts.length > 0) {
+    return courts.map((c) => ({
+      kind: "court",
+      id: c.id,
+      name: c.name,
+      type: c.type,
+      group: c.type
+    }));
   }
   return rows;
 }
@@ -1834,11 +1844,14 @@ function BookingCalendarDemo(props = {}) {
   const courts = (0, import_react.useMemo)(() => {
     const r = props.resources;
     if (Array.isArray(r) && r.length > 0) {
-      return r.map((x) => ({
-        id: x.id,
-        name: x.name,
+      const mapped = r.filter(
+        (x) => x && x.id !== void 0 && x.id !== null && String(x.id).trim() !== ""
+      ).map((x) => ({
+        id: String(x.id),
+        name: x.name != null && String(x.name).trim() !== "" ? String(x.name) : String(x.id),
         type: x.groupType && String(x.groupType).trim() !== "" ? String(x.groupType) : "Resource"
       }));
+      if (mapped.length > 0) return mapped;
     }
     return DEFAULT_COURTS;
   }, [props.resources]);
@@ -2803,7 +2816,6 @@ function BookingCalendarDemo(props = {}) {
       [key]: { ...prev[key] || {}, [filesSubtab]: true }
     }));
   }, [detailItem, detailMode, detailTab, filesSubtab]);
-  console.log(visibleCourtRows, "visibleCourtRows1234", visibleCourts, collapsedGroups);
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Spin,
     {

package/lib/components/pisellReservationScheduleBand/PisellReservationScheduleBand.less

@@ -34,7 +34,8 @@
 /** 与中间日程条同一行：整行深色底，左标题 / 中选日 / 右操作 */
 .pisell-reservation-schedule-band-schedule-row {
   display: grid;
-  grid-template-columns: 1fr auto 1fr;
+  /** 左右按内容占位，剩余宽度给中间，避免「等分 1fr」把左侧挤窄后标题与 Segmented 被迫换行 */
+  grid-template-columns: auto minmax(0, 1fr) auto;
   align-items: center;
   width: 100%;
   min-width: 0;
@@ -61,7 +62,7 @@
 }
 
 .pisell-reservation-schedule-band-schedule {
-  justify-self: center;
+  justify-self: stretch;
   min-width: 0;
   display: flex;
   flex-direction: row;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.11.30",
+  "version": "6.11.32",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -100,8 +100,8 @@
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
     "@pisell/date-picker": "3.0.8",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2"
+    "@pisell/utils": "3.0.2",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",