diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js index 591eb1e..3680f97 100644 --- a/src/utils/formBuilder.js +++ b/src/utils/formBuilder.js @@ -1005,12 +1005,13 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab click: (_) => { this.vanCalendarOption.forFormName = info.name; this.vanCalendarOption.originalObj = row; - this.$set(this.vanCalendarOption, "isShow", true); + this.vanCalendarOption.isShow = true; }, }, }); break; case "datetime": + console.log(3345, this.rules[info.name]) formItem = h("van-field", { props: { readonly: true, @@ -1027,7 +1028,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab click: (_) => { this.vanTimePickerOption.forFormName = info.name; this.vanTimePickerOption.originalObj = row; - this.$set(this.vanTimePickerOption, "isShow", true); + this.vanTimePickerOption.isShow = true }, }, }); @@ -1054,7 +1055,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab this.vanPopupOption.forFormName = info.name; this.vanPopupOption.originalObj = row; this.$set(this.vanPopupOption, "columns", options); - this.$set(this.vanPopupOption, "isShow", true); + this.vanPopupOption.isShow = true; }, }, }); @@ -1090,7 +1091,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab value: 'id' }); this.$set(this.multipleSelectOption, "multipleLimit", info.multiple); - this.$set(this.multipleSelectOption, "isShow", true); + this.multipleSelectOption.isShow = true; }, }, }); @@ -1256,7 +1257,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab value: 'id' }); this.$set(this.multipleSelectOption, "multipleLimit", info.multiple); - this.$set(this.multipleSelectOption, "isShow", true); + this.multipleSelectOption.isShow = true }, }, }); diff --git a/src/utils/request.js b/src/utils/request.js index bd4cde6..244c0a1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -41,6 +41,7 @@ service.interceptors.request.use( // do something with request error console.log(error) // for debug Vue.prototype.$nextTick().then(r => loadingInstance?.close()) + parent?._addError(error, 'axios-request', error.config.params||error.config.data) return Promise.reject(error) } ) @@ -85,8 +86,12 @@ service.interceptors.response.use( store.dispatch('user/resetToken').then(() => { location.reload() }) + if (window._IN_IFRAME) { + parent?._logout() + } }) } + parent?._addError(res.msg, `axios-response ${response.config.url}`, response.config.params || response.config.data) return Promise.reject(new Error(res.msg || 'Error')) } else { return res.data @@ -100,6 +105,7 @@ service.interceptors.response.use( type: 'error', duration: 5 * 1000 }) + parent?._addError(error.toString(), `axios-request ${error.config.url}`, error.config.params || error.config.data) return Promise.reject(error) } ) diff --git a/src/views/flow/MobileForm.vue b/src/views/flow/MobileForm.vue index 8be4227..0f99357 100644 --- a/src/views/flow/MobileForm.vue +++ b/src/views/flow/MobileForm.vue @@ -146,6 +146,7 @@ export default { return h('div',[ h('van-form',{ props: { + 'validate-first': true, 'scroll-to-error': true } },authFields.map(field => formBuilder.bind(this)(this.device, field, h))),