From 05affc91f9b501eaadd8227e6af738938afe26b7 Mon Sep 17 00:00:00 2001
From: gene9831 <pacify.98@gmail.com>
Date: Mon, 5 Feb 2024 01:18:54 -0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=9D=97=E7=9A=84=E8=A1=A8=E5=8D=95=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/common/component/SaveNewBlock.vue | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/common/component/SaveNewBlock.vue b/packages/common/component/SaveNewBlock.vue
index 5006054aa2..2a2c1b0878 100644
--- a/packages/common/component/SaveNewBlock.vue
+++ b/packages/common/component/SaveNewBlock.vue
@@ -5,6 +5,7 @@
         show-message
         :model="formData"
         :rules="rules"
+        ref="formRef"
         label-width="120px"
         :label-align="true"
         label-position="left"
@@ -33,7 +34,7 @@
 </template>
 
 <script>
-import { reactive, computed } from 'vue'
+import { reactive, computed, ref } from 'vue'
 import { Input, Form, FormItem, Button, DialogBox, Select } from '@opentiny/vue'
 import { useBlock, useLayout, useCanvas, useModal } from '@opentiny/tiny-engine-controller'
 import { REGEXP_BLOCK_NAME } from '../js/verification'
@@ -64,6 +65,7 @@ export default {
     const { PLUGIN_NAME, activePlugin } = useLayout()
     const { isSaved } = useCanvas()
     const { confirm } = useModal()
+    const formRef = ref(null)
 
     const categoryList = computed(() =>
       getCategoryList().map((item) => ({ ...item, value: item.id, label: item.name }))
@@ -84,15 +86,21 @@ export default {
       cancel()
     }
     const addBlock = () => {
-      if (isSaved()) {
-        handleAddBlock()
-        return
-      }
-      confirm({
-        message: '当前画布内容尚未保存，新建区块会将画布切换至新区块中，是否要继续切换?',
-        exec: () => {
+      formRef.value.validate((valid) => {
+        if (!valid) {
+          return
+        }
+
+        if (isSaved()) {
           handleAddBlock()
+          return
         }
+        confirm({
+          message: '当前画布内容尚未保存，新建区块会将画布切换至新区块中，是否要继续切换?',
+          exec: () => {
+            handleAddBlock()
+          }
+        })
       })
     }
 
@@ -107,6 +115,7 @@ export default {
     return {
       formData,
       categoryList,
+      formRef,
       rules,
       addBlock,
       cancel,