diff --git a/web/src/components/kibana/console/components/ConsoleInput.tsx b/web/src/components/kibana/console/components/ConsoleInput.tsx index a3cc2946..93d7b9d7 100644 --- a/web/src/components/kibana/console/components/ConsoleInput.tsx +++ b/web/src/components/kibana/console/components/ConsoleInput.tsx @@ -106,7 +106,7 @@ const ConsoleInputUI = ({clusterID, initialText}:ConsoleInputProps) => { editorInstanceRef.current = senseEditor; setInputEditor(senseEditor); senseEditor.update(initialText || DEFAULT_INPUT_VALUE); - applyCurrentSettings(senseEditor!.getCoreEditor(), {fontSize:14, wrapMode: true,}); + // applyCurrentSettings(senseEditor!.getCoreEditor(), {fontSize:14, wrapMode: true,}); function setupAutosave() { let timer: number; diff --git a/web/src/components/kibana/console/components/ConsoleOutput.tsx b/web/src/components/kibana/console/components/ConsoleOutput.tsx index e87cbd6e..178619db 100644 --- a/web/src/components/kibana/console/components/ConsoleOutput.tsx +++ b/web/src/components/kibana/console/components/ConsoleOutput.tsx @@ -46,7 +46,7 @@ function ConsoleOutput({clusterID}: props) { const textarea = editorRef.current!.querySelector('textarea')!; textarea.setAttribute('id', inputId); textarea.setAttribute('readonly', 'true'); - applyCurrentSettings(editorInstanceRef.current!, {fontSize:14, wrapMode: true,}) + // applyCurrentSettings(editorInstanceRef.current!, {fontSize:14, wrapMode: true,}) const unsubscribeResizer = subscribeResizeChecker(editorRef.current!, editorInstanceRef.current!); return () => { diff --git a/web/src/locales/zh-CN/alert.js b/web/src/locales/zh-CN/alert.js index f293a00d..c886d655 100644 --- a/web/src/locales/zh-CN/alert.js +++ b/web/src/locales/zh-CN/alert.js @@ -15,7 +15,7 @@ export default { 'alert.dashboard.severity-options.all': '所有告警级别', 'alert.dashboard.state-options.all': '所有状态', 'alert.dashboard.state-options.active': '告警中', - 'alert.dashboard.state-options.acknowledged': '已知晓', + 'alert.dashboard.state-options.acknowledged': '已响应', 'alert.dashboard.state-options.completed': '已恢复', 'alert.dashboard.state-options.error': '错误', 'alert.dashboard.state-options.deleted': '已删除', @@ -27,7 +27,7 @@ export default { 'alert.dashboard.table.columns.trigger_name': '触发器名称', 'alert.dashboard.table.columns.severity': '告警级别', 'alert.dashboard.table.columns.state': '状态', - 'alert.dashboard.table.columns.acknowledged_time': '确认时间', + 'alert.dashboard.table.columns.acknowledged_time': '响应时间', 'alert.monitor': '监控管理', 'alert.monitor.self': '监控项', diff --git a/web/src/pages/Alerting/index.js b/web/src/pages/Alerting/index.js index 67cdebeb..aa1a2467 100644 --- a/web/src/pages/Alerting/index.js +++ b/web/src/pages/Alerting/index.js @@ -32,7 +32,7 @@ const notifications = { } } -const AlertingMain = React.memo(Main) +// const AlertingMain = React.memo(Main) const AlertingUI = (props)=>{ if(!props.selectedCluster.id){ @@ -49,12 +49,12 @@ const AlertingUI = (props)=>{ }, [props.history]) return ( -
- +