Skip to content

Commit c25c00e

Browse files
shaohuzhang1shaohuzhang1
committed
fix: Invalid parameter saving display
1 parent 28ceb94 commit c25c00e

File tree

10 files changed

+41
-36
lines changed

10 files changed

+41
-36
lines changed

‎ui/src/components/dynamics-form/constructor/index.vue‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ onMounted(() => {
120120
const rander = (data: any) => {
121121
form_data.value.required = data.required ? data.required : false
122122
form_data.value.field = data.field
123+
if (data.show_default_value !== undefined) {
124+
form_data.value.show_default_value = data.show_default_value
125+
}
123126
if (data.input_type) {
124127
form_data.value.input_type = data.input_type + 'Constructor'
125128
}

‎ui/src/components/dynamics-form/constructor/items/DatePickerConstructor.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,22 @@ const getData = () => {
9797
'value-format': formValue.value.format
9898
},
9999
default_value: formValue.value.default_value,
100-
show_default_value: formValue.value.show_default_value,
100+
show_default_value: formValue.value.show_default_value
101101
}
102102
}
103103
const rander = (form_data: any) => {
104104
formValue.value.type = form_data.attrs.type
105105
formValue.value.format = form_data.attrs?.format
106106
formValue.value.default_value = form_data.default_value || ''
107-
formValue.value.show_default_value = form_data.show_default_value
108107
}
109108
defineExpose({ getData, rander })
110109
onBeforeMount(() => {
111110
formValue.value.type = 'datetime'
112111
formValue.value.format = 'YYYY-MM-DD HH:mm:ss'
113112
formValue.value.default_value = ''
114-
formValue.value.show_default_value = true
113+
if (formValue.value.show_default_value === undefined) {
114+
formValue.value.show_default_value = true
115+
}
115116
})
116117
</script>
117118
<style lang="scss"></style>

‎ui/src/components/dynamics-form/constructor/items/JsonInputConstructor.vue‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<template>
2-
<el-form-item
3-
:required="formValue.required"
4-
prop="default_value"
5-
:rules="[default_value_rule]"
6-
>
2+
<el-form-item :required="formValue.required" prop="default_value" :rules="[default_value_rule]">
73
<template #label>
84
<div class="flex-between">
95
默认值
@@ -46,7 +42,7 @@ const getData = () => {
4642
]
4743
},
4844
default_value: formValue.value.default_value,
49-
show_default_value: formValue.value.show_default_value,
45+
show_default_value: formValue.value.show_default_value
5046
}
5147
}
5248
@@ -61,12 +57,13 @@ const default_value_rule = {
6157
6258
const rander = (form_data: any) => {
6359
formValue.value.default_value = form_data.default_value
64-
formValue.value.show_default_value = form_data.show_default_value
6560
}
6661
defineExpose({ getData, rander })
6762
onMounted(() => {
6863
formValue.value.default_value = {}
69-
formValue.value.show_default_value = true
64+
if (formValue.value.show_default_value === undefined) {
65+
formValue.value.show_default_value = true
66+
}
7067
})
7168
</script>
7269
<style lang="scss"></style>

‎ui/src/components/dynamics-form/constructor/items/MultiSelectConstructor.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ const getData = () => {
117117
const rander = (form_data: any) => {
118118
formValue.value.option_list = form_data.option_list || []
119119
formValue.value.default_value = form_data.default_value
120-
formValue.value.show_default_value = form_data.show_default_value
121120
}
122121
123122
defineExpose({ getData, rander })
124123
onMounted(() => {
125124
formValue.value.option_list = []
126125
formValue.value.default_value = ''
127-
formValue.value.show_default_value = true
128-
126+
if (formValue.value.show_default_value === undefined) {
127+
formValue.value.show_default_value = true
128+
}
129129
addOption()
130130
})
131131
</script>

‎ui/src/components/dynamics-form/constructor/items/RadioCardConstructor.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ const getData = () => {
110110
const rander = (form_data: any) => {
111111
formValue.value.option_list = form_data.option_list || []
112112
formValue.value.default_value = form_data.default_value
113-
formValue.value.show_default_value = form_data.show_default_value
114113
}
115114
116115
defineExpose({ getData, rander })
117116
onMounted(() => {
118117
formValue.value.option_list = []
119118
formValue.value.default_value = ''
120-
formValue.value.show_default_value = true
121-
119+
if (formValue.value.show_default_value === undefined) {
120+
formValue.value.show_default_value = true
121+
}
122122
addOption()
123123
})
124124
</script>

‎ui/src/components/dynamics-form/constructor/items/RadioRowConstructor.vue‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
prop="default_value"
5353
:rules="formValue.required ? [{ required: true, message: '默认值 为必填属性' }] : []"
5454
>
55+
<template #label>
56+
<div class="flex-between">
57+
默认值
58+
<el-checkbox v-model="formValue.show_default_value" label="显示默认值" />
59+
</div>
60+
</template>
5561
<RadioRow
5662
:form-field="formField"
5763
v-model="formValue.default_value"
@@ -111,7 +117,9 @@ defineExpose({ getData, rander })
111117
onMounted(() => {
112118
formValue.value.option_list = []
113119
formValue.value.default_value = ''
114-
120+
if (formValue.value.show_default_value === undefined) {
121+
formValue.value.show_default_value = true
122+
}
115123
addOption()
116124
})
117125
</script>

‎ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@ defineExpose({ getData, rander })
115115
onMounted(() => {
116116
formValue.value.option_list = []
117117
formValue.value.default_value = ''
118-
formValue.value.show_default_value = true
119-
118+
if (formValue.value.show_default_value === undefined) {
119+
formValue.value.show_default_value = true
120+
}
120121
addOption()
121122
})
122123
</script>

‎ui/src/components/dynamics-form/constructor/items/TextInputConstructor.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ onMounted(() => {
159159
formValue.value.minlength = 0
160160
formValue.value.maxlength = 20
161161
formValue.value.default_value = ''
162-
formValue.value.show_default_value = true
162+
console.log(formValue.value.show_default_value)
163+
if (formValue.value.show_default_value === undefined) {
164+
formValue.value.show_default_value = true
165+
}
163166
})
164167
</script>
165168
<style lang="scss"></style>

‎ui/src/components/dynamics-form/index.vue‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,9 @@ const initDefaultData = (formField: FormField) => {
149149
!formValue.value[formField.field]) &&
150150
formValue.value[formField.field] != false
151151
) {
152-
formValue.value[formField.field] = formField.default_value
153-
}
154-
155-
// 配置不展示默认值,则设置为undefined
156-
if (formField.show_default_value === false) {
157-
formValue.value[formField.field] = undefined
158-
console.log(formField.show_default_value, formValue.value[formField.field])
152+
if (formField.show_default_value === true) {
153+
formValue.value[formField.field] = formField.default_value
154+
}
159155
}
160156
}
161157
@@ -185,7 +181,10 @@ const render = (
185181
if (form_data[item.field] !== undefined) {
186182
return { [item.field]: form_data[item.field] }
187183
}
188-
return { [item.field]: item.default_value }
184+
if (item.show_default_value) {
185+
return { [item.field]: item.default_value }
186+
}
187+
return {}
189188
})
190189
.reduce((x, y) => ({ ...x, ...y }), {})
191190
formValue.value = _.cloneDeep(value)

‎ui/src/views/application/component/AIModeParamSettingDialog.vue‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import type { FormField } from '@/components/dynamics-form/type'
3838
import modelAPi from '@/api/model'
3939
import applicationApi from '@/api/application'
4040
import DynamicsForm from '@/components/dynamics-form/index.vue'
41-
import { keys } from 'lodash'
4241
const model_form_field = ref<Array<FormField>>([])
4342
const emit = defineEmits(['refresh'])
4443
const dynamicsFormRef = ref<InstanceType<typeof DynamicsForm>>()
@@ -55,12 +54,6 @@ const open = (model_id: string, application_id?: string, model_setting_data?: an
5554
const api = getApi(model_id, application_id)
5655
api.then((ok) => {
5756
model_form_field.value = ok.data
58-
model_setting_data =
59-
model_setting_data && keys(model_setting_data).length > 0
60-
? model_setting_data
61-
: ok.data
62-
.map((item: any) => ({ [item.field]: item.default_value }))
63-
.reduce((x, y) => ({ ...x, ...y }), {})
6457
// 渲染动态表单
6558
dynamicsFormRef.value?.render(model_form_field.value, model_setting_data)
6659
})

0 commit comments

Comments
 (0)