Commit c57d778f authored by 邓晓峰's avatar 邓晓峰

fix: locales LocaleContainer

parent 3f5979a2
Pipeline #47276 skipped with stages
...@@ -12,7 +12,7 @@ import { ...@@ -12,7 +12,7 @@ import {
findPathByWidget, findPathByWidget,
isJSON, isJSON,
} from '@wisdom-utils/components/lib/AppLayout/helpers'; } from '@wisdom-utils/components/lib/AppLayout/helpers';
import { FormattedMessage } from '@/locales/localeExports'; import { FormattedMessage } from '@wisdom-utils/components';
import service from '../../api/service/notification'; import service from '../../api/service/notification';
import { actionCreators } from '../../containers/App/store'; import { actionCreators } from '../../containers/App/store';
import isProd from '../../utils/env'; import isProd from '../../utils/env';
......
...@@ -653,11 +653,11 @@ const BasicLayout = props => { ...@@ -653,11 +653,11 @@ const BasicLayout = props => {
onChange={index => handleUpdateCurrentIndex(index)} onChange={index => handleUpdateCurrentIndex(index)}
data={props.route.routes || []} data={props.route.routes || []}
/> />
<SettingDrawer {/* <SettingDrawer
settings={defaultSetting} settings={defaultSetting}
onSettingChange={config => updateSettings(config)} onSettingChange={config => updateSettings(config)}
publicPath={`${window.location.origin}/${basename}/theme`} publicPath={`${window.location.origin}/${basename}/theme`}
/> /> */}
<div className={classNames(layoutStyles['basicLayout-content'], { <div className={classNames(layoutStyles['basicLayout-content'], {
[layoutStyles['hook_web4']]: location.pathname.startsWith('/civbase/civweb4') [layoutStyles['hook_web4']]: location.pathname.startsWith('/civbase/civweb4')
})}> })}>
...@@ -718,7 +718,7 @@ const BasicLayout = props => { ...@@ -718,7 +718,7 @@ const BasicLayout = props => {
</div> </div>
<PageContainer style={{paddingTop: '0px', height: '100%'}}> <PageContainer style={{paddingTop: '0px', height: '100%'}}>
{ {
renderRoutes(props.route.routes, this.props.global) renderRoutes(props.route.routes, props)
} }
{ {
...@@ -742,7 +742,7 @@ const BasicLayout = props => { ...@@ -742,7 +742,7 @@ const BasicLayout = props => {
): ( ): (
<PageContainer style={{paddingTop: '0px', height: '100%'}}> <PageContainer style={{paddingTop: '0px', height: '100%'}}>
{ {
renderRoutes(props.route.routes, this.props.global) renderRoutes(props.route.routes, props)
} }
{ {
......
...@@ -13,6 +13,7 @@ const UserLayout = props => { ...@@ -13,6 +13,7 @@ const UserLayout = props => {
routes: [], routes: [],
}, },
} = props; } = props;
console.log(props)
const { breadcrumb } = getMenuData(route.routes); const { breadcrumb } = getMenuData(route.routes);
const title = getPageTitle({ const title = getPageTitle({
breadcrumb, breadcrumb,
...@@ -34,7 +35,8 @@ const UserLayout = props => { ...@@ -34,7 +35,8 @@ const UserLayout = props => {
<div className={styles.container}> <div className={styles.container}>
<div className={styles.content}> <div className={styles.content}>
{renderRoutes(route.routes, props.global)} {renderRoutes(route.routes, props
)}
{props.children} {props.children}
</div> </div>
{/* <DefaultFooter links={[]} copyright="Copyright © 熊猫智慧水务 2020 All Rights Reserved 沪ICP备11036640-1"/> */} {/* <DefaultFooter links={[]} copyright="Copyright © 熊猫智慧水务 2020 All Rights Reserved 沪ICP备11036640-1"/> */}
......
...@@ -180,7 +180,7 @@ const BootPage = props => { ...@@ -180,7 +180,7 @@ const BootPage = props => {
</div> </div>
{hasRole ? ( {hasRole ? (
<div className={styles.cloudMonitorBtns}> <div className={styles.cloudMonitorBtns}>
<div class="cloud-using-anaylysis-btn" onClick={toOMSUsingAnalysis}> <div className="cloud-using-anaylysis-btn" onClick={toOMSUsingAnalysis}>
<img src={usingIcon} alt="" title="点击查看平台使用监控" /> <img src={usingIcon} alt="" title="点击查看平台使用监控" />
<span>平台使用分析</span> <span>平台使用分析</span>
</div> </div>
......
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