From 00f8645cd9772b953cd390395f8770a878f4a39f Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <shaohu.zhang@fit2cloud.com>
Date: Mon, 28 Oct 2024 14:02:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=9D=E5=AD=98=E6=9C=AA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../items/SingleSelectConstructor.vue         |  1 +
 .../dynamics-form/items/JsonInput.vue         |  2 ++
 .../component/AIModeParamSettingDialog.vue    |  6 ++--
 .../component/TTSModeParamSettingDialog.vue   | 31 ++++++++-----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue b/ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue
index a453b6f35..2b895f381 100644
--- a/ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue
+++ b/ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue
@@ -87,6 +87,7 @@ const rander = (form_data: any) => {
 defineExpose({ getData, rander })
 onMounted(() => {
   formValue.value.option_list = []
+  formValue.value.default_value = ''
 })
 </script>
 <style lang="scss" scoped>
diff --git a/ui/src/components/dynamics-form/items/JsonInput.vue b/ui/src/components/dynamics-form/items/JsonInput.vue
index 661feeff2..4a2804b1b 100644
--- a/ui/src/components/dynamics-form/items/JsonInput.vue
+++ b/ui/src/components/dynamics-form/items/JsonInput.vue
@@ -108,8 +108,10 @@ const validate_rules = (rule: any, value: any, callback: any) => {
       JSON.parse(model_value.value)
     } catch (e) {
       callback(new Error('JSON格式不正确'))
+      return false
     }
   }
+  return true
 }
 
 defineExpose({ validate_rules: validate_rules })
diff --git a/ui/src/views/application/component/AIModeParamSettingDialog.vue b/ui/src/views/application/component/AIModeParamSettingDialog.vue
index dcff4e9f5..02f65fb7b 100644
--- a/ui/src/views/application/component/AIModeParamSettingDialog.vue
+++ b/ui/src/views/application/component/AIModeParamSettingDialog.vue
@@ -80,8 +80,10 @@ const reset_default = (model_id: string, application_id?: string) => {
 }
 
 const submit = async () => {
-  emit('refresh', form_data.value)
-  dialogVisible.value = false
+  dynamicsFormRef.value?.validate().then(() => {
+    emit('refresh', form_data.value)
+    dialogVisible.value = false
+  })
 }
 
 defineExpose({ open, reset_default })
diff --git a/ui/src/views/application/component/TTSModeParamSettingDialog.vue b/ui/src/views/application/component/TTSModeParamSettingDialog.vue
index bb916d7f4..5d58f4647 100644
--- a/ui/src/views/application/component/TTSModeParamSettingDialog.vue
+++ b/ui/src/views/application/component/TTSModeParamSettingDialog.vue
@@ -28,13 +28,13 @@
           </el-button>
         </span>
         <span class="dialog-footer p-16">
-        <el-button @click.prevent="dialogVisible = false">
-          {{ $t('views.application.applicationForm.buttons.cancel') }}
-        </el-button>
-        <el-button type="primary" @click="submit" :loading="loading">
-          {{ $t('views.application.applicationForm.buttons.confirm') }}
-        </el-button>
-      </span>
+          <el-button @click.prevent="dialogVisible = false">
+            {{ $t('views.application.applicationForm.buttons.cancel') }}
+          </el-button>
+          <el-button type="primary" @click="submit" :loading="loading">
+            {{ $t('views.application.applicationForm.buttons.confirm') }}
+          </el-button>
+        </span>
       </div>
     </template>
   </el-dialog>
@@ -76,8 +76,8 @@ const open = (model_id: string, application_id?: string, model_setting_data?: an
   api.then((ok) => {
     model_form_field.value = ok.data
     const resp = ok.data
-          .map((item: any) => ({ [item.field]: item.default_value }))
-          .reduce((x, y) => ({ ...x, ...y }), {})
+      .map((item: any) => ({ [item.field]: item.default_value }))
+      .reduce((x, y) => ({ ...x, ...y }), {})
     model_setting_data = { ...resp, ...model_setting_data }
     // 渲染动态表单
     dynamicsFormRef.value?.render(model_form_field.value, model_setting_data)
@@ -98,15 +98,12 @@ const reset_default = (model_id: string, application_id?: string) => {
 }
 
 const submit = async () => {
-  dynamicsFormRef.value?.validate().then((ok) => {
-    if (ok) {
-      emit('refresh', form_data.value)
-      dialogVisible.value = false
-    }
+  dynamicsFormRef.value?.validate().then(() => {
+    emit('refresh', form_data.value)
+    dialogVisible.value = false
   })
 }
 
-
 const audioPlayer = ref<HTMLAudioElement | null>(null)
 const testPlay = () => {
   const data = {
@@ -117,7 +114,7 @@ const testPlay = () => {
     .playDemoText(id as string, data, playLoading)
     .then(async (res: any) => {
       if (res.type === 'application/json') {
-        const text = await res.text();
+        const text = await res.text()
         MsgError(text)
         return
       }
@@ -138,10 +135,8 @@ const testPlay = () => {
     .catch((err) => {
       console.log('err: ', err)
     })
-
 }
 
-
 defineExpose({ open, reset_default })
 </script>