bri-components 1.2.68 → 1.2.69
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/lib/0.bri-components.min.js +1 -1
- package/lib/1.bri-components.min.js +1 -1
- package/lib/10.bri-components.min.js +1 -1
- package/lib/11.bri-components.min.js +1 -0
- package/lib/2.bri-components.min.js +1 -1
- package/lib/3.bri-components.min.js +1 -1
- package/lib/4.bri-components.min.js +1 -1
- package/lib/5.bri-components.min.js +1 -1
- package/lib/6.bri-components.min.js +1 -1
- package/lib/7.bri-components.min.js +1 -1
- package/lib/8.bri-components.min.js +1 -1
- package/lib/9.bri-components.min.js +1 -1
- package/lib/bri-components.min.js +16 -16
- package/package.json +2 -2
- package/src/components/controls/base/DshCascader/DshCascader.vue +14 -6
- package/src/components/form/DshAdvSearch.vue +11 -0
- package/src/components/list/DshBox/DshCard.vue +0 -5
- package/src/components/list/DshBox/DshPanel.vue +2 -7
- package/src/components/unit/DshFormUnit.vue +4 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bri-components",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.69",
|
|
4
4
|
"author": "dengshanghui",
|
|
5
5
|
"description": "a component lib for vue project",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"ali-oss": "^6.13.1",
|
|
34
34
|
"axios": "^0.23.0",
|
|
35
|
-
"bri-datas": "^1.0.
|
|
35
|
+
"bri-datas": "^1.0.50",
|
|
36
36
|
"jshint": "^2.12.0",
|
|
37
37
|
"jsonlint": "^1.6.3",
|
|
38
38
|
"minio": "7.1.0",
|
|
@@ -37,6 +37,9 @@
|
|
|
37
37
|
...commonClass,
|
|
38
38
|
'DshCascader-show-auto': true
|
|
39
39
|
}"
|
|
40
|
+
:style="{
|
|
41
|
+
color: curValObj && curValObj.style.color // &&为了和 mobile一致
|
|
42
|
+
}"
|
|
40
43
|
>
|
|
41
44
|
{{ showVal }}
|
|
42
45
|
</div>
|
|
@@ -46,10 +49,15 @@
|
|
|
46
49
|
:content="showVal"
|
|
47
50
|
:transfer="true"
|
|
48
51
|
>
|
|
49
|
-
<div
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
52
|
+
<div
|
|
53
|
+
:class="{
|
|
54
|
+
...commonClass,
|
|
55
|
+
'DshCascader-show-ellipsis': true
|
|
56
|
+
}"
|
|
57
|
+
:style="{
|
|
58
|
+
color: curValObj && curValObj.style.color // &&为了和 mobile一致
|
|
59
|
+
}"
|
|
60
|
+
>
|
|
53
61
|
{{ showVal }}
|
|
54
62
|
</div>
|
|
55
63
|
</bri-tooltip>
|
|
@@ -102,8 +110,8 @@
|
|
|
102
110
|
...commonClass,
|
|
103
111
|
'DshCascaders-show-auto': true
|
|
104
112
|
}"
|
|
105
|
-
:list="curValObjList"
|
|
106
113
|
itemClass="DshCascaders-show-auto-tag"
|
|
114
|
+
:list="curValObjList"
|
|
107
115
|
></dsh-tags>
|
|
108
116
|
|
|
109
117
|
<bri-tooltip
|
|
@@ -116,8 +124,8 @@
|
|
|
116
124
|
...commonClass,
|
|
117
125
|
'DshCascaders-show-ellipsis': true
|
|
118
126
|
}"
|
|
119
|
-
:list="curValObjList"
|
|
120
127
|
itemClass="DshCascaders-show-ellipsis-tag"
|
|
128
|
+
:list="curValObjList"
|
|
121
129
|
></dsh-tags>
|
|
122
130
|
</bri-tooltip>
|
|
123
131
|
</template>
|
|
@@ -231,11 +231,6 @@
|
|
|
231
231
|
selfColumns () {
|
|
232
232
|
return this.columns
|
|
233
233
|
.filter(colItem => ![this.imageField, this.titleField].includes(colItem._key))
|
|
234
|
-
.map(colItem => ({
|
|
235
|
-
...colItem,
|
|
236
|
-
titleAlign: "left",
|
|
237
|
-
columnAlign: "left"
|
|
238
|
-
}))
|
|
239
234
|
.slice(0, 2);
|
|
240
235
|
},
|
|
241
236
|
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
<div class="list">
|
|
63
63
|
<!-- 提示语 -->
|
|
64
64
|
<div
|
|
65
|
-
v-if="!groupItem.finished"
|
|
65
|
+
v-if="!groupItem.list.length || !groupItem.finished"
|
|
66
66
|
class="list-tip"
|
|
67
67
|
:style="{
|
|
68
68
|
color: getBgColor(groupItem),
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
|
|
187
187
|
<!-- 提示语 -->
|
|
188
188
|
<div
|
|
189
|
-
v-if="groupItem.finished"
|
|
189
|
+
v-if="groupItem.list.length && groupItem.finished"
|
|
190
190
|
class="list-tip"
|
|
191
191
|
:style="{
|
|
192
192
|
color: getBgColor(groupItem),
|
|
@@ -314,11 +314,6 @@
|
|
|
314
314
|
selfColumns () {
|
|
315
315
|
return this.columns
|
|
316
316
|
.filter(colItem => ![this.groupField, this.titleField].includes(colItem._key))
|
|
317
|
-
.map(colItem => ({
|
|
318
|
-
...colItem,
|
|
319
|
-
titleAlign: "left",
|
|
320
|
-
columnAlign: "left"
|
|
321
|
-
}))
|
|
322
317
|
.slice(0, 1);
|
|
323
318
|
},
|
|
324
319
|
groupBtnOperationList () {
|
|
@@ -138,12 +138,12 @@
|
|
|
138
138
|
computed: {
|
|
139
139
|
unitStyle () {
|
|
140
140
|
return {
|
|
141
|
-
width: `calc(${(this.formItem._br
|
|
142
|
-
height:
|
|
141
|
+
width: `calc(${(this.formItem._br && this.formItem._span ? this.formItem._span / 24 : 1) * 100}% - 12px)`,
|
|
142
|
+
height: [undefined, 0, 24].includes(this.formItem._span)
|
|
143
143
|
? undefined
|
|
144
|
-
:
|
|
144
|
+
: `${this.height - (this.canEdit ? 0 : 10)}px`, // 去掉下padding
|
|
145
145
|
minHeight: "42px",
|
|
146
|
-
|
|
146
|
+
paddingBottom: this.canEdit ? undefined : "0px", // 详情查看页时，不要上下的padding，为了美观
|
|
147
147
|
|
|
148
148
|
...this.rowStyle
|
|
149
149
|
};
|