bri-components 1.2.31 → 1.2.32
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
|
@@ -604,7 +604,7 @@
|
|
|
604
604
|
: ruleConfig.regs && ruleConfig.regs.length
|
|
605
605
|
? {
|
|
606
606
|
bool: ruleConfig.regs.every(regItem => regItem.test(val)),
|
|
607
|
-
message: col._regMessage ||
|
|
607
|
+
message: col._regMessage || `${col._name}格式不正确`
|
|
608
608
|
}
|
|
609
609
|
: {
|
|
610
610
|
bool: true
|
|
@@ -7,82 +7,83 @@
|
|
|
7
7
|
@submit.native.prevent
|
|
8
8
|
>
|
|
9
9
|
<Row>
|
|
10
|
-
<template v-
|
|
11
|
-
<
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
>
|
|
18
|
-
<FormItem
|
|
19
|
-
class="DshForm-item-FormItem"
|
|
20
|
-
:prop="formItem._key"
|
|
21
|
-
@click.native="clickControl(formItem)"
|
|
10
|
+
<template v-if="displayFormList.length">
|
|
11
|
+
<template v-for="formItem in displayFormList">
|
|
12
|
+
<i-col
|
|
13
|
+
:key="formItem._key"
|
|
14
|
+
:id="formItem._key"
|
|
15
|
+
class="DshForm-item"
|
|
16
|
+
:span="formItem._br ? 24 : (formItem._span || 24)"
|
|
22
17
|
>
|
|
23
|
-
<
|
|
24
|
-
|
|
25
|
-
:
|
|
26
|
-
|
|
27
|
-
:formItem="formItem"
|
|
28
|
-
:allFormList="allFormList"
|
|
29
|
-
:changedFields="changedFields"
|
|
30
|
-
:height="height"
|
|
31
|
-
:rowStyle="rowStyle"
|
|
32
|
-
:labelStyle="labelStyle"
|
|
33
|
-
:formControlClass="formControlClass"
|
|
34
|
-
@change="change(arguments)"
|
|
35
|
-
@refChange="refChange(arguments)"
|
|
36
|
-
@changeField="changeField"
|
|
18
|
+
<FormItem
|
|
19
|
+
class="DshForm-item-FormItem"
|
|
20
|
+
:prop="formItem._key"
|
|
21
|
+
@click.native="clickControl(formItem)"
|
|
37
22
|
>
|
|
38
|
-
<
|
|
23
|
+
<dsh-form-unit
|
|
24
|
+
ref="dshFormItem"
|
|
39
25
|
:canEdit="canEdit"
|
|
40
|
-
:formItem="formItem"
|
|
41
26
|
:formData="formData"
|
|
42
|
-
:allFormList="allFormList"
|
|
43
|
-
></slot>
|
|
44
|
-
|
|
45
|
-
<slot
|
|
46
|
-
name="label"
|
|
47
|
-
slot="label"
|
|
48
|
-
:canEdit="canEdit"
|
|
49
27
|
:formItem="formItem"
|
|
50
|
-
:formData="formData"
|
|
51
28
|
:allFormList="allFormList"
|
|
52
|
-
|
|
29
|
+
:changedFields="changedFields"
|
|
30
|
+
:height="height"
|
|
31
|
+
:rowStyle="rowStyle"
|
|
32
|
+
:labelStyle="labelStyle"
|
|
33
|
+
:formControlClass="formControlClass"
|
|
34
|
+
@change="change(arguments)"
|
|
35
|
+
@refChange="refChange(arguments)"
|
|
36
|
+
@changeField="changeField"
|
|
37
|
+
>
|
|
38
|
+
<slot
|
|
39
|
+
:canEdit="canEdit"
|
|
40
|
+
:formItem="formItem"
|
|
41
|
+
:formData="formData"
|
|
42
|
+
:allFormList="allFormList"
|
|
43
|
+
></slot>
|
|
53
44
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
45
|
+
<slot
|
|
46
|
+
name="label"
|
|
47
|
+
slot="label"
|
|
48
|
+
:canEdit="canEdit"
|
|
49
|
+
:formItem="formItem"
|
|
50
|
+
:formData="formData"
|
|
51
|
+
:allFormList="allFormList"
|
|
52
|
+
></slot>
|
|
62
53
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
54
|
+
<slot
|
|
55
|
+
name="extra"
|
|
56
|
+
slot="extra"
|
|
57
|
+
:canEdit="canEdit"
|
|
58
|
+
:formItem="formItem"
|
|
59
|
+
:formData="formData"
|
|
60
|
+
:allFormList="allFormList"
|
|
61
|
+
></slot>
|
|
62
|
+
|
|
63
|
+
<slot
|
|
64
|
+
name="corner"
|
|
65
|
+
slot="corner"
|
|
66
|
+
:canEdit="canEdit"
|
|
67
|
+
:formItem="formItem"
|
|
68
|
+
:formData="formData"
|
|
69
|
+
:allFormList="allFormList"
|
|
70
|
+
></slot>
|
|
71
|
+
</dsh-form-unit>
|
|
72
|
+
</FormItem>
|
|
73
|
+
</i-col>
|
|
74
74
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
75
|
+
<!-- 换行 -->
|
|
76
|
+
<i-col
|
|
77
|
+
v-if="formItem._wrap"
|
|
78
|
+
:key="formItem._key + '_wrap'"
|
|
79
|
+
style="min-height: 0px;"
|
|
80
|
+
:span="24"
|
|
81
|
+
></i-col>
|
|
82
|
+
</template>
|
|
82
83
|
</template>
|
|
83
84
|
|
|
84
85
|
<div
|
|
85
|
-
v-
|
|
86
|
+
v-else
|
|
86
87
|
class="dsh-tip"
|
|
87
88
|
>{{ "--- 无字段 ---" }}</div>
|
|
88
89
|
</Row>
|
|
@@ -98,6 +99,11 @@
|
|
|
98
99
|
DshFormUnit
|
|
99
100
|
},
|
|
100
101
|
props: {
|
|
102
|
+
// 启用该参数后,查看状态时,空值字段不显示
|
|
103
|
+
notShowEmpty: {
|
|
104
|
+
type: Boolean,
|
|
105
|
+
default: false
|
|
106
|
+
},
|
|
101
107
|
canEdit: {
|
|
102
108
|
type: Boolean,
|
|
103
109
|
default: true
|
|
@@ -162,7 +168,14 @@
|
|
|
162
168
|
]
|
|
163
169
|
};
|
|
164
170
|
},
|
|
165
|
-
computed: {
|
|
171
|
+
computed: {
|
|
172
|
+
displayFormList () {
|
|
173
|
+
return this.formList.filter(formItem =>
|
|
174
|
+
this.isShow(formItem, this.formData) &&
|
|
175
|
+
!(this.notShowEmpty && !this.canEdit && this.$isEmptyData(this.formData[formItem._key]))
|
|
176
|
+
);
|
|
177
|
+
}
|
|
178
|
+
},
|
|
166
179
|
created () {
|
|
167
180
|
this.init();
|
|
168
181
|
},
|
|
@@ -249,7 +262,7 @@
|
|
|
249
262
|
// 格式校验 (不依赖必填)
|
|
250
263
|
if (ruleConfig.regs.length) {
|
|
251
264
|
rules.push({
|
|
252
|
-
message: formItem._regMessage ||
|
|
265
|
+
message: formItem._regMessage || `${formItem._name}格式不正确`,
|
|
253
266
|
trigger: "blur",
|
|
254
267
|
transform: (val) => {
|
|
255
268
|
if (this.$isEmptyData(val)) {
|
|
@@ -434,7 +434,7 @@
|
|
|
434
434
|
: ruleConfig.regs && ruleConfig.regs.length
|
|
435
435
|
? {
|
|
436
436
|
bool: ruleConfig.regs.every(regItem => regItem.test(val)),
|
|
437
|
-
message: col._regMessage ||
|
|
437
|
+
message: col._regMessage || `${col._name}格式不正确`
|
|
438
438
|
}
|
|
439
439
|
: {
|
|
440
440
|
bool: true
|