Merge pull request #528 from weihongyu12/develop

修复navbar变量名的错误，修复dialog取消按钮无法传递Object的问题

Author: LeeJim

src/dialog/dialog.wxml

@@ -49,7 +49,7 @@
         <template
           is="button"
           class="{{classPrefix}}__footer-button-host"
-          data="{{...confirmBtn, block: true, type: 'cancel', externalClass: classPrefix + '__button ' + classPrefix + '__button-cancel ' + (cancelBtn ? classPrefix + '__button-half ' : ' ') + prefix + '-class-cancel'}}"
+          data="{{...cancelBtn, block: true, type: 'cancel', externalClass: classPrefix + '__button ' + classPrefix + '__button-cancel ' + (cancelBtn ? classPrefix + '__button-half ' : ' ') + prefix + '-class-cancel'}}"
         ></template>
       </block>
       <slot name="cancelBtn" />

src/navbar/navbar.less

@@ -14,7 +14,7 @@
   --navbar-height: 44px;
   --navbar-right: 190rpx; // 默认右上角胶囊按钮宽度，组件会在初始化时尝试自动获取胶囊按钮宽度并覆写该值
   --narbar-padding-top: 20px; // 导航栏顶部间距，组件会在初始化时尝试取右侧系统胶囊位置进行覆盖
-  --capsule-wight: 174rpx;
+  --capsule-width: 174rpx;
 
   overflow: hidden;
 
@@ -78,7 +78,7 @@
   &__capsule {
     box-sizing: border-box;
     margin-left: 24rpx;
-    width: var(--capsule-wight);
+    width: var(--capsule-width);
     height: var(--capsule-height);
     line-height: var(--capsule-height);
     border-radius: 16rpx * 2;

src/navbar/navbar.ts

@@ -99,14 +99,12 @@ export default class Navbar extends SuperComponent {
         const ios = !!(res.system.toLowerCase().search('ios') + 1);
         const navbarHeight = ios ? 44 : 48;
         const boxStyleList = [];
-        boxStyleList.push(
-          `--narbar-padding-top:${(rect.bottom + rect.top) / 2 - navbarHeight / 2}px;`,
-        );
+        boxStyleList.push(`--narbar-padding-top:${(rect.bottom + rect.top) / 2 - navbarHeight / 2}px;`);
         if (rect && res?.windowWidth) {
           boxStyleList.push(`--navbar-right:${res.windowWidth - rect.left}px;`); // 导航栏右侧小程序胶囊按钮宽度
         }
         boxStyleList.push(`--capsule-height:${rect.height}px;`); // 胶囊高度
-        boxStyleList.push(`--capsule-wight:${rect.width}px;`); // 胶囊宽度
+        boxStyleList.push(`--capsule-width:${rect.width}px;`); // 胶囊宽度
         boxStyleList.push(`--navbar-height:${navbarHeight}px;`); // navbar高度
         this.setData({
           ios,