From 707ff507beef261dee1ccbf64900de9ba8f33251 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 24 Jul 2024 15:19:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20SSH=20=E8=AE=BE=E7=BD=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datasource/form/EditorDetail.vue     |  9 +-
 .../visualized/data/datasource/index.vue      | 85 ++++++++++---------
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index 269614a408..152b7bf44a 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -159,21 +159,22 @@ const authMethodList = [
 ]
 
 const validateSshHost = (_: any, value: any, callback: any) => {
-  if ((value === null || value === '') && form.value.configuration.useSSH) {
+  console.log(value)
+  if ((value === undefined || value === null || value === '') && form.value.configuration.useSSH) {
     callback(new Error('SSH主机不能为空'))
   }
   return callback()
 }
 
 const validateSshPort = (_: any, value: any, callback: any) => {
-  if ((value === null || value === '') && form.value.configuration.useSSH) {
+  if ((value === undefined || value === null || value === '') && form.value.configuration.useSSH) {
     callback(new Error('SSH端口不能为空'))
   }
   return callback()
 }
 
 const validateSshUserName = (_: any, value: any, callback: any) => {
-  if ((value === null || value === '') && form.value.configuration.useSSH) {
+  if ((value === undefined || value === null || value === '') && form.value.configuration.useSSH) {
     callback(new Error('SSH用户名不能为空'))
   }
   return callback()
@@ -181,7 +182,7 @@ const validateSshUserName = (_: any, value: any, callback: any) => {
 
 const validateSshPassword = (_: any, value: any, callback: any) => {
   if (
-    (value === null || value === '') &&
+    (value === undefined || value === null || value === '') &&
     form.value.configuration.useSSH &&
     form.value.configuration.sshType === 'password'
   ) {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 17704912b4..972690aa8a 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1299,17 +1299,51 @@ const getMenuList = (val: boolean) => {
                     }}</BaseInfoItem>
                   </el-col>
                 </el-row>
-                <span
-                  v-if="!['es', 'api'].includes(nodeInfo.type.toLowerCase())"
-                  class="de-expand"
-                  @click="showPriority = !showPriority"
-                  >{{ t('datasource.priority') }}
-                  <el-icon>
-                    <Icon
-                      :name="showPriority ? 'icon_down_outlined' : 'icon_down_outlined-1'"
-                    ></Icon>
-                  </el-icon>
-                </span>
+                <el-row :gutter="24">
+                  <span
+                    v-if="
+                      !['es', 'api'].includes(nodeInfo.type.toLowerCase()) &&
+                      nodeInfo.configuration.urlType !== 'jdbcUrl'
+                    "
+                    class="de-expand"
+                    @click="showSSH = !showSSH"
+                    >SSH 设置
+                    <el-icon>
+                      <Icon :name="showSSH ? 'icon_down_outlined' : 'icon_down_outlined-1'"></Icon>
+                    </el-icon>
+                  </span>
+                </el-row>
+                <template v-if="showSSH">
+                  <el-row :gutter="24" v-if="nodeInfo.configuration.useSSH">
+                    <el-col :span="12">
+                      <BaseInfoItem label="主机">{{ nodeInfo.configuration.sshHost }}</BaseInfoItem>
+                    </el-col>
+                    <el-col :span="12">
+                      <BaseInfoItem label="端口">{{ nodeInfo.configuration.sshPort }}</BaseInfoItem>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="24" v-if="nodeInfo.configuration.useSSH">
+                    <el-col :span="12">
+                      <BaseInfoItem label="用户名">{{
+                        nodeInfo.configuration.sshUserName
+                      }}</BaseInfoItem>
+                    </el-col>
+                  </el-row>
+                </template>
+                <el-row :gutter="24">
+                  <span
+                    v-if="!['es', 'api'].includes(nodeInfo.type.toLowerCase())"
+                    class="de-expand"
+                    @click="showPriority = !showPriority"
+                    >{{ t('datasource.priority') }}
+                    <el-icon>
+                      <Icon
+                        :name="showPriority ? 'icon_down_outlined' : 'icon_down_outlined-1'"
+                      ></Icon>
+                    </el-icon>
+                  </span>
+                </el-row>
+
                 <template v-if="showPriority">
                   <el-row :gutter="24">
                     <el-col :span="12">
@@ -1339,35 +1373,6 @@ const getMenuList = (val: boolean) => {
                     </el-col>
                   </el-row>
                 </template>
-                <span
-                  v-if="
-                    !['es', 'api'].includes(nodeInfo.type.toLowerCase()) &&
-                    nodeInfo.configuration.urlType !== 'jdbcUrl'
-                  "
-                  class="de-expand"
-                  @click="showSSH = !showSSH"
-                  >SSH 设置
-                  <el-icon>
-                    <Icon :name="showSSH ? 'icon_down_outlined' : 'icon_down_outlined-1'"></Icon>
-                  </el-icon>
-                </span>
-                <template v-if="showSSH">
-                  <el-row :gutter="24" v-if="nodeInfo.configuration.useSSH">
-                    <el-col :span="12">
-                      <BaseInfoItem label="主机">{{ nodeInfo.configuration.sshHost }}</BaseInfoItem>
-                    </el-col>
-                    <el-col :span="12">
-                      <BaseInfoItem label="端口">{{ nodeInfo.configuration.sshPort }}</BaseInfoItem>
-                    </el-col>
-                  </el-row>
-                  <el-row :gutter="24" v-if="nodeInfo.configuration.useSSH">
-                    <el-col :span="12">
-                      <BaseInfoItem label="用户名">{{
-                        nodeInfo.configuration.sshUserName
-                      }}</BaseInfoItem>
-                    </el-col>
-                  </el-row>
-                </template>
               </template>
             </template>
           </BaseInfoContent>