feat: 新增外部样式类l-inner-class；修改textarea样式错误。(# 599) (#653)

zhc525349965 · 7insummer · commit 086b62814afb · 2019-12-11T21:19:06.000+08:00
diff --git a/dist/textarea/index.js b/dist/textarea/index.js
@@ -6,7 +6,7 @@ Component({
    * 组件的属性列表
    */
   behaviors: ['wx://form-field', rules],
-  externalClasses: ['l-class', 'l-error-text', 'l-error-text-class'],
+  externalClasses: ['l-class', 'l-error-text', 'l-error-text-class', 'l-inner-class'],
   properties: {
     // 占位文本
     placeholder: {
diff --git a/dist/textarea/index.wxml b/dist/textarea/index.wxml
@@ -1,10 +1,10 @@
 <!--  input/input.wxml -->
-<label class='form-item {{disabled? "disabled": ""}}   l-class '>
-  <view class='default-border {{border? "border": ""}}'>
+<label class='form-item {{disabled? "disabled": ""}}'>
+  <view class='default-border {{border? "border": ""}} l-class'>
     <view class='mask' wx:if="{{disabled}}"></view>
     <!-- 小程序表单组件 -->
     <textarea
-      class=" textarea"
+      class="textarea l-inner-class"
       type="{{type}}"
       value="{{ value }}"
       password="{{type==='password'}}"
diff --git a/dist/textarea/index.wxss b/dist/textarea/index.wxss
@@ -1 +1 @@
-.form-item{position:relative;font-size:28rpx;color:#333;width:700rpx;display:flex;flex-direction:column;align-items:center;border-bottom:1rpx solid #f3f3f3;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.textarea{width:100%;padding:25rpx;box-sizing:border-box;font-size:28rpx;color:#333;height:200rpx;line-height:40rpx;flex:1;min-height:88rpx;margin-bottom:rpx}.default-border{position:relative;font-size:28rpx;color:#333;width:100%;display:flex;flex-direction:column;align-items:center;border-bottom:1rpx solid #f3f3f3;box-sizing:border-box}.border{border-radius:4rpx;border:1rpx solid #d8dee5}.pls-class{color:#9a9a9a}.indicator{width:95%;text-align:right;margin-bottom:15rpx;color:#9a9a9a}
+.form-item{position:relative;font-size:28rpx;color:#333;width:700rpx;display:flex;flex-direction:column;align-items:center;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.textarea{width:100%;padding:25rpx;box-sizing:border-box;font-size:28rpx;color:#333;height:200rpx;line-height:40rpx;flex:1;min-height:88rpx;margin-bottom:rpx}.default-border{position:relative;font-size:28rpx;color:#333;width:100%;display:flex;flex-direction:column;align-items:center;box-sizing:border-box}.border{border-radius:4rpx;border:1rpx solid #d8dee5}.pls-class{color:#9a9a9a}.indicator{width:95%;text-align:right;margin-bottom:15rpx;color:#9a9a9a}
diff --git a/examples/dist/textarea/index.js b/examples/dist/textarea/index.js
@@ -6,7 +6,7 @@ Component({
    * 组件的属性列表
    */
   behaviors: ['wx://form-field', rules],
-  externalClasses: ['l-class', 'l-error-text', 'l-error-text-class'],
+  externalClasses: ['l-class', 'l-error-text', 'l-error-text-class', 'l-inner-class'],
   properties: {
     // 占位文本
     placeholder: {
diff --git a/examples/dist/textarea/index.wxml b/examples/dist/textarea/index.wxml
@@ -1,10 +1,10 @@
 <!--  input/input.wxml -->
-<label class='form-item {{disabled? "disabled": ""}}   l-class '>
-  <view class='default-border {{border? "border": ""}}'>
+<label class='form-item {{disabled? "disabled": ""}}'>
+  <view class='default-border {{border? "border": ""}} l-class'>
     <view class='mask' wx:if="{{disabled}}"></view>
     <!-- 小程序表单组件 -->
     <textarea
-      class=" textarea"
+      class="textarea l-inner-class"
       type="{{type}}"
       value="{{ value }}"
       password="{{type==='password'}}"
diff --git a/examples/dist/textarea/index.wxss b/examples/dist/textarea/index.wxss
@@ -1 +1 @@
-.form-item{position:relative;font-size:28rpx;color:#333;width:700rpx;display:flex;flex-direction:column;align-items:center;border-bottom:1rpx solid #f3f3f3;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.textarea{width:100%;padding:25rpx;box-sizing:border-box;font-size:28rpx;color:#333;height:200rpx;line-height:40rpx;flex:1;min-height:88rpx;margin-bottom:rpx}.default-border{position:relative;font-size:28rpx;color:#333;width:100%;display:flex;flex-direction:column;align-items:center;border-bottom:1rpx solid #f3f3f3;box-sizing:border-box}.border{border-radius:4rpx;border:1rpx solid #d8dee5}.pls-class{color:#9a9a9a}.indicator{width:95%;text-align:right;margin-bottom:15rpx;color:#9a9a9a}
+.form-item{position:relative;font-size:28rpx;color:#333;width:700rpx;display:flex;flex-direction:column;align-items:center;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.textarea{width:100%;padding:25rpx;box-sizing:border-box;font-size:28rpx;color:#333;height:200rpx;line-height:40rpx;flex:1;min-height:88rpx;margin-bottom:rpx}.default-border{position:relative;font-size:28rpx;color:#333;width:100%;display:flex;flex-direction:column;align-items:center;box-sizing:border-box}.border{border-radius:4rpx;border:1rpx solid #d8dee5}.pls-class{color:#9a9a9a}.indicator{width:95%;text-align:right;margin-bottom:15rpx;color:#9a9a9a}
diff --git a/src/textarea/index.js b/src/textarea/index.js
@@ -6,7 +6,7 @@ Component({
    * 组件的属性列表
    */
   behaviors: ['wx://form-field', rules],
-  externalClasses: ['l-class', 'l-error-text', 'l-error-text-class'],
+  externalClasses: ['l-class', 'l-error-text', 'l-error-text-class', 'l-inner-class'],
   properties: {
     // 占位文本
     placeholder: {
diff --git a/src/textarea/index.less b/src/textarea/index.less
@@ -10,7 +10,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  border-bottom: 1rpx solid #f3f3f3;
+  // border-bottom: 1rpx solid #f3f3f3;
   box-sizing: border-box;
 }
 
@@ -47,7 +47,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  border-bottom: 1rpx solid #f3f3f3;
+  // border-bottom: 1rpx solid #f3f3f3;
   box-sizing: border-box;
 }
 
diff --git a/src/textarea/index.wxml b/src/textarea/index.wxml
@@ -1,10 +1,10 @@
 <!--  input/input.wxml -->
-<label class='form-item {{disabled? "disabled": ""}}   l-class '>
-  <view class='default-border {{border? "border": ""}}'>
+<label class='form-item {{disabled? "disabled": ""}}'>
+  <view class='default-border {{border? "border": ""}} l-class'>
     <view class='mask' wx:if="{{disabled}}"></view>
     <!-- 小程序表单组件 -->
     <textarea
-      class=" textarea"
+      class="textarea l-inner-class"
       type="{{type}}"
       value="{{ value }}"
       password="{{type==='password'}}"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-.form-item{position:relative;font-size:28rpx;color:#333;width:700rpx;display:flex;flex-direction:column;align-items:center;border-bottom:1rpx solid #f3f3f3;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.textarea{width:100%;padding:25rpx;box-sizing:border-box;font-size:28rpx;color:#333;height:200rpx;line-height:40rpx;flex:1;min-height:88rpx;margin-bottom:rpx}.default-border{position:relative;font-size:28rpx;color:#333;width:100%;display:flex;flex-direction:column;align-items:center;border-bottom:1rpx solid #f3f3f3;box-sizing:border-box}.border{border-radius:4rpx;border:1rpx solid #d8dee5}.pls-class{color:#9a9a9a}.indicator{width:95%;text-align:right;margin-bottom:15rpx;color:#9a9a9a}
	`1`	+.form-item{position:relative;font-size:28rpx;color:#333;width:700rpx;display:flex;flex-direction:column;align-items:center;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.textarea{width:100%;padding:25rpx;box-sizing:border-box;font-size:28rpx;color:#333;height:200rpx;line-height:40rpx;flex:1;min-height:88rpx;margin-bottom:rpx}.default-border{position:relative;font-size:28rpx;color:#333;width:100%;display:flex;flex-direction:column;align-items:center;box-sizing:border-box}.border{border-radius:4rpx;border:1rpx solid #d8dee5}.pls-class{color:#9a9a9a}.indicator{width:95%;text-align:right;margin-bottom:15rpx;color:#9a9a9a}