From cfb04396e2b5f51382cbc0ab4aeb65ab7ca4dd3a Mon Sep 17 00:00:00 2001
From: xudan <staysky25@outlook.com>
Date: Mon, 14 Jul 2025 14:03:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=94=AF=E6=8C=81=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=92=8C=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A5=E5=A4=84=E7=90=86=E5=85=88=E8=BF=9B=E5=85=88=E5=87=BA?=
 =?UTF-8?q?=E5=92=8C=E5=90=8E=E8=BF=9B=E5=85=88=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/map/type.ts                     |  1 +
 src/apis/scene/type.ts                   |  1 +
 src/components/card/area-detail-card.vue | 12 ++++++++++++
 src/components/card/area-edit-card.vue   | 15 +++++++++++++++
 src/services/editor.service.ts           | 13 +++++++++----
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/apis/map/type.ts b/src/apis/map/type.ts
index 868c120..473fc85 100644
--- a/src/apis/map/type.ts
+++ b/src/apis/map/type.ts
@@ -44,6 +44,7 @@ export interface MapAreaInfo {
   points?: Array<string>; // 绑定点位id集合
   routes?: Array<string>; // 绑定线路id集合
   maxAmr?: number; // 最大可容纳AMR数
+  inoutflag?: 1 | 2; // 库区规则
 }
 //#endregion
 
diff --git a/src/apis/scene/type.ts b/src/apis/scene/type.ts
index 7f1758a..f0c4a47 100644
--- a/src/apis/scene/type.ts
+++ b/src/apis/scene/type.ts
@@ -67,6 +67,7 @@ export interface StandardSceneArea {
   points?: Array<string>; // 绑定点位id集合
   routes?: Array<string>; // 绑定线路id集合
   maxAmr?: number; // 最大可容纳AMR数
+  inoutflag?: 1 | 2; // 库区规则
   config?: object; // 其它属性配置（可按需增加）
   properties?: unknown; // 附加数据（前端不做任何处理）
 }
diff --git a/src/components/card/area-detail-card.vue b/src/components/card/area-detail-card.vue
index d96d38c..3f45587 100644
--- a/src/components/card/area-detail-card.vue
+++ b/src/components/card/area-detail-card.vue
@@ -43,6 +43,12 @@ const bindRoute = computed<string>(
       .filter((v) => !!v)
       .join('、') ?? '',
 );
+
+const ruleText = computed(() => {
+  if (area.value?.inoutflag === 1) return '先进先出';
+  if (area.value?.inoutflag === 2) return '后进先出';
+  return '';
+});
 </script>
 
 <template>
@@ -69,6 +75,12 @@ const bindRoute = computed<string>(
             <a-typography-text>{{ pen.area?.maxAmr ?? $t('暂无') }}</a-typography-text>
           </a-flex>
         </a-list-item>
+        <a-list-item v-if="MapAreaType.库区 === area.type">
+          <a-flex :gap="8" vertical>
+            <a-typography-text type="secondary">{{ $t('库区规则') }}</a-typography-text>
+            <a-typography-text>{{ ruleText || $t('暂无') }}</a-typography-text>
+          </a-flex>
+        </a-list-item>
         <a-list-item v-if="MapAreaType.库区 === area.type">
           <a-flex :gap="8" vertical>
             <a-typography-text type="secondary">{{ $t('绑定动作点') }}</a-typography-text>
diff --git a/src/components/card/area-edit-card.vue b/src/components/card/area-edit-card.vue
index 7591f21..595ad51 100644
--- a/src/components/card/area-edit-card.vue
+++ b/src/components/card/area-edit-card.vue
@@ -80,6 +80,21 @@ const routes = computed<string[]>(
           />
         </a-col>
       </a-row>
+      <a-row v-if="area.type === MapAreaType.库区" :gutter="[8, 8]">
+        <a-col :span="24">
+          <a-typography-text>{{ $t('库区规则') }}:</a-typography-text>
+        </a-col>
+        <a-col :span="24">
+          <a-select
+            class="full"
+            :value="pen.area?.inoutflag"
+            @change="editor.updateArea(id, { inoutflag: $event as 1 | 2 })"
+          >
+            <a-select-option :value="1">{{ $t('先进先出') }}</a-select-option>
+            <a-select-option :value="2">{{ $t('后进先出') }}</a-select-option>
+          </a-select>
+        </a-col>
+      </a-row>
 
       <a-row :gutter="[8, 8]">
         <a-col :span="24">
diff --git a/src/services/editor.service.ts b/src/services/editor.service.ts
index 4519302..3c9069f 100644
--- a/src/services/editor.service.ts
+++ b/src/services/editor.service.ts
@@ -153,10 +153,10 @@ export class EditorService extends Meta2d {
     if (!areas?.length) return;
     await Promise.all(
       areas.map(async (v) => {
-        const { id, name, desc, x, y, w, h, type, points, routes, maxAmr, properties } = v;
+        const { id, name, desc, x, y, w, h, type, points, routes, maxAmr, inoutflag, properties } = v;
         await this.addArea({ x, y }, { x: x + w, y: y + h }, type, id);
         this.setValue(
-          { id, label: name, desc, properties, area: { type, points, routes, maxAmr } },
+          { id, label: name, desc, properties, area: { type, points, routes, maxAmr, inoutflag } },
           { render: false, history: false, doEvent: false },
         );
       }),
@@ -232,7 +232,7 @@ export class EditorService extends Meta2d {
   #mapSceneArea(pen: MapPen): StandardSceneArea | null {
     if (!pen.id || isEmpty(pen.area)) return null;
     const { id, label, desc, properties } = pen;
-    const { type, points, routes, maxAmr } = pen.area;
+    const { type, points, routes, maxAmr, inoutflag } = pen.area;
     const { x, y, width, height } = this.getPenRect(pen);
     // 进行坐标转换：左上角原点 -> 中心点原点，同时应用ratio缩放
     const transformedCoords = this.#transformCoordinate(x, y);
@@ -253,6 +253,7 @@ export class EditorService extends Meta2d {
     }
     if (MapAreaType.库区 === type) {
       area.points = points?.filter((v) => this.getPenById(v)?.point?.type === MapPointType.动作点);
+      area.inoutflag = inoutflag;
     }
     if ([MapAreaType.互斥区, MapAreaType.非互斥区, MapAreaType.约束区].includes(type)) {
       area.points = points?.filter((v) => {
@@ -809,6 +810,10 @@ export class EditorService extends Meta2d {
           break;
       }
     }
+    const areaInfo: MapAreaInfo = { type, points, routes };
+    if (type === MapAreaType.库区) {
+      areaInfo.inoutflag = 1;
+    }
     const pen: MapPen = {
       id,
       name: 'area',
@@ -819,7 +824,7 @@ export class EditorService extends Meta2d {
       width: w,
       height: h,
       lineWidth: 1,
-      area: { type, points, routes },
+      area: areaInfo,
       locked: LockState.None,
     };
     const area = await this.addPen(pen, true, true, true);