Skip to content

Commit 0aad828

Browse files
perf: User inputs default current time
1 parent a9f202a commit 0aad828

2 files changed

Lines changed: 21 additions & 14 deletions

File tree

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

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@
3636
:label="$t('dynamicsForm.default.label')"
3737
:rules="
3838
formValue.required
39-
? [{ required: true, message: `${$t('dynamicsForm.default.label')}${$t('dynamicsForm.default.requiredMessage')}` }]
39+
? [
40+
{
41+
required: true,
42+
message: `${$t('dynamicsForm.default.label')}${$t('dynamicsForm.default.requiredMessage')}`,
43+
},
44+
]
4045
: []
4146
"
4247
>
@@ -57,34 +62,36 @@
5762
</template>
5863
<script setup lang="ts">
5964
import { computed, onBeforeMount } from 'vue'
65+
import moment from 'moment'
6066
import { t } from '@/locales'
6167
const type_list = [
6268
{
6369
label: t('dynamicsForm.DatePicker.year'),
64-
value: 'year'
70+
value: 'year',
6571
},
6672
{
6773
label: t('dynamicsForm.DatePicker.month'),
68-
value: 'month'
74+
value: 'month',
6975
},
7076
{
7177
label: t('dynamicsForm.DatePicker.date'),
72-
value: 'date'
78+
value: 'date',
7379
},
7480
{
7581
label: t('dynamicsForm.DatePicker.datetime'),
76-
value: 'datetime'
77-
}
82+
value: 'datetime',
83+
},
7884
]
7985
const type_dict: any = {
8086
year: [{ value: 'YYYY' }],
8187
month: [{ value: 'YYYY-MM' }],
8288
date: [{ value: 'YYYY-MM-DD' }],
83-
datetime: [{ value: 'YYYY-MM-DD HH:mm:ss' }]
89+
datetime: [{ value: 'YYYY-MM-DD HH:mm:ss' }],
8490
}
91+
8592
const type_change = () => {
8693
formValue.value.format = type_dict[formValue.value.type][0].value
87-
formValue.value.default_value = ''
94+
formValue.value.default_value = moment().format(formValue.value.format)
8895
}
8996
const props = defineProps<{
9097
modelValue: any
@@ -96,7 +103,7 @@ const formValue = computed({
96103
},
97104
get: () => {
98105
return props.modelValue
99-
}
106+
},
100107
})
101108
102109
const getData = () => {
@@ -105,22 +112,22 @@ const getData = () => {
105112
attrs: {
106113
type: formValue.value.type,
107114
format: formValue.value.format,
108-
'value-format': formValue.value.format
115+
'value-format': formValue.value.format,
109116
},
110117
default_value: formValue.value.default_value,
111-
show_default_value: formValue.value.show_default_value
118+
show_default_value: formValue.value.show_default_value,
112119
}
113120
}
114121
const rander = (form_data: any) => {
115122
formValue.value.type = form_data.attrs.type
116123
formValue.value.format = form_data.attrs?.format
117-
formValue.value.default_value = form_data.default_value || ''
124+
formValue.value.default_value = form_data.default_value
118125
}
119126
defineExpose({ getData, rander })
120127
onBeforeMount(() => {
121128
formValue.value.type = 'datetime'
122129
formValue.value.format = 'YYYY-MM-DD HH:mm:ss'
123-
formValue.value.default_value = ''
130+
formValue.value.default_value = moment().format(formValue.value.format)
124131
if (formValue.value.show_default_value === undefined) {
125132
formValue.value.show_default_value = true
126133
}

ui/src/workflow/nodes/base-node/component/UserFieldFormDialog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const currentRow = computed(() => {
101101
field: row.field || row.variable,
102102
input_type: 'DatePicker',
103103
label: row.label || row.name,
104-
default_value: row.default_value,
104+
default_value: row.default_value || new Date(),
105105
required: row.required != undefined ? row.required : row.is_required,
106106
attrs: {
107107
format: 'YYYY-MM-DD HH:mm:ss',

0 commit comments

Comments
 (0)