Skip to content

Commit 0f29f9f

Browse files
committed
修复vue3版本快捷查询为日期多选时,查询按钮被挡住的问题
1 parent 15aa6e6 commit 0f29f9f

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

Vol.Vue3版本/src/components/basic/QuickSearch.vue

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<div>
33
<el-select
4+
style="width: 150px"
45
size="small"
56
v-if="['select', 'selectList'].indexOf(singleSearch.type) != -1"
67
v-model="searchFormFields[singleSearch.field]"
@@ -19,27 +20,31 @@
1920
</el-option>
2021
</el-select>
2122
<el-date-picker
23+
style="width: 210px"
2224
clearable
2325
size="small"
26+
unlink-panels
2427
v-else-if="['date', 'datetime'].indexOf(singleSearch.type) != -1"
2528
v-model="searchFormFields[singleSearch.field]"
2629
type="daterange"
27-
:value-format="getDateFormat(singleSearch)"
30+
:value-format="getDateFormat(singleSearch)"
2831
:placeholder="singleSearch.title"
2932
>
3033
</el-date-picker>
3134
<el-cascader
32-
clearable
33-
size="small"
34-
v-model="searchFormFields[singleSearch.field]"
35-
v-else-if="singleSearch.type == 'cascader'"
36-
:options="singleSearch.data"
37-
:props="{ checkStrictly: true}"
38-
>
35+
style="width: 210px"
36+
clearable
37+
size="small"
38+
v-model="searchFormFields[singleSearch.field]"
39+
v-else-if="singleSearch.type == 'cascader'"
40+
:options="singleSearch.data"
41+
:props="{ checkStrictly: true }"
42+
>
3943
</el-cascader>
4044
<el-input
4145
clearable
4246
v-else
47+
style="width: 150px"
4348
size="small"
4449
v-model="searchFormFields[singleSearch.field]"
4550
:placeholder="singleSearch.title"
@@ -77,7 +82,7 @@ export default {
7782
},
7883
getDateFormat(item) {
7984
//见https://day.js.org/docs/zh-CN/display/format
80-
return item.type == 'date' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
85+
return item.type == "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss";
8186
},
8287
getDateOptions(date, item) {
8388
if ((!item.min && !item.max) || !date) {

Vol.Vue3版本/src/components/basic/ViewGrid/ViewGrid.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
padding-bottom: 11px;
2626
display: flex;
2727
.search-line {
28-
width: 180px;
28+
min-width: 150px;
2929
}
3030
.search-line > div {
3131
margin-left: 5px;

开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/QuickSearch.vue

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<div>
33
<el-select
4+
style="width: 150px"
45
size="small"
56
v-if="['select', 'selectList'].indexOf(singleSearch.type) != -1"
67
v-model="searchFormFields[singleSearch.field]"
@@ -19,27 +20,31 @@
1920
</el-option>
2021
</el-select>
2122
<el-date-picker
23+
style="width: 210px"
2224
clearable
2325
size="small"
26+
unlink-panels
2427
v-else-if="['date', 'datetime'].indexOf(singleSearch.type) != -1"
2528
v-model="searchFormFields[singleSearch.field]"
2629
type="daterange"
27-
:value-format="getDateFormat(singleSearch)"
30+
:value-format="getDateFormat(singleSearch)"
2831
:placeholder="singleSearch.title"
2932
>
3033
</el-date-picker>
3134
<el-cascader
32-
clearable
33-
size="small"
34-
v-model="searchFormFields[singleSearch.field]"
35-
v-else-if="singleSearch.type == 'cascader'"
36-
:options="singleSearch.data"
37-
:props="{ checkStrictly: true}"
38-
>
35+
style="width: 210px"
36+
clearable
37+
size="small"
38+
v-model="searchFormFields[singleSearch.field]"
39+
v-else-if="singleSearch.type == 'cascader'"
40+
:options="singleSearch.data"
41+
:props="{ checkStrictly: true }"
42+
>
3943
</el-cascader>
4044
<el-input
4145
clearable
4246
v-else
47+
style="width: 150px"
4348
size="small"
4449
v-model="searchFormFields[singleSearch.field]"
4550
:placeholder="singleSearch.title"
@@ -77,7 +82,7 @@ export default {
7782
},
7883
getDateFormat(item) {
7984
//见https://day.js.org/docs/zh-CN/display/format
80-
return item.type == 'date' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
85+
return item.type == "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss";
8186
},
8287
getDateOptions(date, item) {
8388
if ((!item.min && !item.max) || !date) {

开发版dev/Vue.NetCore/Vol.Vue3版本/src/components/basic/ViewGrid/ViewGrid.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
padding-bottom: 11px;
2626
display: flex;
2727
.search-line {
28-
width: 180px;
28+
min-width: 150px;
2929
}
3030
.search-line > div {
3131
margin-left: 5px;

0 commit comments

Comments
 (0)