From 0c5320bb45c7d7f30b73d21f06962c945fceaf2f Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Wed, 17 Apr 2024 19:33:35 -0700
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=9D=A2=E6=9D=BF=E6=96=B0=E5=A2=9E=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/datasource/src/DataSourceField.vue  |  1 +
 .../plugins/datasource/src/DataSourceFieldForm.vue   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/datasource/src/DataSourceField.vue b/packages/plugins/datasource/src/DataSourceField.vue
index 9763b4aa9f..0b684c60e6 100644
--- a/packages/plugins/datasource/src/DataSourceField.vue
+++ b/packages/plugins/datasource/src/DataSourceField.vue
@@ -23,6 +23,7 @@
           <data-source-field-type @cancel="closeFieldType" @select="selectFieldType"></data-source-field-type>
           <data-source-field-form
             ref="fieldForm"
+            :modelValue="modelValue"
             :field="state.field"
             :editable="true"
             :is-open="false"
diff --git a/packages/plugins/datasource/src/DataSourceFieldForm.vue b/packages/plugins/datasource/src/DataSourceFieldForm.vue
index 8bcef0a4dc..2a3b45b1e4 100644
--- a/packages/plugins/datasource/src/DataSourceFieldForm.vue
+++ b/packages/plugins/datasource/src/DataSourceFieldForm.vue
@@ -66,6 +66,10 @@ export default {
     isOpen: {
       type: Boolean,
       default: true
+    },
+    modelValue: {
+      type: Array,
+      default: () => []
     }
   },
   emits: ['save', 'cancel'],
@@ -98,7 +102,9 @@ export default {
     const handleCancel = () => {
       emit('cancel')
     }
-
+    const onlyName = () => {
+      return props.modelValue.some((item) => item.name === state.field.name)
+    }
     const saveField = () => {
       form.value.validate((valid) => {
         if (valid) {
@@ -116,6 +122,10 @@ export default {
 
         return
       }
+      if (onlyName() && rule.field === 'name') {
+        callback(new Error('该字段已存在，请重新输入'))
+        return
+      }
       callback()
     }
 

From 0de9e03529396460b2333ef08ed0c94982fcfef7 Mon Sep 17 00:00:00 2001
From: tianxin <tianxin930618@163.com>
Date: Fri, 19 Apr 2024 00:43:34 -0700
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=9D=A2=E6=9D=BF=E6=96=B0=E5=A2=9E=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/plugins/datasource/src/DataSourceFieldForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceFieldForm.vue b/packages/plugins/datasource/src/DataSourceFieldForm.vue
index 2a3b45b1e4..9768b47ece 100644
--- a/packages/plugins/datasource/src/DataSourceFieldForm.vue
+++ b/packages/plugins/datasource/src/DataSourceFieldForm.vue
@@ -102,7 +102,7 @@ export default {
     const handleCancel = () => {
       emit('cancel')
     }
-    const onlyName = () => {
+    const uniqueName = () => {
       return props.modelValue.some((item) => item.name === state.field.name)
     }
     const saveField = () => {
@@ -122,7 +122,7 @@ export default {
 
         return
       }
-      if (onlyName() && rule.field === 'name') {
+      if (uniqueName() && rule.field === 'name') {
         callback(new Error('该字段已存在，请重新输入'))
         return
       }