From 8085dcdfc1928818ca76e38263591c2b5e735872 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 25 Feb 2025 17:24:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DAPILark=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/datasource/form/ApiHttpRequestDraw.vue | 4 ++++ .../visualized/data/datasource/form/EditorDetail.vue | 8 +++++++- .../views/visualized/data/datasource/form/index.vue | 11 ++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue index 11ce3de0d2..6ae4175579 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue @@ -220,6 +220,10 @@ const initApiItem = ( methodName: 'clearForm', args: [] }) + xpackApiItemBasicInfo?.value?.invokeMethod({ + methodName: 'initForm', + args: [] + }) } else { apiItemBasicInfo.value.clearValidate() } 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 cfe3b6e547..e0ca1e8894 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 @@ -491,6 +491,11 @@ const submitForm = () => { return dsForm.value.validate } +const submitApiForm = () => { + dsApiForm.value.clearValidate() + return dsApiForm.value.validate +} + const clearForm = () => { return dsForm.value.clearValidate() } @@ -641,7 +646,7 @@ const apiRule = { 'syncSetting.startTime': [ { required: true, - message: t('datasource.start_time'), + message: t('sync_task.please_choose_start_time'), trigger: 'change' } ] @@ -804,6 +809,7 @@ const datasetTypeList = [ ] defineExpose({ submitForm, + submitApiForm, resetForm, initForm, clearForm diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue index 955b76a001..0e5249ebc7 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue @@ -493,7 +493,16 @@ const saveDS = () => { request.apiConfiguration = '' validate(val => { if (val) { - doSaveDs(request) + if (currentDsType.value.includes('API')) { + const validateApi = detail?.value?.submitApiForm() + validateApi(v => { + if (v) { + doSaveDs(request) + } + }) + } else { + doSaveDs(request) + } } }) }