diff --git a/web/client/src/layout/components/header/index.jsx b/web/client/src/layout/components/header/index.jsx
index 49cf5b8..6c1014a 100644
--- a/web/client/src/layout/components/header/index.jsx
+++ b/web/client/src/layout/components/header/index.jsx
@@ -5,121 +5,133 @@ import { Nav, Avatar, Dropdown } from "@douyinfe/semi-ui";
import "./index.less";
const Header = (props) => {
- const { dispatch, history, user, actions, socket, headerItems, tochange } = props;
+ const { dispatch, history, user, actions, socket, headerItems, tochange } = props;
- return (
- <>
-
-
+ }
+ >
+
+
+
+ {user?.name?.substr(0, 1)}
+
+
+ {user.name}
+
v.name + '、')} style={{ width: 100, overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}>{user?.department?.map(v => v.name + '、')}
+
+
+
用户中心
+
安全认证
+
+
- {/* collapseButton collapseText */}
+ {/* collapseButton collapseText */}
-
- >
- }
- />
-
- >
- );
+
+ >
+ }
+ />
+
+ >
+ );
};
function mapStateToProps (state) {
- const { global, auth, webSocket } = state;
- return {
- actions: global.actions,
- user: auth.user,
- socket: webSocket.socket,
- };
+ const { global, auth, webSocket } = state;
+ return {
+ actions: global.actions,
+ user: auth.user,
+ socket: webSocket.socket,
+ };
}
export default connect(mapStateToProps)(Header);
diff --git a/web/client/src/sections/install/components/adminModal.jsx b/web/client/src/sections/install/components/adminModal.jsx
index 6a03bf5..4417bac 100644
--- a/web/client/src/sections/install/components/adminModal.jsx
+++ b/web/client/src/sections/install/components/adminModal.jsx
@@ -7,6 +7,7 @@ import { IconAlertCircle } from '@douyinfe/semi-icons';
function adminModal (props) {
const {
close,
+ cancel,
visible,
dispatch,
pepList,
@@ -60,7 +61,7 @@ function adminModal (props) {
})
}
function handleCancel () {
- close();
+ cancel();
//点击弹框取消 左边按钮
}
return (
diff --git a/web/client/src/sections/install/components/memberModal.jsx b/web/client/src/sections/install/components/memberModal.jsx
index c92acc2..0ddef9d 100644
--- a/web/client/src/sections/install/components/memberModal.jsx
+++ b/web/client/src/sections/install/components/memberModal.jsx
@@ -7,6 +7,7 @@ import { IconAlertCircle } from '@douyinfe/semi-icons';
function memberModal (props) {
const {
close,
+ cancel,
visible,
dispatch,
pepList,
@@ -82,7 +83,7 @@ function memberModal (props) {
})
}
function handleCancel () {
- close();
+ cancel();
//点击弹框取消 左边按钮
}
return (
diff --git a/web/client/src/sections/install/components/systemModal.jsx b/web/client/src/sections/install/components/systemModal.jsx
index 8065542..2ace1de 100644
--- a/web/client/src/sections/install/components/systemModal.jsx
+++ b/web/client/src/sections/install/components/systemModal.jsx
@@ -7,6 +7,7 @@ import { IconAlertCircle, IconAlertTriangle } from '@douyinfe/semi-icons';
function adminModal (props) {
const {
close,
+ cancel,
visible,
dispatch,
actions,
@@ -67,7 +68,7 @@ function adminModal (props) {
})
}
function handleCancel () {
- close();
+ cancel();
//点击弹框取消 左边按钮
}
const renderMultipleWithCustomTag = (optionNode, { onClose }) => {
diff --git a/web/client/src/sections/install/containers/roles.jsx b/web/client/src/sections/install/containers/roles.jsx
index 3df529d..96d399e 100644
--- a/web/client/src/sections/install/containers/roles.jsx
+++ b/web/client/src/sections/install/containers/roles.jsx
@@ -593,6 +593,9 @@ const Roles = (props) => {
pepList={pepList}
adminEdit={adminEdit}
editObj={editObj}
+ cancel={() => {
+ setAdminModal(false);
+ }}
close={() => {
setAdminModal(false);
getUserList()
@@ -609,6 +612,9 @@ const Roles = (props) => {
pomsList={pomsList}
anxinDelete={anxinDelete}
anxincloudArr={anxincloudArr}
+ cancel={() => {
+ setMemberModal(false);
+ }}
close={() => {
setMemberModal(false);
getUserList()
diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx
index 64a16a4..f41ad51 100644
--- a/web/client/src/sections/install/containers/system.jsx
+++ b/web/client/src/sections/install/containers/system.jsx
@@ -420,6 +420,9 @@ const Example = (props) => {
anxinDelete={anxinDelete}
appArr={appArr}
bindId={bindId}
+ cancel={() => {
+ setSystemModal(false);
+ }}
close={() => {
setSystemModal(false);
getProjectPomsList()