From 28e8540c78e2c98763e1c270fb24c85aec866254 Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Thu, 1 Sep 2022 19:43:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?/=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config-manager-fe/src/pages/UserManage/RoleTabContent.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx b/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx index c72fbb1b..67dd0634 100644 --- a/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx +++ b/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx @@ -77,6 +77,7 @@ const RoleDetailAndUpdate = forwardRef((props, ref): JSX.Element => { const onSubmit = () => { form.validateFields().then((formData) => { + formData.permissionIdList = formData.permissionIdList.filter((l) => l); formData.permissionIdList.forEach((arr, i) => { // 如果分配的系统下的子权限，自动赋予该系统的权限 if (arr !== null && arr.length) { @@ -212,7 +213,7 @@ const RoleDetailAndUpdate = forwardRef((props, ref): JSX.Element => { rules={[ () => ({ validator(_, value) { - if (Array.isArray(value) && value.some((item) => !!item.length)) { + if (Array.isArray(value) && value.some((item) => !!item?.length)) { return Promise.resolve(); } return Promise.reject(new Error('请为角色至少分配一项权限')); From 500eaace826be7ad8cd5785d71a9baa32fa7c8fb Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Thu, 1 Sep 2022 19:44:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E5=89=8D=E7=AB=AF=E6=89=93?= =?UTF-8?q?=E5=8C=85=E5=A2=9E=E5=8A=A0=E5=88=86=E5=8C=85=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/CoverHtmlWebpackPlugin.js | 12 ++++---- .../config/d1-webpack.base.js | 30 ++++++++----------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js b/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js index be47ab5b..dfb6754e 100755 --- a/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js +++ b/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js @@ -86,12 +86,12 @@ class CoverHtmlWebpackPlugin { assetJson.reverse().forEach((item) => { if (/\.js$/.test(item)) { - // if (item.includes('vendor~')) { - // vendors += ``; - // } else { - // TODO: entry 只有一个 - portalMap['@portal/layout'] = item; - // } + if (item.includes('vendor~')) { + vendors += ``; + } else { + // TODO: entry 只有一个 + portalMap['@portal/layout'] = item; + } } else if (/\.css$/.test(item)) { links += ``; } diff --git a/km-console/packages/layout-clusters-fe/config/d1-webpack.base.js b/km-console/packages/layout-clusters-fe/config/d1-webpack.base.js index d810e58a..9e21c70d 100644 --- a/km-console/packages/layout-clusters-fe/config/d1-webpack.base.js +++ b/km-console/packages/layout-clusters-fe/config/d1-webpack.base.js @@ -9,7 +9,6 @@ const TerserJSPlugin = require('terser-webpack-plugin'); const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const theme = require('./theme'); const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'); -const HardSourceWebpackPlugin = require('hard-source-webpack-plugin'); const isProd = process.env.NODE_ENV === 'production'; const babelOptions = { @@ -43,7 +42,6 @@ const babelOptions = { module.exports = () => { const cssFileName = isProd ? '[name]-[chunkhash].css' : '[name].css'; const plugins = [ - // !isProd && new HardSourceWebpackPlugin(), new CoverHtmlWebpackPlugin(), new ProgressBarPlugin(), new CaseSensitivePathsPlugin(), @@ -150,23 +148,21 @@ module.exports = () => { ], }, optimization: Object.assign( - // { - // splitChunks: { - // cacheGroups: { - // vendor: { - // test: /[\\/]node_modules[\\/]/, - // chunks: 'all', - // name: 'vendor', - // priority: 10, - // enforce: true, - // minChunks: 1, - // maxSize: 3500000, - // }, - // }, - // }, - // }, isProd ? { + splitChunks: { + cacheGroups: { + vendor: { + test: /[\\/]node_modules[\\/]/, + chunks: 'all', + name: 'vendor', + priority: 10, + enforce: true, + minChunks: 1, + maxSize: 3000000, + }, + }, + }, minimizer: [ new TerserJSPlugin({ cache: true, From 0043ab83711db4882dac1e777a07bdbcc0052e3a Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Thu, 1 Sep 2022 19:46:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8C=85=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- km-console/packages/config-manager-fe/src/app.tsx | 4 ++-- .../src/components/TagsWithHide/index.tsx | 7 ++++--- km-console/packages/layout-clusters-fe/src/app.tsx | 4 ++-- .../src/components/TagsWithHide/index.tsx | 7 ++++--- .../src/pages/BrokerControllerChangeLog/index.tsx | 2 +- .../layout-clusters-fe/src/pages/BrokerDashboard/index.tsx | 2 +- .../layout-clusters-fe/src/pages/BrokerList/index.tsx | 2 +- .../layout-clusters-fe/src/pages/Consumers/index.tsx | 2 +- .../packages/layout-clusters-fe/src/pages/Jobs/index.tsx | 2 +- .../layout-clusters-fe/src/pages/LoadRebalance/index.tsx | 2 +- .../src/pages/MutliClusterPage/config.ts | 2 +- .../src/pages/SingleClusterDetail/index.tsx | 2 +- .../src/pages/TestingConsumer/component/ConfigForm.tsx | 2 +- .../src/pages/TestingConsumer/config.tsx | 2 +- .../layout-clusters-fe/src/pages/TestingConsumer/index.tsx | 2 +- .../src/pages/TestingProduce/component/ConfigFrom.tsx | 2 +- .../layout-clusters-fe/src/pages/TestingProduce/config.tsx | 2 +- .../layout-clusters-fe/src/pages/TestingProduce/index.tsx | 2 +- .../layout-clusters-fe/src/pages/TopicDashboard/index.tsx | 2 +- .../layout-clusters-fe/src/pages/TopicList/index.tsx | 2 +- 20 files changed, 28 insertions(+), 26 deletions(-) diff --git a/km-console/packages/config-manager-fe/src/app.tsx b/km-console/packages/config-manager-fe/src/app.tsx index aad916e0..2f29654d 100644 --- a/km-console/packages/config-manager-fe/src/app.tsx +++ b/km-console/packages/config-manager-fe/src/app.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { BrowserRouter as Router, Redirect, Switch } from 'react-router-dom'; import _ from 'lodash'; import './constants/axiosConfig'; -import dantdZhCN from 'knowdesign/lib/locale/zh_CN'; -import dantdEnUS from 'knowdesign/lib/locale/en_US'; +import dantdZhCN from 'knowdesign/es/locale/zh_CN'; +import dantdEnUS from 'knowdesign/es/locale/en_US'; import intlZhCN from './locales/zh'; import intlEnUS from './locales/en'; import { AppContainer, RouteGuard, DProLayout } from 'knowdesign'; diff --git a/km-console/packages/config-manager-fe/src/components/TagsWithHide/index.tsx b/km-console/packages/config-manager-fe/src/components/TagsWithHide/index.tsx index 2b676698..dcf80ee4 100644 --- a/km-console/packages/config-manager-fe/src/components/TagsWithHide/index.tsx +++ b/km-console/packages/config-manager-fe/src/components/TagsWithHide/index.tsx @@ -1,6 +1,6 @@ import { DownOutlined } from '@ant-design/icons'; import { Popover } from 'knowdesign'; -import { TooltipPlacement } from 'knowdesign/lib/basic/tooltip'; +import { TooltipPlacement } from 'knowdesign/es/basic/tooltip'; import React, { useState, useRef, useEffect } from 'react'; import './index.less'; @@ -90,8 +90,9 @@ export default (props: PropsType) => { return (
= curState.endI ? 'hide' : 'show') : '' - }`} + className={`container-item ${ + curState.calculated ? (curState.isHideExpandNode ? 'show' : i >= curState.endI ? 'hide' : 'show') : '' + }`} > {item}
diff --git a/km-console/packages/layout-clusters-fe/src/app.tsx b/km-console/packages/layout-clusters-fe/src/app.tsx index 0c5545ab..a2dd0a30 100755 --- a/km-console/packages/layout-clusters-fe/src/app.tsx +++ b/km-console/packages/layout-clusters-fe/src/app.tsx @@ -4,8 +4,8 @@ import React, { useState, useEffect, useLayoutEffect } from 'react'; import { BrowserRouter, Switch, Route, useLocation, useHistory } from 'react-router-dom'; import { get as lodashGet } from 'lodash'; import { DProLayout, AppContainer, IconFont, Menu, Utils, Page403, Page404, Page500, Modal } from 'knowdesign'; -import dantdZhCN from 'knowdesign/lib/locale/zh_CN'; -import dantdEnUS from 'knowdesign/lib/locale/en_US'; +import dantdZhCN from 'knowdesign/es/locale/zh_CN'; +import dantdEnUS from 'knowdesign/es/locale/en_US'; import { DotChartOutlined } from '@ant-design/icons'; import { licenseEventBus } from './constants/axiosConfig'; import intlZhCN from './locales/zh'; diff --git a/km-console/packages/layout-clusters-fe/src/components/TagsWithHide/index.tsx b/km-console/packages/layout-clusters-fe/src/components/TagsWithHide/index.tsx index 685f4d30..29454309 100644 --- a/km-console/packages/layout-clusters-fe/src/components/TagsWithHide/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/components/TagsWithHide/index.tsx @@ -1,6 +1,6 @@ import { DownOutlined } from '@ant-design/icons'; import { Popover } from 'knowdesign'; -import { TooltipPlacement } from 'knowdesign/lib/basic/tooltip'; +import { TooltipPlacement } from 'knowdesign/es/basic/tooltip'; import React, { useState, useRef, useEffect } from 'react'; import './index.less'; @@ -93,8 +93,9 @@ export default (props: PropsType) => { return (
= curState.endI ? 'hide' : 'show') : '' - }`} + className={`container-item ${ + curState.calculated ? (curState.isHideExpandNode ? 'show' : i >= curState.endI ? 'hide' : 'show') : '' + }`} > {item}
diff --git a/km-console/packages/layout-clusters-fe/src/pages/BrokerControllerChangeLog/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/BrokerControllerChangeLog/index.tsx index bd2443cd..7782bc15 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/BrokerControllerChangeLog/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/BrokerControllerChangeLog/index.tsx @@ -5,7 +5,7 @@ import API from '../../api'; import { getControllerChangeLogListColumns, defaultPagination } from './config'; import BrokerDetail from '../BrokerDetail'; import BrokerHealthCheck from '@src/components/CardBar/BrokerHealthCheck'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import './index.less'; const { request } = Utils; diff --git a/km-console/packages/layout-clusters-fe/src/pages/BrokerDashboard/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/BrokerDashboard/index.tsx index 528ced31..a3398dec 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/BrokerDashboard/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/BrokerDashboard/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { MetricType } from '@src/api'; import BrokerHealthCheck from '@src/components/CardBar/BrokerHealthCheck'; import DashboardDragChart from '@src/components/DashboardDragChart'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import { AppContainer } from 'knowdesign'; const BrokerDashboard = (): JSX.Element => { diff --git a/km-console/packages/layout-clusters-fe/src/pages/BrokerList/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/BrokerList/index.tsx index 68230f60..8be77597 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/BrokerList/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/BrokerList/index.tsx @@ -7,7 +7,7 @@ import { dealTableRequestParams } from '../../constants/common'; import BrokerDetail from '../BrokerDetail'; import CardBar from '@src/components/CardBar'; import BrokerHealthCheck from '@src/components/CardBar/BrokerHealthCheck'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import './index.less'; const { request } = Utils; diff --git a/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.tsx index 7f2d2325..46a77761 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.tsx @@ -7,7 +7,7 @@ import { getOperatingStateListParams } from './interface'; import { useParams } from 'react-router-dom'; import ConsumerGroupDetail from './ConsumerGroupDetail'; import ConsumerGroupHealthCheck from '@src/components/CardBar/ConsumerGroupHealthCheck'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import { hashDataParse } from '@src/constants/common'; const { Option } = Select; diff --git a/km-console/packages/layout-clusters-fe/src/pages/Jobs/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/Jobs/index.tsx index 1704c7cd..29448b1d 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/Jobs/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/Jobs/index.tsx @@ -4,7 +4,7 @@ import { ProTable, Drawer, Utils, AppContainer, Form, Select, Input, Button, mes import API from '../../api'; import { getJobsListColumns, defaultPagination, runningStatus, jobType } from './config'; import JobsCheck from '@src/components/CardBar/JobsCheck'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import { ViewJobsProgress } from './ViewJobsProgress'; import './index.less'; import ReplicaChange from '@src/components/TopicJob/ReplicaChange'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx index 06cb7289..cc0a6c02 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from 'react'; import { Select, Form, Utils, AppContainer, Input, Button, ProTable, Badge, Tag, SearchInput } from 'knowdesign'; import BalanceDrawer from './BalanceDrawer'; import HistoryDrawer from './HistoryDrawer'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import { getSizeAndUnit } from '../../constants/common'; import api from '../../api'; import './index.less'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/config.ts b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/config.ts index d5b8bf31..ccc879c7 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/config.ts +++ b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/config.ts @@ -1,4 +1,4 @@ -import { FormItemType, IFormItem } from 'knowdesign/lib/extend/x-form'; +import { FormItemType, IFormItem } from 'knowdesign/es/extend/x-form'; export const bootstrapServersErrCodes = [10, 11, 12]; export const zkErrCodes = [20, 21]; diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.tsx index 481bf0b5..e4b4b2c6 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.tsx @@ -1,4 +1,4 @@ -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import React from 'react'; import TourGuide, { ClusterDetailSteps } from '@src/components/TourGuide'; import './index.less'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/component/ConfigForm.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/component/ConfigForm.tsx index 4aa38014..a4f8f838 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/component/ConfigForm.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/component/ConfigForm.tsx @@ -1,5 +1,5 @@ import { Button, XForm } from 'knowdesign'; -import { IFormItem } from 'knowdesign/lib/extend/x-form'; +import { IFormItem } from 'knowdesign/es/extend/x-form'; import * as React from 'react'; import './style/form.less'; import { useIntl } from 'react-intl'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/config.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/config.tsx index 097f9f71..d27f8d4e 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/config.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/config.tsx @@ -1,4 +1,4 @@ -import { FormItemType, IFormItem } from 'knowdesign/lib/extend/x-form'; +import { FormItemType, IFormItem } from 'knowdesign/es/extend/x-form'; import moment from 'moment'; import React from 'react'; import { timeFormat } from '../../constants/common'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/index.tsx index 59709947..e3e3f6b9 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/index.tsx @@ -1,5 +1,5 @@ import { AppContainer } from 'knowdesign'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import * as React from 'react'; import { useParams } from 'react-router-dom'; import TaskTabs from './component/TaskTabs'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/component/ConfigFrom.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/component/ConfigFrom.tsx index 0a7b14d5..dd9d9fda 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/component/ConfigFrom.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/component/ConfigFrom.tsx @@ -1,5 +1,5 @@ import { Button, Col, Form, Row } from 'knowdesign'; -import { FormItemType, handleFormItem, IFormItem, renderFormItem } from 'knowdesign/lib/extend/x-form'; +import { FormItemType, handleFormItem, IFormItem, renderFormItem } from 'knowdesign/es/extend/x-form'; import * as React from 'react'; import './style/form.less'; import EditTable from './EditTable'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/config.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/config.tsx index 6739a457..81503271 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/config.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/config.tsx @@ -1,6 +1,6 @@ import { QuestionCircleOutlined } from '@ant-design/icons'; import { IconFont, Switch, Tooltip } from 'knowdesign'; -import { FormItemType, IFormItem } from 'knowdesign/lib/extend/x-form'; +import { FormItemType, IFormItem } from 'knowdesign/es/extend/x-form'; import moment from 'moment'; import React from 'react'; import { timeFormat, getRandomStr } from '@src/constants/common'; diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/index.tsx index ed7dbf82..5be8338d 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingProduce/index.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import ProduceClientTest from './Produce'; import './index.less'; import TaskTabs from '../TestingConsumer/component/TaskTabs'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import { useParams } from 'react-router-dom'; const Produce = () => { diff --git a/km-console/packages/layout-clusters-fe/src/pages/TopicDashboard/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/TopicDashboard/index.tsx index 32b6a4aa..72797227 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TopicDashboard/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TopicDashboard/index.tsx @@ -3,7 +3,7 @@ import { MetricType } from '@src/api'; import TopicHealthCheck from '@src/components/CardBar/TopicHealthCheck'; import DashboardDragChart from '@src/components/DashboardDragChart'; import { AppContainer } from 'knowdesign'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; const TopicDashboard = () => { const [global] = AppContainer.useGlobalValue(); diff --git a/km-console/packages/layout-clusters-fe/src/pages/TopicList/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/TopicList/index.tsx index 787eaf12..02db801e 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TopicList/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TopicList/index.tsx @@ -10,7 +10,7 @@ import TopicHealthCheck from '@src/components/CardBar/TopicHealthCheck'; import TopicDetail from '../TopicDetail'; import Delete from './Delete'; import { ClustersPermissionMap } from '../CommonConfig'; -import DBreadcrumb from 'knowdesign/lib/extend/d-breadcrumb'; +import DBreadcrumb from 'knowdesign/es/extend/d-breadcrumb'; import ReplicaChange from '@src/components/TopicJob/ReplicaChange'; import SmallChart from '@src/components/SmallChart'; import ReplicaMove from '@src/components/TopicJob/ReplicaMove'; From 8281301cbd2a7ca8f908e24d54d41c461cbd4d84 Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Thu, 1 Sep 2022 19:50:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Consumer=20?= =?UTF-8?q?=E7=82=B9=E5=87=BB=20Stop=20=E4=B8=8D=E5=8F=91=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E6=A3=80=E7=B4=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/TestingConsumer/Consume.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/Consume.tsx b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/Consume.tsx index 274f7de4..5ec957a6 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/Consume.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/TestingConsumer/Consume.tsx @@ -192,8 +192,10 @@ const ConsumeClientTest = () => { // 过滤出消费数量不足设定值的partition const filtersPartition = _partitionList.filter((item: any) => item.recordCount < untilMsgNum); curPartitionList.current = filtersPartition; // 用作下一次请求的入参 - setIsStop(filtersPartition.length < 1); - isStopStatus.current = filtersPartition.length < 1; + if (!isStop) { + setIsStop(filtersPartition.length < 1); + isStopStatus.current = filtersPartition.length < 1; + } break; case 'max size': setIsStop(+recordSizeCur.current >= unitMsgSize); @@ -202,8 +204,10 @@ const ConsumeClientTest = () => { case 'max size per partition': // 过滤出消费size不足设定值的partition const filters = partitionConsumedList.filter((item: any) => item.recordSizeUnitB < unitMsgSize); - setIsStop(filters.length < 1); - isStopStatus.current = filters.length < 1; + if (!isStop) { + setIsStop(filters.length < 1); + isStopStatus.current = filters.length < 1; + } curPartitionList.current = filters; break; } From af2b93983f61fe1b6f91e161146745defdd58ed1 Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Thu, 1 Sep 2022 19:50:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=9D=87=E8=A1=A1?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=B1=95=E7=A4=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout-clusters-fe/src/pages/MutliClusterPage/List.tsx | 6 +++--- .../src/pages/SingleClusterDetail/LeftSider.tsx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/List.tsx b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/List.tsx index 6835cd2e..d5e7edfe 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/List.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/List.tsx @@ -147,9 +147,9 @@ const ListScroll = (props: { loadMoreData: any; list: any; pagination: any; getP }} > {[ - ['BytesIn', loadReBalanceEnable && loadReBalanceNwIn], - ['BytesOut', loadReBalanceEnable && loadReBalanceNwOut], - ['Disk', loadReBalanceEnable && loadReBalanceDisk], + ['BytesIn', loadReBalanceNwIn === 1], + ['BytesOut', loadReBalanceNwOut === 1], + ['Disk', loadReBalanceDisk === 1], ].map(([name, isBalanced]) => { return isBalanced ? (
{name} 已均衡
diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx index 7bd3e948..dc104a1a 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx @@ -165,9 +165,9 @@ const LeftSider = () => {
{clusterInfo?.kafkaVersion ?? '-'}
{clusterMetrics?.LoadReBalanceEnable !== undefined && [ - ['BytesIn', clusterMetrics?.LoadReBalanceEnable && clusterMetrics?.LoadReBalanceNwIn], - ['BytesOut', clusterMetrics?.LoadReBalanceEnable && clusterMetrics?.LoadReBalanceNwOut], - ['Disk', clusterMetrics?.LoadReBalanceEnable && clusterMetrics?.LoadReBalanceDisk], + ['BytesIn', clusterMetrics?.LoadReBalanceNwIn === 1], + ['BytesOut', clusterMetrics?.LoadReBalanceNwOut === 1], + ['Disk', clusterMetrics?.LoadReBalanceDisk === 1], ].map(([name, isBalanced]) => { return isBalanced ? (
{name} 已均衡
From d5667254f21a68fd8fe0d43d8614f9d5892e560c Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Thu, 1 Sep 2022 19:51:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=20&=20=E6=96=87?= =?UTF-8?q?=E6=A1=88=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout-clusters-fe/src/pages/Jobs/config.tsx | 7 ++++--- .../src/pages/MutliClusterPage/AccessCluster.tsx | 9 +++------ .../src/pages/MutliClusterPage/HomePage.tsx | 9 +++++++-- .../src/pages/MutliClusterPage/index.less | 5 +++++ .../src/pages/SingleClusterDetail/DetailChart/index.tsx | 6 ++++-- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/km-console/packages/layout-clusters-fe/src/pages/Jobs/config.tsx b/km-console/packages/layout-clusters-fe/src/pages/Jobs/config.tsx index a9af8a89..3474cb2e 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/Jobs/config.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/Jobs/config.tsx @@ -19,9 +19,9 @@ export const jobType = [ }, process.env.BUSSINESS_VERSION ? { - label: '集群均衡', - value: 2, - } + label: '集群均衡', + value: 2, + } : undefined, ].filter((t) => t); @@ -75,6 +75,7 @@ export const getJobsListColumns = (arg?: any) => { title: '任务ID', dataIndex: 'id', key: 'id', + width: 70, }, { title: '任务类型', diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx index e106c313..e7446095 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx @@ -1,5 +1,3 @@ -/* eslint-disable react/display-name */ - import { Button, Divider, Drawer, Form, Input, InputNumber, message, Radio, Select, Spin, Space, Utils } from 'knowdesign'; import * as React from 'react'; import { useIntl } from 'react-intl'; @@ -16,10 +14,9 @@ const clientPropertiesPlaceholder = `用于创建Kafka客户端进行信息获 { "security.protocol": "SASL_PLAINTEXT", "sasl.mechanism": "SCRAM-SHA-256", - "sasl.jaas.config": - "org.apache.kafka.common.security.scram. - ScramLoginModule required username="xxxxxx" - password="xxxxxx";" + "sasl.jaas.config": "org.apache.kafka.common.security. +scram.ScramLoginModule required username=\\"xxxxxx\\" pass +word=\\"xxxxxx\\";" } `; diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/HomePage.tsx b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/HomePage.tsx index f2cc3c8c..4839f54c 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/HomePage.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/HomePage.tsx @@ -93,7 +93,10 @@ const MultiClusterPage = () => { setVersionLoading(true); Utils.request(API.getClustersVersion) .then((versions: string[]) => { - setExistKafkaVersion(versions || []); + if (!Array.isArray(versions)) { + versions = []; + } + setExistKafkaVersion(versions.sort().reverse() || []); setVersionLoading(false); setCheckedKafkaVersions(versions || []); }) @@ -299,7 +302,9 @@ const MultiClusterPage = () => {
- {renderList} +
+ {renderList} +
); }; diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/index.less b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/index.less index 76ff6b41..1d79b7db 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/index.less +++ b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/index.less @@ -329,6 +329,11 @@ } } } + &-dashboard { + & > .dcloud-spin-nested-loading > .dcloud-spin-container::after { + background: transparent; + } + } .multi-cluster-list { box-sizing: content-box; diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/DetailChart/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/DetailChart/index.tsx index 798b69b1..36077890 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/DetailChart/index.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/DetailChart/index.tsx @@ -201,6 +201,8 @@ const DetailChart = (props: { children: JSX.Element }): JSX.Element => { if (Number.isNaN(parsedValue)) { parsedValue = values.MessagesIn; } else { + // 为避免出现过小的数字影响图表展示效果，图表值统一只保留到小数点后三位 + parsedValue = parseFloat(parsedValue.toFixed(3)); if (maxValue < parsedValue) maxValue = parsedValue; } const valuesWithUnit = Object.entries(values).map(([key, value]) => { @@ -287,8 +289,8 @@ const DetailChart = (props: { children: JSX.Element }): JSX.Element => { checkboxProps: (record: MetricInfo) => { return record.name === DEFAULT_METRIC ? { - disabled: true, - } + disabled: true, + } : {}; }, submitCallback: indicatorChangeCallback, From 61784c860a31a95f8d2d9373892037fda4cb07d3 Mon Sep 17 00:00:00 2001 From: ruanliang01 Date: Thu, 1 Sep 2022 21:07:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=B8=8E=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E4=BC=98=E5=85=88?= =?UTF-8?q?=E4=BD=BF=E7=94=A8EXTERNAL=5FKEY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../km/common/zookeeper/znode/brokers/BrokerMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/zookeeper/znode/brokers/BrokerMetadata.java b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/zookeeper/znode/brokers/BrokerMetadata.java index 1f598091..480867af 100644 --- a/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/zookeeper/znode/brokers/BrokerMetadata.java +++ b/km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/zookeeper/znode/brokers/BrokerMetadata.java @@ -113,7 +113,7 @@ public class BrokerMetadata implements Serializable { brokerMetadata.getEndpointMap().put(endpoint.substring(0, idx1), new IpPortData(brokerHost, brokerPort)); - if (KafkaConstant.EXTERNAL_KEY.equals(endpoint.substring(0, idx1))) { + if (KafkaConstant.INTERNAL_KEY.equals(endpoint.substring(0, idx1))) { // 优先使用internal的地址进行展示 brokerMetadata.setHost(brokerHost); brokerMetadata.setPort(ConvertUtil.string2Integer(brokerPort));