xy 1 year ago
parent 6e0c161835
commit 95762c4157

@ -75,6 +75,10 @@ import { setToken,getToken } from "@/utils/auth"
if(window.top !== window.self) { if(window.top !== window.self) {
// 当前页面在iframe中 // 当前页面在iframe中
window._IN_IFRAME = true; window._IN_IFRAME = true;
Vue.config.errorHandler = (err, vm, info) => {
top?._addError(err.message, err.stack)
console.error(err)
}
} }
if (window.__POWERED_BY_WUJIE__) { if (window.__POWERED_BY_WUJIE__) {
let instance; let instance;

@ -514,7 +514,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
formBuilderMap(device).get(info.type), formBuilderMap(device).get(info.type),
{ {
props: { props: {
value: row ? (row[info.name] ? row[info.name].split(',').map(i => Number(i)) : []) : (this.form[info.name] ? this.form[info.name].split(',').map(i => Number(i)) : []), value: row ? (row[info.name] ? row[info.name].toString()?.split(',').map(i => Number(i)) : []) : (this.form[info.name] ? this.form[info.name].toString()?.split(',').map(i => Number(i)) : []),
clearable: true, clearable: true,
placeholder: info.help_text, placeholder: info.help_text,
multiple: true, multiple: true,

@ -41,7 +41,7 @@ service.interceptors.request.use(
// do something with request error // do something with request error
console.log(error) // for debug console.log(error) // for debug
Vue.prototype.$nextTick().then(r => loadingInstance?.close()) Vue.prototype.$nextTick().then(r => loadingInstance?.close())
parent?._addError(error, 'axios-request', error.config.params||error.config.data) top?._addError(error, 'axios-request', error.config.params||error.config.data)
return Promise.reject(error) return Promise.reject(error)
} }
) )
@ -87,11 +87,13 @@ service.interceptors.response.use(
location.reload() location.reload()
}) })
if (window._IN_IFRAME) { if (window._IN_IFRAME) {
parent?._logout() top?._logout()
} }
}) })
} }
parent?._addError(res.msg, `axios-response ${response.config.url}`, response.config.params || response.config.data) if (top) {
top._addError(res.msg, `axios-response ${response.config?.url}`, response.config?.params || response.config?.data)
}
return Promise.reject(new Error(res.msg || 'Error')) return Promise.reject(new Error(res.msg || 'Error'))
} else { } else {
return res.data return res.data
@ -105,7 +107,9 @@ service.interceptors.response.use(
type: 'error', type: 'error',
duration: 5 * 1000 duration: 5 * 1000
}) })
parent?._addError(error.toString(), `axios-request ${error.config.url}`, error.config.params || error.config.data) if (top) {
top._addError(error.toString(), `axios-request ${error.config.url}`, error.config.params || error.config.data)
}
return Promise.reject(error) return Promise.reject(error)
} }
) )

Loading…
Cancel
Save