0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10872、10854

This commit is contained in:
xieyonghong 2023-03-27 20:09:23 +08:00
parent de51d8a0eb
commit ba326d6532
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/rule-engine/Scene/Save/components/Timer/index.vue
View File

@ -18,21 +18,7 @@
@change='updateValue' @change='updateValue'
/> />
</j-form-item> </j-form-item>
<j-form-item v-if='showCron' name='cron' :rules="[ <j-form-item v-if='showCron' name='cron' :rules="cronRules">
{ max: 64, message: '最多可输入64个字符' },
{
validator: async (_, v) => {
if (v) {
if (!isCron(v)) {
return Promise.reject(new Error('请输入正确的cron表达式'));
}
} else {
return Promise.reject(new Error('请输入cron表达式'));
}
return Promise.resolve();
}
}
]">
<j-input placeholder='corn表达式' v-model:value='formModel.cron' @change='updateValue' /> <j-input placeholder='corn表达式' v-model:value='formModel.cron' @change='updateValue' />
</j-form-item> </j-form-item>
<template v-else> <template v-else>
@ -139,6 +125,22 @@ const props = defineProps({
const emit = defineEmits<Emit>() const emit = defineEmits<Emit>()
const cronRules = [
{ max: 64, message: '最多可输入64个字符' },
{
validator: async (_: any, v: string) => {
if (v) {
if (!isCron(v)) {
return Promise.reject(new Error('请输入正确的cron表达式'));
}
} else {
return Promise.reject(new Error('请输入cron表达式'));
}
return Promise.resolve();
}
}
]
const formModel = reactive<OperationTimer>({ const formModel = reactive<OperationTimer>({
trigger: 'week', trigger: 'week',
when: props.value.when || [], when: props.value.when || [],