diff --git a/pages/component/input/input.test.js b/pages/component/input/input.test.js
index c804a7b847815205123c6501f0ab0df2f5c4fdfb..4b4178f0843b9401c3392de0ba79f9255087d851 100644
--- a/pages/component/input/input.test.js
+++ b/pages/component/input/input.test.js
@@ -198,4 +198,9 @@ describe('component-native-input', () => {
})
expect(image).toSaveImageSnapshot()
})
+
+ it('both set modelValue and value', async()=>{
+ const input2 = await page.$('#both-model-value');
+ expect(await input2.value()).toEqual("123")
+ })
});
diff --git a/pages/component/input/input.uvue b/pages/component/input/input.uvue
index 6a547a53832f7fa869721c2d58c08565c7b2eb73..7193a80246fef9f118c88ee65408674a3a37b783 100644
--- a/pages/component/input/input.uvue
+++ b/pages/component/input/input.uvue
@@ -1,382 +1,393 @@
-
-
-
-
-
-
-
-
- 设置输入框的初始内容
-
-
-
-
-
-
-
-
- type取值（不同输入法表现可能不一致）
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 密码输入框
-
-
-
-
-
-
-
-
- 占位符样式
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 设置输入框的初始内容
+
+
+
+
+
+
+
+
+ type取值（不同输入法表现可能不一致）
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 密码输入框
+
+
+
+
+
+
+
+
+ 占位符样式
+
+
+
+
+
+
-
-
-
-
- 设置禁用输入框
-
-
-
-
-
-
-
-
- 设置最大输入长度
-
-
-
-
-
-
-
-
- 设置光标与键盘的距离
-
-
-
-
-
-
-
-
- 自动获取焦点
-
-
-
-
-
-
-
-
- confirm-type取值（不同输入法表现可能不一致）
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 点击键盘右下角按钮时保持键盘不收起
-
-
-
-
-
-
-
-
- 设置输入框聚焦时光标的位置（点击生效）
-
-
-
-
-
-
-
-
- 设置输入框聚焦时光标的起始位置和结束位置（点击生效）
-
-
-
-
-
-
-
-
- 设置光标颜色为红色
-
-
-
-
-
-
-
-
-
- 键盘弹起时，自动上推页面
-
-
-
-
-
-
-
-
-
- 设置hold-keyboard
-
-
-
-
-
-
-
-
-
-
- input事件
- {{inputEventDetail}}
-
-
-
-
-
-
-
-
- focus事件和blur事件
- {{focusAndBlurEventDetail}}
-
-
-
-
-
-
-
-
- confirm事件
- {{confirmEventDetail}}
-
-
-
-
-
-
-
-
- keyboardheightchange事件
- {{keyboardHeightChangeEventDetail}}
-
-
-
-
-
-
-
-
- 带清除按钮的输入框
-
-
-
-
-
-
-
-
-
-
- 可查看密码的输入框
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/component/textarea/textarea.test.js b/pages/component/textarea/textarea.test.js
index 2f5c2a5ca6f1aa350037af33e860c143021b97ba..4ba6beb9ef502bc6d46ac5d65ecddb48f1af5fba 100644
--- a/pages/component/textarea/textarea.test.js
+++ b/pages/component/textarea/textarea.test.js
@@ -73,4 +73,9 @@ describe('component-native-textarea', () => {
await page.waitFor(500)
}
})
+
+ it('both set modelValue and value', async () => {
+ let textarea2 = await page.$('.both-set-textarea');
+ expect(await textarea2.value()).toBe("123")
+ })
});
diff --git a/pages/component/textarea/textarea.uvue b/pages/component/textarea/textarea.uvue
index d76e67b80632c0bc10f3ce599f46021de9ad32ac..da1b1ad451fff804e044ab5da87c663b14a500b2 100644
--- a/pages/component/textarea/textarea.uvue
+++ b/pages/component/textarea/textarea.uvue
@@ -1,56 +1,57 @@
-
-
-
+ radio_change_confirm_type(checked : number) { this.confirm_type_current = checked }
+ }
+}
+
+
+
@@ -86,17 +87,17 @@ export default {
@focus="textarea_focus"
style="padding: 10px; border: 1px solid #666;height: 200px"
/>
-
-
-
-
+
+
+
-
+ >
+
-
-
+
+
+ 同时存在 v-model 和 value
+
+
+
+
-
-
-
-
+}
+
+.main .list-item {
+ width: 100%;
+ height: 100px;
+ border: 1px solid #666;
+}
+