From 746aeaff35a7990d238d647fc695fe2670923eff Mon Sep 17 00:00:00 2001
From: GoldenZqqqq <1361001127@qq.com>
Date: Sat, 14 Dec 2024 15:43:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA/=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2-=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=B5=81=E7=A8=8B=E6=A0=87=E8=AF=86=E4=B8=8E?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E6=89=8D=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=E7=AC=AC=E4=B8=89=E6=AD=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/PropertiesPanel.vue         |  7 ----
 src/views/bpm/model/CreateUpdate.vue          | 35 +++++++++----------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
index 7056403f..e3dba33d 100644
--- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
@@ -245,10 +245,3 @@ watch(
   }
 )
 </script>
-<style lang="scss">
-.process-panel__container {
-  position: absolute;
-  top: 90px;
-  right: 60px;
-}
-</style>
diff --git a/src/views/bpm/model/CreateUpdate.vue b/src/views/bpm/model/CreateUpdate.vue
index 849be1ed..9dc4e6a0 100644
--- a/src/views/bpm/model/CreateUpdate.vue
+++ b/src/views/bpm/model/CreateUpdate.vue
@@ -550,34 +550,33 @@ const handleDesignSuccess = (bpmnXml?: string) => {
 const handleStepClick = async (index: number) => {
   // 如果是切换到第三步（流程设计），需要校验key和name
   if (index === 2) {
-    if (!formData.value.id) {
-      // 新增时才校验
-      try {
-        await formRef.value?.validateField(['key', 'name'])
-        // 确保数据已经准备好
-        await nextTick()
-      } catch (error) {
-        message.warning('请先填写流程标识和流程名称')
-        return
-      }
+    if (!formData.value.key || !formData.value.name) {
+      message.warning('请先填写流程标识和流程名称')
+      return
     }
-    // 确保数据已经准备好再切换
-    await nextTick()
   }
+
   currentStep.value = index
 }
 
 // 添加一个计算属性来判断是否显示设计器
 const showDesigner = computed(() => {
-  return currentStep.value === 2 && Boolean(formData.value.id || (formData.value.key && formData.value.name))
+  return (
+    currentStep.value === 2 &&
+    Boolean(formData.value.id || (formData.value.key && formData.value.name))
+  )
 })
 
 // 监听步骤变化，确保数据准备完成
-watch(() => currentStep.value, async (newStep) => {
-  if (newStep === 2) {
-    await nextTick()
-  }
-}, { immediate: false })
+watch(
+  () => currentStep.value,
+  async (newStep) => {
+    if (newStep === 2) {
+      await nextTick()
+    }
+  },
+  { immediate: false }
+)
 
 // 在组件卸载时清理
 onBeforeUnmount(() => {