+
+ );
+ }
+}
+
+export default PermissionsManagement;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.scss b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.scss
new file mode 100644
index 000000000..03175a7be
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.scss
@@ -0,0 +1,12 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/index.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/index.js
new file mode 100644
index 000000000..cfd9f7839
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/index.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import PermissionsManagement from './PermissionsManagement';
+
+export default PermissionsManagement;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/README.md b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/README.md
new file mode 100644
index 000000000..ba2cd2c97
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/README.md
@@ -0,0 +1,7 @@
+# 权限控制
+
+> AuthorityControl
+
+1. UserManagement => 用户管理
+2. RolesManagement => 角色管理
+3. PermissionsManagement => 权限管理
\ No newline at end of file
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/NewRole.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/NewRole.js
new file mode 100644
index 000000000..c650a28bb
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/NewRole.js
@@ -0,0 +1,96 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+ Button,
+ Field,
+ Form,
+ Input,
+ Dialog,
+ Pagination,
+ Table,
+ ConfigProvider,
+ // Field,
+} from '@alifd/next';
+
+const FormItem = Form.Item;
+
+const formItemLayout = {
+ labelCol: { fixedSpan: 3 },
+ wrapperCol: { span: 20 },
+};
+
+@ConfigProvider.config
+class NewRole extends React.Component {
+ static displayName = 'NewRole';
+
+ field = new Field(this);
+
+ static propTypes = {
+ locale: PropTypes.object,
+ visible: PropTypes.bool,
+ };
+
+ check() {
+ const errors = {
+ role: '角色不能为空!',
+ username: '用户名不能为空!',
+ };
+ const vals = ['role', 'username'].map(key => {
+ const val = this.field.getValue(key);
+ if (!val) {
+ this.field.setError(key, errors[key]);
+ }
+ return val;
+ });
+ if (vals.filter(v => v).length === 2) {
+ return vals;
+ }
+ return null;
+ }
+
+ render() {
+ const { getError } = this.field;
+ const { visible, onOk, onCancel } = this.props;
+ return (
+ <>
+
+
+ );
+ }
+}
+
+export default NewRole;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js
new file mode 100644
index 000000000..ab0e3220f
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js
@@ -0,0 +1,138 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button, Field, Form, Input, Dialog, Pagination, Table, ConfigProvider } from '@alifd/next';
+import { connect } from 'react-redux';
+import { getRoles, createRole, deleteRole } from '../../../reducers/authority';
+import RegionGroup from '../../../components/RegionGroup';
+import NewRole from './NewRole';
+
+import './RolesManagement.scss';
+
+const FormItem = Form.Item;
+
+const formItemLayout = {
+ labelCol: { fixedSpan: 3 },
+ wrapperCol: { span: 20 },
+};
+
+@connect(state => ({ roles: state.authority.roles }), { getRoles })
+@ConfigProvider.config
+class RolesManagement extends React.Component {
+ static displayName = 'RolesManagement';
+
+ static propTypes = {
+ locale: PropTypes.object,
+ roles: PropTypes.object,
+ getRoles: PropTypes.func,
+ };
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: true,
+ pageNo: 1,
+ pageSize: 9,
+ };
+ }
+
+ componentDidMount() {
+ this.getRoles();
+ }
+
+ getRoles() {
+ const { pageNo, pageSize } = this.state;
+ this.props
+ .getRoles({ pageNo, pageSize })
+ .then(() => {
+ if (this.state.loading) {
+ this.setState({ loading: false });
+ }
+ })
+ .catch(() => this.setState({ loading: false }));
+ }
+
+ colseCreateRole() {
+ this.setState({ createRoleVisible: false });
+ }
+
+ render() {
+ const { roles } = this.props;
+ const { loading, pageSize, pageNo, createRoleVisible, passwordResetUser } = this.state;
+ return (
+ <>
+
+
+
+
+
+
+
+ (
+ <>
+
+
+ )}
+ />
+
+ {roles.totalCount > pageSize && (
+ this.setState({ pageNo }, () => this.getRoles())}
+ />
+ )}
+
+ createRole(role).then(res => {
+ this.getRoles();
+ return res;
+ })
+ }
+ onCancel={() => this.colseCreateRole()}
+ />
+
+ );
+ }
+}
+
+export default RolesManagement;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.scss b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.scss
new file mode 100644
index 000000000..03175a7be
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.scss
@@ -0,0 +1,12 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/index.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/index.js
new file mode 100644
index 000000000..6eaec98b8
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/index.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import RolesManagement from './RolesManagement';
+
+export default RolesManagement;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/NewUser.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/NewUser.js
new file mode 100644
index 000000000..891f2449b
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/NewUser.js
@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+ Button,
+ Field,
+ Form,
+ Input,
+ Dialog,
+ Pagination,
+ Table,
+ ConfigProvider,
+ // Field,
+} from '@alifd/next';
+import './UserManagement.scss';
+
+const FormItem = Form.Item;
+
+const formItemLayout = {
+ labelCol: { fixedSpan: 3 },
+ wrapperCol: { span: 20 },
+};
+
+@ConfigProvider.config
+class NewUser extends React.Component {
+ static displayName = 'NewUser';
+
+ field = new Field(this);
+
+ static propTypes = {
+ locale: PropTypes.object,
+ visible: PropTypes.bool,
+ };
+
+ check() {
+ const errors = {
+ username: '用户名不能为空!',
+ password: '密码不能为空!',
+ };
+ const vals = ['username', 'password'].map(key => {
+ const val = this.field.getValue(key);
+ if (!val) {
+ this.field.setError(key, errors[key]);
+ }
+ return val;
+ });
+ if (vals.filter(v => v).length === 2) {
+ return vals;
+ }
+ return null;
+ }
+
+ render() {
+ const { getError } = this.field;
+ const { visible, onOk, onCancel } = this.props;
+ return (
+ <>
+
+
+ );
+ }
+}
+
+export default NewUser;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/PasswordReset.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/PasswordReset.js
new file mode 100644
index 000000000..63eb3df51
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/PasswordReset.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+ Button,
+ Field,
+ Form,
+ Input,
+ Dialog,
+ Pagination,
+ Table,
+ ConfigProvider,
+ // Field,
+} from '@alifd/next';
+import './UserManagement.scss';
+
+const FormItem = Form.Item;
+
+const formItemLayout = {
+ labelCol: { fixedSpan: 3 },
+ wrapperCol: { span: 20 },
+};
+
+@ConfigProvider.config
+class PasswordReset extends React.Component {
+ static displayName = 'PasswordReset';
+
+ field = new Field(this);
+
+ static propTypes = {
+ locale: PropTypes.object,
+ visible: PropTypes.bool,
+ };
+
+ check() {
+ const errors = { password: '密码不能为空!' };
+ const vals = ['password'].map(key => {
+ const val = this.field.getValue(key);
+ if (!val) {
+ this.field.setError(key, errors[key]);
+ }
+ return val;
+ });
+ if (vals.filter(v => v).length === 1) {
+ return [this.props.username, ...vals];
+ }
+ return null;
+ }
+
+ render() {
+ const { getError } = this.field;
+ const { username, onOk, onCancel } = this.props;
+ return (
+ <>
+
+
+ );
+ }
+}
+
+export default PasswordReset;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.js
new file mode 100644
index 000000000..d73eb7601
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.js
@@ -0,0 +1,161 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button, Field, Form, Input, Dialog, Pagination, Table, ConfigProvider } from '@alifd/next';
+import { connect } from 'react-redux';
+import { getUsers, createUser, deleteUser, passwordReset } from '../../../reducers/authority';
+import RegionGroup from '../../../components/RegionGroup';
+import NewUser from './NewUser';
+import PasswordReset from './PasswordReset';
+
+import './UserManagement.scss';
+
+const FormItem = Form.Item;
+
+const formItemLayout = {
+ labelCol: { fixedSpan: 3 },
+ wrapperCol: { span: 20 },
+};
+
+@connect(state => ({ users: state.authority.users }), { getUsers })
+@ConfigProvider.config
+class UserManagement extends React.Component {
+ static displayName = 'UserManagement';
+
+ static propTypes = {
+ locale: PropTypes.object,
+ users: PropTypes.object,
+ getUsers: PropTypes.func,
+ createUser: PropTypes.func,
+ };
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: true,
+ pageNo: 1,
+ pageSize: 9,
+ };
+ }
+
+ componentDidMount() {
+ this.getUsers();
+ }
+
+ getUsers() {
+ const { pageNo, pageSize } = this.state;
+ this.props
+ .getUsers({ pageNo, pageSize })
+ .then(() => {
+ if (this.state.loading) {
+ this.setState({ loading: false });
+ }
+ })
+ .catch(() => this.setState({ loading: false }));
+ }
+
+ colseCreateUser() {
+ this.setState({ createUserVisible: false });
+ }
+
+ render() {
+ const { users } = this.props;
+ const { loading, pageSize, pageNo, createUserVisible, passwordResetUser } = this.state;
+ return (
+ <>
+
+
+ {users.totalCount > pageSize && (
+ this.setState({ pageNo }, () => this.getUsers())}
+ />
+ )}
+
+ createUser(user).then(res => {
+ this.setState({ pageNo: 1 }, () => this.getUsers());
+ return res;
+ })
+ }
+ onCancel={() => this.colseCreateUser()}
+ />
+
+ passwordReset(user).then(res => {
+ this.getUsers();
+ return res;
+ })
+ }
+ onCancel={() => this.setState({ passwordResetUser: undefined })}
+ />
+
+ );
+ }
+}
+
+export default UserManagement;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.scss b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.scss
new file mode 100644
index 000000000..20cf13723
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.scss
@@ -0,0 +1,18 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import '../authority.scss';
+
+.users-pagination {
+ float: right;
+ margin-top: 20px;
+}
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/index.js b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/index.js
new file mode 100644
index 000000000..4df885840
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/index.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import UserManagement from './UserManagement';
+
+export default UserManagement;
diff --git a/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/authority.scss b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/authority.scss
new file mode 100644
index 000000000..a1112a3ef
--- /dev/null
+++ b/console/src/main/resources/static/console-fe/src/pages/AuthorityControl/authority.scss
@@ -0,0 +1,17 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.filter-panel {
+ text-align: right;
+ padding: 10px 0;
+}
diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
index c9bc12e06..ede9e64a8 100644
--- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
+++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
@@ -1095,7 +1095,7 @@ class ConfigurationManagement extends React.Component {
render() {
const { locale = {} } = this.props;
return (
-
+ <>
(this.batchHandle = ref)} />
-
+
);
}
}
diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/index.scss b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/index.scss
index c61bab940..29986bda4 100644
--- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/index.scss
+++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/index.scss
@@ -13,7 +13,4 @@
.next-pagination-size-selector{
position: static !important;
-}
-.next-overlay-inner{
- top:154px !important;
-}
+}
\ No newline at end of file
diff --git a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js
index ec6638023..de5dbc1f2 100644
--- a/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js
+++ b/console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js
@@ -183,7 +183,7 @@ class ListeningToQuery extends React.Component {
},
];
return (
-