@ebiz/designer-components 0.1.119 → 0.1.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.1.119",
+  "version": "0.1.121",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/EbizDormDashboard.vue

@@ -18,7 +18,7 @@
                 <div class="room-percent">{{ roomPercent(room) }}%</div>
               </div>
               <div class="room-no">{{ room.roomNo }}</div>
-              <div class="room-type">{{ room.roomType }}</div>
+              <div class="room-type">{{ room.roomType }}{{ room.roomDormType ? `(${room.roomDormType})` : ''}}</div>
             </div>
           </t-tooltip>
         </div>
@@ -128,6 +128,7 @@ const emitRoomClick = (room, floor) => {
     floor: floor.name ?? floor.floor,
     roomNo: room.roomNo,
     roomType: room.roomType,
+    roomDormType: room.roomDormType,
     totalBeds: Number(room.totalBeds || 0),
     occupiedBeds: Number(room.occupiedBeds || 0),
     percent: roomPercent(room)
@@ -160,6 +161,7 @@ const getFloors = () => {
         rooms: rooms.map((r) => ({
           roomNo: String(r.room_no ?? r.name ?? ''),
           roomType: r.type_desc ?? '',
+          roomDormType: r.dorm_type_desc ?? '',
           totalBeds: Number(r.occupant_max_num ?? r.bed_num ?? 0),
           occupiedBeds: Number(r.occupant_num ?? 0)
         }))
@@ -242,7 +244,6 @@ onMounted(() => {
 }
 .floor-block {
   display: flex;
-  flex-direction: column;
   gap: 8px;
   border: 1px solid #eee;
   border-radius: 12px;
@@ -256,11 +257,14 @@ onMounted(() => {
 }
 .floor-title {
   font-weight: 500;
+      white-space: nowrap;
+    margin-top: 10px;
 }
 .rooms-grid {
+  width: calc(100% - 30px);
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(55px, 1fr));
-  gap: 12px;
+  grid-template-columns: repeat(auto-fill, 40px);
+  gap: 28px;
 }
 .room-item {
   display: flex;
@@ -269,7 +273,7 @@ onMounted(() => {
 }
 .room-card {
   position: relative;
-  height: 70px;
+  height: 40px;
   border-radius: 8px;
   background: #f0f0f0;
   overflow: hidden;
@@ -297,13 +301,14 @@ onMounted(() => {
   line-height: 1;
   font-weight: 600;
   color: #333;
-  text-align: center;
+  text-align: left;
 }
 .room-type {
   margin-top: 2px;
-  font-size: 12px;
+  font-size: 10px;
   line-height: 1;
   color: #666;
-  text-align: center;
+  text-align: left;
+  white-space: nowrap;
 }
 </style>

package/src/components/EbizParkingDashboard.vue

@@ -9,12 +9,13 @@
           <t-card :bordered="true" class="slot-card">
             <div class="slot-header">
               <div class="slot-number">{{ assignedMap[n]?.number || (curType === 'free' ? '0'+n : n) }}</div>
-              <t-tag v-if="assignedMap[n]" theme="success" size="small">已分配</t-tag>
+              <t-tag v-if="assignedMap[n] && assignedMap[n].status === 'CANCELLED'" theme="success" size="small">已分配</t-tag>
+              <t-tag v-else-if="assignedMap[n] && assignedMap[n].status === 'DESTORY'" theme="danger" size="small">已注销</t-tag>
               <t-tag v-else theme="default" size="small">未分配</t-tag>
             </div>
             <div class="slot-body">
               <div v-if="assignedMap[n]" class="slot-info">
-                <div class="slot-name">{{ assignedMap[n].name }}</div>
+                <div class="slot-name">{{ assignedMap[n].name || assignedMap[n].employee_info?.name }}</div>
                 <div class="slot-plate">{{ assignedMap[n].plate_number }}</div>
                 <div class="slot-desc">{{ assignedMap[n].fee_type_desc }} · {{ assignedMap[n].location_id_name }}</div>
               </div>
@@ -106,12 +107,12 @@ const fetchData = () => {
         page: 1,
         pageSize: 500,
         queryParams: {
-          status: 'CANCELLED'
+          status: 'CANCELLED,DESTORY'
         }
       },
       {
-        key: 'ParkingSpaceApply_Key',
-        apiId: 2977,
+        key: 'ParkingSpaceApplyDashboard',
+        apiId: 3395,
         apiType: 0
       }
     )