Skip to content

Commit 1f3a8ea

Browse files
author
piexlMax(奇淼
committed
feat: 不再对查询条件时间范围进行检测
1 parent 2bd82ea commit 1f3a8ea

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

server/resource/package/web/view/table.vue.tpl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ getDataSourceFunc()
9696
<div>
9797
{{- if not .IsTree }}
9898
<div class="gva-search-box">
99-
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
99+
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" @keyup.enter="onSubmit">
100100
{{- if .GvaModel }}
101101
<el-form-item label="创建日期" prop="createdAtRange">
102102
<template #label>
@@ -379,18 +379,6 @@ const rule = reactive({
379379
{{- end }}
380380
})
381381
382-
const searchRule = reactive({
383-
createdAtRange: [
384-
{ validator: (rule, value, callback) => {
385-
if (!searchInfo.value.createdAtRange || searchInfo.value.createdAtRange.length < 2) {
386-
callback(new Error('请选择开始日期和结束日期'))
387-
} else {
388-
callback()
389-
}
390-
}, trigger: 'change' }
391-
]
392-
})
393-
394382
const elFormRef = ref()
395383
const elSearchFormRef = ref()
396384

server/resource/plugin/web/view/view.vue.tpl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ getDataSourceFunc()
9595
<div>
9696
{{- if not .IsTree }}
9797
<div class="gva-search-box">
98-
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
98+
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" @keyup.enter="onSubmit">
9999
{{- if .GvaModel }}
100100
<el-form-item label="创建日期" prop="createdAtRange">
101101
<template #label>
@@ -374,18 +374,6 @@ const rule = reactive({
374374
{{- end }}
375375
})
376376
377-
const searchRule = reactive({
378-
createdAtRange: [
379-
{ validator: (rule, value, callback) => {
380-
if (!searchInfo.value.createdAtRange || searchInfo.value.createdAtRange.length < 2) {
381-
callback(new Error('请选择开始日期和结束日期'))
382-
} else {
383-
callback()
384-
}
385-
}, trigger: 'change' }
386-
]
387-
})
388-
389377
const elFormRef = ref()
390378
const elSearchFormRef = ref()
391379

0 commit comments

Comments
 (0)