- 由于该Region已被逻辑集群【 {this.state.logicalClusterName} 】使用
- 请先解除Region与逻辑集群的关系
+ 该Region已被逻辑集群【 {this.state.logicalClusterName} 】使用，请先解除Region与逻辑集群的关系
diff --git a/kafka-manager-console/src/container/admin/cluster-detail/index.less b/kafka-manager-console/src/container/admin/cluster-detail/index.less
index 0dd4d106..9b5d5103 100644
--- a/kafka-manager-console/src/container/admin/cluster-detail/index.less
+++ b/kafka-manager-console/src/container/admin/cluster-detail/index.less
@@ -16,7 +16,7 @@
.traffic-table {
margin: 10px 0;
- min-height: 450px;
+ min-height: 330px;
.traffic-header {
width: 100%;
height: 44px;
diff --git a/kafka-manager-console/src/container/admin/cluster-list/index.tsx b/kafka-manager-console/src/container/admin/cluster-list/index.tsx
index dfac45d7..be6956d6 100644
--- a/kafka-manager-console/src/container/admin/cluster-list/index.tsx
+++ b/kafka-manager-console/src/container/admin/cluster-list/index.tsx
@@ -4,6 +4,7 @@ import { wrapper } from 'store';
import { observer } from 'mobx-react';
import { IXFormWrapper, IMetaData, IRegister } from 'types/base-type';
import { admin } from 'store/admin';
+import { users } from 'store/users';
import { registerCluster, createCluster, pauseMonitoring } from 'lib/api';
import { SearchAndFilterContainer } from 'container/search-filter';
import { cluster } from 'store/cluster';
@@ -78,34 +79,34 @@ export class ClusterList extends SearchAndFilterContainer {
disabled: item ? true : false,
},
},
- {
- key: 'idc',
- label: '数据中心',
- defaultValue: region.regionName,
- rules: [{ required: true, message: '请输入数据中心' }],
- attrs: {
- placeholder: '请输入数据中心',
- disabled: true,
- },
- },
- {
- key: 'mode',
- label: '集群类型',
- type: 'select',
- options: cluster.clusterModes.map(ele => {
- return {
- label: ele.message,
- value: ele.code,
- };
- }),
- rules: [{
- required: true,
- message: '请选择集群类型',
- }],
- attrs: {
- placeholder: '请选择集群类型',
- },
- },
+ // {
+ // key: 'idc',
+ // label: '数据中心',
+ // defaultValue: region.regionName,
+ // rules: [{ required: true, message: '请输入数据中心' }],
+ // attrs: {
+ // placeholder: '请输入数据中心',
+ // disabled: true,
+ // },
+ // },
+ // {
+ // key: 'mode',
+ // label: '集群类型',
+ // type: 'select',
+ // options: cluster.clusterModes.map(ele => {
+ // return {
+ // label: ele.message,
+ // value: ele.code,
+ // };
+ // }),
+ // rules: [{
+ // required: true,
+ // message: '请选择集群类型',
+ // }],
+ // attrs: {
+ // placeholder: '请选择集群类型',
+ // },
+ // },
{
key: 'kafkaVersion',
label: 'kafka版本',
@@ -148,7 +149,7 @@ export class ClusterList extends SearchAndFilterContainer {
attrs: {
placeholder: `请输入JMX认证，例如：
{
-"maxConn": 10, #KM对单台Broker对最大连接数
+"maxConn": 10, #KM对单台Broker的最大jmx连接数
"username": "xxxxx", #用户名
"password": "xxxxx", #密码
"openSSL": true, #开启SSL，true表示开启SSL，false表示关闭
@@ -276,32 +277,41 @@ export class ClusterList extends SearchAndFilterContainer {
public getColumns = () => {
const cols = getAdminClusterColumns();
+ const role = users.currentUser.role;
const col = {
title: '操作',
render: (value: string, item: IMetaData) => (
<>
- 编辑
-
-
@@ -318,7 +329,14 @@ export class ClusterList extends SearchAndFilterContainer {
{this.renderSearch('', '请输入集群名称')}
集群接入指南
-
+ {
+ role && role === 2 ?
+
+ :
+
+
+
+ }
diff --git a/kafka-manager-console/src/container/admin/config.tsx b/kafka-manager-console/src/container/admin/config.tsx
index 09a70f83..1f9d6d81 100644
--- a/kafka-manager-console/src/container/admin/config.tsx
+++ b/kafka-manager-console/src/container/admin/config.tsx
@@ -28,14 +28,16 @@ export const getUserColumns = () => {
showApplyModal(record)}>编辑
showApplyModalModifyPassword(record)}>修改密码
-
+
+
+ )
+ };
+
+ componentDidMount() {
+ admin.getOperationRecordData({ moduleId: 0 });
+ }
+
+ render() {
+ return
+ this.searchForm(params)}
+ clearAll={() => this.clearAll()}
+ isReset={true}
+ />
+
+
+
+
+
+ {
+ this.renderOperationRecordList()
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/kafka-manager-console/src/container/admin/searchForm.tsx b/kafka-manager-console/src/container/admin/searchForm.tsx
new file mode 100644
index 00000000..afbff03c
--- /dev/null
+++ b/kafka-manager-console/src/container/admin/searchForm.tsx
@@ -0,0 +1,120 @@
+import * as React from 'react';
+import { Select, Input, InputNumber, Form, Switch, Checkbox, DatePicker, Radio, Upload, Button, Icon, Tooltip } from 'component/antd';
+// import './index.less';
+const Search = Input.Search;
+export interface IFormItem {
+ key: string;
+ label: string;
+ type: string;
+ value?: string;
+ // 内部组件属性注入
+ attrs?: any;
+ // form属性注入
+ formAttrs?: any;
+ defaultValue?: string | number | any[];
+ rules?: any[];
+ invisible?: boolean;
+ getvaluefromevent: Function;
+}
+
+interface SerachFormProps {
+ formMap: IFormItem[];
+ // formData: any;
+ form: any;
+ onSubmit: Function;
+ isReset?: boolean;
+ clearAll: Function;
+ layout?: 'inline' | 'horizontal' | 'vertical';
+}
+
+export interface IFormSelect extends IFormItem {
+ options: Array<{ key?: string | number, value: string | number, label: string }>;
+}
+
+class SearchForm extends React.Component
{headerMenu.map((item: IMenuItem, index: number) =>
diff --git a/kafka-manager-console/src/container/modal/admin/cluster.ts b/kafka-manager-console/src/container/modal/admin/cluster.ts
index 20ed9098..ac4af3a5 100644
--- a/kafka-manager-console/src/container/modal/admin/cluster.ts
+++ b/kafka-manager-console/src/container/modal/admin/cluster.ts
@@ -22,11 +22,11 @@ export const showEditClusterTopic = (item: IClusterTopics) => {
},
{
key: 'appId',
- label: '应用ID',
+ label: '应用名称',
type: 'select',
options: app.adminAppData.map(item => {
return {
- label: item.appId,
+ label: item.name,
value: item.appId,
};
}),
@@ -61,7 +61,7 @@ export const showEditClusterTopic = (item: IClusterTopics) => {
attrs: {
placeholder: '请输入保存时间',
suffix: '小时',
- prompttype:'修改保存时间，预计一分钟左右生效!'
+ prompttype: '修改保存时间，预计一分钟左右生效!'
},
},
{
diff --git a/kafka-manager-console/src/container/modal/admin/confirm-detail-topic.tsx b/kafka-manager-console/src/container/modal/admin/confirm-detail-topic.tsx
index 41f6ed61..83d1b02d 100644
--- a/kafka-manager-console/src/container/modal/admin/confirm-detail-topic.tsx
+++ b/kafka-manager-console/src/container/modal/admin/confirm-detail-topic.tsx
@@ -35,7 +35,6 @@ class CustomForm extends React.Component {
this.props.form.validateFields((err: any, values: any) => {
const deleteData = this.props.formData;
if (!err) {
- // console.log('values', values);
if (values.topicName !== this.props.formData.topicName) {
notification.error({ message: 'topic名称不正确，请重新输入' });
} else {
@@ -77,7 +76,6 @@ class CustomForm extends React.Component {
}
public render() {
- // console.log('props', this.props);
const { formData = {} as any, visible } = this.props;
const { getFieldDecorator } = this.props.form;
let metadata = [] as IBrokersMetadata[];
diff --git a/kafka-manager-console/src/container/modal/admin/expand-partition.tsx b/kafka-manager-console/src/container/modal/admin/expand-partition.tsx
index dfb51ba9..44001081 100644
--- a/kafka-manager-console/src/container/modal/admin/expand-partition.tsx
+++ b/kafka-manager-console/src/container/modal/admin/expand-partition.tsx
@@ -111,11 +111,11 @@ class CustomForm extends React.Component {
})()}
- {/* */}
+ {/* */}
{/* this.onSwitchChange(checked)} /> */}
{ this.onSwitchChange(e.target.value === 'region' ? true : false); }}>
Region类型
- Borker类型
+ Broker类型
diff --git a/kafka-manager-console/src/container/modal/admin/task.ts b/kafka-manager-console/src/container/modal/admin/task.ts
index d9a609ac..12a46d53 100644
--- a/kafka-manager-console/src/container/modal/admin/task.ts
+++ b/kafka-manager-console/src/container/modal/admin/task.ts
@@ -28,8 +28,8 @@ const updateInputModal = (status?: string) => {
formMap[4].invisible = status === 'region';
formMap[5].invisible = status !== 'region';
- formMap[4].rules = [{required: status !== 'region'}];
- formMap[5].rules = [{required: status === 'region'}];
+ formMap[4].rules = [{ required: status !== 'region' }];
+ formMap[5].rules = [{ required: status === 'region' }];
// tslint:disable-next-line:no-unused-expression
wrapper.ref && wrapper.ref.updateFormMap$(formMap, wrapper.xFormWrapper.formData);
};
@@ -103,7 +103,7 @@ export const createMigrationTasks = () => {
label: 'Region',
value: 'region',
}, {
- label: 'Borker',
+ label: 'Broker',
value: 'broker',
}],
rules: [{
@@ -141,7 +141,7 @@ export const createMigrationTasks = () => {
placeholder: '请选择目标Region',
},
},
-
+
{
key: 'beginTime',
label: '计划开始时间',
diff --git a/kafka-manager-console/src/container/modal/offline-app-modal-new.tsx b/kafka-manager-console/src/container/modal/offline-app-modal-new.tsx
new file mode 100644
index 00000000..2b582f77
--- /dev/null
+++ b/kafka-manager-console/src/container/modal/offline-app-modal-new.tsx
@@ -0,0 +1,78 @@
+import * as React from 'react';
+import { Table, Modal, Tooltip, Icon, message, notification, Alert, Button } from 'component/antd';
+import { app } from 'store/app';
+import { getApplyOnlineColumns } from 'container/topic/config';
+import { observer } from 'mobx-react';
+import { modal } from 'store/modal';
+import { users } from 'store/users';
+import { urlPrefix } from 'constants/left-menu';
+import { region } from 'store';
+
+@observer
+export class ConnectAppNewList extends React.Component {
+
+ public componentDidMount() {
+ app.getAppsConnections(modal.params);
+ }
+
+ public handleCancel = () => {
+ app.setAppsConnections([]);
+ modal.close();
+ }
+
+ public handleSubmit = () => {
+ const connectionList = app.appsConnections;
+ if (connectionList && connectionList.length) {
+ return message.warning('存在连接信息，无法申请下线！');
+ }
+ const offlineParams = {
+ type: 11,
+ applicant: users.currentUser.username,
+ description: '',
+ extensions: JSON.stringify({ appId: modal.params }),
+ };
+ app.applyAppOffline(offlineParams).then((data: any) => {
+ notification.success({ message: '申请下线成功' });
+ window.location.href = `${urlPrefix}/user/order-detail/?orderId=${data.id}®ion=${region.currentRegion}`;
+ });
+ modal.close();
+ }
+
+ public render() {
+ const connectionList = app.appsConnections;
+ return (
+ <>
+ 确定
+ :
+ <>
+
+
+
+ }
+ width={500}
+ >
+
+
+ );
+ }
+}
diff --git a/kafka-manager-console/src/container/modal/order.tsx b/kafka-manager-console/src/container/modal/order.tsx
index c982db4c..4daec7c9 100644
--- a/kafka-manager-console/src/container/modal/order.tsx
+++ b/kafka-manager-console/src/container/modal/order.tsx
@@ -4,13 +4,14 @@ import { message, Icon, notification, Modal, Table, Tooltip } from 'component/an
import { IApprovalOrder, IBaseOrder, IOrderInfo } from 'types/base-type';
import { admin } from 'store/admin';
import { modal } from 'store/modal';
+import { cluster } from 'store/cluster';
import { cellStyle } from 'constants/table';
import * as React from 'react';
const updateInputModal = (status: string, type: number) => {
const formMap = wrapper.xFormWrapper.formMap;
- const region = type === 0 ? 5 : 3;
- const broker = type === 0 ? 6 : 4;
+ const region = type === 0 ? 6 : 3;
+ const broker = type === 0 ? 7 : 4;
formMap[region].invisible = status === 'region';
formMap[broker].invisible = status !== 'region';
@@ -37,6 +38,12 @@ const renderModalTilte = (type: number, status: number) => {
export const showApprovalModal = (info: IOrderInfo, status: number, from?: string) => {
const { id, type } = info;
const formMap = [{
+ key: 'clusterId',
+ label: '所属集群',
+ type: 'input_number',
+ defaultValue: info.detail.logicalClusterName,
+ attrs: { disabled: true },
+ }, {
key: 'partitionNum',
label: '分区数',
type: 'input_number',
@@ -87,7 +94,7 @@ export const showApprovalModal = (info: IOrderInfo, status: number, from?: strin
label: 'Region',
value: 'region',
}, {
- label: 'Borker',
+ label: 'Broker',
value: 'broker',
}],
rules: [{ required: false, message: '请选择类型' }],
diff --git a/kafka-manager-console/src/container/modal/topic.tsx b/kafka-manager-console/src/container/modal/topic.tsx
index d4df0318..4e026641 100644
--- a/kafka-manager-console/src/container/modal/topic.tsx
+++ b/kafka-manager-console/src/container/modal/topic.tsx
@@ -399,8 +399,8 @@ export const updateAllTopicFormModal = () => {
const formMap = wrapper.xFormWrapper.formMap;
if (topic.authorities) {
const { consume, send, checkStatus } = judgeAccessStatus(topic.authorities.access);
- formMap[3].defaultValue = checkStatus;
- formMap[3].options = [{
+ formMap[2].defaultValue = checkStatus;
+ formMap[2].options = [{
label: `消费权限${consume ? '（已拥有）' : ''}`,
value: '1',
disabled: consume,
@@ -409,7 +409,7 @@ export const updateAllTopicFormModal = () => {
value: '2',
disabled: send,
}];
- formMap[3].rules = [{
+ formMap[2].rules = [{
required: true,
validator: (rule: any, value: any, callback: any) => getPowerValidator(rule, value, callback, checkStatus, 'allTopic'),
}];
@@ -476,7 +476,6 @@ export const showAllPermissionModal = (item: ITopic) => {
const showAllPermission = (appId: string, item: ITopic, access: number) => {
const { consume, send, checkStatus } = judgeAccessStatus(access);
-
const xFormModal = {
formMap: [
{
@@ -489,16 +488,6 @@ const showAllPermission = (appId: string, item: ITopic, access: number) => {
disabled: true,
},
},
- {
- key: 'clusterName',
- label: '集群名称',
- defaultValue: item.clusterName,
- rules: [{ required: true, message: '请输入集群名称' }],
- attrs: {
- placeholder: '请输入集群名称',
- disabled: true,
- },
- },
{
key: 'appId',
label: '绑定应用',
@@ -526,6 +515,26 @@ const showAllPermission = (appId: string, item: ITopic, access: number) => {
validator: (rule: any, value: any, callback: any) => getPowerValidator(rule, value, callback, checkStatus, 'allTopic'),
}],
},
+ // {
+ // key: 'clusterName',
+ // label: '集群名称',
+ // defaultValue: item.clusterName,
+ // rules: [{ required: true, message: '请输入集群名称' }],
+ // attrs: {
+ // placeholder: '请输入集群名称',
+ // disabled: true,
+ // },
+ // },
+ // {
+ // key: 'clusterName',
+ // label: '集群名称',
+ // defaultValue: item.clusterName,
+ // rules: [{ required: true, message: '请输入集群名称' }],
+ // attrs: {
+ // placeholder: '请输入集群名称',
+ // disabled: true,
+ // },
+ // },
{
key: 'description',
label: '申请原因',
@@ -587,16 +596,16 @@ export const showPermissionModal = (item: ITopic) => {
disabled: true,
},
},
- {
- key: 'clusterName',
- label: '集群名称',
- defaultValue: item.clusterName,
- rules: [{ required: true, message: '请输入集群名称' }],
- attrs: {
- placeholder: '请输入集群名称',
- disabled: true,
- },
- },
+ // {
+ // key: 'clusterName',
+ // label: '集群名称',
+ // defaultValue: item.clusterName,
+ // rules: [{ required: true, message: '请输入集群名称' }],
+ // attrs: {
+ // placeholder: '请输入集群名称',
+ // disabled: true,
+ // },
+ // },
{
key: 'appName',
label: '绑定应用',
diff --git a/kafka-manager-console/src/container/search-filter.tsx b/kafka-manager-console/src/container/search-filter.tsx
index ac5d6bc1..f6ed09fa 100644
--- a/kafka-manager-console/src/container/search-filter.tsx
+++ b/kafka-manager-console/src/container/search-filter.tsx
@@ -126,7 +126,7 @@ export class SearchAndFilterContainer extends React.Component
@@ -194,7 +194,7 @@ export class SearchAndFilterContainer extends React.Component {
+ public renderColumnsFilter = (type: string, params?: any) => {
return {
filterIcon: this.renderFilterIcon.bind(null, type),
filterDropdownVisible: this.state[type] as boolean,
diff --git a/kafka-manager-console/src/container/staff-select.tsx b/kafka-manager-console/src/container/staff-select.tsx
index e9072569..f01637e9 100644
--- a/kafka-manager-console/src/container/staff-select.tsx
+++ b/kafka-manager-console/src/container/staff-select.tsx
@@ -28,7 +28,8 @@ export class StaffSelect extends React.Component {
public getStaffList = () => {
const { value } = this.props;
const current = users.currentUser.username || getCookie('username');
- const principals = value || (current ? [current] : []);
+ const principals = [''];
+ // const principals = value || (current ? [current] : []);
const promises: any[] = [];
for (const item of principals) {
@@ -64,7 +65,6 @@ export class StaffSelect extends React.Component {
const { value, isDisabled } = this.props;
const current = users.currentUser.username || getCookie('username');
const principals = value || (current ? [current] : []);
-
return (
+ {
+ connectionList && connectionList.length
+ ?
+ 该应用已与Topic关联，请先解除应用与Topic之间的关系。点击查看
+ :
+ 应用下线后，AppID、密钥将会失效，请谨慎操作！
+ }
+
+