日志报告

src/view/Manage/DatasourceManage/Component/TaskReportModal.jsx

@@ -11,13 +11,14 @@ const { Meta } = Card;
 const { RangePicker } = DatePicker;
 
 const TaskReportModal = (props) => {
-  const { visible, onCancel, scope } = props;
+  const { visible, onCancel, scope, scopes } = props;
 
   const [ summaryDatas, setSummaryDatas ] = useState([]);
   const [ currentSummaryData, setCurrentSummaryData ] = useState({});
   const [ reportDetail, setReportDetail ] = useState({});
   const [ taskTracersBindStateId, setTaskTracersBindStateId ] = useState([]);
   const [ rangeValue, setRangeValue ] = useState([]);
+  const [ expandedRowKeys, setExpandedRowKeys ] = useState([]);
 
   useEffect(() => {
 
@@ -73,12 +74,28 @@ const TaskReportModal = (props) => {
 
         data && (data.title||[]).sort(compare);
 
+        let _scopes = [];
+
+        (scopes||[]).forEach(item => {
+          (item.catalogs||[]).forEach((catalog) => {
+            _scopes = [..._scopes, ...(catalog.scopes||[])]; 
+          });
+        })
+
         data && (data.title||[]).forEach(item => {
           item.title = item.value||'';
           item.dataIndex = item.name||'';
           item.ellipsis = true;
         })
 
+        data && (data.datas||[]).forEach(item => {
+          (_scopes||[]).forEach(_item => {
+            if (_item.scopeId === Number(item.scope)) {
+              item.scope = _item.scopeName;
+            }
+          })
+        })
+
         setReportDetail(data||{});
       }
     })
@@ -117,8 +134,9 @@ const TaskReportModal = (props) => {
 
   const onSummaryDataChange = (item) => {
     if (item.hasDetail) {
-      setCurrentSummaryData(item);
       setTaskTracersBindStateId([]);
+      setCurrentSummaryData(item);
+      setExpandedRowKeys([]);
       getTaskReportDetail(item.params);
     }
   }
@@ -128,6 +146,7 @@ const TaskReportModal = (props) => {
     setCurrentSummaryData({});
     setReportDetail({});
     setTaskTracersBindStateId([]);
+    setExpandedRowKeys([]);
   }
 
   return (
@@ -228,6 +247,7 @@ const TaskReportModal = (props) => {
               </Spin>
             );
           },
+          expandedRowKeys,
           onExpand: (expanded, record) => {
             let exsit = false;
             (taskTracersBindStateId||[]).forEach(item => {
@@ -236,9 +256,20 @@ const TaskReportModal = (props) => {
               }
             })
 
+            const newExpandedKeys = [...expandedRowKeys];
+            if (expanded) {
+              newExpandedKeys.push(record.taskStateId||'');
+            } else {
+              const index = newExpandedKeys.indexOf(record.id||'');
+              newExpandedKeys.splice(index, 1);
+            }
+
+            setExpandedRowKeys([...newExpandedKeys]);
+
             if (expanded && !exsit) {
               getTaskTracer(record);
             }
+
           }
         }}
       />

src/view/Manage/DatasourceManage/index.jsx

@@ -300,6 +300,7 @@ const DatasourceManage = () => {
       <TaskReportModal 
         visible={taskReportModalVisible}
         scope={selectedScope}
+        scopes={scopes}
         onCancel={onTaskReportModalCancel}
       />