Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions packages/components/color-picker/color-picker.less
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,9 @@
&__swatches-items {
margin-top: 24rpx;
width: 100%;
list-style: none;
height: 48rpx;
display: flex;

overflow-x: auto;
overflow-y: auto;
flex-direction: row;

&::-webkit-scrollbar {
display: none;
Expand Down
4 changes: 2 additions & 2 deletions packages/components/color-picker/template.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<view class="{{classPrefix}}__swatches-wrap" wx:if="{{innerSwatchList.length}}">
<view class="{{classPrefix}}__swatches">
<view class="{{classPrefix}}__swatches-title" wx:if="{{isMultiple}}"> 系统预设色彩 </view>
<view class="{{classPrefix}}__swatches-items">
<scroll-view class="{{classPrefix}}__swatches-items" scroll-x enable-flex scroll-anchoring type="list">
<view
wx:for="{{innerSwatchList}}"
wx:for-item="swatch"
Expand All @@ -86,7 +86,7 @@
>
<view class="{{classPrefix}}__swatches-inner" style="background-color: {{swatch}};"> </view>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
Expand Down
6 changes: 6 additions & 0 deletions packages/tdesign-miniprogram/.changelog/pr-4288.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
pr_number: 4288
contributor: anlyyao
---

- fix(ColorPicker): 修复弹窗模式下预设颜色(swatch-colors)无法横向滚动 @anlyyao ([#4288](https://github.com/Tencent/tdesign-miniprogram/pull/4288))