diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index 77206da7a..136726660 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -44,7 +44,7 @@
       <template
         wx:elif="{{iconName || _.isNoEmptyObj(iconData)}}"
         is="icon"
-        data="{{class: classPrefix + '__icon', tClass: prefix + '-class-icon', name: iconName, ...iconData}}"
+        data="{{cls: classPrefix + '__icon', tClass: prefix + '-class-icon', name: iconName, ...iconData}}"
       />
       <view wx:else class="{{classPrefix}}__text {{prefix}}-class-content">
         <slot />
diff --git a/src/button/button.wxml b/src/button/button.wxml
index 24f84fd08..467462305 100644
--- a/src/button/button.wxml
+++ b/src/button/button.wxml
@@ -31,7 +31,7 @@
   <template
     wx:if="{{iconName || _.isNoEmptyObj(iconData)}}"
     is="icon"
-    data="{{class: classPrefix + '__icon', tClass: prefix + '-class-icon', ariaHidden: true, name: iconName, ...iconData}}"
+    data="{{cls: classPrefix + '__icon', tClass: prefix + '-class-icon', ariaHidden: true, name: iconName, ...iconData}}"
   />
   <t-loading
     wx:if="{{loading}}"
diff --git a/src/calendar/calendar.less b/src/calendar/calendar.less
index 18b91700c..a82505dfd 100644
--- a/src/calendar/calendar.less
+++ b/src/calendar/calendar.less
@@ -195,6 +195,10 @@
     }
   }
 
+  &__confirm-btn {
+    font-size: 40px;
+  }
+
   &__footer {
     padding: 32rpx;
   }
diff --git a/src/calendar/template.wxml b/src/calendar/template.wxml
index 81eeb919a..1dceaf8db 100644
--- a/src/calendar/template.wxml
+++ b/src/calendar/template.wxml
@@ -64,7 +64,7 @@
       <!-- <t-button block theme="primary" v-bind="confirmBtn" bind:tap="handleConfirm" /> -->
       <template
         is="button"
-        data="{{ block: true,  theme: 'primary', class: 't-calendar__confirm-btn', ...innerConfirmBtn }}"
+        data="{{ block: true,  theme: 'primary', cls: 't-calendar__confirm-btn', ...innerConfirmBtn }}"
       />
     </block>
   </view>
diff --git a/src/common/template/badge.wxml b/src/common/template/badge.wxml
index df8c7177c..5d7f69aa1 100644
--- a/src/common/template/badge.wxml
+++ b/src/common/template/badge.wxml
@@ -9,7 +9,7 @@
     shape="{{shape || 'circle'}}"
     show-zero="{{showZero || false}}"
     size="{{size || 'medium'}}"
-    t-class="{{class}} {{tClass}}"
+    t-class="{{cls}} {{tClass}}"
     t-class-content="{{tClassContent}}"
     t-class-count="{{tClassCount}}"
   />
diff --git a/src/common/template/button.wxml b/src/common/template/button.wxml
index faff528bd..4c742d71e 100644
--- a/src/common/template/button.wxml
+++ b/src/common/template/button.wxml
@@ -1,8 +1,8 @@
 <template name="button">
   <t-button
     block="{{block || false}}"
-    class="{{class || ''}}"
-    t-class="{{externalClass}}"
+    class="{{cls || ''}}"
+    t-class="{{tClass}}"
     disabled="{{disabled || false}}"
     data-type="{{type}}"
     data-extra="{{extra}}"
diff --git a/src/common/template/icon.wxml b/src/common/template/icon.wxml
index 0fafa2c0d..c4701bd74 100644
--- a/src/common/template/icon.wxml
+++ b/src/common/template/icon.wxml
@@ -1,7 +1,7 @@
 <template name="icon">
   <t-icon
     style="{{style || ''}}"
-    class="{{class}}"
+    class="{{cls}}"
     t-class="{{tClass}}"
     prefix="{{prefix || ''}}"
     name="{{name || ''}}"
diff --git a/src/common/template/image.wxml b/src/common/template/image.wxml
index 43fe5244f..e2a8f823c 100644
--- a/src/common/template/image.wxml
+++ b/src/common/template/image.wxml
@@ -1,6 +1,6 @@
 <template name="image">
   <t-image
-    class="{{class}}"
+    class="{{cls}}"
     t-class="{{tClass}}"
     t-class-load="{{tClassLoad}}"
     style="{{style || ''}}"
diff --git a/src/dialog/dialog.ts b/src/dialog/dialog.ts
index 2856f0d42..6b3abea78 100644
--- a/src/dialog/dialog.ts
+++ b/src/dialog/dialog.ts
@@ -52,8 +52,8 @@ export default class Dialog extends SuperComponent {
         const btn = buttonMap[key];
         const base: Record<string, any> = {
           block: true,
-          class: [...cls, `${classPrefix}__button--${key}`],
-          externalClass: [...externalCls, `${prefix}-class-${key}`],
+          cls: [...cls, `${classPrefix}__button--${key}`],
+          tClass: [...externalCls, `${prefix}-class-${key}`],
           variant: rect.buttonVariant,
         };
 
diff --git a/src/dialog/dialog.wxml b/src/dialog/dialog.wxml
index 5609ddef1..9b2ba7004 100644
--- a/src/dialog/dialog.wxml
+++ b/src/dialog/dialog.wxml
@@ -39,7 +39,7 @@
         <block wx:for="{{actions}}" wx:key="index">
           <template
             is="button"
-            data="{{block: true, type: 'action', extra: index, externalClass: prefix + '-class-action', class: this.getActionClass(classPrefix, buttonLayout), ...item }}"
+            data="{{block: true, type: 'action', extra: index, tClass: prefix + '-class-action', cls: this.getActionClass(classPrefix, buttonLayout), ...item }}"
           />
         </block>
       </block>
diff --git a/src/empty/empty.wxml b/src/empty/empty.wxml
index 875007238..d8ec86ce4 100644
--- a/src/empty/empty.wxml
+++ b/src/empty/empty.wxml
@@ -8,7 +8,7 @@
     <template
       wx:elif="{{iconName || _.isNoEmptyObj(iconData)}}"
       is="icon"
-      data="{{class: classPrefix + '__icon', name: iconName, ...iconData}}"
+      data="{{cls: classPrefix + '__icon', name: iconName, ...iconData}}"
     />
     <slot wx:else name="image" />
   </view>
diff --git a/src/fab/fab.wxml b/src/fab/fab.wxml
index 1bca71c82..462516203 100644
--- a/src/fab/fab.wxml
+++ b/src/fab/fab.wxml
@@ -7,6 +7,6 @@
 >
   <template
     is="button"
-    data="{{ ...baseButtonProps, icon, ...buttonProps, externalClass: prefix + '-fab__button', content: text, ariaLabel}}"
+    data="{{ ...baseButtonProps, icon, ...buttonProps, tClass: classPrefix + '__button', content: text, ariaLabel}}"
   />
 </view>
diff --git a/src/grid-item/grid-item.wxml b/src/grid-item/grid-item.wxml
index e0bb95399..0408b8c8f 100644
--- a/src/grid-item/grid-item.wxml
+++ b/src/grid-item/grid-item.wxml
@@ -50,7 +50,7 @@
           <template
             wx:if="{{iconName || _.isNoEmptyObj(iconData)}}"
             is="icon"
-            data="{{class: classPrefix + '__icon', name: iconName, ...iconData}}"
+            data="{{cls: classPrefix + '__icon', name: iconName, ...iconData}}"
           />
         </view>
       </t-badge>
diff --git a/src/progress/progress.wxml b/src/progress/progress.wxml
index 0ce673c3a..f6036839b 100644
--- a/src/progress/progress.wxml
+++ b/src/progress/progress.wxml
@@ -27,7 +27,7 @@
       <template
         wx:if="{{_.includes(this.STATUS, status)}}"
         is="icon"
-        data="{{class: classPrefix + '__icon', size:'44rpx', name: this.LINE_STATUS_ICON[status]}}"
+        data="{{cls: classPrefix + '__icon', size:'44rpx', name: this.LINE_STATUS_ICON[status]}}"
       ></template>
       <text wx:else>{{ _.isString(label)? label: computedProgress + '%' }}</text>
     </view>
@@ -86,7 +86,7 @@
           <template
             wx:if="{{_.includes(this.STATUS, status)}}"
             is="icon"
-            data="{{class: classPrefix + '__icon', size:'96rpx', name: this.CIRCLE_STATUS_ICON[status]}}"
+            data="{{cls: classPrefix + '__icon', size:'96rpx', name: this.CIRCLE_STATUS_ICON[status]}}"
           ></template>
           <text wx:else>{{ _.isString(label)? label: computedProgress + '%' }}</text>
         </view>
diff --git a/src/result/result.wxml b/src/result/result.wxml
index 875bdb518..5bb1cbce2 100644
--- a/src/result/result.wxml
+++ b/src/result/result.wxml
@@ -7,7 +7,7 @@
 >
   <view aria-hidden="true" class="{{classPrefix}}__thumb">
     <t-image wx:if="{{image}}" t-class="{{prefix}}-class-image" src="{{image}}" mode="aspectFit" />
-    <template wx:elif="{{_icon}}" is="icon" data="{{class: classPrefix + '__icon', ..._icon }}" />
+    <template wx:elif="{{_icon}}" is="icon" data="{{cls: classPrefix + '__icon', ..._icon }}" />
     <slot name="image" />
   </view>
 
diff --git a/src/side-bar-item/side-bar-item.wxml b/src/side-bar-item/side-bar-item.wxml
index a95478ef1..2faa8335a 100644
--- a/src/side-bar-item/side-bar-item.wxml
+++ b/src/side-bar-item/side-bar-item.wxml
@@ -16,7 +16,7 @@
     <view class="{{classPrefix}}__prefix"></view>
     <view class="{{classPrefix}}__suffix"></view>
   </block>
-  <template wx:if="{{_icon}}" is="icon" data="{{ class: classPrefix + '__icon', ..._icon }}" />
+  <template wx:if="{{_icon}}" is="icon" data="{{ cls: classPrefix + '__icon', ..._icon }}" />
   <block wx:if="{{badgeProps}}">
     <template is="badge" data="{{ ...badgeProps, content: label }}" />
   </block>
diff --git a/src/swipe-cell/swipe-cell.wxml b/src/swipe-cell/swipe-cell.wxml
index 9b97d9142..fba87e04b 100644
--- a/src/swipe-cell/swipe-cell.wxml
+++ b/src/swipe-cell/swipe-cell.wxml
@@ -32,7 +32,7 @@
         <template
           wx:if="{{item.icon}}"
           is="icon"
-          data="{{class: classPrefix + '__icon', name: item.icon, ...item.icon}}"
+          data="{{cls: classPrefix + '__icon', name: item.icon, ...item.icon}}"
         ></template>
         <text wx:if="{{item.text}}" class="{{classPrefix}}__text">{{item.text}}</text>
       </view>
@@ -51,7 +51,7 @@
         <template
           wx:if="{{item.icon}}"
           is="icon"
-          data="{{class: classPrefix + '__icon', name: item.icon, ...item.icon}}"
+          data="{{cls: classPrefix + '__icon', name: item.icon, ...item.icon}}"
         ></template>
         <text wx:if="{{item.text}}" class="{{classPrefix}}__text">{{item.text}}</text>
       </view>
diff --git a/src/swiper/swiper.wxml b/src/swiper/swiper.wxml
index e4fc9a141..cdbed70d0 100644
--- a/src/swiper/swiper.wxml
+++ b/src/swiper/swiper.wxml
@@ -32,7 +32,7 @@
     >
       <template
         is="image"
-        data="{{ class: classPrefix + '__image-host', tClass: this.getImageClass(prefix, current, index, list), style: 'height: ' + _.addUnit(height), src: _.isObject(item) ? item.value : item, mode: 'aspectFill', dataset: index, ...imageProps, bindload: 'onImageLoad' }}"
+        data="{{ cls: classPrefix + '__image-host', tClass: this.getImageClass(prefix, current, index, list), style: 'height: ' + _.addUnit(height), src: _.isObject(item) ? item.value : item, mode: 'aspectFill', dataset: index, ...imageProps, bindload: 'onImageLoad' }}"
       />
     </swiper-item>
   </swiper>
diff --git a/src/tabs/tabs.wxml b/src/tabs/tabs.wxml
index 246865134..f9b087c04 100644
--- a/src/tabs/tabs.wxml
+++ b/src/tabs/tabs.wxml
@@ -42,7 +42,7 @@
               class="{{_.cls(classPrefix + '__item-inner', [theme, ['active', currentIndex === index]])}}"
               aria-hidden="{{ item.badgeProps.dot || item.badgeProps.count }}"
             >
-              <template wx:if="{{item.icon}}" is="icon" data="{{ class: classPrefix + '__icon', ...item.icon }}" />
+              <template wx:if="{{item.icon}}" is="icon" data="{{ cls: classPrefix + '__icon', ...item.icon }}" />
               <block wx:if="{{item.badgeProps}}">
                 <template is="badge" data="{{ ...item.badgeProps, content: item.label }}" />
               </block>