From b555d41faf262815924c7a6609432ffd7c13e273 Mon Sep 17 00:00:00 2001
From: wb-msm261421 <wb-msm261421@alibaba-inc.com>
Date: Mon, 11 Mar 2024 16:04:09 +0800
Subject: [PATCH] fix(sysom-web): Diagnosis query add service_name field and
 delete channel type default

---
 sysom_web/src/locales/en-US/pages.js              |  2 ++
 sysom_web/src/locales/zh-CN/pages.js              |  2 ++
 .../pages/diagnose/query/components/QueryForm.jsx | 15 ++++++++++++++-
 sysom_web/src/pages/diagnose/query/index.jsx      | 15 ++++++++++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/sysom_web/src/locales/en-US/pages.js b/sysom_web/src/locales/en-US/pages.js
index 32f5b9fa..ff4f77e3 100644
--- a/sysom_web/src/locales/en-US/pages.js
+++ b/sysom_web/src/locales/en-US/pages.js
@@ -404,6 +404,7 @@ export default {
   'pages.diagnose.creationtime': 'Creation time',
   'pages.diagnose.diagnosisID': 'Diagnosis ID',
   'pages.diagnose.diagnosisType': 'Diagnosis Type',
+  'pages.diagnose.diagnosisName': 'Diagnosis Name',
   'pages.diagnose.diagnosisParams': 'Diagnosis parameters',
   'pages.diagnose.diagnosisCommand': 'Diagnosis command',
   'pages.diagnose.state': 'State',
@@ -411,6 +412,7 @@ export default {
   'pages.diagnose.completediagnosis': 'Complete diagnosis',
   'pages.diagnose.anomaly': 'Anomaly',
   'pages.diagnose.operation': 'Operation',
+  'pages.diagnose.reset': 'Reset',
   'pages.diagnose.viewdiagnosisresults': 'Viewing diagnosis results',
   'pages.diagnose.viewdiagnosisdetail': 'Viewing diagnosis detail',
   'pages.diagnose.viewerrormessages': 'Viewing error messages',
diff --git a/sysom_web/src/locales/zh-CN/pages.js b/sysom_web/src/locales/zh-CN/pages.js
index 0edb489b..fc594637 100644
--- a/sysom_web/src/locales/zh-CN/pages.js
+++ b/sysom_web/src/locales/zh-CN/pages.js
@@ -441,6 +441,7 @@ export default {
   'pages.diagnose.creationtime': '创建时间',
   'pages.diagnose.diagnosisID': '诊断ID',
   'pages.diagnose.diagnosisType': '诊断类型',
+  'pages.diagnose.diagnosisName': '诊断名称',
   'pages.diagnose.diagnosisParams': '诊断参数',
   'pages.diagnose.diagnosisCommand': '诊断命令',
   'pages.diagnose.state': '状态',
@@ -448,6 +449,7 @@ export default {
   'pages.diagnose.completediagnosis': '诊断完毕',
   'pages.diagnose.anomaly': '异常',
   'pages.diagnose.operation': '操作',
+  'pages.diagnose.reset': '重置',
   'pages.diagnose.viewdiagnosisresults': '查看诊断结果',
   'pages.diagnose.viewdiagnosisdetail': '查看诊断详情',
   'pages.diagnose.viewerrormessages': '查看出错信息',
diff --git a/sysom_web/src/pages/diagnose/query/components/QueryForm.jsx b/sysom_web/src/pages/diagnose/query/components/QueryForm.jsx
index 9651f42b..c34f8db6 100644
--- a/sysom_web/src/pages/diagnose/query/components/QueryForm.jsx
+++ b/sysom_web/src/pages/diagnose/query/components/QueryForm.jsx
@@ -1,7 +1,7 @@
 /*
  * @Author: wb-msm241621
  * @Date: 2024-03-05 18:04:46
- * @LastEditTime: 2024-03-08 13:59:46
+ * @LastEditTime: 2024-03-11 15:24:22
  * @Description: 
  */
 import { useRef } from 'react';
@@ -25,6 +25,10 @@ export default (props) => {
                 formRef={resultFormRef}
                 onFinish={(v) => { props?.onDone?.(v) }}
                 submitter={{
+                    searchConfig: {
+                        submitText: <FormattedMessage id="pages.hotfix.submit" defaultMessage="submit" />,
+                        resetText: <FormattedMessage id="pages.diagnose.reset" defaultMessage="reset" />
+                    },
                     onReset: () => {
                         resultFormRef.current.resetFields()
                         props?.onReset()
@@ -51,6 +55,15 @@ export default (props) => {
                         valueEnum={props.chanelEnum}
                         initialValue={channel}
                     />
+                    <ProFormSelect
+                        name="service_name"
+                        width="md"
+                        label={int1.formatMessage({
+                            id: "pages.diagnose.diagnosisName",
+                            defaultMessage: "Diagnosis Name"
+                        })}
+                        valueEnum={props.serviceNameEnum}
+                    />
                 </ProFormGroup>
                 <ProFormList
                     name="params"
diff --git a/sysom_web/src/pages/diagnose/query/index.jsx b/sysom_web/src/pages/diagnose/query/index.jsx
index 6a71eaaf..cc6421dd 100644
--- a/sysom_web/src/pages/diagnose/query/index.jsx
+++ b/sysom_web/src/pages/diagnose/query/index.jsx
@@ -1,12 +1,12 @@
 /*
  * @Author: wb-msm241621
  * @Date: 2024-03-05 17:12:08
- * @LastEditTime: 2024-03-08 15:26:17
+ * @LastEditTime: 2024-03-11 16:01:03
  * @Description: 
  */
 import { PageContainer } from '@ant-design/pro-layout';
 import _ from 'lodash';
-import { request } from 'umi';
+import { request, FormattedMessage } from 'umi';
 import { Divider, Modal } from 'antd';
 import QueryForm from './components/QueryForm';
 import TaskList from '../components/TaskList';
@@ -53,7 +53,8 @@ const DiagnoseQuery = () => {
     const [params, setParams] = useState(initialierQueryParams);
     const [diagnoseMenus, setDiagnoseMenus] = useState([]);
     const [pannelConfig, setPannelConfig] = useState();
-    const chanelEnum = new Object({ ssh: { text: "SSH通道" } })
+    const chanelEnum = new Object()
+    const [serviceNameEnum, setServiceNameEnum] = useState({})
 
     useEffect(() => {
         request("/resource/diagnose/v2/multichannel.json")
@@ -77,6 +78,13 @@ const DiagnoseQuery = () => {
             })
             .then(res => {
                 const { menus } = res;
+                const snMenu = new Object({})
+                menus.map(item => {
+                    const itemTuple = _.split(item, '.')
+                    const serviceName = itemTuple[itemTuple.length - 1]
+                    snMenu[serviceName] = { text: <FormattedMessage id={item} defaultMessage={serviceName} /> }
+                })
+                setServiceNameEnum(snMenu)
                 const diagnosePaths = menus.map(item => {
                     const s = _.replace(item, "menu.", "")
                     const new_s = insertIntoTuple((_.split(s, ".")), 1, "v2")
@@ -120,6 +128,7 @@ const DiagnoseQuery = () => {
             <QueryForm
                 params={initialierQueryParams}
                 chanelEnum={chanelEnum}
+                serviceNameEnum={serviceNameEnum}
                 onDone={(v) => { setParams(v); resultListRef.current.reload(); }}
                 onReset={() => { setParams(initialierQueryParams); resultListRef.current.reload(); }}
             />
-- 
Gitee