Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(slider):css standard #45

Merged
merged 3 commits into from
Dec 24, 2021
Merged

feat(slider):css standard #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53c9f70
feat(slider):css standard
JJunYang Dec 24, 2021
eb71ede
dev:update -if problems
JJunYang Dec 24, 2021
6e666e4
dev: update external classname with prefix
JJunYang Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 33 additions & 41 deletions src/slider/slider.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,39 @@
// @import (css) '../common/index.wxss';
@import '../common/style/index.less';

@bar-height: 2rpx;
@block-color: #fff;
@block-size: 16px;

.t-slider__container {
.@{prefix}-slider__container {
font-size: 14px;

&.bottom {
.@{prefix}-slider--bottom {
padding-bottom: 40rpx;
}

.t-slider-value,
.t-slider-range-extrem,
.t-slider-dot-value {
color: rgba(0, 0, 0, .4);
.@{prefix}-slider__value,
.@{prefix}-slider__range-extreme,
.@{prefix}-slider__dot-value {
color: rgba(0, 0, 0, 0.4);
}

&.disabled {
.t-slider-value,
.t-slider-range-extrem,
.t-slider-dot-value,
.scale-desc {
color: rgba(0, 0, 0, .26);
&.@{prefix}-is-disabled {
.@{prefix}-slider__value,
.@{prefix}-slider__range-extreme,
.@{prefix}-slider__dot-value,
.@{prefix}-slider__scale-desc {
color: rgba(0, 0, 0, 0.26);
}
}

.t-slider-value__active {
text-align: center;
}
}

.t-slider__wrapper {
.@{prefix}-slider__wrapper {
display: flex;
align-items: center;
height: 96rpx;

// 单点滑块样式
.t-slider__main {
.@{prefix}-slider__main {
position: relative;
margin: 0 32rpx;
flex: 10;
Expand All @@ -47,14 +43,14 @@
border-radius: @bar-height;
display: inline-block;

.t-slider-line {
.@{prefix}-slider__line {
position: absolute;
top: 8px;
height: @bar-height * 2;
border-radius: @bar-height;
}

.t-slider-dot {
.@{prefix}-slider__dot {
border-radius: 50%;
border: 2rpx solid #dcdcdc;
position: absolute;
Expand All @@ -66,47 +62,43 @@
}
}

.t-slider-value {
.@{prefix}-slider__value {
display: inline-block;
}

.t-slider-value__min {
.@{prefix}-slider__value--min {
margin-left: 16px;
}

.t-slider-value__max {
.@{prefix}-slider__value--max {
margin-right: 16px;
}

.t-slider-value__right {
.@{prefix}-slider__value--right {
flex-basis: 80rpx;
}

.t-slider-active {
width: 100%;
}
}

// 范围滑块样式
.t-slider-range-container {
.@{prefix}-slider__range-container {
display: flex;
padding: @block-size * 1.4 0 0 0;

.t-slider-range-extrem {
.@{prefix}-slider__range-extreme {
display: inline-block;
}

.t-slider-range-min {
.@{prefix}-slider__range-extreme--min {
margin-left: 32rpx;
text-align: left;
}

.t-slider-range-max {
.@{prefix}-slider__range-extreme--max {
margin-right: 32rpx;
text-align: right;
}

.t-slider-bar {
.@{prefix}-slider__bar {
margin: 0 32rpx;
flex: 10;
padding: 16rpx 0;
Expand All @@ -116,7 +108,7 @@
position: relative;
display: inline-block;

.t-slider-dot {
.@{prefix}-slider__dot {
border-radius: 50%;
border: 2rpx solid #dcdcdc;
position: absolute;
Expand All @@ -126,11 +118,11 @@
height: @block-size;
top: @bar-height - @block-size + 16;

&__left {
&--left {
left: 0;
}

&__right {
&--right {
right: 0;
}

Expand All @@ -141,7 +133,7 @@
}
}

.t-slider-line {
.@{prefix}-slider__line {
position: absolute;
top: 8px;
height: 5rpx;
Expand All @@ -150,17 +142,17 @@
}

// 刻度样式
.t-slider-scale-item {
.@{prefix}-slider__scale-item {
background-color: #0052d9;
width: @bar-height * 2;
height: 14rpx;
position: absolute;
bottom: 6rpx;
z-index: 1;

.scale-desc {
.@{prefix}-slider__scale-desc {
position: absolute;
color: rgba(0, 0, 0, .4);
color: rgba(0, 0, 0, 0.4);
transform: translateX(-50%);
top: 20rpx;
}
Expand Down
14 changes: 8 additions & 6 deletions src/slider/slider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ const { prefix } = config;
const name = `${prefix}-slider`;
@wxComponent()
export default class Slider extends SuperComponent {
externalClasses: [
't-class',
't-class-bar',
't-class-bar-active',
't-class-bar-disabled',
't-class-cursor',
externalClasses = [
`${{ prefix }}-class`,
`${{ prefix }}-class-bar`,
`${{ prefix }}-class-bar-active`,
`${{ prefix }}-class-bar-disabled`,
`${{ prefix }}-class-cursor`,
];

properties = props;
Expand All @@ -34,6 +34,7 @@ export default class Slider extends SuperComponent {
scaleArray: any[];
scaleTextArray: any[];
_value: number | number[];
prefix: string;
} = {
// 按钮样式列表
sliderStyles: '',
Expand All @@ -51,6 +52,7 @@ export default class Slider extends SuperComponent {
isScale: false,
scaleArray: [],
scaleTextArray: [],
prefix,
};

observers = {
Expand Down
73 changes: 37 additions & 36 deletions src/slider/slider.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<wxs src="./slider.wxs" module="utils" />
<view
class="{{classPrefix}}__container {{isScale && scaleTextArray.length ? 'bottom' : ''}} t-class {{disabled ? 'disabled t-class-bar-disabled' : ''}}"
class="{{classPrefix}}__container {{isScale && scaleTextArray.length ? classPrefix + '--bottom' : ''}} {{prefix}}-class {{disabled ? prefix + '-is-disabled ' + prefix + '-class-bar-disabled' : ''}}"
>
<block wx-if="{{!range}}">
<block wx:if="{{!range}}">
<view class="{{classPrefix}}__wrapper">
<text wx-if="{{showExtremeValue}}" class="{{classPrefix}}-value {{classPrefix}}-value__min"
>{{ label ? utils.getValue(label, min) : min}}</text
>
<text wx:if="{{showExtremeValue}}" class="{{classPrefix}}__value {{classPrefix}}__value--min">
{{ label ? utils.getValue(label, min) : min}}
</text>
<view
id="sliderLine"
class="{{classPrefix}}__main t-class-bar"
class="{{classPrefix}}__main {{prefix}}-class-bar"
style="background-color: {{disabled ? disabledColor[1] : colors[1]}};"
bindtap="onSingleLineTap"
>
<block wx:if="{{isScale}}">
<view
class="{{classPrefix}}-scale-item"
class="{{classPrefix}}__scale-item"
wx:for="{{scaleArray}}"
wx:for-index="index"
wx:key="index"
style="background:{{_value < item ? (disabled ? disabledColor[1] : colors[1]) : ( disabled ? disabledColor[0] : colors[0])}};left:{{item}}%;transform:translateX({{- item}}%);"
style="background:{{_value < item ? (disabled ? disabledColor[1] : colors[1]) : ( disabled ? disabledColor[0] : colors[0])}}; left:{{item}}%; transform:translateX({{- item}}%);"
>
<view wx:if="{{scaleTextArray.length}}" class="scale-desc">
<view wx:if="{{scaleTextArray.length}}" class="{{classPrefix}}__scale-desc">
{{scaleTextArray[index]}}
</view>
</view>
</block>
<view
class="{{classPrefix}}-line t-class-bar-active"
style="background-color: {{disabled ? disabledColor[0] : colors[0]}}; left: {{lineLeft}}px;width: {{lineBarWidth}};"
class="{{classPrefix}}__line {{prefix}}-class-bar-active"
style="background-color: {{disabled ? disabledColor[0] : colors[0]}}; left: {{lineLeft}}px; width: {{lineBarWidth}};"
bindtap="onSingleLineTap"
>
<view
id="singleDot"
class="{{classPrefix}}-dot t-class-cursor"
class="{{classPrefix}}__dot {{prefix}}-class-cursor"
style="left: {{activeLeft}}px"
bindtouchmove="onSingleTouchMove"
bind:touchend="onTouchEnd"
bind:touchcancel="onTouchEnd"
/>
</view>
</view>
<text wx-if="{{label}}" class="{{classPrefix}}-value {{classPrefix}}-value__right"
>{{utils.getValue(label, _value)}}</text
>
<text wx-if="{{showExtremeValue}}" class="{{classPrefix}}-value {{classPrefix}}-value__max"
>{{ label ? utils.getValue(label, max) : max}}</text
>
<text wx:if="{{label}}" class="{{classPrefix}}__value {{classPrefix}}__value--right">
{{utils.getValue(label, _value)}}
</text>
<text wx:if="{{showExtremeValue}}" class="{{classPrefix}}__value {{classPrefix}}__value--max">
{{ label ? utils.getValue(label, max) : max}}
</text>
</view>
</block>

<!-- range选择器自定义 -->
<block wx-if="{{range}}">
<view class="{{classPrefix}}-range-container">
<block wx:if="{{range}}">
<view class="{{classPrefix}}__range-container">
<view
wx:if="{{showExtremeValue}}"
class="{{classPrefix}}-range-extrem {{classPrefix}}-range-min"
>{{min}}</view
class="{{classPrefix}}__range-extreme {{classPrefix}}__range-extreme--min"
>
{{min}}
</view>
<view
id="sliderLine"
bindtap="onLineTap"
class="{{classPrefix}}-bar t-class-bar"
class="{{classPrefix}}__bar {{prefix}}-class-bar"
style="background-color: {{disabled ? disabledColor[1] : colors[1]}};"
>
<block wx:if="{{isScale}}">
<view
class="{{classPrefix}}-scale-item"
class="{{classPrefix}}__scale-item"
wx:for="{{scaleArray}}"
wx:for-index="index"
wx:key="index"
Expand All @@ -76,7 +76,7 @@
</view>
</block>
<view
class="{{classPrefix}}-line t-class-bar-active"
class="{{classPrefix}}__line {{prefix}}-class-bar-active"
bindtap="onLineTap"
style="background-color: {{disabled ? disabledColor[0] : colors[0]}}; left: {{lineLeft}}px; right: {{lineRight}}px;"
/>
Expand All @@ -85,31 +85,32 @@
bindtouchmove="onTouchMoveLeft"
bind:touchend="onTouchEnd"
bind:touchcancel="onTouchEnd"
class="{{classPrefix}}-dot {{classPrefix}}-dot__left t-class-cursor"
class="{{classPrefix}}__dot {{classPrefix}}__dot--left {{prefix}}-class-cursor"
style="left: {{activeLeft}}px"
>
<view wx:if="{{label}}" class="{{classPrefix}}-dot-value"
>{{utils.getValue(label, dotTopValue[0])}}</view
>
<view wx:if="{{label}}" class="{{classPrefix}}__dot-value">
{{utils.getValue(label, dotTopValue[0])}}
</view>
</view>
<view
id="rightDot"
bindtouchmove="onTouchMoveRight"
bind:touchend="onTouchEnd"
bind:touchcancel="onTouchEnd"
class="{{classPrefix}}-dot {{classPrefix}}-dot__right t-class-cursor"
class="{{classPrefix}}__dot {{classPrefix}}__dot--right {{prefix}}-class-cursor"
style="right: {{activeRight}}px"
>
<view wx:if="{{label}}" class="{{classPrefix}}-dot-value"
>{{utils.getValue(label, dotTopValue[1])}}</view
>
<view wx:if="{{label}}" class="{{classPrefix}}__dot-value">
{{utils.getValue(label, dotTopValue[1])}}
</view>
</view>
</view>
<view
wx:if="{{showExtremeValue}}"
class="{{classPrefix}}-range-extrem {{classPrefix}}-range-max"
>{{max}}</view
class="{{classPrefix}}__range-extreme {{classPrefix}}__range-extreme--max"
>
{{max}}
</view>
</view>
</block>
</view>