n20-common-lib 2.7.0-beta.18 → 2.7.0-beta.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/assets/css/advanced-filter.scss +253 -113
- package/src/components/AdvancedFilter/filterItem.vue +7 -1
- package/src/components/AdvancedFilter/formItemRender.vue +191 -37
- package/src/components/AdvancedFilter/index.vue +90 -33
- package/src/components/AdvancedFilter/main/Form/form-item.vue +87 -0
- package/src/components/AdvancedFilter/main/Form/form.vue +59 -0
- package/src/components/AdvancedFilter/main/index.vue +34 -0
- package/src/components/AdvancedFilter/utils.js +2 -4
- package/src/components/DateChoose/index.vue +278 -276
- package/src/components/TablePro/index.vue +12 -6
- package/src/directives/VRuleKey/index.js +0 -2
- package/style/index.css +1 -1
- package/theme/blue.css +1 -1
- package/theme/cctcRed.css +1 -1
- package/theme/green.css +1 -1
- package/theme/lightBlue.css +1 -1
- package/theme/orange.css +1 -1
- package/theme/purple.css +1 -1
- package/theme/red.css +1 -1
- package/theme/yellow.css +1 -1
- package/src/components/AdvancedFilter/FormItem.vue +0 -34
package/package.json
CHANGED
|
@@ -1,8 +1,160 @@
|
|
|
1
|
+
// &-item {
|
|
2
|
+
// position: relative;
|
|
3
|
+
// display: inline-block;
|
|
4
|
+
// vertical-align: middle;
|
|
5
|
+
// max-width: 426px;
|
|
6
|
+
// margin-right: 8px;
|
|
7
|
+
// padding-left: 8px;
|
|
8
|
+
// border-radius: 4px;
|
|
9
|
+
// border: 1px solid #dcdfe5;
|
|
10
|
+
// background: #fff;
|
|
11
|
+
// cursor: pointer;
|
|
12
|
+
|
|
13
|
+
// &__name {
|
|
14
|
+
// display: inline-block;
|
|
15
|
+
// vertical-align: middle;
|
|
16
|
+
// white-space: nowrap;
|
|
17
|
+
// overflow: hidden;
|
|
18
|
+
// max-width: 168px;
|
|
19
|
+
// margin-right: 6px;
|
|
20
|
+
// color: #182b50;
|
|
21
|
+
// }
|
|
22
|
+
|
|
23
|
+
// &__value {
|
|
24
|
+
// display: inline-block;
|
|
25
|
+
// vertical-align: middle;
|
|
26
|
+
// white-space: nowrap;
|
|
27
|
+
// overflow: hidden;
|
|
28
|
+
// text-overflow: ellipsis;
|
|
29
|
+
// max-width: 312px;
|
|
30
|
+
|
|
31
|
+
// //margin-right: 14px;
|
|
32
|
+
// .el-input .el-input__inner {
|
|
33
|
+
// border: none;
|
|
34
|
+
// padding-left: 0;
|
|
35
|
+
// background-color: transparent;
|
|
36
|
+
// }
|
|
37
|
+
|
|
38
|
+
// .el-input__inner:focus {
|
|
39
|
+
// box-shadow: none;
|
|
40
|
+
// }
|
|
41
|
+
|
|
42
|
+
// }
|
|
43
|
+
|
|
44
|
+
// .filter_remove {
|
|
45
|
+
// display: none;
|
|
46
|
+
// position: absolute;
|
|
47
|
+
// height: 13px;
|
|
48
|
+
// width: 13px;
|
|
49
|
+
// background: #f1f1f1;
|
|
50
|
+
// right: -5px;
|
|
51
|
+
// top: -7px;
|
|
52
|
+
// font-size: 14px;
|
|
53
|
+
// z-index: 1;
|
|
54
|
+
// border-radius: 50%;
|
|
55
|
+
// cursor: pointer;
|
|
56
|
+
// }
|
|
57
|
+
|
|
58
|
+
// &:hover {
|
|
59
|
+
// .filter_remove {
|
|
60
|
+
// display: block;
|
|
61
|
+
// }
|
|
62
|
+
// }
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
// .el-form-item__label {
|
|
67
|
+
// padding: 0;
|
|
68
|
+
// display: inline-block;
|
|
69
|
+
// vertical-align: middle;
|
|
70
|
+
// white-space: nowrap;
|
|
71
|
+
// overflow: hidden;
|
|
72
|
+
// text-overflow: ellipsis;
|
|
73
|
+
// margin-right: 4px;
|
|
74
|
+
// }
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
// .el-range-editor.el-input__inner {
|
|
78
|
+
// min-width: 168px;
|
|
79
|
+
// max-width: 224px;
|
|
80
|
+
|
|
81
|
+
// .el-range-input {
|
|
82
|
+
// background-color: transparent;
|
|
83
|
+
// }
|
|
84
|
+
// }
|
|
85
|
+
|
|
86
|
+
// .n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
|
|
87
|
+
// min-width: 168px;
|
|
88
|
+
// max-width: 380px;
|
|
89
|
+
// }
|
|
90
|
+
|
|
91
|
+
// .n20-date-editor .el-input__prefix {
|
|
92
|
+
// display: none;
|
|
93
|
+
// }
|
|
94
|
+
|
|
95
|
+
// .el-input,
|
|
96
|
+
// .el-input__inner {
|
|
97
|
+
// border: none;
|
|
98
|
+
// width: 100%;
|
|
99
|
+
// background-color: transparent;
|
|
100
|
+
// }
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
// .el-input__inner:active,
|
|
105
|
+
// .el-input__inner:focus {
|
|
106
|
+
// box-shadow: none;
|
|
107
|
+
// border: none;
|
|
108
|
+
// border-color: #fff;
|
|
109
|
+
// }
|
|
110
|
+
|
|
111
|
+
// .el-checkbox-group {
|
|
112
|
+
// height: 32px;
|
|
113
|
+
// line-height: 32px;
|
|
114
|
+
// vertical-align: middle;
|
|
115
|
+
// padding: 0 10px;
|
|
116
|
+
// }
|
|
117
|
+
|
|
118
|
+
// .el-radio-group {
|
|
119
|
+
// padding: 0 10px;
|
|
120
|
+
// }
|
|
121
|
+
|
|
122
|
+
// .n20-num-w {
|
|
123
|
+
// padding-left: 5px;
|
|
124
|
+
|
|
125
|
+
// .el-input,
|
|
126
|
+
// .el-input__inner {
|
|
127
|
+
// padding-left: 0;
|
|
128
|
+
// }
|
|
129
|
+
|
|
130
|
+
// .el-input--suffix .el-input__inner {
|
|
131
|
+
// padding-right: 26px;
|
|
132
|
+
// }
|
|
133
|
+
// }
|
|
134
|
+
|
|
135
|
+
// .n20-numberRange {
|
|
136
|
+
// padding-right: 8px;
|
|
137
|
+
// }
|
|
138
|
+
|
|
139
|
+
// &-close {
|
|
140
|
+
// display: none;
|
|
141
|
+
// position: absolute;
|
|
142
|
+
// top: -6px;
|
|
143
|
+
// right: -20px;
|
|
144
|
+
// }
|
|
145
|
+
|
|
146
|
+
// &:hover {
|
|
147
|
+
// .n20-advanced-filter-item-close {
|
|
148
|
+
// display: inline-block;
|
|
149
|
+
// }
|
|
150
|
+
// }
|
|
151
|
+
// }
|
|
152
|
+
|
|
153
|
+
|
|
1
154
|
.n20-advanced-filter {
|
|
2
155
|
position: relative;
|
|
3
156
|
display: flex;
|
|
4
157
|
align-items: center;
|
|
5
|
-
flex: 1;
|
|
6
158
|
padding: 8px 0;
|
|
7
159
|
|
|
8
160
|
&-item.n20-advanced-filter-active {
|
|
@@ -11,48 +163,113 @@
|
|
|
11
163
|
}
|
|
12
164
|
|
|
13
165
|
&-body {
|
|
166
|
+
|
|
167
|
+
.el-form-item,
|
|
168
|
+
.el-form-item--small.el-form-item {
|
|
169
|
+
margin-bottom: 8px;
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
.el-form-item__content {
|
|
173
|
+
display: inline-block;
|
|
174
|
+
vertical-align: middle;
|
|
175
|
+
}
|
|
14
176
|
}
|
|
15
177
|
|
|
16
178
|
&-item {
|
|
17
|
-
|
|
179
|
+
box-sizing: border-box;
|
|
18
180
|
display: inline-block;
|
|
19
181
|
vertical-align: middle;
|
|
20
|
-
max-width: 426px;
|
|
182
|
+
max-width: 426px !important;
|
|
183
|
+
min-width: 120px;
|
|
21
184
|
margin-right: 8px;
|
|
22
|
-
|
|
185
|
+
border: 1px solid $--border-color-base;
|
|
186
|
+
padding: 0 0 0 8px;
|
|
23
187
|
border-radius: 4px;
|
|
24
|
-
|
|
25
|
-
background: #fff;
|
|
188
|
+
white-space: nowrap;
|
|
26
189
|
cursor: pointer;
|
|
27
190
|
|
|
28
|
-
|
|
191
|
+
|
|
192
|
+
|
|
193
|
+
.el-form-item__label {
|
|
194
|
+
padding: 0;
|
|
195
|
+
max-width: 168px;
|
|
29
196
|
display: inline-block;
|
|
30
197
|
vertical-align: middle;
|
|
31
198
|
white-space: nowrap;
|
|
32
199
|
overflow: hidden;
|
|
33
|
-
|
|
34
|
-
margin-right:
|
|
35
|
-
color: #182b50;
|
|
200
|
+
text-overflow: ellipsis;
|
|
201
|
+
margin-right: 4px;
|
|
36
202
|
}
|
|
37
203
|
|
|
38
|
-
|
|
39
|
-
|
|
204
|
+
|
|
205
|
+
|
|
206
|
+
.el-range-editor.el-input__inner {
|
|
207
|
+
min-width: 168px;
|
|
208
|
+
max-width: 224px;
|
|
209
|
+
|
|
210
|
+
.el-range-input {
|
|
211
|
+
background-color: transparent;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
.n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
|
|
216
|
+
min-width: 168px;
|
|
217
|
+
max-width: 380px;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
.n20-date-editor .el-input__prefix {
|
|
221
|
+
display: none;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
.el-input,
|
|
225
|
+
.el-input__inner {
|
|
226
|
+
padding-left: 0;
|
|
227
|
+
border: none;
|
|
228
|
+
width: 100%;
|
|
229
|
+
background-color: transparent;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
.el-select__input.is-small {
|
|
233
|
+
margin-left: 0;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
|
|
237
|
+
|
|
238
|
+
.el-input__inner:active,
|
|
239
|
+
.el-input__inner:focus {
|
|
240
|
+
box-shadow: none;
|
|
241
|
+
border: none;
|
|
242
|
+
border-color: #fff;
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
.el-checkbox-group {
|
|
246
|
+
height: 32px;
|
|
247
|
+
line-height: 32px;
|
|
40
248
|
vertical-align: middle;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
249
|
+
padding: 0 10px;
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
.el-radio-group {
|
|
253
|
+
padding: 0 10px;
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
.n20-num-w {
|
|
257
|
+
// padding-left: 5px;
|
|
258
|
+
|
|
259
|
+
.el-input,
|
|
260
|
+
.el-input__inner {
|
|
48
261
|
padding-left: 0;
|
|
49
|
-
background-color: transparent;
|
|
50
262
|
}
|
|
51
|
-
|
|
52
|
-
|
|
263
|
+
|
|
264
|
+
.el-input--suffix .el-input__inner {
|
|
265
|
+
padding-right: 25px;
|
|
53
266
|
}
|
|
267
|
+
}
|
|
54
268
|
|
|
269
|
+
.n20-numberRange {
|
|
270
|
+
padding-right: 8px;
|
|
55
271
|
}
|
|
272
|
+
|
|
56
273
|
.filter_remove {
|
|
57
274
|
display: none;
|
|
58
275
|
position: absolute;
|
|
@@ -66,101 +283,24 @@
|
|
|
66
283
|
border-radius: 50%;
|
|
67
284
|
cursor: pointer;
|
|
68
285
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
286
|
+
|
|
287
|
+
|
|
288
|
+
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
&-item:hover {
|
|
292
|
+
.filter_remove {
|
|
293
|
+
display: block;
|
|
73
294
|
}
|
|
295
|
+
}
|
|
74
296
|
|
|
75
297
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
// display: inline-block;
|
|
80
|
-
// vertical-align: middle;
|
|
81
|
-
// white-space: nowrap;
|
|
82
|
-
// overflow: hidden;
|
|
83
|
-
// text-overflow: ellipsis;
|
|
84
|
-
// margin-right: 4px;
|
|
85
|
-
//}
|
|
86
|
-
//
|
|
87
|
-
//
|
|
88
|
-
//.el-range-editor.el-input__inner {
|
|
89
|
-
// min-width: 168px;
|
|
90
|
-
// max-width: 224px;
|
|
91
|
-
//
|
|
92
|
-
// .el-range-input {
|
|
93
|
-
// background-color: transparent;
|
|
94
|
-
// }
|
|
95
|
-
//}
|
|
96
|
-
//
|
|
97
|
-
//.n20-date-editor.el-date-editor--datetimerange.el-range-editor--small.has-value {
|
|
98
|
-
// min-width: 168px;
|
|
99
|
-
// max-width: 380px;
|
|
100
|
-
//}
|
|
101
|
-
//
|
|
102
|
-
//.n20-date-editor .el-input__prefix {
|
|
103
|
-
// display: none;
|
|
104
|
-
//}
|
|
105
|
-
//
|
|
106
|
-
//.el-input,
|
|
107
|
-
//.el-input__inner {
|
|
108
|
-
// border: none;
|
|
109
|
-
// width: 100%;
|
|
110
|
-
// background-color: transparent;
|
|
111
|
-
//}
|
|
112
|
-
//
|
|
113
|
-
//
|
|
114
|
-
//
|
|
115
|
-
//.el-input__inner:active,
|
|
116
|
-
//.el-input__inner:focus {
|
|
117
|
-
// box-shadow: none;
|
|
118
|
-
// border: none;
|
|
119
|
-
// border-color: #fff;
|
|
120
|
-
//}
|
|
121
|
-
//
|
|
122
|
-
//.el-checkbox-group {
|
|
123
|
-
// height: 32px;
|
|
124
|
-
// line-height: 32px;
|
|
125
|
-
// vertical-align: middle;
|
|
126
|
-
// padding: 0 10px;
|
|
127
|
-
//}
|
|
128
|
-
//
|
|
129
|
-
//.el-radio-group {
|
|
130
|
-
// padding: 0 10px;
|
|
131
|
-
//}
|
|
132
|
-
//
|
|
133
|
-
//.n20-num-w {
|
|
134
|
-
// padding-left: 5px;
|
|
135
|
-
//
|
|
136
|
-
// .el-input,
|
|
137
|
-
// .el-input__inner {
|
|
138
|
-
// padding-left: 0;
|
|
139
|
-
// }
|
|
140
|
-
//
|
|
141
|
-
// .el-input--suffix .el-input__inner {
|
|
142
|
-
// padding-right: 26px;
|
|
143
|
-
// }
|
|
144
|
-
//}
|
|
145
|
-
//
|
|
146
|
-
//.n20-numberRange {
|
|
147
|
-
// padding-right: 8px;
|
|
148
|
-
//}
|
|
149
|
-
//
|
|
150
|
-
//&-close {
|
|
151
|
-
// display: none;
|
|
152
|
-
// position: absolute;
|
|
153
|
-
// top: -6px;
|
|
154
|
-
// right:-20px;
|
|
155
|
-
//}
|
|
156
|
-
//
|
|
157
|
-
//&:hover {
|
|
158
|
-
// .n20-advanced-filter-item-close {
|
|
159
|
-
// display: inline-block;
|
|
160
|
-
// }
|
|
161
|
-
//}
|
|
298
|
+
|
|
299
|
+
&-item.el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
|
|
300
|
+
font-size: 16px;
|
|
162
301
|
}
|
|
163
302
|
|
|
303
|
+
|
|
164
304
|
&-item.el-form-item[disabled] {
|
|
165
305
|
background-color: #f5f5f5 !important;
|
|
166
306
|
border-color: #e4e7ed !important;
|
|
@@ -213,4 +353,4 @@
|
|
|
213
353
|
display: inline-block;
|
|
214
354
|
vertical-align: middle;
|
|
215
355
|
}
|
|
216
|
-
}
|
|
356
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<el-checkbox-group v-model="checkArrayCalc" class="popover-check-box" @change="checkChange">
|
|
2
|
+
<el-checkbox-group v-model="checkArrayCalc" :max="maxLength" class="popover-check-box" @change="checkChange">
|
|
3
3
|
<vue-draggable
|
|
4
4
|
:list="filterList"
|
|
5
5
|
:animation="200"
|
|
@@ -30,6 +30,9 @@ export default {
|
|
|
30
30
|
checkArray: {
|
|
31
31
|
type: Array,
|
|
32
32
|
default: () => []
|
|
33
|
+
},
|
|
34
|
+
maxLength: {
|
|
35
|
+
type: Number
|
|
33
36
|
}
|
|
34
37
|
},
|
|
35
38
|
computed: {
|
|
@@ -48,6 +51,9 @@ export default {
|
|
|
48
51
|
},
|
|
49
52
|
methods: {
|
|
50
53
|
checkChange(keys) {
|
|
54
|
+
if (keys.length > this.maxLength) {
|
|
55
|
+
return this.$message.warning(`最多只能添加${this.maxLength}个筛选条件!`)
|
|
56
|
+
}
|
|
51
57
|
this.$emit('checked', keys)
|
|
52
58
|
},
|
|
53
59
|
dragChange() {
|