From 5036880fc037e5d112206b93a729f60be12bf8ab Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 07 十一月 2024 17:03:13 +0800
Subject: [PATCH] 2024.11.07 bug修复
---
miniprogram_npm/tdesign-miniprogram/checkbox/checkbox.wxml | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/miniprogram_npm/tdesign-miniprogram/checkbox/checkbox.wxml b/miniprogram_npm/tdesign-miniprogram/checkbox/checkbox.wxml
index 9feb113..eb9db8a 100644
--- a/miniprogram_npm/tdesign-miniprogram/checkbox/checkbox.wxml
+++ b/miniprogram_npm/tdesign-miniprogram/checkbox/checkbox.wxml
@@ -5,16 +5,21 @@
class="{{_.cls(classPrefix, [placement, theme, ['checked', checked], ['block', block]])}} class {{prefix}}-class"
aria-role="checkbox"
aria-checked="{{checked ? (indeterminate ? 'mixed' : true) : false}}"
- aria-disabled="{{disabled ? true : false}}"
- bind:tap="onChange"
+ aria-disabled="{{_disabled ? true : false}}"
+ mut-bind:tap="handleTap"
tabindex="{{tabindex}}"
>
<view
wx:if="{{theme == 'default'}}"
- class="{{_.cls(classPrefix + '__icon', [placement, ['checked', checked], ['disabled', disabled]])}} {{prefix}}-class-icon"
+ class="{{_.cls(classPrefix + '__icon', [placement, ['checked', checked], ['disabled', _disabled]])}} {{prefix}}-class-icon"
>
- <view wx:if="{{_.isArray(icon)}}" class="{{classPrefix}}__icon">
- <image src="{{checked ? icon[0] : icon[1]}}" class="{{classPrefix}}__icon-image" webp />
+ <slot name="icon" wx:if="{{icon === 'slot'}}" />
+ <view wx:elif="{{_.isArray(icon)}}" class="{{classPrefix}}__icon">
+ <image
+ src="{{checked ? indeterminate && icon[2] ? icon[2] : icon[0] : icon[1]}}"
+ class="{{classPrefix}}__icon-image"
+ webp
+ />
</view>
<block wx:else>
<t-icon
@@ -29,25 +34,27 @@
/>
<view
wx:elif="{{!checked && (icon == 'circle' || icon == 'rectangle')}}"
- class="{{_.cls(classPrefix + '__icon-' + icon, [['disabled', disabled]])}}"
+ class="{{_.cls(classPrefix + '__icon-' + icon, [['disabled', _disabled]])}}"
/>
<view wx:if="{{!checked && icon == 'line'}}" class="placeholder"></view>
</block>
</view>
- <view class="{{classPrefix}}__content" data-target="text" catch:tap="onChange">
+ <view class="{{classPrefix}}__content" data-target="text" mut-bind:tap="handleTap">
<view
- class="{{_.cls(classPrefix + '__title', [['disabled', disabled], ['checked', checked]])}} {{prefix}}-class-label"
+ class="{{_.cls(classPrefix + '__title', [['disabled', _disabled], ['checked', checked]])}} {{prefix}}-class-label"
style="-webkit-line-clamp:{{maxLabelRow}}"
>
- {{label}}
+ <block wx:if="{{label}}">{{label}}</block>
<slot />
<slot name="label" />
</view>
<view
- class="{{_.cls(classPrefix + '__description', [['disabled', disabled]])}} {{prefix}}-class-content "
+ class="{{_.cls(classPrefix + '__description', [['disabled', _disabled]])}} {{prefix}}-class-content "
style="-webkit-line-clamp:{{maxContentRow}}"
- >{{content}}<slot name="content"
- /></view>
+ >
+ <block wx:if="{{content}}">{{content}}</block>
+ <slot name="content" />
+ </view>
</view>
<view
wx:if="{{theme == 'default' && !borderless}}"
--
Gitblit v1.9.3