Browse Source

ADD:添加智能推荐协同模式

wjj 3 years ago
parent
commit
9d559d94dc

+ 6 - 3
src/components/GlobalHeader/RightContent.jsx

@@ -1,4 +1,4 @@
-import { Tooltip, Tag } from 'antd';
+import { Tooltip, Tag ,message} from 'antd';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
 import { connect, SelectLang } from 'umi';
@@ -14,7 +14,7 @@ const ENVTagColor = {
 };
 
 const GlobalHeaderRight = (props) => {
-  const { theme, layout, dispatch, taskName } = props;
+  const { theme, layout, dispatch, taskName,collaborative_type } = props;
   const [idInfo, setIdInfo] = useState({});
   let className = styles.right;
 
@@ -42,6 +42,7 @@ const GlobalHeaderRight = (props) => {
         setIdInfo(idInfo);
       }else{
         //错误处理
+        message.error(res.cause);
         console.log(res)
       }
     })
@@ -61,7 +62,8 @@ const GlobalHeaderRight = (props) => {
   return (
     <div className={className}>
       {/*<NoticeIconView />*/}
-      <h3>{taskName || ''}</h3>
+      <h3>{taskName ? `${taskName} [${collaborative_type==='0' ? '智能推荐模式' : ''}]` : ''}</h3>
+      {/*<h3>{taskName || ''}</h3>*/}
       {/*<SelectLang className={styles.action}/>*/}
     </div>
   );
@@ -71,4 +73,5 @@ export default connect(({ report, settings }) => ({
   theme: settings.navTheme,
   layout: settings.layout,
   taskName: report.taskName,
+  collaborative_type: report.collaborative_type,
 }))(GlobalHeaderRight);

+ 5 - 2
src/models/report.js

@@ -4,21 +4,24 @@ const ReportModel = {
   namespace: 'report',
   state: {
     taskName: '',
+    collaborative_type:''
   },
   effects: {
     * getTaskName({ payload }, { call, put}){
       const { examId } = payload;
       const res = yield call(getExamInfo, examId);
       const taskName = res?.result?.name;
+      const collaborative_type = res?.result?.collaborative_type;
       yield put({
         type: 'saveTaskName',
-        payload: taskName,
+        payload: { taskName,collaborative_type },
       });
     },
   },
   reducers: {
     saveTaskName(state, { payload }) {
-      return { ...state, taskName: payload };
+      const {collaborative_type,taskName} = payload;
+      return { ...state, taskName ,collaborative_type };
     },
   }
 };

+ 2 - 1
src/pages/bugs/components/BugTreeList/index.jsx

@@ -23,7 +23,8 @@ const BugTreeList = (props) => {
   }, [bugTreeList]);
 
   useEffect(() => {
-    if (JSON.stringify(currentTreeItem) !== '[]') {
+    if (currentTreeItem&&JSON.stringify(currentTreeItem) !== '[]') {
+      console.log(currentTreeItem)
       //获取bug详情信息用于展示
       dispatch({
         type: 'editReport/getBugDetail',

+ 13 - 9
src/pages/edit/components/Step2/index.jsx

@@ -50,7 +50,7 @@ const Step2 = (props) => {
   const [editReportForm] = Form.useForm();
 
   const {
-    dispatch, reportCommonInfo, osType,
+    dispatch, reportCommonInfo, osType,collaborative_type,
     testCaseList, caseBugList, categories, pathInfo,commonId
   } = props;
   const [showTaskRecommendModal, setTaskRecommendModal] = useState(false);
@@ -453,14 +453,17 @@ const Step2 = (props) => {
                     <PlusOutlined className={styles.addIcon} />
                     缺陷
                   </Button>
+                  {
+                    collaborative_type === '0' ?
+                      <Button size="small"
+                              className={styles.recommendBtn}
+                              disabled={JSON.stringify(currentTestCaseRef.current) === '{}'}
+                              onClick={() => handleClickRecommendBtn()}>
+                        <ShareAltOutlined className={styles.addIcon}/>
+                        推荐
+                      </Button> : null
+                  }
 
-                  <Button size="small"
-                          className={styles.recommendBtn}
-                          disabled={JSON.stringify(currentTestCaseRef.current) === '{}'}
-                          onClick={() => handleClickRecommendBtn()}>
-                    <ShareAltOutlined className={styles.addIcon}/>
-                    推荐
-                  </Button>
                 </div>
 
               </div>
@@ -846,7 +849,7 @@ const Step2 = (props) => {
   );
 };
 
-export default connect(({ editReport, loading }) => ({
+export default connect(({ editReport, loading ,report}) => ({
   submitting: loading.effects['editReport/submitStepForm'],
   reportCommonInfo: editReport.reportCommonInfo,
   testCaseList: editReport.testCaseList,
@@ -855,4 +858,5 @@ export default connect(({ editReport, loading }) => ({
   pathInfo: editReport.pathInfo,
   osType: editReport.osType,
   commonId: editReport.commonId,
+  collaborative_type: report.collaborative_type,
 }))(Step2);

+ 1 - 0
src/pages/edit/model.js

@@ -35,6 +35,7 @@ const Model = {
       amount: '500',
     },
     taskName: '',
+    collaborative_type:'0',
     reportCommonInfo: {},
     testCaseList: [],
     caseBugList: [],