diff --git a/web/config/router.config.js b/web/config/router.config.js index b33bbbb5..bfcdee98 100644 --- a/web/config/router.config.js +++ b/web/config/router.config.js @@ -482,7 +482,7 @@ export default [ }, { path: '/system/command', - name: 'command', + name: 'commonCommand', component: './System/Command/Index', hideInMenu: true }, diff --git a/web/src/components/GlobalHeader/index.less b/web/src/components/GlobalHeader/index.less index 5ed7fbaf..23e61c18 100644 --- a/web/src/components/GlobalHeader/index.less +++ b/web/src/components/GlobalHeader/index.less @@ -127,3 +127,7 @@ i.trigger { } } } + +[tabindex]{ + outline: none !important; +} \ No newline at end of file diff --git a/web/src/components/kibana/console/components/Console.tsx b/web/src/components/kibana/console/components/Console.tsx index 42a0f717..ce0ed644 100644 --- a/web/src/components/kibana/console/components/Console.tsx +++ b/web/src/components/kibana/console/components/Console.tsx @@ -41,22 +41,22 @@ const ConsoleWrapper = ({ const lastDatum = requestData?.[requestData.length - 1] ?? requestError; - const calcHeight = height > 0 ? (height-35)+'px' : '100%'; - const leftBarRef = useRef(null) - const rightBarRef = useRef(null) - const [widths, setWidths] = useState(['50%', '50%']) - const onPanelWidthChange = (widths:any)=>{ - const [lp, rp] = widths; - setWidths([lp+2+'%', rp+'%']); - } + const calcHeight = height > 0 ? (height)+'px' : '100%'; + // const leftBarRef = useRef(null) + // const rightBarRef = useRef(null) + // const [widths, setWidths] = useState(['calc(50% - 7px)', 'calc(50% - 7px)']) + // const onPanelWidthChange = (widths:any)=>{ + // const [lp, rp] = widths; + // setWidths([lp+'%', rp+'%']); + // } return (
- - + + -
+
- + -
+
- 健康状态： + ：
- 集群地址： - {selectedCluster.host} + ： + {selectedCluster.host}
- 版本： - {selectedCluster.version} + ： + {selectedCluster.version}
); const [headerInfoVisible, setHeaderInfoVisible] = React.useState(false) @@ -105,7 +106,7 @@ const [headerInfoVisible, setHeaderInfoVisible] = React.useState(false) <>
- 响应状态： + ： } > - - {/* Use   to ensure that no matter the width we don't allow line breaks */} - {statusCode} - {statusText} - + + + {/* Use   to ensure that no matter the width we don't allow line breaks */} + {statusCode} - {statusText} + +
- 时延： + ：
- - - + {/* */}
diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js index 4480aea0..ab955f21 100644 --- a/web/src/locales/en-US.js +++ b/web/src/locales/en-US.js @@ -1,4 +1,5 @@ import alert from './en-US/alert'; +import console from './en-US/console'; export default { 'navBar.lang': 'Languages', @@ -152,6 +153,7 @@ export default { 'menu.system.logs.audit': 'AUDIT', 'menu.system.logs.query': 'QUERY', 'menu.system.logs.slow': 'SLOW', + 'menu.system.commonCommand': 'COMMON COMMAND', 'menu.form': 'Form', @@ -405,4 +407,5 @@ export default { 'Setting panel shows in development environment only, please manually modify', ...alert, + ...console, }; diff --git a/web/src/locales/en-US/console.js b/web/src/locales/en-US/console.js new file mode 100644 index 00000000..7cc9e809 --- /dev/null +++ b/web/src/locales/en-US/console.js @@ -0,0 +1,9 @@ +export default { + 'console.cluster.status': 'Health', + 'console.cluster.endpoint': 'Endpoint', + 'console.cluster.version': 'Version', + 'console.response.status': 'Response status', + 'console.response.time_elapsed': 'Time elapsed', + 'console.request.headers': 'Headers', + 'console.request.headers.title': 'Request header info', +} \ No newline at end of file diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js index b5ada7b8..d58d79b5 100644 --- a/web/src/locales/zh-CN.js +++ b/web/src/locales/zh-CN.js @@ -1,4 +1,5 @@ import alert from './zh-CN/alert'; +import console from './zh-CN/console'; export default { 'navBar.lang': '语言', @@ -158,6 +159,7 @@ export default { 'menu.system.logs.audit': '审计日志', 'menu.system.logs.query': '查询日志', 'menu.system.logs.slow': '慢日志', + 'menu.system.commonCommand': '常用命令', 'menu.form': '表单页', @@ -406,4 +408,5 @@ export default { '配置栏只在开发环境用于预览，生产环境不会展现，请拷贝后手动修改配置文件', ...alert, + ...console, }; diff --git a/web/src/locales/zh-CN/console.js b/web/src/locales/zh-CN/console.js new file mode 100644 index 00000000..fadd5d02 --- /dev/null +++ b/web/src/locales/zh-CN/console.js @@ -0,0 +1,9 @@ +export default { + 'console.cluster.status': '健康状态', + 'console.cluster.endpoint': '集群地址', + 'console.cluster.version': '版本', + 'console.response.status': '响应状态', + 'console.response.time_elapsed': '时延', + 'console.request.headers': '请求头', + 'console.request.headers.title': '请求头信息', +} \ No newline at end of file diff --git a/web/src/pages/Cluster/components/clusters.scss b/web/src/pages/Cluster/components/clusters.scss index 189f2c27..bbbdbb26 100644 --- a/web/src/pages/Cluster/components/clusters.scss +++ b/web/src/pages/Cluster/components/clusters.scss @@ -9,6 +9,7 @@ &.left{ border-right: 1px solid rgb(232, 232, 232); padding-right: 15px; + min-width: 642px; .card-cnt{ margin-top: 10px; .ant-list-item{ diff --git a/web/src/pages/Cluster/components/tag.scss b/web/src/pages/Cluster/components/tag.scss index e82b8767..f3aa5708 100644 --- a/web/src/pages/Cluster/components/tag.scss +++ b/web/src/pages/Cluster/components/tag.scss @@ -9,6 +9,7 @@ &.checked{ background: #1890ff; color: #fff; + border-color: #1890ff; } >.wrapper{ font-size: 12px; diff --git a/web/src/pages/DevTool/Console.tsx b/web/src/pages/DevTool/Console.tsx index be144617..777c8f21 100644 --- a/web/src/pages/DevTool/Console.tsx +++ b/web/src/pages/DevTool/Console.tsx @@ -1,6 +1,7 @@ import Console from '../../components/kibana/console/components/Console'; import {connect} from 'dva'; -import {Tabs, Button, Icon, Menu, Dropdown} from 'antd'; +import {Button, Icon, Menu, Dropdown, Tabs} from 'antd'; +// import Tabs from '@/components/infini/tabs'; import {useState, useReducer, useCallback, useEffect, useMemo, useRef, useLayoutEffect} from 'react'; import {useLocalStorage} from '@/lib/hooks/storage'; import {setClusterID} from '../../components/kibana/console/modules/mappings/mappings';