fix: resolved series of problems in skyline (#2791)

* fix: resolved series of problems in skyline * fix: resolved series of problems in skyline --------- Co-authored-by: jarmywang <[email protected]>
Tencent · May 23, 2024 · e9f5a18 · e9f5a18
1 parent 90e6e97
commit e9f5a18
Show file tree

Hide file tree

Showing 31 changed files with 74 additions and 282 deletions.
diff --git a/src/button/button.less b/src/button/button.less
@@ -209,6 +209,7 @@
   font-family: PingFang SC, Microsoft YaHei, Arial Regular;
   font-weight: @button-font-weight;
   vertical-align: top;
+  box-sizing: border-box;
 
   .cursor-pointer();
 
@@ -572,7 +573,6 @@
 
   &--block {
     display: flex;
-    box-sizing: border-box;
     width: 100%;
   }
 

diff --git a/src/checkbox/checkbox.wxml b/src/checkbox/checkbox.wxml
@@ -44,15 +44,17 @@
       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 "
       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}}"

diff --git a/src/dropdown-menu/__test__/__snapshots__/index.test.js.snap b/src/dropdown-menu/__test__/__snapshots__/index.test.js.snap
@@ -163,16 +163,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项一
-      
+                                  选项一
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -216,16 +212,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项二
-      
+                                  选项二
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -282,16 +274,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-radio__title--checked t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项三
-      
+                                  选项三
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-radio__description--checked t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -335,16 +323,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项四
-      
+                                  选项四
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -388,16 +372,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项五
-      
+                                  选项五
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -441,16 +421,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项六
-      
+                                  选项六
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -494,16 +470,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项七
-      
+                                  选项七
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -547,16 +519,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      选项八
-      
+                                  选项八
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"
@@ -600,16 +568,12 @@ exports[`dropdown-menu :base 1`] = `
                                   class="t-radio__title t-radio__title--disabled t-class-label"
                                   style="-webkit-line-clamp:3"
                                 >
-                                  
-      禁用选项
-      
+                                  禁用选项
                                 </wx-view>
                                 <wx-view
                                   class="t-radio__description t-radio__description--disabled t-class-content "
                                   style="-webkit-line-clamp:5"
-                                >
-                                  
-                                </wx-view>
+                                />
                               </wx-view>
                               <wx-view
                                 class="t-radio__border t-radio__border--left t-class-border"

diff --git a/src/navbar/navbar.less b/src/navbar/navbar.less
@@ -71,6 +71,7 @@
     background: @navbar-bg-color;
     display: flex;
     align-items: center;
+    box-sizing: content-box;
   }
 
   &__left {

diff --git a/src/radio/radio.wxml b/src/radio/radio.wxml
@@ -42,16 +42,18 @@
       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], ['checked', checked]])}} {{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="{{!borderless}}" class="{{_.cls(classPrefix + '__border', [_placement])}} {{prefix}}-class-border" />

diff --git a/src/textarea/__test__/__snapshots__/demo.test.js.snap b/src/textarea/__test__/__snapshots__/demo.test.js.snap
@@ -12,7 +12,6 @@ exports[`Textarea Textarea autosize demo works fine 1`] = `
     disableDefaultPadding="{{true}}"
     label="标签文字"
     placeholder="请输入文字"
-    tClassLabel=""
     bind:line-change="onLineChange"
   />
 </autosize>
@@ -41,8 +40,6 @@ exports[`Textarea Textarea card demo works fine 1`] = `
       placeholder="请输入文字"
       style="border-radius: 18rpx;"
       tClass="external-class"
-      tClassIndicator=""
-      tClassLabel=""
     />
   </wx-view>
 </card>
@@ -66,7 +63,6 @@ exports[`Textarea Textarea custom demo works fine 1`] = `
       placeholder="请输入文字"
       style="height: 248rpx"
       tClass="external-class"
-      tClassIndicator=""
     />
   </wx-view>
 </custom>
@@ -80,7 +76,6 @@ exports[`Textarea Textarea disabled demo works fine 1`] = `
     label="标签文字"
     placeholder="请输入文字"
     tClass="external-class"
-    tClassLabel=""
     value="不可编辑文字"
   />
 </disabled>
@@ -93,7 +88,6 @@ exports[`Textarea Textarea label demo works fine 1`] = `
     label="标签文字"
     placeholder="请输入文字"
     tClass="external-class"
-    tClassLabel=""
   />
 </wx-label>
 `;
@@ -107,8 +101,6 @@ exports[`Textarea Textarea maxcharacter demo works fine 1`] = `
     maxcharacter="200"
     placeholder="设置最大字符个数，一个汉字表示两个字符"
     tClass="external-class"
-    tClassIndicator=""
-    tClassLabel=""
   />
 </maxcharacter>
 `;
@@ -122,8 +114,6 @@ exports[`Textarea Textarea maxlength demo works fine 1`] = `
     maxlength="200"
     placeholder="设置最大字符个数"
     tClass="external-class"
-    tClassIndicator=""
-    tClassLabel=""
   />
 </maxlength>
 `;
diff --git a/src/textarea/_example/autosize/index.js b/src/textarea/_example/autosize/index.js
@@ -1,7 +1,4 @@
-import SkylineBehavior from '@behaviors/skyline.js';
-
 Component({
-  behaviors: [SkylineBehavior],
   data: {
     autosize: {
       maxHeight: 120,

diff --git a/src/textarea/_example/autosize/index.wxml b/src/textarea/_example/autosize/index.wxml
@@ -1,6 +1,5 @@
 <t-textarea
   label="标签文字"
-  t-class-label="{{skylineRender?'skyline-label':''}}"
   placeholder="请输入文字"
   disableDefaultPadding="{{true}}"
   autosize="{{autosize}}"

diff --git a/src/textarea/_example/autosize/index.wxss b/src/textarea/_example/autosize/index.wxss
@@ -1,10 +0,0 @@
-.skyline-label {
-  font-size: 28rpx;
-  color: rgba(0, 0, 0, 0.9);
-  flex-shrink: 0;
-  line-height: 44rpx;
-  padding-bottom: 16rpx;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}

diff --git a/src/textarea/_example/card/index.js b/src/textarea/_example/card/index.js
@@ -1,7 +1,4 @@
-import SkylineBehavior from '@behaviors/skyline.js';
-
 Component({
-  behaviors: [SkylineBehavior],
   data: {
     style: 'border-radius: 18rpx;',
   },

diff --git a/src/textarea/_example/card/index.wxml b/src/textarea/_example/card/index.wxml
@@ -1,8 +1,6 @@
 <view class="textarea-example">
   <t-textarea
     t-class="external-class"
-    t-class-label="{{skylineRender?'skyline-label':''}}"
-    t-class-indicator="{{skylineRender?'skyline-indicator':''}}"
     label="标签文字"
     placeholder="请输入文字"
     maxlength="500"

diff --git a/src/textarea/_example/card/index.wxss b/src/textarea/_example/card/index.wxss
@@ -7,23 +7,3 @@
 .external-class {
   height: 312rpx;
 }
-
-.skyline-label {
-  font-size: 28rpx;
-  color: rgba(0, 0, 0, 0.9);
-  flex-shrink: 0;
-  line-height: 44rpx;
-  padding-bottom: 16rpx;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.skyline-indicator {
-  color: rgba(0, 0, 0, 0.4);
-  font-size: 24rpx;
-  text-align: right;
-  /*line-height: 40rpx;*/
-  padding-top: 16rpx;
-  min-height: 56rpx;
-}
diff --git a/src/textarea/_example/custom/index.js b/src/textarea/_example/custom/index.js
@@ -1,7 +1,4 @@
-import SkylineBehavior from '@behaviors/skyline.js';
-
 Component({
-  behaviors: [SkylineBehavior],
   data: {
     style: 'height: 248rpx',
   },

diff --git a/src/textarea/_example/custom/index.wxml b/src/textarea/_example/custom/index.wxml
@@ -2,7 +2,6 @@
   <text class="textarea-example__label">标签文字</text>
   <t-textarea
     t-class="external-class"
-    t-class-indicator="{{skylineRender?'skyline-indicator':''}}"
     placeholder="请输入文字"
     bordered
     maxlength="100"

diff --git a/src/textarea/_example/custom/index.wxss b/src/textarea/_example/custom/index.wxss
@@ -15,12 +15,3 @@
   line-height: 40rpx;
   padding-bottom: 16rpx;
 }
-
-.skyline-indicator {
-  color: rgba(0, 0, 0, 0.4);
-  font-size: 24rpx;
-  text-align: right;
-  /*line-height: 40rpx;*/
-  padding-top: 16rpx;
-  min-height: 56rpx;
-}
diff --git a/src/textarea/_example/disabled/index.js b/src/textarea/_example/disabled/index.js
@@ -1,3 +1 @@
-import SkylineBehavior from '@behaviors/skyline.js';
-
-Component({ behaviors: [SkylineBehavior] });
+Component({});