fix: bug#11193、11190、11189

This commit is contained in:
xieyonghong 2023-03-29 17:02:50 +08:00
parent c6717f6be0
commit 09267955f5
3 changed files with 15 additions and 4 deletions

View File

@ -107,8 +107,10 @@ const read = (type: string, data: any) => {
const getList = () => {
loading.value = true;
const params = {
'sorts[0].name': 'notifyTime',
'sorts[0].order': 'desc',
sorts: [{
name: 'notifyTime',
order: 'desc'
}],
terms: [
{
terms: [

View File

@ -47,7 +47,7 @@ const change = (number: number) => {
_keys.add(number)
}
}
rowKeys.value = [..._keys.values()]
rowKeys.value = [..._keys.values()].sort((a, b) => a - b )
emit('update:value', rowKeys.value)
emit('change', rowKeys.value)
}

View File

@ -15,7 +15,7 @@
]'
option-type='button'
button-style='solid'
@change='updateValue'
@change='triggerChange'
/>
</j-form-item>
<j-form-item v-if='showCron' name='cron' :rules="cronRules">
@ -170,7 +170,10 @@ const showPeriod = computed(() => {
return formModel.trigger !== 'cron' && formModel.mod === 'period'
})
const updateValue = () => {
const cloneValue = cloneDeep(formModel)
if (cloneValue.trigger === 'cron') {
delete cloneValue.when
@ -186,6 +189,12 @@ const updateValue = () => {
emit('update:value', cloneValue)
}
const triggerChange = (v: any) => {
formModel.when = []
formModel.cron = undefined
updateValue()
}
defineExpose({
validateFields: () => new Promise(async (resolve) => {
const data = await timerForm.value?.validateFields()