feat(Fab): add default slot (#3204)

Tencent · Oct 15, 2024 · 89da488 · 89da488
1 parent becc87a
commit 89da488
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/button/button.ts b/src/button/button.ts
@@ -2,7 +2,7 @@ import { SuperComponent, wxComponent } from '../common/src/index';
 import config from '../common/config';
 import props from './props';
 import { canIUseFormFieldButton } from '../common/version';
-import { setIcon } from '../common/utils';
+import { calcIcon } from '../common/utils';
 import type { TdButtonProps } from './type';
 
 const { prefix } = config;
@@ -33,9 +33,8 @@ export default class Button extends SuperComponent {
     },
 
     icon(icon) {
-      const obj = setIcon('icon', icon, '');
       this.setData({
-        ...obj,
+        _icon: calcIcon(icon, ''),
       });
     },
   };

diff --git a/src/button/button.wxml b/src/button/button.wxml
@@ -31,9 +31,9 @@
   aria-label="{{ariaLabel}}"
 >
   <template
-    wx:if="{{iconName || _.isNoEmptyObj(iconData)}}"
+    wx:if="{{_icon}}"
     is="icon"
-    data="{{class: classPrefix + '__icon', tClass: prefix + '-class-icon', ariaHidden: true, name: iconName, ...iconData}}"
+    data="{{class: classPrefix + '__icon', tClass: prefix + '-class-icon', ariaHidden: true, name: iconName, ..._icon}}"
   />
   <t-loading
     wx:if="{{loading}}"

diff --git a/src/common/template/button.wxml b/src/common/template/button.wxml
@@ -36,5 +36,7 @@
     bind:launchapp="onTplButtonTap"
     bind:agreeprivacyauthorization="onTplButtonTap"
     aria-label="{{ariaLabel || ''}}"
-  />
+  >
+    <slot />
+  </t-button>
 </template>