diff --git a/Routes.js b/Routes.js index 869b1f9d3..328c3145a 100644 --- a/Routes.js +++ b/Routes.js @@ -56,4 +56,4 @@ export const deepRoutes = [ ] // 不进行组织或个人判断 -export const specialRoute = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "undefined", "admins", "oauth", "competitions"] \ No newline at end of file +export const specialRoute = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "undefined", "admins", "oauth", "competitions", "hiagent"] \ No newline at end of file diff --git a/src/App.js b/src/App.js index 66bc88fa9..7e05ec87f 100644 --- a/src/App.js +++ b/src/App.js @@ -159,6 +159,11 @@ const Topic = Loadable({ loading: Loading, }) +const Iframe = Loadable({ + loader: () => import("./forge/iframe"), + loading: Loading, +}); + // 此处仅维护前端可能的一级路由,不用进行项目或者组织判断的字段。 const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone"]; @@ -338,6 +343,12 @@ class App extends Component { {!pathName || (pathName && pathName.toLowerCase() !== 'glcc') ? : } {/* */} + {/* iframe页面 */} + ( +} + +export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Iframe)))); \ No newline at end of file diff --git a/src/index.css b/src/index.css index a5d90bc3d..452f0f91b 100644 --- a/src/index.css +++ b/src/index.css @@ -246,6 +246,11 @@ i.color-orange05:hover { border-radius: 6px; background-color: #ffebe9; padding: 10px 8px; - font-size: 12px; + font-size: 12px; margin-bottom: 5px; +} + +.test-iframe { + margin-top: -48px; + vertical-align:bottom; } \ No newline at end of file