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

Fix/20230715 wrong label #2195

Merged
merged 3 commits into from
Jul 17, 2023
Merged

Fix/20230715 wrong label #2195

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
742cad0
fix(slider, message): 修复message nowrap classPrefix 失效 & slider 组件标签大括号异常
Jul 15, 2023
18a5c3d
fix(message 组件): marquee 还原
Jul 15, 2023
d7562b4
fix(message): 多余中括号移除
Jul 17, 2023
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: 1 addition & 5 deletions src/message/message.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<wxs src="./message.wxs" module="this"></wxs>
<wxs src="../common/utils.wxs" module="_" />

<import src="../common/template/icon.wxml" />

<block wx:if="{{visible}}">
<view
class="{{classPrefix}} class {{prefix}}-class {{classPrefix}}--{{theme}}"
Expand All @@ -15,9 +13,8 @@
<slot name="icon" />
<template wx:if="{{_icon}}" is="icon" data="{{tClass: prefix + '-class-icon', ariaHidden: true, ..._icon }}" />
</view>

<view
class="{{classPrefix}}__text-wrap {{marquee ? '{{classPrefix}}__text-nowrap' : ''}}"
class="{{classPrefix}}__text-wrap {{marquee ? classPrefix + '__text-nowrap' : ''}}"
style="text-align: {{align}}"
id="{{classPrefix}}__text-wrap"
>
Expand All @@ -43,7 +40,6 @@
bind:complete="handleLinkClick"
/>
<slot name="link" />

<view class="{{classPrefix}}__icon--right" bind:tap="handleClose">
<slot name="close-btn" />
<template
Expand Down
2 changes: 1 addition & 1 deletion src/slider/slider.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
style="left:{{item.left}}px; transform: translateX(-50%);"
aria-hidden="{{true}}"
>
<view wx:if="{{scaleTextArray.length}}" class="{{_.cls(classPrefix + '__scale-desc', [theme])}}}}">
<view wx:if="{{scaleTextArray.length}}" class="{{_.cls(classPrefix + '__scale-desc', [theme])}}">
{{scaleTextArray[index]}}
</view>
</view>
Expand Down