From d3f3531cdbbf542ff16ec642d4b28b4e0e16cffb Mon Sep 17 00:00:00 2001 From: zengqiao Date: Sun, 8 Nov 2020 15:43:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/container/admin/cluster-list/index.tsx | 10 +++++----- kafka-manager-console/src/container/admin/config.tsx | 6 +++--- .../container/admin/operation-management/config.tsx | 2 +- .../admin/operation-management/migration-detail.tsx | 2 +- .../src/container/alarm/add-alarm/alarm-select.tsx | 2 +- .../src/container/alarm/add-alarm/config.tsx | 10 +++++----- .../src/container/alarm/add-alarm/index.tsx | 2 +- .../container/alarm/alarm-detail/shield-history.tsx | 10 +++++----- .../src/container/alarm/alarm-list.tsx | 4 ++-- kafka-manager-console/src/container/app/app-list.tsx | 2 +- .../src/container/modal/admin/cluster.ts | 3 ++- .../src/container/modal/admin/migration.ts | 2 +- .../src/container/modal/admin/user.ts | 2 +- .../src/container/modal/admin/version.ts | 6 +++--- kafka-manager-console/src/container/modal/alarm.tsx | 4 ++-- kafka-manager-console/src/container/modal/app.tsx | 2 +- 16 files changed, 35 insertions(+), 34 deletions(-) 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 2a87c69e..1dc246ca 100644 --- a/kafka-manager-console/src/container/admin/cluster-list/index.tsx +++ b/kafka-manager-console/src/container/admin/cluster-list/index.tsx @@ -134,19 +134,19 @@ export class ClusterList extends SearchAndFilterContainer { formData: item ? item : {}, visible: true, width: 590, - title: '注册集群', + title: item ? '编辑' : '接入集群', onSubmit: (value: IRegister) => { value.idc = region.currentRegion; if (item) { value.clusterId = item.clusterId; registerCluster(value).then(data => { admin.getMetaData(true); - notification.success({ message: '修改集群成功' }); + notification.success({ message: '编辑集群成功' }); }); } else { createCluster(value).then(data => { admin.getMetaData(true); - notification.success({ message: '注册集群成功' }); + notification.success({ message: '接入集群成功' }); }); } @@ -256,7 +256,7 @@ export class ClusterList extends SearchAndFilterContainer { 修改 + >编辑 {this.renderSearch('', '请输入集群名称')}
  • - +
    • diff --git a/kafka-manager-console/src/container/admin/config.tsx b/kafka-manager-console/src/container/admin/config.tsx index 8f7ec86c..098d0b49 100644 --- a/kafka-manager-console/src/container/admin/config.tsx +++ b/kafka-manager-console/src/container/admin/config.tsx @@ -26,7 +26,7 @@ export const getUserColumns = () => { render: (text: string, record: IUser) => { return ( - showApplyModal(record)}>修改 + showApplyModal(record)}>编辑 users.deleteUser(record.username)} @@ -105,7 +105,7 @@ export const getVersionColumns = () => { render: (text: string, record: IUploadFile) => { return ( - showModifyModal(record)}>修改 + showModifyModal(record)}>编辑 version.deleteFile(record.id)} @@ -164,7 +164,7 @@ export const getConfigureColumns = () => { render: (text: string, record: IConfigure) => { return ( - showConfigureModal(record)}>修改 + showConfigureModal(record)}>编辑 admin.deleteConfigure(record.configKey)} diff --git a/kafka-manager-console/src/container/admin/operation-management/config.tsx b/kafka-manager-console/src/container/admin/operation-management/config.tsx index ff551092..d21370f7 100644 --- a/kafka-manager-console/src/container/admin/operation-management/config.tsx +++ b/kafka-manager-console/src/container/admin/operation-management/config.tsx @@ -45,7 +45,7 @@ export const migrationTaskColumns = (migrationUrl: string) => { 开始 } {[0, 1].indexOf(item.status) > -1 && - modifyMigrationTask(item, 'modify')} style={{ marginRight: 16 }}>修改} + modifyMigrationTask(item, 'modify')} style={{ marginRight: 16 }}>编辑} {item.status === 0 && ( <> this.renderRessignDetail(item)} style={{ marginRight: 16 }}>详情 - modifyTransferTask(item, 'modify', this.taskId)}>修改 + modifyTransferTask(item, 'modify', this.taskId)}>编辑 ), }, diff --git a/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx b/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx index 95e93fc7..6d19ec26 100644 --- a/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx +++ b/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx @@ -52,7 +52,7 @@ export class AlarmSelect extends React.Component { target="_blank" href="https://github.com/didi/kafka-manager" > - 新建告警组？ + 新增规则组？ ); diff --git a/kafka-manager-console/src/container/alarm/add-alarm/config.tsx b/kafka-manager-console/src/container/alarm/add-alarm/config.tsx index 6bed50c3..de611ba1 100644 --- a/kafka-manager-console/src/container/alarm/add-alarm/config.tsx +++ b/kafka-manager-console/src/container/alarm/add-alarm/config.tsx @@ -14,7 +14,7 @@ import { region } from 'store/region'; export const getAlarmColumns = (urlPrefix: string) => { const columns = [ { - title: '告警名称', + title: '告警规则', dataIndex: 'name', key: 'name', width: '25%', @@ -32,7 +32,7 @@ export const getAlarmColumns = (urlPrefix: string) => { ); }, }, { - title: '应用名称', + title: '所属应用', dataIndex: 'appName', key: 'appName', width: '25%', @@ -72,7 +72,7 @@ export const getAlarmColumns = (urlPrefix: string) => { width: '10%', render: (text: string, item: IMonitorStrategies) => ( <> - 修改 + 编辑 deteleMonitor(item)} @@ -205,8 +205,8 @@ export const xActionFormMap = [{ export const xTypeFormMap = [{ key: 'alarmName', - label: '告警名称', - rules: [{ required: true, message: '请输入告警名称' }], + label: '告警规则', + rules: [{ required: true, message: '请输入告警规则' }], attrs: {placeholder: '请输入', disabled: isDetailPage}, }, { key: 'app', diff --git a/kafka-manager-console/src/container/alarm/add-alarm/index.tsx b/kafka-manager-console/src/container/alarm/add-alarm/index.tsx index 03347f5f..ae201823 100644 --- a/kafka-manager-console/src/container/alarm/add-alarm/index.tsx +++ b/kafka-manager-console/src/container/alarm/add-alarm/index.tsx @@ -152,7 +152,7 @@ export class AddAlarm extends SearchAndFilterContainer { handlePageBack('/alarm')} - title={(this.id || this.id === 0) ? '修改告警配置' : '新建告警配置'} + title={(this.id || this.id === 0) ? '编辑告警规则' : '新建告警规则'} extra={[ , , diff --git a/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx b/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx index 154bd4c0..71ec4877 100644 --- a/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx +++ b/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx @@ -34,7 +34,7 @@ export class ShieldHistory extends React.Component { title: '详情', content: (
      -
    • 告警名称：{record.monitorName}
      • +
    • 告警规则：{record.monitorName}
    • 开始时间：{moment(record.startTime).format(timeFormat)}
    • 结束时间：{moment(record.endTime).format(timeFormat)}
    • 说明：{record.description}
      • @@ -48,10 +48,10 @@ export class ShieldHistory extends React.Component { formMap: [ { key: 'monitorName', - label: '告警名称', + label: '告警规则', rules: [{ required: true, - message: '请输入告警名称', + message: '请输入告警规则', }], attrs: { disabled: true, @@ -112,7 +112,7 @@ export class ShieldHistory extends React.Component { monitorId: record.monitorId, } as IMonitorSilences; alarm.modifyMask(params, this.id).then(data => { - notification.success({ message: '修改成功' }); + notification.success({ message: '编辑成功' }); }); }, }; @@ -158,7 +158,7 @@ export class ShieldHistory extends React.Component { render: (action: any, record: IMonitorSilences) => { return( <> - this.modifyMonitor(record)} className="action-button">修改 + this.modifyMonitor(record)} className="action-button">编辑 this.silencesDetail(record)} className="action-button">详情 {this.renderApp('应用：')} - {this.renderSearch('名称：', '请输入告警名称或者操作人')} + {this.renderSearch('名称：', '请输入告警规则或者操作人')}
      • diff --git a/kafka-manager-console/src/container/app/app-list.tsx b/kafka-manager-console/src/container/app/app-list.tsx index e5db757c..ef897246 100644 --- a/kafka-manager-console/src/container/app/app-list.tsx +++ b/kafka-manager-console/src/container/app/app-list.tsx @@ -92,7 +92,7 @@ export class CommonAppList extends SearchAndFilterContainer { render: (text: any, record: IAppItem) => { return ( - showEditModal(record, this.from)}>修改 + showEditModal(record, this.from)}>编辑 showEditModal(record, this.from, true)}>详情 this.getOnlineConnect(record)}>申请下线 ); diff --git a/kafka-manager-console/src/container/modal/admin/cluster.ts b/kafka-manager-console/src/container/modal/admin/cluster.ts index e2b0616f..43b8a333 100644 --- a/kafka-manager-console/src/container/modal/admin/cluster.ts +++ b/kafka-manager-console/src/container/modal/admin/cluster.ts @@ -25,9 +25,10 @@ export const showEditClusterTopic = (item: IClusterTopics) => { label: '应用ID', rules: [{ required: true, + message: '请输入应用ID', }], attrs: { - disabled: true, + placeholder: '请输入应用ID', }, }, { diff --git a/kafka-manager-console/src/container/modal/admin/migration.ts b/kafka-manager-console/src/container/modal/admin/migration.ts index f27cb455..da89b003 100644 --- a/kafka-manager-console/src/container/modal/admin/migration.ts +++ b/kafka-manager-console/src/container/modal/admin/migration.ts @@ -104,7 +104,7 @@ export const modifyTransferTask = (item: IReassign, action: string, taskId: numb minThrottle: transBToMB(item.minThrottle), }, visible: true, - title: '修改', + title: '编辑', onSubmit: (value: IExecute) => { const params = { action, diff --git a/kafka-manager-console/src/container/modal/admin/user.ts b/kafka-manager-console/src/container/modal/admin/user.ts index 381b2f8f..dcfc69ae 100644 --- a/kafka-manager-console/src/container/modal/admin/user.ts +++ b/kafka-manager-console/src/container/modal/admin/user.ts @@ -30,7 +30,7 @@ export const showApplyModal = (record?: IUser) => { ], formData: record || {}, visible: true, - title: record ? '修改用户信息' : '新增用户', + title: record ? '修改用户' : '新增用户', onSubmit: (value: IUser) => { if (record) { return users.modfiyUser(value).then(() => { diff --git a/kafka-manager-console/src/container/modal/admin/version.ts b/kafka-manager-console/src/container/modal/admin/version.ts index a0e7a296..07e592af 100644 --- a/kafka-manager-console/src/container/modal/admin/version.ts +++ b/kafka-manager-console/src/container/modal/admin/version.ts @@ -133,7 +133,7 @@ export const showModifyModal = (record: IUploadFile) => { formData: record || {}, visible: true, isWaitting: true, - title: '修改', + title: '编辑', onSubmit: async (value: IUploadFile) => { value.file = value.uploadFile[0].originFileObj; const md5 = await computeChecksumMd5(value.file); @@ -175,11 +175,11 @@ export const showConfigureModal = (record?: IConfigure) => { formData: record || {}, visible: true, isWaitting: true, - title: `${record ? '修改配置' : '新建配置'}`, + title: `${record ? '编辑配置' : '新建配置'}`, onSubmit: async (value: IConfigure) => { if (record) { return admin.editConfigure(value).then(data => { - notification.success({ message: '修改配置成功' }); + notification.success({ message: '编辑配置成功' }); }); } return admin.addNewConfigure(value).then(data => { diff --git a/kafka-manager-console/src/container/modal/alarm.tsx b/kafka-manager-console/src/container/modal/alarm.tsx index 512e9a93..02742ab2 100644 --- a/kafka-manager-console/src/container/modal/alarm.tsx +++ b/kafka-manager-console/src/container/modal/alarm.tsx @@ -11,10 +11,10 @@ export const createMonitorSilences = (monitorId: number, monitorName: string) = formMap: [ { key: 'monitorName', - label: '告警名称', + label: '告警规则', rules: [{ required: true, - message: '请输入告警名称', + message: '请输入告警规则', }], attrs: { disabled: true, diff --git a/kafka-manager-console/src/container/modal/app.tsx b/kafka-manager-console/src/container/modal/app.tsx index f11779f8..64556c0d 100644 --- a/kafka-manager-console/src/container/modal/app.tsx +++ b/kafka-manager-console/src/container/modal/app.tsx @@ -85,7 +85,7 @@ export const showEditModal = (record?: IAppItem, from?: string, isDisabled?: boo ], formData: record, visible: true, - title: `${isDisabled ? '详情' : record ? '修改' : '应用申请'}`, + title: `${isDisabled ? '详情' : record ? '编辑' : '应用申请'}`, onSubmit: (value: IAppItem) => { if (isDisabled) { return; -- GitLab