Skip to content

Commit 277aac1

Browse files
committed
fix: 【demo控制台warn问题,autofocus变量没有引用问题、修改count颜色为:inherit、autofocus变量没有引用问题】
1 parent f08f378 commit 277aac1

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

devui/textarea/src/textarea-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const textareaProps = {
1919
},
2020
value: {
2121
type: String,
22-
default: undefined,
22+
default: '',
2323
},
2424
maxLength: {
2525
type: Number,

devui/textarea/src/textarea.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
@import '../../style/core/form';
2-
@import '../../style/mixins/flex';
32

43
.devui-textarea-wrap {
54
.devui-textarea-show-count {
65
text-align: right;
7-
color: #00000073;
6+
color: inherit;
87
white-space: nowrap;
98
pointer-events: none;
109
font-size: $devui-font-size;

devui/textarea/src/textarea.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ export default defineComponent({
1212
[props.cssClass]: true,
1313
}
1414

15-
const curLengthRef = ref<number>(0)
15+
const curValueRef = ref<string>(props.value)
1616
const onInput = ($event: Event) => {
1717
const inputValue = ($event.target as HTMLInputElement).value
18-
curLengthRef.value = inputValue.length
18+
curValueRef.value = inputValue
1919
ctx.emit('update:value', inputValue);
2020
},
2121
onFocus = ($event: Event) => {
@@ -32,14 +32,13 @@ export default defineComponent({
3232
};
3333

3434
return {
35-
textareaCls, onInput, onFocus, onBlur, onChange, onKeydown, curLengthRef, ...props
35+
textareaCls, onInput, onFocus, onBlur, onChange, onKeydown, curValueRef, autofocus: props.autofocus
3636
};
3737

3838
},
3939
render() {
4040
const {
4141
id,
42-
value,
4342
placeholder,
4443
disabled,
4544
maxLength,
@@ -51,18 +50,17 @@ export default defineComponent({
5150
onChange,
5251
onKeydown,
5352
showCount,
54-
curLengthRef,
55-
...attrs
53+
autofocus,
54+
curValueRef,
5655
} = this
5756
return (
5857
<div class='devui-textarea-wrap'
5958
>
6059
<textarea
61-
{...attrs}
6260
{...{ DTextarea: true }}
6361
id={id}
64-
value={value}
65-
autofocus={true}
62+
value={curValueRef}
63+
autofocus={autofocus}
6664
placeholder={placeholder}
6765
disabled={disabled}
6866
maxlength={maxLength}
@@ -78,7 +76,7 @@ export default defineComponent({
7876
{
7977
showCount && <div
8078
class='devui-textarea-show-count'>
81-
{curLengthRef}
79+
{curValueRef.length}
8280
{!(maxLength ?? false) ? '' : ' / ' + maxLength}
8381
</div>
8482
}

docs/components/textarea/index.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
1717
<d-textarea
1818
value="我是默认值"
19-
autoFocus
19+
:autofocus="true"
2020
id="textArea"
2121
cssClass="my-text-area"
2222
></d-textarea>
@@ -45,23 +45,23 @@
4545
```vue
4646
<template>
4747
<h4 style="margin: 10px 0">vertical</h4>
48-
<d-textarea resize="vertical"></d-textarea>
48+
<d-textarea placeholder="我可以缩放" resize="vertical"></d-textarea>
4949
5050
<h4 style="margin: 10px 0">horizontal</h4>
5151
52-
<d-textarea resize="horizontal" placeholder="Please Enter"></d-textarea>
52+
<d-textarea resize="horizontal" placeholder="请输入"></d-textarea>
5353
5454
<h4 style="margin: 10px 0">both</h4>
5555
56-
<d-textarea resize="both" placeholder="Please Enter"></d-textarea>
56+
<d-textarea resize="both" placeholder="请输入"></d-textarea>
5757
5858
<h4 style="margin: 10px 0">none</h4>
5959
60-
<d-textarea resize="none" placeholder="Please Enter"></d-textarea>
60+
<d-textarea resize="none" placeholder="请输入"></d-textarea>
6161
6262
<h4 style="margin: 10px 0">inherit</h4>
6363
64-
<d-textarea resize="inherit" placeholder="Please Enter"></d-textarea>
64+
<d-textarea resize="inherit" placeholder="请输入"></d-textarea>
6565
</template>
6666
```
6767

@@ -74,12 +74,12 @@
7474
```vue
7575
<template>
7676
<h4 style="margin: 10px 0">默认</h4>
77-
<d-textarea showCount="true" placeholder="Please Enter"></d-textarea>
77+
<d-textarea :showCount="true" placeholder="请输入"></d-textarea>
7878
<h4 style="margin: 10px 0">显示最大字数</h4>
7979
<d-textarea
80-
showCount="true"
81-
maxLength="20"
82-
placeholder="Please Enter"
80+
:showCount="true"
81+
:maxLength="20"
82+
placeholder="请输入"
8383
></d-textarea>
8484
</template>
8585
<style>
@@ -98,8 +98,8 @@
9898
```vue
9999
<template>
100100
<d-textarea
101-
showCount="true"
102-
maxLength="20"
101+
:showCount="true"
102+
:maxLength="20"
103103
placeholder="打开控制台输入文字看看"
104104
@update:value="onUpdate"
105105
@change="onChange"

0 commit comments

Comments
 (0)