sadais-piui 1.2.7-beta2 → 1.2.7-beta22
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/components/pi-calendar-panel/components/calendar-days/index.vue +371 -0
- package/components/pi-calendar-panel/index.vue +173 -151
- package/components/pi-checkbox/index.vue +2 -2
- package/components/pi-checkbox-group/index.vue +4 -0
- package/components/pi-circle-progress/index.vue +65 -9
- package/components/pi-collapse/index.vue +114 -0
- package/components/pi-collapse-item/index.vue +347 -0
- package/components/pi-date-picker/index.vue +20 -6
- package/components/pi-dropdown/components/dropdown-tab.vue +33 -24
- package/components/pi-dropdown/index.vue +39 -20
- package/components/pi-dropdown-item/index.vue +15 -8
- package/components/pi-form/index.vue +5 -4
- package/components/pi-form-item/index.vue +4 -1
- package/components/pi-input/index.vue +2 -2
- package/components/pi-radio/index.vue +2 -2
- package/components/pi-radio-group/index.vue +4 -0
- package/components/pi-steps/index.vue +85 -33
- package/components/pi-tabs/index.vue +4 -3
- package/components/pi-tag/index.vue +488 -0
- package/config/calendarPanel.js +3 -1
- package/config/circleProgress.js +7 -8
- package/config/collapse.js +7 -0
- package/config/collapseItem.js +11 -0
- package/config/datePicker.js +1 -0
- package/config/dropdown.js +3 -1
- package/config/steps.js +1 -1
- package/config/tag.js +21 -0
- package/package.json +1 -1
|
@@ -6,18 +6,22 @@
|
|
|
6
6
|
:items="tabs"
|
|
7
7
|
:show-slider-bar="false"
|
|
8
8
|
show-item-split-line
|
|
9
|
+
:stretch="stretch"
|
|
9
10
|
active-text-color="inherit"
|
|
10
11
|
>
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
<!-- 注意:slot内不能使用父组件data -->
|
|
13
|
+
<dropdown-tab
|
|
14
|
+
slot="item"
|
|
15
|
+
slot-scope="{ item, index }"
|
|
16
|
+
:item="item"
|
|
17
|
+
@click="handleClickTab(item, index)"
|
|
18
|
+
/>
|
|
15
19
|
</pi-tabs>
|
|
16
20
|
</view>
|
|
17
21
|
<!-- 展示dropdownItem下的数据 -->
|
|
18
22
|
<view
|
|
19
|
-
class="pi-dropdown-content
|
|
20
|
-
:class="[contentClass, show ? 'pi-ani-slide-
|
|
23
|
+
class="pi-dropdown-content"
|
|
24
|
+
:class="[contentClass, show ? 'pi-ani-slide-bottom-show' : 'pi-ani-slide-bottom-hide']"
|
|
21
25
|
:style="[contentStyle, contentCombinationStyle]"
|
|
22
26
|
>
|
|
23
27
|
<slot />
|
|
@@ -26,11 +30,12 @@
|
|
|
26
30
|
<!-- 遮罩层 -->
|
|
27
31
|
<view
|
|
28
32
|
v-if="!closed"
|
|
29
|
-
class="pi-
|
|
33
|
+
class="pi-fixed pi-dropdown-mask"
|
|
30
34
|
:class="[show ? getMask.animationShow : getMask.animationHide]"
|
|
31
35
|
:style="[
|
|
32
36
|
{
|
|
33
37
|
'z-index': getMask.zIndex,
|
|
38
|
+
'top': maskAlignTop ? containerRect.top + containerRect.height + 'px' : '-9999px',
|
|
34
39
|
'background': getMask.background,
|
|
35
40
|
'animation-duration': getDuration.css
|
|
36
41
|
}
|
|
@@ -158,11 +163,27 @@ export default {
|
|
|
158
163
|
},
|
|
159
164
|
// 选中checkbox配置
|
|
160
165
|
selectedCheckbox: {
|
|
161
|
-
type: Object,
|
|
166
|
+
type: [Object, String],
|
|
162
167
|
default() {
|
|
163
168
|
// 参照checkbox
|
|
164
169
|
return dropdown.selectedCheckbox
|
|
165
170
|
}
|
|
171
|
+
},
|
|
172
|
+
// 标签是否均分布局,可选值 `true`
|
|
173
|
+
stretch: {
|
|
174
|
+
type: Boolean,
|
|
175
|
+
// `false`
|
|
176
|
+
default() {
|
|
177
|
+
return dropdown.stretch
|
|
178
|
+
}
|
|
179
|
+
},
|
|
180
|
+
// 是否需要蒙层顶部对齐组件,可选值 `false`
|
|
181
|
+
maskAlignTop: {
|
|
182
|
+
type: Boolean,
|
|
183
|
+
// `true`
|
|
184
|
+
default() {
|
|
185
|
+
return dropdown.maskAlignTop
|
|
186
|
+
}
|
|
166
187
|
}
|
|
167
188
|
},
|
|
168
189
|
data() {
|
|
@@ -182,8 +203,8 @@ export default {
|
|
|
182
203
|
const { containerRect, closed } = this
|
|
183
204
|
return {
|
|
184
205
|
top: `${containerRect.height}px`,
|
|
185
|
-
left:
|
|
186
|
-
width: `${
|
|
206
|
+
left: `-${containerRect.left}px`,
|
|
207
|
+
width: `${this.$pi.system.systemInfo.windowWidth}px`,
|
|
187
208
|
zIndex: !closed ? 101 : -1
|
|
188
209
|
}
|
|
189
210
|
},
|
|
@@ -218,15 +239,11 @@ export default {
|
|
|
218
239
|
// 同步父子组件的值
|
|
219
240
|
if (this.val[index] !== item.val) {
|
|
220
241
|
console.log(TAG, 'Dropdown和DropdownItem绑定值不一致,即将同步')
|
|
221
|
-
|
|
222
|
-
// 以子组件的值为准
|
|
223
|
-
hasValueChange = true
|
|
224
|
-
val[index] = item.val
|
|
225
|
-
} else if (this.val[index]) {
|
|
226
|
-
item.emitChange(this.val[index])
|
|
227
|
-
}
|
|
242
|
+
item.emitChange(this.val[index])
|
|
228
243
|
}
|
|
229
|
-
const currentOption = item.options?.find(
|
|
244
|
+
const currentOption = item.options?.find(
|
|
245
|
+
opt => !opt.clearable && opt[item.getKeyField] === this.val[index]
|
|
246
|
+
)
|
|
230
247
|
const newItem = {
|
|
231
248
|
showIcon: item.showIcon,
|
|
232
249
|
iconOption: item.getIconOption,
|
|
@@ -246,6 +263,10 @@ export default {
|
|
|
246
263
|
// 显示当前Tab
|
|
247
264
|
async handleClickTab(item) {
|
|
248
265
|
if (item.disabled) return
|
|
266
|
+
if (this.show && item.id === this.activeItem.id) {
|
|
267
|
+
this.closeMask()
|
|
268
|
+
return
|
|
269
|
+
}
|
|
249
270
|
// 更新打开的tab标志
|
|
250
271
|
this.tabs = this.tabs.map(tab => {
|
|
251
272
|
tab.opened = tab.id === item.id
|
|
@@ -304,10 +325,8 @@ export default {
|
|
|
304
325
|
.pi-dropdown-content {
|
|
305
326
|
position: absolute;
|
|
306
327
|
background: #ffffff;
|
|
307
|
-
border-radius: 12rpx;
|
|
308
328
|
}
|
|
309
329
|
.pi-dropdown-mask {
|
|
310
|
-
top: -9999px;
|
|
311
330
|
left: -9999px;
|
|
312
331
|
right: -9999px;
|
|
313
332
|
bottom: -9999px;
|
|
@@ -4,17 +4,21 @@
|
|
|
4
4
|
<view
|
|
5
5
|
v-for="item in options"
|
|
6
6
|
:key="item[getKeyField]"
|
|
7
|
-
class="item-wrap pi-pd-tb-24 pi-pd-lr-32 pi-w-100P pi-
|
|
8
|
-
:class="[
|
|
7
|
+
class="item-wrap pi-pd-tb-24 pi-pd-lr-32 pi-w-100P pi-align-center"
|
|
8
|
+
:class="[
|
|
9
|
+
customClass,
|
|
10
|
+
item[getDisabledField] ? 'disabled' : '',
|
|
11
|
+
getSelectedCheckbox === 'none' ? 'pi-justify-center' : 'pi-justify-between'
|
|
12
|
+
]"
|
|
9
13
|
:style="[customStyle, getItemStyle]"
|
|
10
14
|
@tap="handleSelectItem(item)"
|
|
11
15
|
>
|
|
12
|
-
<view>
|
|
16
|
+
<view :class="[{ 'pi-primary': item[keyField] === val }]">
|
|
13
17
|
{{ item[getDisplayField] }}
|
|
14
18
|
</view>
|
|
15
19
|
<!-- 如果配置了图片地址,使用图片 -->
|
|
16
20
|
<pi-img
|
|
17
|
-
v-if="getSelectedImg.src && item
|
|
21
|
+
v-if="getSelectedImg.src && item[keyField] === val"
|
|
18
22
|
:src="getSelectedImg.src"
|
|
19
23
|
:mode="getSelectedImg.mode"
|
|
20
24
|
:width="getSelectedImg.width"
|
|
@@ -34,9 +38,9 @@
|
|
|
34
38
|
/>
|
|
35
39
|
<!-- 默认使用复选框 -->
|
|
36
40
|
<pi-checkbox
|
|
37
|
-
v-if="!getSelectedImg.src"
|
|
41
|
+
v-if="!getSelectedImg.src && getSelectedCheckbox !== 'none'"
|
|
38
42
|
readonly
|
|
39
|
-
:value="item
|
|
43
|
+
:value="item[keyField] === val"
|
|
40
44
|
:name="getSelectedCheckbox.name"
|
|
41
45
|
:shape="getSelectedCheckbox.shape"
|
|
42
46
|
:border-radius="getSelectedCheckbox.borderRadius"
|
|
@@ -148,7 +152,7 @@ export default {
|
|
|
148
152
|
},
|
|
149
153
|
// 选中checkbox配置
|
|
150
154
|
selectedCheckbox: {
|
|
151
|
-
type: Object,
|
|
155
|
+
type: [Object, String],
|
|
152
156
|
default() {
|
|
153
157
|
// 参照checkbox
|
|
154
158
|
return dropdownItem.selectedCheckbox
|
|
@@ -185,6 +189,9 @@ export default {
|
|
|
185
189
|
return this.$pi.lang.mergeDeep(selectedImg, this.selectedImg)
|
|
186
190
|
},
|
|
187
191
|
getSelectedCheckbox() {
|
|
192
|
+
if (this.inheritProps.selectedCheckbox === 'none') {
|
|
193
|
+
return this.inheritProps.selectedCheckbox
|
|
194
|
+
}
|
|
188
195
|
const selectedCheckbox = this.inheritProps.selectedCheckbox || dropdownItem.selectedCheckbox
|
|
189
196
|
return this.$pi.lang.mergeDeep(selectedCheckbox, this.selectedCheckbox)
|
|
190
197
|
},
|
|
@@ -203,7 +210,7 @@ export default {
|
|
|
203
210
|
if (item[this.getDisabledField]) {
|
|
204
211
|
return
|
|
205
212
|
}
|
|
206
|
-
this.emitChange(item.
|
|
213
|
+
this.emitChange(item[this.getKeyField])
|
|
207
214
|
setTimeout(() => {
|
|
208
215
|
this._parent.submit()
|
|
209
216
|
}, 300) // 延迟 可见按钮点击动画
|
|
@@ -449,7 +449,10 @@ export default {
|
|
|
449
449
|
resolve(_getResolve())
|
|
450
450
|
})
|
|
451
451
|
.catch(({ errors, fields }) => {
|
|
452
|
-
console.log(TAG, '表单校验失败', this.prop
|
|
452
|
+
console.log(TAG, '表单校验失败', `字段名:${this.prop},字段值:${fieldValue}`)
|
|
453
|
+
console.log(TAG, '字段值:', fieldValue)
|
|
454
|
+
console.log(TAG, '错误信息', errors)
|
|
455
|
+
console.log(TAG, '校验规则', fields)
|
|
453
456
|
// 记录状态和报错信息
|
|
454
457
|
this.validateState = 'error'
|
|
455
458
|
this.validateMessage = errors ? errors[0].message : ''
|
|
@@ -328,8 +328,8 @@ export default {
|
|
|
328
328
|
handleChange(value) {
|
|
329
329
|
this.val = value
|
|
330
330
|
this.handleEmitChange()
|
|
331
|
-
this.dispatch('PiForm', 'form-change',
|
|
332
|
-
this.dispatch('PiFormItem', 'form-change',
|
|
331
|
+
this.dispatch('PiForm', 'form-change', this.val)
|
|
332
|
+
this.dispatch('PiFormItem', 'form-change', this.val)
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
}
|
|
@@ -10,13 +10,12 @@
|
|
|
10
10
|
{ stretch: getStretch },
|
|
11
11
|
customClass
|
|
12
12
|
]"
|
|
13
|
-
@tap="handleRadioToggle(true)"
|
|
14
13
|
>
|
|
15
14
|
<view
|
|
16
15
|
v-if="!['text', 'button'].includes(getShape)"
|
|
17
16
|
class="radio-icon"
|
|
18
17
|
:style="[radioStyle]"
|
|
19
|
-
@tap
|
|
18
|
+
@tap="handleRadioToggle(false)"
|
|
20
19
|
>
|
|
21
20
|
<view v-if="getShape === 'dot'" class="dot" />
|
|
22
21
|
<pi-icon v-else name="blod-check" :size="getIconSize" />
|
|
@@ -26,6 +25,7 @@
|
|
|
26
25
|
class="radio-label"
|
|
27
26
|
:class="[getShape]"
|
|
28
27
|
:style="[textStyle]"
|
|
28
|
+
@tap="handleRadioToggle(true)"
|
|
29
29
|
>
|
|
30
30
|
<slot />
|
|
31
31
|
</view>
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
</template>
|
|
16
16
|
|
|
17
17
|
<script>
|
|
18
|
+
import Emitter from '../../mixin/emitter'
|
|
18
19
|
import ValueSync from '../../mixin/value-sync'
|
|
19
20
|
import { parentInit } from '../../mixin/props-sync'
|
|
20
21
|
import { getConfig } from '../../config'
|
|
@@ -26,6 +27,7 @@ export default {
|
|
|
26
27
|
name: 'PiRadioGroup',
|
|
27
28
|
// 混入自定义样式customStyle和customClass
|
|
28
29
|
mixins: [
|
|
30
|
+
Emitter,
|
|
29
31
|
ValueSync,
|
|
30
32
|
// parentInit 混入子组件要继承的属性
|
|
31
33
|
parentInit([
|
|
@@ -181,6 +183,8 @@ export default {
|
|
|
181
183
|
this.val = childName
|
|
182
184
|
}
|
|
183
185
|
this.handleEmitChange()
|
|
186
|
+
this.dispatch('PiForm', 'form-change', this.val)
|
|
187
|
+
this.dispatch('PiFormItem', 'form-change', this.val)
|
|
184
188
|
}
|
|
185
189
|
}
|
|
186
190
|
}
|
|
@@ -8,42 +8,56 @@
|
|
|
8
8
|
:class="[itemClass, item.mode, direction, { active: index < val }]"
|
|
9
9
|
>
|
|
10
10
|
<view class="step-icon pi-flex-row-center" :style="[item.style]">
|
|
11
|
-
<
|
|
12
|
-
<
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
<
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
11
|
+
<view class="step-icon-inner">
|
|
12
|
+
<template v-if="item.mode === 'dot'">
|
|
13
|
+
<view class="item-dot pi-radius-round" :style="[item.dotStyle]" />
|
|
14
|
+
</template>
|
|
15
|
+
<!-- 数字-->
|
|
16
|
+
<template v-if="item.mode === 'number'">
|
|
17
|
+
<text v-if="index >= val">
|
|
18
|
+
{{ index + 1 }}
|
|
19
|
+
</text>
|
|
20
|
+
<pi-icon v-else name="check" color="#ffffff" />
|
|
21
|
+
</template>
|
|
22
|
+
<!-- 图标 -->
|
|
23
|
+
<pi-icon
|
|
24
|
+
v-if="item.mode === 'icon'"
|
|
25
|
+
:custom-style="item.icon.customStyle"
|
|
26
|
+
:custom-class="item.icon.customClass"
|
|
27
|
+
:name="item.icon.name"
|
|
28
|
+
:dot="item.icon.dot"
|
|
29
|
+
:dot-radius="item.icon.dotRadius"
|
|
30
|
+
:badge="item.icon.badge"
|
|
31
|
+
:color="item.icon.color"
|
|
32
|
+
:size="item.icon.size"
|
|
33
|
+
:class-prefix="item.icon.classPrefix"
|
|
34
|
+
/>
|
|
35
|
+
</view>
|
|
34
36
|
</view>
|
|
35
37
|
|
|
36
38
|
<!-- 文字 -->
|
|
37
39
|
<view :class="['pi-steps-item-text']" :style="{ color: item.style.fontColor }">
|
|
38
40
|
<slot name="item" :item="item" :index="index" :active="index < val">
|
|
39
41
|
<view>{{ item.name }}</view>
|
|
40
|
-
<text class="pi-fz-20" style="word-break:break-all">
|
|
42
|
+
<text v-if="item.desc" class="pi-fz-20 pi-mg-top-10" style="word-break:break-all">
|
|
43
|
+
{{ item.desc }}
|
|
44
|
+
</text>
|
|
41
45
|
</slot>
|
|
42
46
|
</view>
|
|
43
47
|
|
|
44
48
|
<!-- 中线 -->
|
|
45
|
-
<view
|
|
46
|
-
|
|
49
|
+
<view
|
|
50
|
+
v-if="items.length === 1 || index < items.length - 1"
|
|
51
|
+
class="pi-steps-item-line"
|
|
52
|
+
:style="[lineStyle, item.lineStyle]"
|
|
53
|
+
>
|
|
54
|
+
<pi-line
|
|
55
|
+
:direction="direction"
|
|
56
|
+
length="100%"
|
|
57
|
+
:hair-line="false"
|
|
58
|
+
:color="item.icon.color"
|
|
59
|
+
border-style="dashed"
|
|
60
|
+
/>
|
|
47
61
|
</view>
|
|
48
62
|
</view>
|
|
49
63
|
</view>
|
|
@@ -138,7 +152,10 @@ export default {
|
|
|
138
152
|
}
|
|
139
153
|
},
|
|
140
154
|
data() {
|
|
141
|
-
return {
|
|
155
|
+
return {
|
|
156
|
+
iconsRect: [],
|
|
157
|
+
itemsRect: []
|
|
158
|
+
}
|
|
142
159
|
},
|
|
143
160
|
computed: {
|
|
144
161
|
getDotMaxSize() {
|
|
@@ -191,16 +208,18 @@ export default {
|
|
|
191
208
|
} else {
|
|
192
209
|
style.backgroundColor = this.getCurrentColor
|
|
193
210
|
}
|
|
211
|
+
item.icon.color = this.getCurrentColor
|
|
194
212
|
} else if (index < this.val && this.activeColor) {
|
|
195
213
|
// 已激活步骤
|
|
196
214
|
style.fontColor = this.activeColor
|
|
197
215
|
if (item.mode === 'icon') {
|
|
198
216
|
style.color = this.activeColor
|
|
199
217
|
} else if (item.mode === 'dot') {
|
|
200
|
-
item.dotStyle.backgroundColor = this.
|
|
218
|
+
item.dotStyle.backgroundColor = this.activeColor
|
|
201
219
|
} else {
|
|
202
220
|
style.backgroundColor = this.activeColor
|
|
203
221
|
}
|
|
222
|
+
item.icon.color = this.activeColor
|
|
204
223
|
} else if (index > this.val) {
|
|
205
224
|
// 未激活步骤
|
|
206
225
|
style.fontColor = this.color
|
|
@@ -213,14 +232,47 @@ export default {
|
|
|
213
232
|
if (item.mode === 'number') {
|
|
214
233
|
style.backgroundColor = this.color
|
|
215
234
|
}
|
|
235
|
+
item.icon.color = this.color
|
|
216
236
|
}
|
|
217
237
|
item.style = style
|
|
238
|
+
item.lineStyle = {}
|
|
239
|
+
if (
|
|
240
|
+
this.direction === 'column' &&
|
|
241
|
+
this.itemsRect.length &&
|
|
242
|
+
this.iconsRect.length &&
|
|
243
|
+
index < this.itemsRect.length - 1
|
|
244
|
+
) {
|
|
245
|
+
// 动态计算线的位置和高度
|
|
246
|
+
item.lineStyle.top = `${this.iconsRect[index].top -
|
|
247
|
+
this.itemsRect[index].top +
|
|
248
|
+
this.iconsRect[index].height +
|
|
249
|
+
2}px`
|
|
250
|
+
item.lineStyle.height = `${this.itemsRect[index].height -
|
|
251
|
+
this.iconsRect[index + 1].height}px`
|
|
252
|
+
}
|
|
218
253
|
return item
|
|
219
254
|
})
|
|
220
255
|
}
|
|
221
256
|
},
|
|
222
|
-
watch: {
|
|
223
|
-
|
|
257
|
+
watch: {
|
|
258
|
+
items: {
|
|
259
|
+
deep: true,
|
|
260
|
+
immediate: false,
|
|
261
|
+
handler(value) {
|
|
262
|
+
this.init()
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
},
|
|
266
|
+
mounted() {
|
|
267
|
+
this.init()
|
|
268
|
+
},
|
|
269
|
+
methods: {
|
|
270
|
+
async init() {
|
|
271
|
+
this.iconsRect = await this.$pi.common.queryRect(this, '.step-icon-inner', true)
|
|
272
|
+
this.itemsRect = await this.$pi.common.queryRect(this, '.pi-steps-item', true)
|
|
273
|
+
console.log(TAG, '计算.pi-steps布局', this.itemsRect, this.iconsRect)
|
|
274
|
+
}
|
|
275
|
+
}
|
|
224
276
|
}
|
|
225
277
|
</script>
|
|
226
278
|
|
|
@@ -256,7 +308,7 @@ export default {
|
|
|
256
308
|
display: flex;
|
|
257
309
|
flex-direction: row;
|
|
258
310
|
justify-content: flex-start;
|
|
259
|
-
align-items:
|
|
311
|
+
align-items: baseline;
|
|
260
312
|
min-height: 120rpx;
|
|
261
313
|
.pi-steps-item-text {
|
|
262
314
|
width: 95%;
|
|
@@ -266,15 +318,15 @@ export default {
|
|
|
266
318
|
}
|
|
267
319
|
.pi-steps-item-line {
|
|
268
320
|
position: absolute;
|
|
269
|
-
top: 75%;
|
|
270
321
|
z-index: 0;
|
|
271
|
-
height: 50%;
|
|
272
322
|
}
|
|
273
323
|
}
|
|
274
324
|
.item-dot,
|
|
275
325
|
.step-icon {
|
|
276
326
|
border-radius: 50%;
|
|
277
327
|
overflow: hidden;
|
|
328
|
+
position: relative;
|
|
329
|
+
z-index: 2;
|
|
278
330
|
}
|
|
279
331
|
|
|
280
332
|
&.active {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
activeIndex === index && activeTextColor ? { color: activeTextColor } : {},
|
|
14
14
|
activeIndex === index && activeItemStyle ? activeItemStyle : {}
|
|
15
15
|
]"
|
|
16
|
-
class="pi-tab pi-align-center"
|
|
16
|
+
class="pi-tab pi-justify-center pi-align-center "
|
|
17
17
|
:class="[
|
|
18
18
|
{
|
|
19
19
|
disabled: item[disabledField],
|
|
@@ -283,7 +283,8 @@ export default {
|
|
|
283
283
|
width: this.getSliderBarWidth,
|
|
284
284
|
height: this.getSliderBarHeight,
|
|
285
285
|
borderRadius: this.getSliderBarRadius,
|
|
286
|
-
transitionDuration: duration.css
|
|
286
|
+
transitionDuration: duration.css,
|
|
287
|
+
...this.sliderBarStyle
|
|
287
288
|
}
|
|
288
289
|
let sliderScrollLeft = this.activeRect.left
|
|
289
290
|
if (style.width !== 'auto') {
|
|
@@ -355,7 +356,7 @@ export default {
|
|
|
355
356
|
white-space: nowrap;
|
|
356
357
|
.pi-tab {
|
|
357
358
|
position: relative;
|
|
358
|
-
display: inline-
|
|
359
|
+
display: inline-flex;
|
|
359
360
|
font-size: 30rpx;
|
|
360
361
|
text-align: center;
|
|
361
362
|
transition: all $pi-animation-duration $pi-animation-timing-function;
|