提交 4b10b7bf 编写于 作者: shutao-dc's avatar shutao-dc

Merge branch 'dev' of https://gitcode.net/dcloud/hello-uni-app-x into dev

...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
this.univerifyManager = uni.getUniverifyManager(); this.univerifyManager = uni.getUniverifyManager();
// 预登录 // 预登录
this.univerifyManager?.preLogin({ this.univerifyManager?.preLogin({
success() { success: () => {
console.log("pre login success"); console.log("pre login success");
}, },
fail(err : PreLoginFail) { fail: (err : PreLoginFail) => {
console.error("pre login fail => " + JSON.stringify(err)); console.error("pre login fail => " + JSON.stringify(err));
uni.showModal({ uni.showModal({
title: '预登录失败', title: '预登录失败',
......
...@@ -139,6 +139,14 @@ describe('component-native-input', () => { ...@@ -139,6 +139,14 @@ describe('component-native-input', () => {
// await page.waitFor(500) // await page.waitFor(500)
// }) // })
it("cursor-color", async () => {
await page.setData({
cursor_color: "transparent",
})
await page.waitFor(500)
expect(await (await page.$('.uni-input-cursor-color')).property("cursor-color")).toBe("transparent")
})
it("afterAllTestScreenshot", async () => { it("afterAllTestScreenshot", async () => {
const image = await program.screenshot({ const image = await program.screenshot({
fullPage: true fullPage: true
......
...@@ -136,6 +136,15 @@ ...@@ -136,6 +136,15 @@
</view> </view>
</view> </view>
<view>
<view class="uni-title" @click="changeCursorColor">
<text class="uni-title-text">设置光标颜色为透明(点击生效,再点复位)</text>
</view>
<view class="uni-input-wrapper">
<input class="uni-input uni-input-cursor-color" :cursor-color="cursor_color" value="光标颜色" />
</view>
</view>
<view> <view>
<view class="uni-title"> <view class="uni-title">
<text class="uni-title-text">键盘弹起时,自动上推页面</text> <text class="uni-title-text">键盘弹起时,自动上推页面</text>
...@@ -219,6 +228,7 @@ ...@@ -219,6 +228,7 @@
inputClearValue: '', inputClearValue: '',
showPassword: true, showPassword: true,
cursor: -1, cursor: -1,
cursor_color: "#3393E2",
selectionStart: -1, selectionStart: -1,
selectionEnd: -1, selectionEnd: -1,
inputEventDetail: '', inputEventDetail: '',
...@@ -290,6 +300,13 @@ ...@@ -290,6 +300,13 @@
}, },
test_check_input_value():number { test_check_input_value():number {
return this.onMaxLengthInputValue.length return this.onMaxLengthInputValue.length
},
changeCursorColor(){
if(this.cursor_color == "#3393E2"){
this.cursor_color = "transparent"
}else{
this.cursor_color = "#3393E2"
}
} }
} }
} }
......
...@@ -61,6 +61,13 @@ describe('component-native-textarea', () => { ...@@ -61,6 +61,13 @@ describe('component-native-textarea', () => {
} = await textarea.size() } = await textarea.size()
expect(height).toBeLessThanOrEqual(150) expect(height).toBeLessThanOrEqual(150)
}) */ }) */
it("cursor-color", async () => {
await page.setData({
cursor_color: "transparent",
})
await page.waitFor(500)
expect(await textarea.property("cursor-color")).toBe("transparent")
})
it("inputmode", async () => { it("inputmode", async () => {
const inputmodeEnum = await page.data("inputmode_enum") const inputmodeEnum = await page.data("inputmode_enum")
......
...@@ -13,6 +13,7 @@ export default { ...@@ -13,6 +13,7 @@ export default {
default_value:"", default_value:"",
maxlength:-1, maxlength:-1,
inputmode_enum: [{"value":0,"name":"none"},{"value":1,"name":"text"},{"value":2,"name":"decimal"},{"value":3,"name":"numeric"},{"value":4,"name":"tel"},{"value":5,"name":"search"},{"value":6,"name":"email"},{"value":7,"name":"url"}] as ItemType[], inputmode_enum: [{"value":0,"name":"none"},{"value":1,"name":"text"},{"value":2,"name":"decimal"},{"value":3,"name":"numeric"},{"value":4,"name":"tel"},{"value":5,"name":"search"},{"value":6,"name":"email"},{"value":7,"name":"url"}] as ItemType[],
cursor_color: "#3393E2",
inputmode_enum_current: 0 inputmode_enum_current: 0
} }
}, },
...@@ -38,6 +39,7 @@ export default { ...@@ -38,6 +39,7 @@ export default {
change_confirm_hold_boolean(checked : boolean) { this.confirm_hold_boolean = checked }, change_confirm_hold_boolean(checked : boolean) { this.confirm_hold_boolean = checked },
change_focus_boolean(checked : boolean) { this.focus_boolean = checked }, change_focus_boolean(checked : boolean) { this.focus_boolean = checked },
change_auto_focus_boolean(checked : boolean) { this.auto_focus_boolean = checked }, change_auto_focus_boolean(checked : boolean) { this.auto_focus_boolean = checked },
change_cursor_color_boolean(checked : boolean) { if(checked){ this.cursor_color = "transparent"} else {this.cursor_color = "#3393E2"}},
radio_change_inputmode_enum(checked : number) { this.inputmode_enum_current = checked } radio_change_inputmode_enum(checked : number) { this.inputmode_enum_current = checked }
} }
} }
...@@ -55,6 +57,7 @@ export default { ...@@ -55,6 +57,7 @@ export default {
:fixed="fixed_boolean" :fixed="fixed_boolean"
:show-confirm-bar="show_confirm_bar_boolean" :show-confirm-bar="show_confirm_bar_boolean"
:adjust-position="adjust_position_boolean" :adjust-position="adjust_position_boolean"
:cursor-color="cursor_color"
:inputmode="inputmode_enum[inputmode_enum_current].name" :inputmode="inputmode_enum[inputmode_enum_current].name"
:maxlength="maxlength" :maxlength="maxlength"
@click="textarea_click" @click="textarea_click"
...@@ -115,6 +118,11 @@ export default { ...@@ -115,6 +118,11 @@ export default {
title="自动获取焦点" title="自动获取焦点"
@change="change_auto_focus_boolean" @change="change_auto_focus_boolean"
></boolean-data> ></boolean-data>
<boolean-data
:defaultValue="false"
title="改变光标颜色为透明"
@change="change_cursor_color_boolean"
></boolean-data>
<enum-data <enum-data
:items="inputmode_enum" :items="inputmode_enum"
title="是一个枚举属性,它提供了用户在编辑元素或其内容时可能输入的数据类型的提示。在符合条件的高版本webview里,uni-app的 web 和 app-vue 平台中可使用本属性。" title="是一个枚举属性,它提供了用户在编辑元素或其内容时可能输入的数据类型的提示。在符合条件的高版本webview里,uni-app的 web 和 app-vue 平台中可使用本属性。"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册