From fd1c0b71c51caff3b8c60cfe5706a810dec71bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=B6=85?= Date: Tue, 23 Nov 2021 17:48:10 +0800 Subject: [PATCH] =?UTF-8?q?V2.5.0=E5=89=8D=E7=AB=AF=20=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81&=E5=89=8D=E7=AB=AFbugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kafka-manager-console/package.json | 4 ++-- .../src/assets/image/weChat.png | Bin 0 -> 37031 bytes .../image/{wechat.jpeg => wechats.jpeg} | Bin .../src/component/chart/date-picker-chart.tsx | 18 +++++++++++++++++- .../src/container/header/index.tsx | 8 ++++---- .../src/container/user-center/order-list.tsx | 16 ++++++++++++---- kafka-manager-console/src/routers/index.htm | 5 ++++- 7 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 kafka-manager-console/src/assets/image/weChat.png rename kafka-manager-console/src/assets/image/{wechat.jpeg => wechats.jpeg} (100%) diff --git a/kafka-manager-console/package.json b/kafka-manager-console/package.json index 15e2b523..d768bc73 100644 --- a/kafka-manager-console/package.json +++ b/kafka-manager-console/package.json @@ -1,6 +1,6 @@ { "name": "logi-kafka", - "version": "2.4.3", + "version": "2.5.0", "description": "", "scripts": { "start": "webpack-dev-server", @@ -57,4 +57,4 @@ "dependencies": { "format-to-json": "^1.0.4" } -} +} \ No newline at end of file diff --git a/kafka-manager-console/src/assets/image/weChat.png b/kafka-manager-console/src/assets/image/weChat.png new file mode 100644 index 0000000000000000000000000000000000000000..126f5816dbfcbf08a726e67c5c02ecdb2bd772fd GIT binary patch literal 37031 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�Iv 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 { public changeChartOptions(options: any) { const noData = options.series.length ? false : true; this.setState({ noData }); + options.tooltip.formatter = (params: any) => { + var res = + "

" + + params[0].data.time + + "

"; + for (var i = 0; i < params.length; i++) { + res += `
+ + ${params[i].seriesName} + ${params[i].data[params[i].seriesName]} +
`; + } + return res; + } this.chart.setOption(options, true); } @@ -79,7 +95,7 @@ export class ChartWithDatePicker extends React.Component { public render() { const { customerNode } = this.props; return ( -
+
{customerNode} diff --git a/kafka-manager-console/src/container/header/index.tsx b/kafka-manager-console/src/container/header/index.tsx index e12e397c..c668335a 100644 --- a/kafka-manager-console/src/container/header/index.tsx +++ b/kafka-manager-console/src/container/header/index.tsx @@ -7,7 +7,7 @@ import { urlPrefix } from 'constants/left-menu'; import { region, IRegionIdcs } from 'store/region'; import logoUrl from '../../assets/image/kafka-logo.png'; import userIcon from '../../assets/image/normal.png'; -import weChat from '../../assets/image/wechat.jpeg'; +import weChat from '../../assets/image/wechat.png'; import { users } from 'store/users'; import { observer } from 'mobx-react'; import { Link } from 'react-router-dom'; @@ -60,8 +60,8 @@ export const Header = observer((props: IHeader) => { }); }; const content = ( -
- +
+
); const helpCenter = ( @@ -144,7 +144,7 @@ export const Header = observer((props: IHeader) => {
- Kafka Manager + LogiKM v2.4.2 {/* 添加版本超链接 */}
diff --git a/kafka-manager-console/src/container/user-center/order-list.tsx b/kafka-manager-console/src/container/user-center/order-list.tsx index 6c81b0ec..119168cd 100644 --- a/kafka-manager-console/src/container/user-center/order-list.tsx +++ b/kafka-manager-console/src/container/user-center/order-list.tsx @@ -115,11 +115,19 @@ export class OrderList extends SearchAndFilterContainer { status, { title: '申请时间', - dataIndex: 'gmtTime', - key: 'gmtTime', - sorter: (a: IBaseOrder, b: IBaseOrder) => b.gmtTime - a.gmtTime, + dataIndex: 'gmtCreate', + key: 'gmtCreate', + sorter: (a: IBaseOrder, b: IBaseOrder) => b.gmtCreate - a.gmtCreate, render: (t: number) => moment(t).format(timeFormat), - }, { + }, + { + title: '审批时间', + dataIndex: 'gmtHandle', + key: 'gmtHandle', + sorter: (a: IBaseOrder, b: IBaseOrder) => b.gmtHandle - a.gmtHandle, + render: (t: number) => moment(t).format(timeFormat), + }, + { title: '操作', key: 'operation', dataIndex: 'operation', diff --git a/kafka-manager-console/src/routers/index.htm b/kafka-manager-console/src/routers/index.htm index b8d8454f..7cb7a0fd 100644 --- a/kafka-manager-console/src/routers/index.htm +++ b/kafka-manager-console/src/routers/index.htm @@ -1,12 +1,15 @@ + - KafkaManager + LogiKM +
+ \ No newline at end of file