Browse Source

hiddenBreadcrumb && menu.disableLocal (#4009)

* menu.disableLocal

* hiddenBreadcrumb

* lint

* lint
pull/4038/head
拷钉 7 years ago
committed by 陈帅
parent
commit
cc5c81555e
  1. 1
      src/components/Authorized/CheckPermissions.js
  2. 1
      src/components/Authorized/PromiseRender.js
  3. 1
      src/components/Authorized/Secured.js
  4. 6
      src/components/PageHeaderWrapper/breadcrumb.js
  5. 14
      src/components/PageHeaderWrapper/index.js

1
src/components/Authorized/CheckPermissions.js

@ -1,4 +1,5 @@
import React from 'react'; import React from 'react';
// eslint-disable-next-line import/no-cycle
import PromiseRender from './PromiseRender'; import PromiseRender from './PromiseRender';
import { CURRENT } from './renderAuthorize'; import { CURRENT } from './renderAuthorize';

1
src/components/Authorized/PromiseRender.js

@ -1,6 +1,7 @@
import { Spin } from 'antd'; import { Spin } from 'antd';
import isEqual from 'lodash/isEqual'; import isEqual from 'lodash/isEqual';
import React from 'react'; import React from 'react';
// eslint-disable-next-line import/no-cycle
import { isComponentClass } from './Secured'; import { isComponentClass } from './Secured';
export default class PromiseRender extends React.Component { export default class PromiseRender extends React.Component {

1
src/components/Authorized/Secured.js

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import Exception from '../Exception'; import Exception from '../Exception';
// eslint-disable-next-line import/no-cycle
import CheckPermissions from './CheckPermissions'; import CheckPermissions from './CheckPermissions';
/** /**

6
src/components/PageHeaderWrapper/breadcrumb.js

@ -3,6 +3,7 @@ import pathToRegexp from 'path-to-regexp';
import Link from 'umi/link'; import Link from 'umi/link';
import { formatMessage } from 'umi-plugin-react/locale'; import { formatMessage } from 'umi-plugin-react/locale';
import { urlToList } from '../_utils/pathTools'; import { urlToList } from '../_utils/pathTools';
import { menu } from '../../defaultSettings';
// 渲染Breadcrumb 子节点 // 渲染Breadcrumb 子节点
// Render the Breadcrumb child node // Render the Breadcrumb child node
@ -21,7 +22,10 @@ const itemRender = (route, params, routes, paths) => {
const renderItemLocal = item => { const renderItemLocal = item => {
if (item.locale) { if (item.locale) {
return formatMessage({ id: item.locale, defaultMessage: item.name }); const name = menu.disableLocal
? item.name
: formatMessage({ id: item.locale, defaultMessage: item.name });
return name;
} }
return item.name; return item.name;
}; };

14
src/components/PageHeaderWrapper/index.js

@ -44,6 +44,7 @@ const PageHeaderWrapper = ({
content, content,
logo, logo,
extraContent, extraContent,
hiddenBreadcrumb,
...restProps ...restProps
}) => { }) => {
return ( return (
@ -66,11 +67,14 @@ const PageHeaderWrapper = ({
} }
key="pageheader" key="pageheader"
{...restProps} {...restProps}
breadcrumb={conversionBreadcrumbList({ breadcrumb={
...value, !hiddenBreadcrumb &&
...restProps, conversionBreadcrumbList({
home: <FormattedMessage id="menu.home" defaultMessage="Home" />, ...value,
})} ...restProps,
home: <FormattedMessage id="menu.home" defaultMessage="Home" />,
})
}
className={styles.pageHeader} className={styles.pageHeader}
linkElement={Link} linkElement={Link}
footer={renderFooter(restProps)} footer={renderFooter(restProps)}

Loading…
Cancel
Save