Skip to content

Commit 10db1a5

Browse files
committed
feat(CombinedTabs): 新增 l-content-class 外部样式类
l-content-class 覆盖内容区域样式 close #283
1 parent fbbbd0d commit 10db1a5

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

dist/combined-tabs/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/combined-tabs/index.wxml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view class="l-tabs l-sub-placement-left l-tabs-vertical {{aminmated ? 'l-aminmated' :''}} {{scrollable ? 'l-tabs-scroll':''}}">
55
<template is="tab-header" wx:if="{{tabList[currentIndex].subTabs.length}}" data="{{tab:tabList[currentIndex].subTabs,placemanet,scrollable,transformY,transformX,activeKey:tabList[currentIndex].activeSubKey,hasLine,activeColor,inactiveColor,headerType:'subTab'}}"></template>
66
<view class="l-tabs-main">
7-
<view wx:if="{{!swipeable}}" class="l-tabpanel-content">
7+
<view wx:if="{{!swipeable}}" class="l-tabpanel-content l-content-class">
88
<view class="l-tabpanel {{item.key===activeKey?'l-tabpanel-active':'l-tabpanel-inactive'}}" wx:for="{{tabList}}" wx:key="key" style="{{placement=='left'||placement=='right' ? 'position:absolute;width:100%;height:100%;transform:translate(0,'+ 100 * index +'%) translateZ(0px);':''}}">
99
<view class="l-subpanel-content" wx:if="{{item.subTabs.length>0}}" style="{{'transform:translate(0,'+ -100 * item.subCurrentIndex +'%) translateZ(0px);'}}">
1010
<view class="l-subpanel" wx:for="{{item.subTabs}}" wx:for-item="tab" wx:key="key">
@@ -14,17 +14,17 @@
1414
<slot name="{{item.key}}" wx:else></slot>
1515
</view>
1616
</view>
17-
<swiper wx:else class="l-tabpanel-content" bindchange="swiperChange" current="{{currentIndex}}">
17+
<swiper wx:else class="l-tabpanel-content l-content-class" bindchange="swiperChange" current="{{currentIndex}}">
1818
<swiper-item class="l-tabpanel {{item.key===activeKey?'l-tabpanel-active':''}}" wx:for="{{tabList}}" wx:key="key">
1919
<view wx:if="{{item.subTabs.length>0}}">
2020
<swiper class="" vertical bindchange="subSwiperChange" current="{{item.subCurrentIndex}}">
2121
<swiper-item wx:for="{{item.subTabs}}" wx:for-item="tab" wx:key="key">
2222
<slot name="{{tab.key}}"></slot>
2323
</swiper-item>
2424
</swiper>
25-
26-
</view>
27-
<slot name="{{item.key}}" wx:else></slot>
25+
26+
</view>
27+
<slot name="{{item.key}}" wx:else></slot>
2828
</swiper-item>
2929
</swiper>
3030
</view>
@@ -41,4 +41,4 @@
4141
</view>
4242
</view>
4343
</scroll-view>
44-
</template>
44+
</template>

examples/dist/combined-tabs/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// components/tabs/index.js
22
Component({
33
externalClasses: ['l-class-header', 'l-class-active', 'l-class-inactive', 'l-class-line', 'l-class-tabimage',
4-
'l-header-class', 'l-active-class', 'l-inactive-class', 'l-line-class', 'l-tabimage-class'
4+
'l-header-class', 'l-active-class', 'l-inactive-class', 'l-line-class', 'l-tabimage-class','l-content-class'
55
],
66
relations: {
77
'../tabpanel/index': {

examples/dist/combined-tabs/index.wxml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view class="l-tabs l-sub-placement-left l-tabs-vertical {{aminmated ? 'l-aminmated' :''}} {{scrollable ? 'l-tabs-scroll':''}}">
55
<template is="tab-header" wx:if="{{tabList[currentIndex].subTabs.length}}" data="{{tab:tabList[currentIndex].subTabs,placemanet,scrollable,transformY,transformX,activeKey:tabList[currentIndex].activeSubKey,hasLine,activeColor,inactiveColor,headerType:'subTab'}}"></template>
66
<view class="l-tabs-main">
7-
<view wx:if="{{!swipeable}}" class="l-tabpanel-content">
7+
<view wx:if="{{!swipeable}}" class="l-tabpanel-content l-content-class">
88
<view class="l-tabpanel {{item.key===activeKey?'l-tabpanel-active':'l-tabpanel-inactive'}}" wx:for="{{tabList}}" wx:key="key" style="{{placement=='left'||placement=='right' ? 'position:absolute;width:100%;height:100%;transform:translate(0,'+ 100 * index +'%) translateZ(0px);':''}}">
99
<view class="l-subpanel-content" wx:if="{{item.subTabs.length>0}}" style="{{'transform:translate(0,'+ -100 * item.subCurrentIndex +'%) translateZ(0px);'}}">
1010
<view class="l-subpanel" wx:for="{{item.subTabs}}" wx:for-item="tab" wx:key="key">
@@ -14,17 +14,17 @@
1414
<slot name="{{item.key}}" wx:else></slot>
1515
</view>
1616
</view>
17-
<swiper wx:else class="l-tabpanel-content" bindchange="swiperChange" current="{{currentIndex}}">
17+
<swiper wx:else class="l-tabpanel-content l-content-class" bindchange="swiperChange" current="{{currentIndex}}">
1818
<swiper-item class="l-tabpanel {{item.key===activeKey?'l-tabpanel-active':''}}" wx:for="{{tabList}}" wx:key="key">
1919
<view wx:if="{{item.subTabs.length>0}}">
2020
<swiper class="" vertical bindchange="subSwiperChange" current="{{item.subCurrentIndex}}" >
2121
<swiper-item wx:for="{{item.subTabs}}" wx:for-item="tab" wx:key="key">
2222
<slot name="{{tab.key}}"></slot>
2323
</swiper-item>
2424
</swiper>
25-
26-
</view>
27-
<slot name="{{item.key}}" wx:else></slot>
25+
26+
</view>
27+
<slot name="{{item.key}}" wx:else></slot>
2828
</swiper-item>
2929
</swiper>
3030
</view>
@@ -41,4 +41,4 @@
4141
</view>
4242
</view>
4343
</scroll-view>
44-
</template>
44+
</template>

src/combined-tabs/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// components/tabs/index.js
22
Component({
33
externalClasses: ['l-class-header', 'l-class-active', 'l-class-inactive', 'l-class-line', 'l-class-tabimage',
4-
'l-header-class', 'l-active-class', 'l-inactive-class', 'l-line-class', 'l-tabimage-class'
4+
'l-header-class', 'l-active-class', 'l-inactive-class', 'l-line-class', 'l-tabimage-class','l-content-class'
55
],
66
relations: {
77
'../tabpanel/index': {

src/combined-tabs/index.wxml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view class="l-tabs l-sub-placement-left l-tabs-vertical {{aminmated ? 'l-aminmated' :''}} {{scrollable ? 'l-tabs-scroll':''}}">
55
<template is="tab-header" wx:if="{{tabList[currentIndex].subTabs.length}}" data="{{tab:tabList[currentIndex].subTabs,placemanet,scrollable,transformY,transformX,activeKey:tabList[currentIndex].activeSubKey,hasLine,activeColor,inactiveColor,headerType:'subTab'}}"></template>
66
<view class="l-tabs-main">
7-
<view wx:if="{{!swipeable}}" class="l-tabpanel-content">
7+
<view wx:if="{{!swipeable}}" class="l-tabpanel-content l-content-class">
88
<view class="l-tabpanel {{item.key===activeKey?'l-tabpanel-active':'l-tabpanel-inactive'}}" wx:for="{{tabList}}" wx:key="key" style="{{placement=='left'||placement=='right' ? 'position:absolute;width:100%;height:100%;transform:translate(0,'+ 100 * index +'%) translateZ(0px);':''}}">
99
<view class="l-subpanel-content" wx:if="{{item.subTabs.length>0}}" style="{{'transform:translate(0,'+ -100 * item.subCurrentIndex +'%) translateZ(0px);'}}">
1010
<view class="l-subpanel" wx:for="{{item.subTabs}}" wx:for-item="tab" wx:key="key">
@@ -14,17 +14,17 @@
1414
<slot name="{{item.key}}" wx:else></slot>
1515
</view>
1616
</view>
17-
<swiper wx:else class="l-tabpanel-content" bindchange="swiperChange" current="{{currentIndex}}">
17+
<swiper wx:else class="l-tabpanel-content l-content-class" bindchange="swiperChange" current="{{currentIndex}}">
1818
<swiper-item class="l-tabpanel {{item.key===activeKey?'l-tabpanel-active':''}}" wx:for="{{tabList}}" wx:key="key">
1919
<view wx:if="{{item.subTabs.length>0}}">
2020
<swiper class="" vertical bindchange="subSwiperChange" current="{{item.subCurrentIndex}}" >
2121
<swiper-item wx:for="{{item.subTabs}}" wx:for-item="tab" wx:key="key">
2222
<slot name="{{tab.key}}"></slot>
2323
</swiper-item>
2424
</swiper>
25-
26-
</view>
27-
<slot name="{{item.key}}" wx:else></slot>
25+
26+
</view>
27+
<slot name="{{item.key}}" wx:else></slot>
2828
</swiper-item>
2929
</swiper>
3030
</view>
@@ -41,4 +41,4 @@
4141
</view>
4242
</view>
4343
</scroll-view>
44-
</template>
44+
</template>

0 commit comments

Comments
 (0)