From cc5c81555ea31f3e149bbc82796366619c3b47b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8B=B7=E9=92=89?= <41830859@qq.com>
Date: Fri, 19 Apr 2019 16:13:45 +0800
Subject: [PATCH] hiddenBreadcrumb && menu.disableLocal (#4009)
* menu.disableLocal
* hiddenBreadcrumb
* lint
* lint
---
src/components/Authorized/CheckPermissions.js | 1 +
src/components/Authorized/PromiseRender.js | 1 +
src/components/Authorized/Secured.js | 1 +
src/components/PageHeaderWrapper/breadcrumb.js | 6 +++++-
src/components/PageHeaderWrapper/index.js | 14 +++++++++-----
5 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/components/Authorized/CheckPermissions.js b/src/components/Authorized/CheckPermissions.js
index 4b49d1f8..a1da2618 100644
--- a/src/components/Authorized/CheckPermissions.js
+++ b/src/components/Authorized/CheckPermissions.js
@@ -1,4 +1,5 @@
import React from 'react';
+// eslint-disable-next-line import/no-cycle
import PromiseRender from './PromiseRender';
import { CURRENT } from './renderAuthorize';
diff --git a/src/components/Authorized/PromiseRender.js b/src/components/Authorized/PromiseRender.js
index 58de6593..c03a41d4 100644
--- a/src/components/Authorized/PromiseRender.js
+++ b/src/components/Authorized/PromiseRender.js
@@ -1,6 +1,7 @@
import { Spin } from 'antd';
import isEqual from 'lodash/isEqual';
import React from 'react';
+// eslint-disable-next-line import/no-cycle
import { isComponentClass } from './Secured';
export default class PromiseRender extends React.Component {
diff --git a/src/components/Authorized/Secured.js b/src/components/Authorized/Secured.js
index 25b961f0..bd53b2f5 100644
--- a/src/components/Authorized/Secured.js
+++ b/src/components/Authorized/Secured.js
@@ -1,5 +1,6 @@
import React from 'react';
import Exception from '../Exception';
+// eslint-disable-next-line import/no-cycle
import CheckPermissions from './CheckPermissions';
/**
diff --git a/src/components/PageHeaderWrapper/breadcrumb.js b/src/components/PageHeaderWrapper/breadcrumb.js
index c20eaf63..4264fef3 100644
--- a/src/components/PageHeaderWrapper/breadcrumb.js
+++ b/src/components/PageHeaderWrapper/breadcrumb.js
@@ -3,6 +3,7 @@ import pathToRegexp from 'path-to-regexp';
import Link from 'umi/link';
import { formatMessage } from 'umi-plugin-react/locale';
import { urlToList } from '../_utils/pathTools';
+import { menu } from '../../defaultSettings';
// 渲染Breadcrumb 子节点
// Render the Breadcrumb child node
@@ -21,7 +22,10 @@ const itemRender = (route, params, routes, paths) => {
const renderItemLocal = item => {
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;
};
diff --git a/src/components/PageHeaderWrapper/index.js b/src/components/PageHeaderWrapper/index.js
index a78da3d8..1e5318ff 100644
--- a/src/components/PageHeaderWrapper/index.js
+++ b/src/components/PageHeaderWrapper/index.js
@@ -44,6 +44,7 @@ const PageHeaderWrapper = ({
content,
logo,
extraContent,
+ hiddenBreadcrumb,
...restProps
}) => {
return (
@@ -66,11 +67,14 @@ const PageHeaderWrapper = ({
}
key="pageheader"
{...restProps}
- breadcrumb={conversionBreadcrumbList({
- ...value,
- ...restProps,
- home: ,
- })}
+ breadcrumb={
+ !hiddenBreadcrumb &&
+ conversionBreadcrumbList({
+ ...value,
+ ...restProps,
+ home: ,
+ })
+ }
className={styles.pageHeader}
linkElement={Link}
footer={renderFooter(restProps)}