From d50b9fae60d57b7135e256b11fbfe5465b5ff07c Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Fri, 12 Dec 2025 13:36:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[bpm][antd]=20bpmn=20=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E5=AE=A1=E6=89=B9=E4=BA=BA=E8=B6=85=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BoundaryEventTimer.vue         | 87 +++++++++++--------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
index 7c3ebe9a5..25a6ebd38 100644
--- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
+++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/custom-config/components/BoundaryEventTimer.vue
@@ -2,14 +2,17 @@
 import { inject, nextTick, ref, toRaw, watch } from 'vue';
 
 import {
+  Col,
   Divider,
   FormItem,
   InputNumber,
   RadioButton,
   RadioGroup,
+  Row,
   Select,
   SelectOption,
   Switch,
+  TypographyText,
 } from 'ant-design-vue';
 
 import { convertTimeUnit } from '#/views/bpm/components/simple-process-design/components/nodes-config/utils';
@@ -73,7 +76,7 @@ const resetElement = () => {
   // 执行动作
   timeoutHandlerType.value = elExtensionElements.value.values?.find(
     (ex: any) => ex.$type === `${prefix}:TimeoutHandlerType`,
-  )?.[0];
+  );
   if (timeoutHandlerType.value) {
     configExtensions.value.push(timeoutHandlerType.value);
     if (eventDefinition.value.timeCycle) {
@@ -243,38 +246,54 @@ watch(
         </RadioButton>
       </RadioGroup>
     </FormItem>
-    <FormItem label="超时时间设置" v-if="timeoutHandlerEnable">
-      <span class="mr-2">当超过</span>
-      <FormItem name="timeDuration">
-        <InputNumber
-          class="mr-2"
-          :style="{ width: '100px' }"
-          v-model:value="timeDuration"
-          :min="1"
-          :controls="true"
-          @change="
-            () => {
-              updateTimeModdle();
-              updateElementExtensions();
-            }
-          "
-        />
-      </FormItem>
-      <Select
-        v-model:value="timeUnit"
-        class="mr-2"
-        :style="{ width: '100px' }"
-        @change="onTimeUnitChange"
-      >
-        <SelectOption
-          v-for="item in TIME_UNIT_TYPES"
-          :key="item.value"
-          :value="item.value"
-        >
-          {{ item.label }}
-        </SelectOption>
-      </Select>
-      未处理
+    <FormItem
+      label="超时时间设置"
+      v-if="timeoutHandlerEnable"
+      :label-col="{ span: 24 }"
+      :wrapper-col="{ span: 24 }"
+    >
+      <Row :gutter="[0, 0]">
+        <Col>
+          <TypographyText class="mr-2 mt-2 inline-flex text-sm">
+            当超过
+          </TypographyText>
+        </Col>
+        <Col>
+          <FormItem name="timeDuration" class="mb-0">
+            <InputNumber
+              class="mr-2 mt-0.5"
+              v-model:value="timeDuration"
+              :min="1"
+              controls-position="right"
+              @change="
+                () => {
+                  updateTimeModdle();
+                  updateElementExtensions();
+                }
+              "
+            />
+          </FormItem>
+        </Col>
+        <Col>
+          <Select
+            v-model:value="timeUnit"
+            class="mr-2 !w-24"
+            @change="onTimeUnitChange"
+          >
+            <SelectOption
+              v-for="item in TIME_UNIT_TYPES"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+              {{ item.label }}
+            </SelectOption>
+          </Select>
+          <TypographyText class="mr-2 mt-2 inline-flex text-sm">
+            未处理
+          </TypographyText>
+        </Col>
+      </Row>
     </FormItem>
     <FormItem
       label="最大提醒次数"
@@ -295,5 +314,3 @@ watch(
     </FormItem>
   </div>
 </template>
-
-<style lang="scss" scoped></style>