bri-components 1.2.64 → 1.2.66
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 +1 -1
- package/src/components/controls/control.less +44 -10
- package/src/components/controls/senior/selectDepartments.vue +1 -1
- package/src/components/form/DshForm.vue +8 -2
- package/src/components/list/BriCard.vue +1 -1
- package/src/components/list/BriTable.vue +1 -1
- package/src/components/list/DshBox/DshBox.vue +1 -1
- package/src/components/list/DshBox/DshCard.vue +295 -156
- package/src/components/list/DshBox/DshCrossTable.vue +1 -1
- package/src/components/list/DshBox/DshList.vue +7 -14
- package/src/components/list/DshBox/DshPanel.vue +376 -265
- package/src/components/list/DshCascaderTable.vue +1 -1
- package/src/components/other/BriLoading.vue +1 -1
- package/src/components/small/DshDropdown.vue +1 -1
- package/src/components/unit/DshFormUnit.vue +63 -54
- package/src/styles/components/list/DshBox/DshList.less +2 -3
- package/src/styles/global/text.less +10 -3
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
'DshFormUnit-required': canEdit && formItem._required,
|
|
7
7
|
'DshFormUnit-line': formItem._line
|
|
8
8
|
},
|
|
9
|
-
formControlClass
|
|
9
|
+
formControlClass
|
|
10
10
|
]"
|
|
11
11
|
:style="{
|
|
12
12
|
width: `calc(${(formItem._br ? (formItem._span || 24)/24 : 1) * 100}% - 12px)`,
|
|
@@ -155,7 +155,9 @@
|
|
|
155
155
|
? formItem._tipsRender.call(this, formItem, formData)
|
|
156
156
|
: formItem._openTip
|
|
157
157
|
? (h) => {
|
|
158
|
-
return h("span", {
|
|
158
|
+
return h("span", {
|
|
159
|
+
class: "DshFormUnit-tip"
|
|
160
|
+
}, [
|
|
159
161
|
h("Icon", {
|
|
160
162
|
props: {
|
|
161
163
|
type: "md-help-circle"
|
|
@@ -165,37 +167,18 @@
|
|
|
165
167
|
},
|
|
166
168
|
on: {
|
|
167
169
|
click: () => {
|
|
168
|
-
|
|
169
|
-
if (formItem._tipUrl) {
|
|
170
|
-
this.$https({
|
|
171
|
-
url: {
|
|
172
|
-
module: "customPage",
|
|
173
|
-
name: formItem._tipUrl
|
|
174
|
-
},
|
|
175
|
-
params: {
|
|
176
|
-
formData: formData,
|
|
177
|
-
propsObj: formItem
|
|
178
|
-
},
|
|
179
|
-
callback: res => {
|
|
180
|
-
this.showTipModal = true;
|
|
181
|
-
formItem._tipContent = res;
|
|
182
|
-
}
|
|
183
|
-
});
|
|
184
|
-
}
|
|
185
|
-
} else {
|
|
186
|
-
this.showTipModal = true;
|
|
187
|
-
}
|
|
170
|
+
this.clickOpenTip(formItem, formData);
|
|
188
171
|
}
|
|
189
172
|
}
|
|
190
173
|
}),
|
|
191
174
|
|
|
192
175
|
h("dsh-modal", {
|
|
176
|
+
class: "DshFormUnit-tip-modal",
|
|
193
177
|
props: {
|
|
194
178
|
value: this.showTipModal,
|
|
195
179
|
mode: "small",
|
|
196
180
|
propsObj: {
|
|
197
181
|
title: "温馨提示",
|
|
198
|
-
class: "DshFormUnit-modal",
|
|
199
182
|
showSlotClose: false,
|
|
200
183
|
maskClosable: true
|
|
201
184
|
}
|
|
@@ -234,6 +217,29 @@
|
|
|
234
217
|
]);
|
|
235
218
|
}
|
|
236
219
|
: undefined;
|
|
220
|
+
},
|
|
221
|
+
// 是否打开tip弹窗
|
|
222
|
+
clickOpenTip (formItem, formData) {
|
|
223
|
+
if (formItem._tipKind === "dynamic" && !formItem._tipContent) {
|
|
224
|
+
if (formItem._tipUrl) {
|
|
225
|
+
this.$https({
|
|
226
|
+
url: {
|
|
227
|
+
module: "customPage",
|
|
228
|
+
name: formItem._tipUrl
|
|
229
|
+
},
|
|
230
|
+
params: {
|
|
231
|
+
formData: formData,
|
|
232
|
+
propsObj: formItem
|
|
233
|
+
},
|
|
234
|
+
callback: res => {
|
|
235
|
+
this.showTipModal = true;
|
|
236
|
+
formItem._tipContent = res;
|
|
237
|
+
}
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
} else {
|
|
241
|
+
this.showTipModal = true;
|
|
242
|
+
}
|
|
237
243
|
}
|
|
238
244
|
}
|
|
239
245
|
};
|
|
@@ -245,28 +251,28 @@
|
|
|
245
251
|
padding: 0px 10px 10px;
|
|
246
252
|
|
|
247
253
|
&-label {
|
|
248
|
-
|
|
249
|
-
padding: 5px 0px 5px;
|
|
254
|
+
padding: 5px 0px;
|
|
250
255
|
line-height: 20px;
|
|
251
256
|
font-size: @smallSize;
|
|
257
|
+
position: relative;
|
|
252
258
|
display: flex;
|
|
253
259
|
align-items: center;
|
|
254
260
|
|
|
255
261
|
&-left {
|
|
256
|
-
flex:
|
|
257
|
-
min-width:
|
|
258
|
-
position: relative;
|
|
262
|
+
flex: 3;
|
|
263
|
+
min-width: 0px;
|
|
259
264
|
}
|
|
260
265
|
|
|
261
266
|
&-right {
|
|
262
267
|
flex: 1;
|
|
263
268
|
min-width: 0px;
|
|
269
|
+
padding-left: 10px;
|
|
264
270
|
text-align: right;
|
|
265
271
|
}
|
|
266
272
|
|
|
267
273
|
&-name {
|
|
268
|
-
font-size: @textSize;
|
|
269
274
|
.dsh-ellipsis();
|
|
275
|
+
font-size: @textSize;
|
|
270
276
|
|
|
271
277
|
&-edit {
|
|
272
278
|
color: @textColor;
|
|
@@ -288,13 +294,14 @@
|
|
|
288
294
|
}
|
|
289
295
|
|
|
290
296
|
&-control {
|
|
291
|
-
overflow: hidden;
|
|
297
|
+
// overflow: hidden;
|
|
292
298
|
|
|
293
299
|
&-component {
|
|
294
300
|
|
|
295
301
|
}
|
|
296
302
|
}
|
|
297
303
|
|
|
304
|
+
// 左右显示时
|
|
298
305
|
&-line {
|
|
299
306
|
display: flex;
|
|
300
307
|
justify-content: space-between;
|
|
@@ -302,10 +309,9 @@
|
|
|
302
309
|
|
|
303
310
|
.DshFormUnit-label {
|
|
304
311
|
max-width: 280px;
|
|
305
|
-
margin: 0px 8px 0px -10px; //
|
|
312
|
+
margin: 0px 8px 0px -10px; // line模式下显示必填
|
|
306
313
|
padding-left: 10px;
|
|
307
314
|
font-size: @textSize;
|
|
308
|
-
overflow: hidden;
|
|
309
315
|
|
|
310
316
|
&-left {
|
|
311
317
|
flex: 1;
|
|
@@ -330,7 +336,7 @@
|
|
|
330
336
|
}
|
|
331
337
|
|
|
332
338
|
&-required {
|
|
333
|
-
.DshFormUnit-label
|
|
339
|
+
.DshFormUnit-label::before {
|
|
334
340
|
position: absolute;
|
|
335
341
|
left: -10px;
|
|
336
342
|
|
|
@@ -345,29 +351,32 @@
|
|
|
345
351
|
}
|
|
346
352
|
}
|
|
347
353
|
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
354
|
+
// 提示框的
|
|
355
|
+
&-tip {
|
|
356
|
+
&-modal {
|
|
357
|
+
.wrap {
|
|
358
|
+
width: 100%;
|
|
359
|
+
height: 100%;
|
|
360
|
+
display: flex;
|
|
361
|
+
flex-direction: column;
|
|
362
|
+
|
|
363
|
+
&-content {
|
|
364
|
+
flex: 1;
|
|
365
|
+
min-height: 0px;
|
|
366
|
+
padding: 0px 12px;
|
|
367
|
+
overflow: auto;
|
|
368
|
+
}
|
|
361
369
|
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
370
|
+
&-btns {
|
|
371
|
+
margin: 10px 0px;
|
|
372
|
+
text-align: right;
|
|
365
373
|
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
374
|
+
.ivu-btn {
|
|
375
|
+
font-size: 16px;
|
|
376
|
+
font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
|
|
377
|
+
font-weight: 600;
|
|
378
|
+
border-radius: 4px;
|
|
379
|
+
}
|
|
371
380
|
}
|
|
372
381
|
}
|
|
373
382
|
}
|
|
@@ -6,13 +6,21 @@
|
|
|
6
6
|
color: @textColor;
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
#dsh-nodata {
|
|
10
10
|
width: 100%;
|
|
11
11
|
padding: 20px 10px;
|
|
12
12
|
text-align: center;
|
|
13
13
|
font-size: 14px;
|
|
14
14
|
font-weight: 500;
|
|
15
|
-
color: @
|
|
15
|
+
color: @placeholderColor;
|
|
16
|
+
}
|
|
17
|
+
#dsh-nodata-large {
|
|
18
|
+
width: 100%;
|
|
19
|
+
padding: 20px 10px;
|
|
20
|
+
text-align: center;
|
|
21
|
+
font-size: 16px;
|
|
22
|
+
font-weight: 500;
|
|
23
|
+
color: @placeholderColor;
|
|
16
24
|
}
|
|
17
25
|
|
|
18
26
|
.dsh-subtip {
|
|
@@ -21,7 +29,6 @@
|
|
|
21
29
|
font-size: 12px;
|
|
22
30
|
font-weight: 500;
|
|
23
31
|
color: @placeholderColor;
|
|
24
|
-
// background-color: #f3f3f3;
|
|
25
32
|
}
|
|
26
33
|
|
|
27
34
|
// 出现三个点
|