Skip to content

Commit babf94f

Browse files
authored
UI: Autoscroll to Error Field (apache#5200)
Fixes apache#4798
1 parent dd458fe commit babf94f

87 files changed

Lines changed: 144 additions & 99 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ui/src/components/view/ResourceLimitTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export default {
119119
120120
if (this.formLoading) return
121121
122-
this.form.validateFields((err, values) => {
122+
this.form.validateFieldsAndScroll((err, values) => {
123123
if (err) {
124124
return
125125
}

ui/src/components/view/SearchView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ export default {
512512
handleSubmit (e) {
513513
e.preventDefault()
514514
this.paramsFilter = {}
515-
this.form.validateFields((err, values) => {
515+
this.form.validateFieldsAndScroll((err, values) => {
516516
if (err) {
517517
return
518518
}

ui/src/views/AutogenView.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ export default {
12011201
this.modalInfo.title = this.currentAction.label
12021202
this.modalInfo.docHelp = this.currentAction.docHelp
12031203
}
1204-
this.form.validateFields((err, values) => {
1204+
this.form.validateFieldsAndScroll((err, values) => {
12051205
if (!err) {
12061206
this.actionLoading = true
12071207
const itemsNameMap = {}
@@ -1295,7 +1295,7 @@ export default {
12951295
},
12961296
execSubmit (e) {
12971297
e.preventDefault()
1298-
this.form.validateFields((err, values) => {
1298+
this.form.validateFieldsAndScroll((err, values) => {
12991299
if (err) {
13001300
return
13011301
}
@@ -1528,7 +1528,7 @@ export default {
15281528
if (!confirmPasswordVal || confirmPasswordVal.length === 0) {
15291529
callback()
15301530
} else if (value && this.confirmDirty) {
1531-
form.validateFields(['confirmpassword'], { force: true })
1531+
form.validateFieldsAndScroll(['confirmpassword'], { force: true })
15321532
callback()
15331533
} else {
15341534
callback()

ui/src/views/auth/Login.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export default {
229229
handleSubmit (e) {
230230
e.preventDefault()
231231
const {
232-
form: { validateFields },
232+
form: { validateFieldsAndScroll },
233233
state,
234234
customActiveKey,
235235
Login
@@ -238,9 +238,9 @@ export default {
238238
239239
state.loginBtn = true
240240
241-
const validateFieldsKey = customActiveKey === 'cs' ? ['username', 'password', 'domain'] : ['idp']
241+
const validateFieldsAndScrollKey = customActiveKey === 'cs' ? ['username', 'password', 'domain'] : ['idp']
242242
243-
validateFields(validateFieldsKey, { force: true }, (err, values) => {
243+
validateFieldsAndScroll(validateFieldsAndScrollKey, { force: true }, (err, values) => {
244244
if (!err) {
245245
if (this.$config.multipleServer) {
246246
this.axios.defaults.baseURL = (this.server.apiHost || '') + this.server.apiBase

ui/src/views/compute/AttachIso.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export default {
117117
handleSubmit (e) {
118118
e.preventDefault()
119119
if (this.loading) return
120-
this.form.validateFields((err, values) => {
120+
this.form.validateFieldsAndScroll((err, values) => {
121121
if (err) {
122122
return
123123
}

ui/src/views/compute/CreateKubernetesCluster.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,12 @@ export default {
432432
handleSubmit (e) {
433433
e.preventDefault()
434434
if (this.loading) return
435-
this.form.validateFields((err, values) => {
435+
const options = {
436+
scroll: {
437+
offsetTop: 10
438+
}
439+
}
440+
this.form.validateFieldsAndScroll(options, (err, values) => {
436441
if (err) {
437442
return
438443
}

ui/src/views/compute/CreateSSHKeyPair.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export default {
146146
handleSubmit (e) {
147147
e.preventDefault()
148148
if (this.loading) return
149-
this.form.validateFields((err, values) => {
149+
this.form.validateFieldsAndScroll((err, values) => {
150150
if (err) {
151151
return
152152
}

ui/src/views/compute/CreateSnapshotWizard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default {
112112
e.preventDefault()
113113
114114
if (this.loading) return
115-
this.form.validateFields((err, values) => {
115+
this.form.validateFieldsAndScroll((err, values) => {
116116
if (err) return
117117
118118
const params = {}

ui/src/views/compute/DeployVM.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,9 +1475,14 @@ export default {
14751475
},
14761476
handleSubmit (e) {
14771477
console.log('wizard submit')
1478+
const options = {
1479+
scroll: {
1480+
offsetTop: 90
1481+
}
1482+
}
14781483
e.preventDefault()
14791484
if (this.loading.deploy) return
1480-
this.form.validateFields(async (err, values) => {
1485+
this.form.validateFieldsAndScroll(options, async (err, values) => {
14811486
if (err) {
14821487
if (err.licensesaccepted) {
14831488
this.$notification.error({

ui/src/views/compute/DestroyVM.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export default {
104104
handleSubmit (e) {
105105
e.preventDefault()
106106
if (this.loading) return
107-
this.form.validateFields((err, values) => {
107+
this.form.validateFieldsAndScroll((err, values) => {
108108
if (err) {
109109
return
110110
}

0 commit comments

Comments
 (0)