From 1901dc466e0e74845dd7426dd7009cc47bf40559 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 11 Apr 2024 14:22:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86-Host=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A3=80=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1037322 --user=宋昌昌 【项目管理】环境管理-环境-HOST-添加多个host，其中域名为空保存时未提示域名必填 https://www.tapd.cn/55049933/s/1494309
---
 .../environmental/components/EnvParamBox.vue  | 29 ++++++++++++++-----
 .../components/envParams/HostTab.vue          | 10 +++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/project-management/environmental/components/EnvParamBox.vue b/frontend/src/views/project-management/environmental/components/EnvParamBox.vue
index 8c5e4a4345..7015a3eb0b 100644
--- a/frontend/src/views/project-management/environmental/components/EnvParamBox.vue
+++ b/frontend/src/views/project-management/environmental/components/EnvParamBox.vue
@@ -48,7 +48,7 @@
       <EnvParamsTab v-if="activeKey === 'envParams'" />
       <HttpTab v-else-if="activeKey === 'http'" />
       <DataBaseTab v-else-if="activeKey === 'database'" />
-      <HostTab v-else-if="activeKey === 'host'" />
+      <HostTab v-else-if="activeKey === 'host'" ref="hostTabRef" />
       <!-- <PreTab v-else-if="activeKey === 'pre'" />
       <PostTab v-else-if="activeKey === 'post'" /> -->
       <div v-else-if="activeKey === 'pre' || activeKey === 'post'" class="h-full">
@@ -77,6 +77,7 @@
 </template>
 
 <script lang="ts" setup>
+  import { ref } from 'vue';
   import { Message } from '@arco-design/web-vue';
   import { cloneDeep } from 'lodash-es';
 
@@ -114,6 +115,7 @@
   const loading = ref(false);
   const tabSettingVisible = ref(false);
   const appStore = useAppStore();
+  const hostTabRef = ref();
 
   const store = useProjectEnvStore();
   const envPluginList = ref<EnvPluginListItem[]>([]);
@@ -216,17 +218,27 @@
     };
   }
 
+  const saveCallBack = async () => {
+    // 校验通过回调保存
+    loading.value = true;
+    store.currentEnvDetailInfo.mock = true;
+    await updateOrAddEnv({ fileList: [], request: getParameters() });
+    setState(true);
+
+    Message.success(store.currentEnvDetailInfo.id ? t('common.updateSuccess') : t('common.saveSuccess'));
+    emit('ok', store.currentEnvDetailInfo.id);
+  };
+
   const handleSave = async () => {
     await envForm.value?.validate(async (valid) => {
       if (!valid) {
         try {
-          loading.value = true;
-          store.currentEnvDetailInfo.mock = true;
-          await updateOrAddEnv({ fileList: [], request: getParameters() });
-          setState(true);
-
-          Message.success(store.currentEnvDetailInfo.id ? t('common.updateSuccess') : t('common.saveSuccess'));
-          emit('ok', store.currentEnvDetailInfo.id);
+          // 保存Host-Tab的数据(目前只加了Host)
+          if (activeKey.value === 'host') {
+            hostTabRef.value?.validateForm(saveCallBack);
+          } else {
+            await saveCallBack();
+          }
         } catch (error) {
           // eslint-disable-next-line no-console
           console.log(error);
@@ -236,6 +248,7 @@
       }
     });
   };
+
   watchEffect(() => {
     if (store.currentId) {
       store.initEnvDetail();
diff --git a/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue b/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue
index 9d5a43c55d..e2136c04dd 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue
@@ -48,13 +48,11 @@
   import { onClickOutside } from '@vueuse/core';
   import { debounce } from 'lodash-es';
 
-  import MsCodeEditor from '@/components/pure/ms-code-editor/index.vue';
   import MsBatchForm from '@/components/business/ms-batch-form/index.vue';
   import { FormItemModel } from '@/components/business/ms-batch-form/types';
 
   import { useI18n } from '@/hooks/useI18n';
   import useProjectEnvStore from '@/store/modules/setting/useProjectEnvStore';
-  import { getGenerateId } from '@/utils';
 
   import { EnvConfigItem } from '@/models/projectManagement/environmental';
 
@@ -104,6 +102,10 @@
   // 代码编辑器内容
   const editorContent = ref('');
 
+  function validateForm(cb?: () => void) {
+    return batchFormRef.value?.formValidate(cb);
+  }
+
   /**
    * 解析代码编辑器内容
    */
@@ -130,6 +132,10 @@
     });
   }
 
+  defineExpose({
+    validateForm,
+  });
+
   watch(
     () => editorContent.value,
     (val) => {