From 0868a81061a87d80f6fecc39a3fcfa08cc210551 Mon Sep 17 00:00:00 2001
From: Amy0104 <97265214+Amy0104@users.noreply.github.com>
Date: Thu, 24 Mar 2022 16:02:26 +0800
Subject: [PATCH] [Fix][UI Next][V1.0.0-Alpha] Remove the timeout settings
 switch in HTTP. (#9149)

---
 .../projects/task/components/node/fields/use-http.ts  | 11 ++---------
 .../projects/task/components/node/format-data.ts      |  6 ------
 .../projects/task/components/node/tasks/use-http.ts   |  1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-http.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-http.ts
index 9f21ba75a..4f3ede726 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-http.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-http.ts
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useCustomParams } from '.'
 import type { IJsonItem } from '../types'
 
 export function useHttp(model: { [field: string]: any }): IJsonItem[] {
   const { t } = useI18n()
-  const timeoutSpan = computed(() => (model.timeoutSetting ? 12 : 0))
 
   const HTTP_CHECK_CONDITIONS = [
     {
@@ -140,16 +138,11 @@ export function useHttp(model: { [field: string]: any }): IJsonItem[] {
         placeholder: t('project.node.http_condition_tips')
       }
     },
-    {
-      type: 'switch',
-      field: 'timeoutSetting',
-      name: t('project.node.timeout_settings')
-    },
     {
       type: 'input-number',
       field: 'connectTimeout',
       name: t('project.node.connect_timeout'),
-      span: timeoutSpan,
+      span: 12,
       props: {
         max: Math.pow(7, 10) - 1
       },
@@ -172,7 +165,7 @@ export function useHttp(model: { [field: string]: any }): IJsonItem[] {
       type: 'input-number',
       field: 'socketTimeout',
       name: t('project.node.socket_timeout'),
-      span: timeoutSpan,
+      span: 12,
       props: {
         max: Math.pow(7, 10) - 1
       },
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
index 745c4c3d7..0a0888eb5 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
@@ -368,12 +368,6 @@ export function formatModel(data: ITaskData) {
       (item: { id: number }) => item.id
     )
   }
-  if (
-    data.taskParams?.connectTimeout !== 60000 ||
-    data.taskParams?.socketTimeout !== 60000
-  ) {
-    params.timeoutSetting = true
-  }
   if (data.taskParams?.mainJar) {
     params.mainJar = data.taskParams?.mainJar.id
   }
diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-http.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-http.ts
index a41f3fb1b..6d8d1e7e7 100644
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-http.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-http.ts
@@ -48,7 +48,6 @@ export function useHttp({
     httpParams: [],
     url: '',
     condition: '',
-    timeoutSetting: false,
     connectTimeout: 60000,
     socketTimeout: 60000
   } as INodeData)