From 285faf5ac7421622e7f8d3e8e9ac4659a136cf85 Mon Sep 17 00:00:00 2001 From: yangpan Date: Thu, 26 Mar 2020 20:22:26 +0800 Subject: [PATCH 1/3] fix: #404 --- components/input/InputTextarea.tsx | 11 +++++++---- components/input/style/index.scss | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/components/input/InputTextarea.tsx b/components/input/InputTextarea.tsx index c9ba076f5..8d7bd116e 100644 --- a/components/input/InputTextarea.tsx +++ b/components/input/InputTextarea.tsx @@ -45,12 +45,15 @@ export default class InputTextarea extends PureComponent - {rest.value || rest.defaultValue} +
{ this.input = ele; }}> + {rest.value || rest.defaultValue || rest.placeholder}
); diff --git a/components/input/style/index.scss b/components/input/style/index.scss index 88ad12683..de8c02782 100644 --- a/components/input/style/index.scss +++ b/components/input/style/index.scss @@ -39,6 +39,10 @@ overflow: visible; } + @include m(textarea--placeholder) { + color: var(--color-text-placeholder); + } + @include e(content) { position: relative; height: var(--input-line-height); From 510deb68ed1d4955f86cec254474f08c061ae59a Mon Sep 17 00:00:00 2001 From: yangpan Date: Thu, 26 Mar 2020 20:27:30 +0800 Subject: [PATCH 2/3] fix: #406 --- components/input/InputTextarea.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/input/InputTextarea.tsx b/components/input/InputTextarea.tsx index 8d7bd116e..619b4fa46 100644 --- a/components/input/InputTextarea.tsx +++ b/components/input/InputTextarea.tsx @@ -36,9 +36,10 @@ export default class InputTextarea extends PureComponent Date: Fri, 27 Mar 2020 12:20:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89textarea=E7=9A=84r?= =?UTF-8?q?eadonly=E7=9A=84placeholder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/input/InputTextarea.tsx | 4 ++-- components/input/style/index.scss | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/components/input/InputTextarea.tsx b/components/input/InputTextarea.tsx index 619b4fa46..7d6f4d039 100644 --- a/components/input/InputTextarea.tsx +++ b/components/input/InputTextarea.tsx @@ -179,8 +179,8 @@ export default class InputTextarea extends PureComponent { this.input = ele; }}> - {rest.value || rest.defaultValue || rest.placeholder} +
{ this.input = ele; }}> + {rest.value || rest.defaultValue}
); diff --git a/components/input/style/index.scss b/components/input/style/index.scss index de8c02782..88ad12683 100644 --- a/components/input/style/index.scss +++ b/components/input/style/index.scss @@ -39,10 +39,6 @@ overflow: visible; } - @include m(textarea--placeholder) { - color: var(--color-text-placeholder); - } - @include e(content) { position: relative; height: var(--input-line-height);