From 89fef39731436acce1ddd9198f6e3d284a196227 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Tue, 16 Jul 2024 11:14:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(schema):=20=E8=87=AA=E5=8A=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=BB=98=E8=AE=A4=E8=A1=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/pure/ms-form-table/index.vue  |  4 ++++
 frontend/src/components/pure/ms-json-schema/index.vue | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/pure/ms-form-table/index.vue b/frontend/src/components/pure/ms-form-table/index.vue
index fe79f97273..19530f3e71 100644
--- a/frontend/src/components/pure/ms-form-table/index.vue
+++ b/frontend/src/components/pure/ms-form-table/index.vue
@@ -535,6 +535,10 @@
     emit('selectAll', checked);
   }
 
+  defineExpose({
+    validateAndUpdateErrorMessageList,
+  });
+
   await initColumns();
 </script>
 
diff --git a/frontend/src/components/pure/ms-json-schema/index.vue b/frontend/src/components/pure/ms-json-schema/index.vue
index cb7ddc9aa2..99b6f7b8bd 100644
--- a/frontend/src/components/pure/ms-json-schema/index.vue
+++ b/frontend/src/components/pure/ms-json-schema/index.vue
@@ -1,5 +1,6 @@
 <template>
   <MsFormTable
+    ref="formTableRef"
     v-model:originalSelectedKeys="selectedKeys"
     v-model:expanded-keys="expandKeys"
     :data="data"
@@ -617,7 +618,6 @@
   const selectedKeys = defineModel<string[]>('selectedKeys', {
     default: () => ['root'],
   });
-
   const rowSelection = computed<TableRowSelection | undefined>(() => {
     if (props.disabled) {
       return undefined;
@@ -629,6 +629,7 @@
       width: 32,
     };
   });
+  const formTableRef = ref<InstanceType<typeof MsFormTable>>();
 
   // 初始化根节点
   watchEffect(() => {
@@ -963,7 +964,13 @@
   }
 
   function addLineIfLast(record: TableData, rowIndex: number) {
-    if (rowIndex === (record.parent || data.value[0]).children.length - 1) {
+    formTableRef.value?.validateAndUpdateErrorMessageList(); // 输入名称，校验重复名
+    const firstLevelLastChild = data.value[0].children?.[data.value[0].children.length - 1]; // root 的最后一个子节点
+    // 当前输入的是最后一行，且 root 的最后一个子节点不是默认行数据，则自动新增一行默认数据
+    if (
+      rowIndex === (record.parent || data.value[0]).children.length - 1 &&
+      (firstLevelLastChild?.title !== '' || firstLevelLastChild?.type !== 'string')
+    ) {
       addChild(data.value[0]);
     }
     emitChange('titleInput');