uview-plus 3.2.11 → 3.2.13
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/changelog.md +7 -0
- package/components/u-cell/u-cell.vue +3 -3
- package/components/u-datetime-picker/u-datetime-picker.vue +4 -1
- package/components/u-form-item/u-form-item.vue +2 -2
- package/components/u-modal/u-modal.vue +1 -0
- package/components/u-steps-item/u-steps-item.vue +6 -6
- package/package.json +1 -1
package/changelog.md
CHANGED
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
</slot>
|
|
31
31
|
<view class="u-cell__right-icon-wrap" v-if="$slots['right-icon'] || isLink"
|
|
32
32
|
:class="[`u-cell__right-icon-wrap--${arrowDirection}`]">
|
|
33
|
-
<
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
<u-icon v-if="rightIcon && !$slots['right-icon']" :name="rightIcon" :custom-style="rightIconStyle" :color="disabled ? '#c8c9cc' : 'info'"
|
|
34
|
+
:size="size === 'large' ? 18 : 16"></u-icon>
|
|
35
|
+
<slot v-else name="right-icon">
|
|
36
36
|
</slot>
|
|
37
37
|
</view>
|
|
38
38
|
<view class="u-cell__right-icon-wrap" v-if="$slots['righticon']"
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<view v-if="hasInput">
|
|
2
|
+
<view v-if="hasInput" class="u-datetime-picker">
|
|
3
3
|
<u-input
|
|
4
4
|
:placeholder="placeholder"
|
|
5
5
|
border="surround"
|
|
@@ -443,4 +443,7 @@
|
|
|
443
443
|
|
|
444
444
|
<style lang="scss" scoped>
|
|
445
445
|
@import '../../libs/css/components.scss';
|
|
446
|
+
.u-datetime-picker {
|
|
447
|
+
width: 100%;
|
|
448
|
+
}
|
|
446
449
|
</style>
|
|
@@ -115,7 +115,8 @@
|
|
|
115
115
|
labelWidth: 45,
|
|
116
116
|
// 错误提示方式
|
|
117
117
|
errorType: 'message'
|
|
118
|
-
}
|
|
118
|
+
},
|
|
119
|
+
color: color
|
|
119
120
|
}
|
|
120
121
|
},
|
|
121
122
|
// 组件创建完成时，将当前实例保存到u-form中
|
|
@@ -131,7 +132,6 @@
|
|
|
131
132
|
methods: {
|
|
132
133
|
addStyle,
|
|
133
134
|
addUnit,
|
|
134
|
-
color,
|
|
135
135
|
init() {
|
|
136
136
|
// 父组件的实例
|
|
137
137
|
this.updateParentData()
|
|
@@ -130,22 +130,22 @@
|
|
|
130
130
|
}
|
|
131
131
|
},
|
|
132
132
|
statusColor() {
|
|
133
|
-
let
|
|
133
|
+
let colorTmp = ''
|
|
134
134
|
switch (this.statusClass) {
|
|
135
135
|
case 'finish':
|
|
136
|
-
|
|
136
|
+
colorTmp = this.parentData.activeColor
|
|
137
137
|
break
|
|
138
138
|
case 'error':
|
|
139
|
-
|
|
139
|
+
colorTmp = color.error
|
|
140
140
|
break
|
|
141
141
|
case 'process':
|
|
142
|
-
|
|
142
|
+
colorTmp = this.parentData.dot ? this.parentData.activeColor : 'transparent'
|
|
143
143
|
break
|
|
144
144
|
default:
|
|
145
|
-
|
|
145
|
+
colorTmp = this.parentData.inactiveColor
|
|
146
146
|
break
|
|
147
147
|
}
|
|
148
|
-
return
|
|
148
|
+
return colorTmp
|
|
149
149
|
},
|
|
150
150
|
contentStyle() {
|
|
151
151
|
const style = {}
|