feat:设备使用记录

uview-plus/components/u-textarea/u-textarea.vue

@@ -3,9 +3,9 @@
         <textarea
             class="u-textarea__field"
             :value="innerValue"
-            :style="{ height: addUnit(height) }"
+            :style="fieldStyle"
             :placeholder="placeholder"
-            :placeholder-style="addStyle(placeholderStyle, 'string')"
+            :placeholder-style="addStyle(placeholderStyle, typeof placeholderStyle === 'string' ? 'string' : 'object')"
             :placeholder-class="placeholderClass"
             :disabled="disabled"
             :focus="focus"
@@ -50,7 +50,7 @@ import { addStyle, addUnit, deepMerge, formValidate, os } from '../../libs/funct
 /**
  * Textarea 文本域
  * @description 文本域此组件满足了可能出现的表单信息补充，编辑等实际逻辑的功能，内置了字数校验等
- * @tutorial https://ijry.github.io/uview-plus/components/textarea.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/textarea.html
  *
  * @property {String | Number} 		value					输入框的内容
  * @property {String | Number}		placeholder				输入框为空时占位符
@@ -146,6 +146,15 @@ export default {
         // #endif
 	},
     computed: {
+		fieldStyle() {
+			let style = {};
+			style['height'] = addUnit(this.height);
+			if (this.autoHeight) {
+				style['height'] = 'auto';
+				style['minHeight'] = addUnit(this.height);
+			}
+			return style;
+		},
         // 组件的类名
         textareaClass() {
             let classes = [],
@@ -236,8 +245,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-textarea {
     border-radius: 4px;
     background-color: #fff;