@pisell/materials 6.11.31 → 6.11.32

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

@@ -1590,7 +1590,6 @@ function buildGroupedCourtRows(courts) {
   var predefined = ["VIP", "Standard"];
   var rows = [];
   var consumedIds = new Set();
-  console.log(courts, collapsedGroups, 'courts, collapsedGroups = {}');
   predefined.forEach(function (group) {
     var items = courts.filter(function (court) {
       return court.type === group;
@@ -1647,7 +1646,21 @@ function buildGroupedCourtRows(courts) {
       });
     }
   });
-  console.log(rows, 'rows123');
+  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;
 }
 
@@ -2066,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]);
@@ -3213,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

@@ -1524,7 +1524,6 @@ function buildGroupedCourtRows(courts, collapsedGroups = {}) {
   const predefined = ["VIP", "Standard"];
   const rows = [];
   const consumedIds = /* @__PURE__ */ new Set();
-  console.log(courts, collapsedGroups, "courts, collapsedGroups = {}");
   predefined.forEach((group) => {
     const items = courts.filter((court) => court.type === group);
     if (items.length === 0) return;
@@ -1562,7 +1561,16 @@ function buildGroupedCourtRows(courts, collapsedGroups = {}) {
       items.forEach((court) => rows.push({ kind: "court", ...court, group: label }));
     }
   });
-  console.log(rows, "rows123");
+  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;
 }
 function assignDayOverlapLanesInPlace(overlays) {
@@ -1836,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]);
@@ -2805,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.31",
+  "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",