bri-components 1.2.70 → 1.2.71
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/base/DshCascader/DshCascader.vue +2 -2
- package/src/components/controls/base/DshEditor.vue +1 -1
- package/src/components/controls/base/DshInput/DshInput.vue +44 -17
- package/src/components/controls/base/DshSelect/DshCheckbox.vue +1 -1
- package/src/components/controls/base/DshSelect/DshSelect.vue +1 -1
- package/src/components/controls/base/DshSwitch/DshSwitch.vue +1 -1
- package/src/components/controls/control.less +2 -2
- package/src/components/controls/mixins/cascaderMixin.js +1 -1
- package/src/components/controls/mixins/controlMixin.js +24 -16
- package/src/components/controls/mixins/selectMixin.js +2 -2
- package/src/components/list/BriTree.vue +1 -1
- package/src/components/list/DshBox/DshCrossTable.vue +7 -6
- package/src/components/list/DshCascaderTable.vue +4 -1
- package/src/.DS_Store +0 -0
- package/src/components/.DS_Store +0 -0
- package/src/components/controls/.DS_Store +0 -0
- package/src/components/controls/senior/.DS_Store +0 -0
- package/src/styles/.DS_Store +0 -0
- package/src/styles/components/.DS_Store +0 -0
package/package.json
CHANGED
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
>
|
|
31
31
|
<!-- 有值 -->
|
|
32
32
|
<template v-if="!$isEmptyData(curValList)">
|
|
33
|
-
<!--
|
|
33
|
+
<!-- 高度自由时 单元格-级联表格内，详情页-独占一行宽度时 -->
|
|
34
34
|
<div
|
|
35
35
|
v-if="isHeightAuto"
|
|
36
36
|
:class="{
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
>
|
|
104
104
|
<!-- 有值 -->
|
|
105
105
|
<template v-if="!$isEmptyData(curValList)">
|
|
106
|
-
<!--
|
|
106
|
+
<!-- 高度自由时 单元格-级联表格内，详情页-独占一行宽度时 -->
|
|
107
107
|
<dsh-tags
|
|
108
108
|
v-if="isHeightAuto"
|
|
109
109
|
:class="{
|
|
@@ -38,18 +38,37 @@
|
|
|
38
38
|
</div>
|
|
39
39
|
|
|
40
40
|
<!-- 单选模式 查看 -->
|
|
41
|
-
<div
|
|
41
|
+
<div
|
|
42
|
+
v-else-if="!multipleMode && !canEdit"
|
|
43
|
+
class="DshInput-show"
|
|
44
|
+
>
|
|
42
45
|
<!-- 有值 -->
|
|
43
46
|
<template v-if="!$isEmptyData(curVal)">
|
|
44
|
-
<!--
|
|
45
|
-
<
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
<!-- 高度自由时 单元格-级联表格内，详情页-独占一行宽度时 -->
|
|
48
|
+
<template v-if="isHeightAuto">
|
|
49
|
+
<a
|
|
50
|
+
v-if="inputType === 'url'"
|
|
51
|
+
:class="{
|
|
52
|
+
...commonClass2,
|
|
53
|
+
'DshInput-show-auto': true,
|
|
54
|
+
'DshInput-show-auto-url': true
|
|
55
|
+
}"
|
|
56
|
+
@click="goHttpWindow($event)"
|
|
57
|
+
>
|
|
58
|
+
{{ showVal }}
|
|
59
|
+
</a>
|
|
60
|
+
|
|
61
|
+
<div
|
|
62
|
+
v-else
|
|
63
|
+
:class="{
|
|
64
|
+
...commonClass2,
|
|
65
|
+
'DshInput-show-auto': true,
|
|
66
|
+
'DshInput-show-auto-detail': isDetailShow,
|
|
67
|
+
'DshInput-show-auto-text': ['text', 'textarea'].includes(inputType)
|
|
68
|
+
}"
|
|
69
|
+
v-html="showVal"
|
|
70
|
+
></div>
|
|
71
|
+
</template>
|
|
53
72
|
|
|
54
73
|
<!-- 表格和查看页 里的查看 -->
|
|
55
74
|
<bri-tooltip
|
|
@@ -61,7 +80,7 @@
|
|
|
61
80
|
<a
|
|
62
81
|
v-if="inputType === 'url'"
|
|
63
82
|
:class="{
|
|
64
|
-
...
|
|
83
|
+
...commonClass2,
|
|
65
84
|
'DshInput-show-ellipsis': true,
|
|
66
85
|
'DshInput-show-ellipsis-url': true
|
|
67
86
|
}"
|
|
@@ -73,7 +92,7 @@
|
|
|
73
92
|
<div
|
|
74
93
|
v-else
|
|
75
94
|
:class="{
|
|
76
|
-
...
|
|
95
|
+
...commonClass2,
|
|
77
96
|
'DshInput-show-ellipsis': true
|
|
78
97
|
}"
|
|
79
98
|
>
|
|
@@ -85,7 +104,7 @@
|
|
|
85
104
|
<!-- 无值 -->
|
|
86
105
|
<div
|
|
87
106
|
v-else
|
|
88
|
-
:class="
|
|
107
|
+
:class="commonClass2"
|
|
89
108
|
>
|
|
90
109
|
{{ emptyShowVal }}
|
|
91
110
|
</div>
|
|
@@ -197,13 +216,21 @@
|
|
|
197
216
|
|
|
198
217
|
.DshInput {
|
|
199
218
|
#control-show();
|
|
200
|
-
width: 100%;
|
|
201
219
|
|
|
202
220
|
&-show {
|
|
203
221
|
&-auto {
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
222
|
+
&-detail {
|
|
223
|
+
max-height: 500px;
|
|
224
|
+
overflow: auto;
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
&-text {
|
|
228
|
+
white-space: pre-wrap!important;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
&-url {
|
|
232
|
+
color: @themeColor!important;
|
|
233
|
+
}
|
|
207
234
|
}
|
|
208
235
|
|
|
209
236
|
&-ellipsis {
|
|
@@ -205,7 +205,7 @@ export default {
|
|
|
205
205
|
},
|
|
206
206
|
// 每项的颜色相关style --flat方式在用
|
|
207
207
|
getItemColorStyle (item) {
|
|
208
|
-
const color = this.colorMap[item.color] || this.colorMap["color-
|
|
208
|
+
const color = this.colorMap[item.color] || this.colorMap["color-default"];
|
|
209
209
|
return this.useColor
|
|
210
210
|
? {
|
|
211
211
|
backgroundColor: this.$getColor(color, 0.1),
|
|
@@ -132,39 +132,38 @@ export default {
|
|
|
132
132
|
"bri-control-disabled": this.canEdit && !this.finalCanEdit,
|
|
133
133
|
"bri-control-unit": this.isUnitShow,
|
|
134
134
|
"bri-control-show": this.isDetailShow,
|
|
135
|
-
|
|
136
135
|
"dsh-ellipsis": this.isUnitShow,
|
|
137
136
|
"bri-control-nodata": this.$isEmptyData(this.curVal)
|
|
138
137
|
};
|
|
139
138
|
},
|
|
139
|
+
commonClass2 () {
|
|
140
|
+
return {
|
|
141
|
+
"bri-control-edit": this.canEdit && this.finalCanEdit,
|
|
142
|
+
"bri-control-disabled": this.canEdit && !this.finalCanEdit,
|
|
143
|
+
"bri-control-unit": this.isUnitShow,
|
|
144
|
+
"bri-control-show": this.isDetailShow,
|
|
145
|
+
"bri-control-nodata": this.$isEmptyData(this.curVal)
|
|
146
|
+
};
|
|
147
|
+
},
|
|
148
|
+
clearable () {
|
|
149
|
+
return this.commonDealPropsObj._clearable;
|
|
150
|
+
},
|
|
140
151
|
// 单独一行
|
|
141
152
|
isFullRow () {
|
|
142
153
|
return this.propsObj._span === 24 || !this.propsObj._span;
|
|
143
154
|
},
|
|
144
|
-
//
|
|
155
|
+
// 控件内容的高度自由（在表格内且_heightAuto为true，2.详情页内且独占一行）
|
|
145
156
|
isHeightAuto () {
|
|
146
157
|
return this.isInTable
|
|
147
|
-
?
|
|
148
|
-
// ? this.isUnitShow
|
|
158
|
+
? !!this.propsObj._heightAuto
|
|
149
159
|
: this.isFullRow;
|
|
150
160
|
},
|
|
151
|
-
clearable () {
|
|
152
|
-
return this.commonDealPropsObj._clearable;
|
|
153
|
-
},
|
|
154
|
-
// showAlign () {
|
|
155
|
-
// return !this.isUnitShow
|
|
156
|
-
// ? "flex-start"
|
|
157
|
-
// : this.propsObj._align === "right"
|
|
158
|
-
// ? "flex-end"
|
|
159
|
-
// : this.propsObj._align === "center"
|
|
160
|
-
// ? "center"
|
|
161
|
-
// : "flex-start";
|
|
162
|
-
// },
|
|
163
161
|
|
|
164
162
|
/* 部分条件下 才使用的属性 */
|
|
165
163
|
// isShare () {
|
|
166
164
|
// return !!this.propsObj.isShare;
|
|
167
165
|
// },
|
|
166
|
+
// 单元格状态
|
|
168
167
|
isInTable () {
|
|
169
168
|
return !!this.propsObj.isInTable;
|
|
170
169
|
},
|
|
@@ -188,6 +187,15 @@ export default {
|
|
|
188
187
|
isDetailShow () {
|
|
189
188
|
return !this.isInTable && !this.canEdit;
|
|
190
189
|
},
|
|
190
|
+
// showAlign () {
|
|
191
|
+
// return !this.isUnitShow
|
|
192
|
+
// ? "flex-start"
|
|
193
|
+
// : this.propsObj._align === "right"
|
|
194
|
+
// ? "flex-end"
|
|
195
|
+
// : this.propsObj._align === "center"
|
|
196
|
+
// ? "center"
|
|
197
|
+
// : "flex-start";
|
|
198
|
+
// },
|
|
191
199
|
|
|
192
200
|
/* 部分控件下 才使用的属性 */
|
|
193
201
|
compKey () {
|
|
@@ -158,14 +158,14 @@ export default {
|
|
|
158
158
|
getItemClass (item) {
|
|
159
159
|
return [
|
|
160
160
|
this.useColor
|
|
161
|
-
? this.colorMap[item.color] ? item.color : "color-
|
|
161
|
+
? this.colorMap[item.color] ? item.color : "color-default"
|
|
162
162
|
: undefined,
|
|
163
163
|
item.class
|
|
164
164
|
];
|
|
165
165
|
},
|
|
166
166
|
// 获取某项的颜色相关style --flat方式在用
|
|
167
167
|
getItemColorStyle (item) {
|
|
168
|
-
const color = this.colorMap[item.color] || this.colorMap["color-
|
|
168
|
+
const color = this.colorMap[item.color] || this.colorMap["color-default"];
|
|
169
169
|
return this.useColor
|
|
170
170
|
? {
|
|
171
171
|
backgroundColor: this.$getColor(color, 0.1),
|
|
@@ -355,7 +355,7 @@
|
|
|
355
355
|
props: {
|
|
356
356
|
dropdownObj: {
|
|
357
357
|
icon: "md-arrow-dropdown-circle",
|
|
358
|
-
color: this.colorMap[data.color] || this.colorMap["color-
|
|
358
|
+
color: this.colorMap[data.color] || this.colorMap["color-default"]
|
|
359
359
|
},
|
|
360
360
|
menuClass: "BriTree-dropdown-menu",
|
|
361
361
|
list: this.colorArr
|
|
@@ -52,8 +52,8 @@
|
|
|
52
52
|
<!-- 表头s -->
|
|
53
53
|
<div class="DshCrossTable-left-body">
|
|
54
54
|
<div :style="{
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
height: '10000px'
|
|
56
|
+
}">
|
|
57
57
|
<table
|
|
58
58
|
cellspacing="0"
|
|
59
59
|
cellpadding="0"
|
|
@@ -96,9 +96,9 @@
|
|
|
96
96
|
}"
|
|
97
97
|
>
|
|
98
98
|
<bri-tooltip
|
|
99
|
-
transfer
|
|
100
|
-
:content="colItem.title"
|
|
101
99
|
style="width: calc(100% - 16px)"
|
|
100
|
+
:content="colItem.title"
|
|
101
|
+
transfer
|
|
102
102
|
>
|
|
103
103
|
<div class="td-content dsh-ellipsis">
|
|
104
104
|
<slot
|
|
@@ -119,13 +119,14 @@
|
|
|
119
119
|
</slot>
|
|
120
120
|
</div>
|
|
121
121
|
</bri-tooltip>
|
|
122
|
+
|
|
122
123
|
<Tooltip
|
|
123
|
-
style="width:16px"
|
|
124
124
|
v-if="colItem._comment"
|
|
125
|
+
style="width:16px"
|
|
125
126
|
:content="colItem._comment"
|
|
126
|
-
:transfer="true"
|
|
127
127
|
placement="top-start"
|
|
128
128
|
max-width="200"
|
|
129
|
+
:transfer="true"
|
|
129
130
|
>
|
|
130
131
|
<Icon
|
|
131
132
|
type="ios-help-circle-outline"
|
|
@@ -149,7 +149,10 @@
|
|
|
149
149
|
:canEdit="canEdit"
|
|
150
150
|
:rowIndex="rowIndex"
|
|
151
151
|
:formData="row[col.nodeKey]"
|
|
152
|
-
:formItem="
|
|
152
|
+
:formItem="{
|
|
153
|
+
...col,
|
|
154
|
+
_heightAuto: true
|
|
155
|
+
}"
|
|
153
156
|
@change="$dispatchEvent(operationMap.changeVal, col, row, arguments)"
|
|
154
157
|
></dsh-list-unit>
|
|
155
158
|
</td>
|
package/src/.DS_Store
DELETED
|
Binary file
|
package/src/components/.DS_Store
DELETED
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/src/styles/.DS_Store
DELETED
|
Binary file
|
|
Binary file
|