Skip to content

Commit 88e8133

Browse files
rayhomierayhomie
committed
fix: raido&checkbox label slot in dingding
1 parent 8b32bce commit 88e8133

File tree

2 files changed

+103
-95
lines changed

2 files changed

+103
-95
lines changed

‎src/Checkbox/index.axml‎

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,35 @@
22
from="./index.sjs"
33
name="componentUtils" />
44

5-
<template name="checkbox-item">
6-
<view class="ant-checkbox-item-container">
7-
<view class="ant-checkbox-item-wrap">
8-
<!-- #if WECHAT -->
9-
<checkbox-group bindchange="onChange">
10-
<checkbox
11-
class="ant-checkbox-item-base"
12-
value="{{ value }}"
13-
checked="{{ mixin.value }}"
14-
disabled="{{ disabled }}" />
15-
</checkbox-group>
16-
<!-- #endif -->
17-
<!-- #if ALIPAY -->
5+
<template name="checkbox">
6+
<view class="ant-checkbox-item-wrap">
7+
<!-- #if WECHAT -->
8+
<checkbox-group bindchange="onChange">
189
<checkbox
1910
class="ant-checkbox-item-base"
2011
value="{{ value }}"
21-
onChange="onChange"
2212
checked="{{ mixin.value }}"
2313
disabled="{{ disabled }}" />
24-
<!-- #endif -->
25-
<view class="ant-checkbox-item-fake">
26-
<view
27-
class="ant-checkbox-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}"
28-
style="{{ mixin.value && !disabled && color ? 'background:' + color : '' }}">
29-
<ant-icon
30-
a:if="{{ mixin.value }}"
31-
type="CheckOutline"
32-
className="ant-checkbox-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}-icon" />
33-
</view>
14+
</checkbox-group>
15+
<!-- #endif -->
16+
<!-- #if ALIPAY -->
17+
<checkbox
18+
class="ant-checkbox-item-base"
19+
value="{{ value }}"
20+
onChange="onChange"
21+
checked="{{ mixin.value }}"
22+
disabled="{{ disabled }}" />
23+
<!-- #endif -->
24+
<view class="ant-checkbox-item-fake">
25+
<view
26+
class="ant-checkbox-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}"
27+
style="{{ mixin.value && !disabled && color ? 'background:' + color : '' }}">
28+
<ant-icon
29+
a:if="{{ mixin.value }}"
30+
type="CheckOutline"
31+
className="ant-checkbox-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}-icon" />
3432
</view>
3533
</view>
36-
<view
37-
class="ant-checkbox-item-content {{ disabled ? 'ant-checkbox-item-disabled' : '' }}">
38-
<slot />
39-
</view>
4034
</view>
4135
</template>
4236

@@ -54,29 +48,39 @@
5448
style="{{ style || '' }}"
5549
bindtap="onChange">
5650
<!-- #endif -->
57-
<template
58-
is="checkbox-item"
59-
data="{{
60-
value,
61-
mixin,
62-
disabled,
63-
color
64-
}}"
65-
/>
51+
<view class="ant-checkbox-item-container">
52+
<template
53+
is="checkbox"
54+
data="{{
55+
value,
56+
mixin,
57+
disabled,
58+
color
59+
}}"
60+
/>
61+
<view class="ant-checkbox-item-content {{ disabled ? 'ant-checkbox-item-disabled' : '' }}">
62+
<slot />
63+
</view>
64+
</view>
6665
</label>
6766
<view
6867
a:else
6968
class="ant-checkbox-item {{ className || '' }}"
7069
style="{{ style || '' }}"
7170
catchTap="onChange"
7271
>
73-
<template
74-
is="checkbox-item"
75-
data="{{
76-
value,
77-
mixin,
78-
disabled,
79-
color
80-
}}"
81-
/>
72+
<view class="ant-checkbox-item-container">
73+
<template
74+
is="checkbox"
75+
data="{{
76+
value,
77+
mixin,
78+
disabled,
79+
color
80+
}}"
81+
/>
82+
<view class="ant-checkbox-item-content {{ disabled ? 'ant-checkbox-item-disabled' : '' }}">
83+
<slot />
84+
</view>
85+
</view>
8286
</view>

‎src/Radio/index.axml‎

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,33 @@
22
from="./index.sjs"
33
name="componentUtils" />
44

5-
<template name="radio-item">
6-
<view class="ant-radio-item-container">
7-
<view class="ant-radio-item-wrap">
8-
<!-- #if ALIPAY -->
9-
<radio
10-
value="{{ value }}"
11-
class="ant-radio-item-base"
12-
onChange="onChange"
13-
checked="{{ mixin.value }}"
14-
disabled="{{ disabled }}" />
15-
<!-- #endif -->
16-
<!-- #if WECHAT -->
17-
<radio
18-
value="{{ value }}"
19-
class="ant-radio-item-base"
20-
checked="{{ mixin.value }}"
21-
disabled="{{ disabled }}" />
22-
<!-- #endif -->
23-
<view class="ant-radio-item-fake">
24-
<view
25-
class="ant-radio-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}"
26-
style="{{ mixin.value && !disabled && color ? 'background:' + color : '' }}">
27-
<ant-icon
28-
a:if="{{ mixin.value }}"
29-
type="CheckOutline"
30-
className="ant-radio-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}-icon" />
31-
</view>
5+
<template name="radio">
6+
<view class="ant-radio-item-wrap">
7+
<!-- #if ALIPAY -->
8+
<radio
9+
value="{{ value }}"
10+
class="ant-radio-item-base"
11+
onChange="onChange"
12+
checked="{{ mixin.value }}"
13+
disabled="{{ disabled }}" />
14+
<!-- #endif -->
15+
<!-- #if WECHAT -->
16+
<radio
17+
value="{{ value }}"
18+
class="ant-radio-item-base"
19+
checked="{{ mixin.value }}"
20+
disabled="{{ disabled }}" />
21+
<!-- #endif -->
22+
<view class="ant-radio-item-fake">
23+
<view
24+
class="ant-radio-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}"
25+
style="{{ mixin.value && !disabled && color ? 'background:' + color : '' }}">
26+
<ant-icon
27+
a:if="{{ mixin.value }}"
28+
type="CheckOutline"
29+
className="ant-radio-item-fake-{{ componentUtils.getClassName(mixin.value, disabled) }}-icon" />
3230
</view>
3331
</view>
34-
<view
35-
class="ant-radio-item-content {{ disabled ? 'ant-radio-item-disabled' : '' }}">
36-
<slot />
37-
</view>
3832
</view>
3933
</template>
4034

@@ -51,29 +45,39 @@
5145
style="{{ style }}"
5246
bindtap="handleTap">
5347
<!-- #endif -->
54-
<template
55-
is="radio-item"
56-
data="{{
57-
value,
58-
mixin,
59-
disabled,
60-
color
61-
}}"
62-
/>
48+
<view class="ant-radio-item-container">
49+
<template
50+
is="radio"
51+
data="{{
52+
value,
53+
mixin,
54+
disabled,
55+
color
56+
}}"
57+
/>
58+
<view class="ant-radio-item-content {{ disabled ? 'ant-radio-item-disabled' : '' }}">
59+
<slot />
60+
</view>
61+
</view>
6362
</label>
6463
<view
6564
a:else
6665
class="ant-radio-item {{ className || '' }}"
6766
style="{{ style }}"
6867
catchTap="handleTap"
6968
>
70-
<template
71-
is="radio-item"
72-
data="{{
73-
value,
74-
mixin,
75-
disabled,
76-
color
77-
}}"
78-
/>
69+
<view class="ant-radio-item-container">
70+
<template
71+
is="radio"
72+
data="{{
73+
value,
74+
mixin,
75+
disabled,
76+
color
77+
}}"
78+
/>
79+
<view class="ant-radio-item-content {{ disabled ? 'ant-radio-item-disabled' : '' }}">
80+
<slot />
81+
</view>
82+
</view>
7983
</view>

0 commit comments

Comments
 (0)