Skip to content

Commit ba869e3

Browse files
muronggjuzi214032
authored andcommitted
fix(Icon): 修复组件 l-self-class 外部样式类无效问题
将所有引用 Icon 并使用 l-self-class 外部样式类的组件 class 名称移至 l-class 外部样式类 close #968
1 parent e0fc001 commit ba869e3

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/image-picker/index.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<l-grid-item wx:for="{{ urls }}" wx:key="index" key="{{ index }}" slot="{{ index }}">
44
<view class="item l-item-class" catchtap="onPreviewTap" data-index="{{ index }}">
55
<view class="close" data-index="{{ index }}" catchtap="onDelTap">
6-
<l-icon name="close" color="#fff" size="22" l-self-class="close-icon" />
6+
<l-icon name="close" color="#fff" size="22" l-class="close-icon" />
77
</view>
88
<image class="{{size === 3? 'img': 'min-img'}}" mode="{{ mode }}" src="{{newOrOld==='old'? item:item.url }}" />
99
</view>

src/list/index.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<template name="cell-left-main">
1414
<view class="left-section ">
1515
<image wx:if="{{image}}" class="l-image l-class-image l-image-class" src="{{image}}" mode="aspectFit|aspectFill|widthFix" />
16-
<l-icon wx:elif="{{icon}}" l-self-class="l-icon" l-class="l-class-icon l-icon-class" name="{{icon}}" size="{{iconSize}}" color="{{iconColor}}" />
16+
<l-icon wx:elif="{{icon}}" l-class="l-icon l-class-icon l-icon-class" name="{{icon}}" size="{{iconSize}}" color="{{iconColor}}" />
1717
<view class="l-text">
1818
<view class="l-content l-class-content l-content-class">{{title}}</view>
1919
<view class="l-desc l-class-desc l-desc-class" wx:if="{{desc}}">{{desc}}</view>

src/segment/index.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
</view>
2323
<template name="tab-item">
2424
<image wx:if="{{ item.image.activeImage || item.image.defaultImage }}" src="{{item.key===activeKey? item.image.activeImage:item.image.defaultImage}}" class="l-tab-image l-class-tabimage l-tab-image-class" />
25-
<l-icon wx:if="{{item.icon}}" l-class="l-class-icon l-icon-class" l-self-class="{{item.key===activeKey ? 'l-icon-active':'l-icon-inactive'}}" name="{{item.icon}}" color="{{item.key===activeKey?activeColor:inactiveColor}}" size="{{item.iconSize}}"/>
25+
<l-icon wx:if="{{item.icon}}" l-class="l-class-icon l-icon-class {{item.key===activeKey ? 'l-icon-active':'l-icon-inactive'}}" name="{{item.icon}}" color="{{item.key===activeKey?activeColor:inactiveColor}}" size="{{item.iconSize}}"/>
2626
{{item.tab}}
2727
</template>

src/tabs/index.wxml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
<image wx:if="{{ item.image.activeImage || item.image.defaultImage }}"
2121
src="{{item.key===activeKey? item.image.activeImage:item.image.defaultImage}}"
2222
class="l-tab-image l-class-tabimage l-tabimage-class"/>
23-
<l-icon wx:if="{{item.icon}}" l-class="l-class-icon l-icon-class"
24-
l-self-class="{{item.key===activeKey ? 'l-icon-active':'l-icon-inactive'}}" name="{{item.icon}}"
23+
<l-icon wx:if="{{item.icon}}"
24+
l-class="l-class-icon l-icon-class {{item.key===activeKey ? 'l-icon-active':'l-icon-inactive'}}"
25+
name="{{item.icon}}"
2526
color="{{item.key===activeKey?activeColor:inactiveColor}}" size="{{item.iconSize}}"/>
2627
{{item.tab}}
2728
<slot wx:if="{{!item.tab}}" name="{{item.key+'.tab'}}"></slot>

0 commit comments

Comments
 (0)