Commit 687b27ff authored by 邓晓峰's avatar 邓晓峰

fix: iframe load error

parent 5e119413
Pipeline #22293 passed with stages
in 26 minutes 45 seconds
......@@ -189,7 +189,9 @@ class AvatarDropdown extends React.Component {
}
componentDidMount() {
services.getVersion().then(res => {
services.getVersion({
ignoreSite: true
}).then(res => {
if(res.success) {
this.setState({
version: res.message
......
......@@ -59,10 +59,7 @@ const generRotes = (widgets, parent, level = 0) => {
});
} else {
const baseURL = item.product || 'civweb4';
//item.product ? item.product : item.url.replace(/\s/g, '') === '' ? '' : 'civweb5';
let url =
item.hasOwnProperty('url') && !isUrl(url) && baseURL !== ''
? `/${baseURL}/${item.url.replace(/\s*/g, '')}`
let url = item.hasOwnProperty('url') ? `/${baseURL}/${item.url.replace(/\s*/g, '')}`
: !item.hasOwnProperty('url')
? guid('web_console')
: '';
......@@ -71,6 +68,10 @@ const generRotes = (widgets, parent, level = 0) => {
url = getURL(url);
}
if(isUrl(item.url)) {
url = item.url
}
const l = level ? level + 1 : -1;
const common = {
name: item.label,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment