bri-components 1.2.84 → 1.2.85
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
CHANGED
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
height: auto;
|
|
32
32
|
padding: 6px 0px;
|
|
33
33
|
margin-right: 12px;
|
|
34
|
-
margin-
|
|
34
|
+
margin-top: 4px;
|
|
35
35
|
white-space: normal;
|
|
36
36
|
|
|
37
37
|
.ivu-@{control-type} {
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
|
|
87
87
|
|
|
88
88
|
& + span {
|
|
89
|
-
color: #
|
|
89
|
+
color: #999999;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -97,6 +97,67 @@
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
&-color {
|
|
100
|
+
#template (@color) {
|
|
101
|
+
.ivu-@{control-type} {
|
|
102
|
+
.ivu-@{control-type}-inner {
|
|
103
|
+
border-color: @color;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
&-checked {
|
|
107
|
+
// 因为不一致，所以明确名字分开写
|
|
108
|
+
.ivu-radio-inner {
|
|
109
|
+
&::after {
|
|
110
|
+
background-color: @color;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
.ivu-checkbox-inner {
|
|
114
|
+
background-color: @color;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
&-checked {
|
|
120
|
+
border-color: @color;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
&-disabled {
|
|
124
|
+
border-color: transparent;
|
|
125
|
+
|
|
126
|
+
.ivu-@{control-type} {
|
|
127
|
+
.ivu-@{control-type}-inner {
|
|
128
|
+
border-color: #cccccc;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
&-checked {
|
|
132
|
+
// 因为不一致，所以明确名字分开写
|
|
133
|
+
.ivu-radio-inner {
|
|
134
|
+
&::after {
|
|
135
|
+
background-color: #cccccc;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
.ivu-checkbox-inner {
|
|
139
|
+
background-color: #cccccc;
|
|
140
|
+
|
|
141
|
+
// 对勾的颜色
|
|
142
|
+
&::after {
|
|
143
|
+
border-color: #f3f3f3;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
|
|
149
|
+
& + span {
|
|
150
|
+
color: @color;
|
|
151
|
+
opacity: 0.6;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
&.ivu-@{control-type}-wrapper-checked {
|
|
156
|
+
border-color: #cccccc;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
100
161
|
.ivu-@{control-type}-wrapper {
|
|
101
162
|
padding: 6px 15px;
|
|
102
163
|
border-radius: 4px;
|
|
@@ -105,10 +166,8 @@
|
|
|
105
166
|
|
|
106
167
|
.ivu-@{control-type} {
|
|
107
168
|
.ivu-@{control-type}-inner {
|
|
108
|
-
border: 2px solid
|
|
109
|
-
background-color: transparent;
|
|
169
|
+
border: 2px solid #aaaaaa;
|
|
110
170
|
}
|
|
111
|
-
|
|
112
171
|
// 因为不一致，所以明确名字分开写
|
|
113
172
|
.ivu-radio-inner {
|
|
114
173
|
width: 14px;
|
|
@@ -119,77 +178,50 @@
|
|
|
119
178
|
height: 6px;
|
|
120
179
|
left: 2px;
|
|
121
180
|
top: 2px;
|
|
181
|
+
background-color: transparent;
|
|
122
182
|
}
|
|
123
183
|
}
|
|
124
184
|
.ivu-checkbox-inner {
|
|
185
|
+
background-color: transparent;
|
|
186
|
+
|
|
125
187
|
&::after {
|
|
126
188
|
top: 2px;
|
|
127
189
|
left: 4px;
|
|
128
190
|
}
|
|
129
191
|
}
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
each(@resourceColor, {
|
|
134
|
-
.color-@{index}.ivu-@{control-type}-wrapper {
|
|
135
|
-
.ivu-@{control-type} {
|
|
136
|
-
.ivu-@{control-type}-inner {
|
|
137
|
-
border-color: @value;
|
|
138
|
-
}
|
|
139
192
|
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
.ivu-checkbox-inner {
|
|
148
|
-
background-color: @value;
|
|
193
|
+
&-checked {
|
|
194
|
+
// 因为不一致，所以明确名字分开写
|
|
195
|
+
.ivu-radio-inner {
|
|
196
|
+
&::after {
|
|
197
|
+
background-color: #aaaaaa;
|
|
149
198
|
}
|
|
150
199
|
}
|
|
200
|
+
.ivu-checkbox-inner {
|
|
201
|
+
background-color: #aaaaaa;
|
|
202
|
+
}
|
|
151
203
|
}
|
|
204
|
+
}
|
|
152
205
|
|
|
153
|
-
|
|
154
|
-
|
|
206
|
+
&-checked {
|
|
207
|
+
border-color: #aaaaaa;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
.color-default.ivu-@{control-type}-wrapper {
|
|
212
|
+
// 为了填补default主题下无style
|
|
213
|
+
// background-color: @theme-focus!important;
|
|
214
|
+
.ivu-@{control-type} {
|
|
215
|
+
& + span {
|
|
216
|
+
color: @themeColor;
|
|
155
217
|
}
|
|
218
|
+
}
|
|
156
219
|
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
border-color: #cccccc;
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
&-checked {
|
|
166
|
-
// 因为不一致，所以明确名字分开写
|
|
167
|
-
.ivu-radio-inner {
|
|
168
|
-
&::after {
|
|
169
|
-
background-color: #cccccc;
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
.ivu-checkbox-inner {
|
|
173
|
-
background-color: #cccccc;
|
|
174
|
-
|
|
175
|
-
// 对勾的颜色
|
|
176
|
-
&::after {
|
|
177
|
-
border-color: #f3f3f3;
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
& + span {
|
|
184
|
-
color: @value;
|
|
185
|
-
opacity: 0.6;
|
|
186
|
-
}
|
|
187
|
-
}
|
|
188
|
-
|
|
189
|
-
&.ivu-@{control-type}-wrapper-checked {
|
|
190
|
-
border-color: #cccccc;
|
|
191
|
-
}
|
|
192
|
-
}
|
|
220
|
+
#template(@themeColor);
|
|
221
|
+
}
|
|
222
|
+
each(@resourceColor, {
|
|
223
|
+
.color-@{index}.ivu-@{control-type}-wrapper {
|
|
224
|
+
#template(@value);
|
|
193
225
|
}
|
|
194
226
|
});
|
|
195
227
|
}
|
|
@@ -201,6 +233,7 @@
|
|
|
201
233
|
|
|
202
234
|
.ivu-@{control-type}-wrapper {
|
|
203
235
|
height: 30px;
|
|
236
|
+
margin-top: 0px;
|
|
204
237
|
margin-bottom: 2px;
|
|
205
238
|
white-space: nowrap;
|
|
206
239
|
}
|
|
@@ -50,14 +50,17 @@
|
|
|
50
50
|
<dsh-form-unit
|
|
51
51
|
v-else-if="['field', undefined].includes(conditionItem.logic)"
|
|
52
52
|
:key="`${conditionItem._id}field`"
|
|
53
|
-
class="
|
|
53
|
+
:class="{
|
|
54
|
+
'DshAdvSearch-conditions-item': true,
|
|
55
|
+
'DshAdvSearch-conditions-item-dynamic': conditionItem.dynamicList.length
|
|
56
|
+
}"
|
|
54
57
|
:formData="conditionItem"
|
|
55
58
|
:formItem="conditionItem.formItem"
|
|
56
59
|
height="80"
|
|
57
60
|
@change="change('control', conditionItem, ...arguments)"
|
|
58
61
|
>
|
|
59
|
-
<
|
|
60
|
-
<
|
|
62
|
+
<template v-if="!conditionItem.__isDelete__">
|
|
63
|
+
<slot :conditionItem="conditionItem">
|
|
61
64
|
<!-- 子表的筛选，出现是有条件的，递归 -->
|
|
62
65
|
<template v-if="['subSearch', 'subTableSearch'].includes(conditionItem.fieldOperator)">
|
|
63
66
|
<dsh-adv-search
|
|
@@ -108,8 +111,8 @@
|
|
|
108
111
|
v-else-if="['isnull', 'notnull', 'nosize', 'size', 'nolist', 'list'].includes(conditionItem.fieldOperator)"
|
|
109
112
|
class="DshAdvSearch-conditions-item-blank"
|
|
110
113
|
>请选择右上角条件</div>
|
|
111
|
-
</
|
|
112
|
-
</
|
|
114
|
+
</slot>
|
|
115
|
+
</template>
|
|
113
116
|
|
|
114
117
|
<!-- 右上角 -->
|
|
115
118
|
<div
|
|
@@ -343,7 +346,7 @@
|
|
|
343
346
|
&-delete {
|
|
344
347
|
position: absolute;
|
|
345
348
|
top: 3px;
|
|
346
|
-
right: -
|
|
349
|
+
right: -3px;
|
|
347
350
|
padding: 3px;
|
|
348
351
|
color: red;
|
|
349
352
|
display: none;
|
|
@@ -412,7 +415,7 @@
|
|
|
412
415
|
}
|
|
413
416
|
|
|
414
417
|
&-icon {
|
|
415
|
-
|
|
418
|
+
|
|
416
419
|
}
|
|
417
420
|
}
|
|
418
421
|
}
|
|
@@ -453,16 +456,13 @@
|
|
|
453
456
|
&-conditions {
|
|
454
457
|
&-item {
|
|
455
458
|
.DshFormUnit-label-right {
|
|
456
|
-
flex:
|
|
457
|
-
margin-right:
|
|
459
|
+
flex: 3;
|
|
460
|
+
margin-right: 10px;
|
|
458
461
|
}
|
|
459
462
|
|
|
460
|
-
|
|
461
|
-
.DshFormUnit-line {
|
|
462
|
-
padding-left: 0px;
|
|
463
|
-
|
|
463
|
+
&-dynamic {
|
|
464
464
|
.DshFormUnit-label-right {
|
|
465
|
-
flex:
|
|
465
|
+
flex: 4;
|
|
466
466
|
}
|
|
467
467
|
}
|
|
468
468
|
}
|