diff --git a/src/views/traceManage/tshark/hooks/usePCAP.ts b/src/views/traceManage/tshark/hooks/usePCAP.ts index 36eeb0a1..d9c16e0a 100644 --- a/src/views/traceManage/tshark/hooks/usePCAP.ts +++ b/src/views/traceManage/tshark/hooks/usePCAP.ts @@ -31,11 +31,11 @@ type StateType = { /**当前选中的帧编号 */ selectedFrame: number; /**当前选中的帧数据 */ - selectedPacket: { tree: any[]; data_sources: any[] }; + packetFrame: { tree: any[]; data_sources: any[] }; /**pcap包帧数据 */ - packetFrameData: Map | null; - /**当前选中的帧数据-空占位 */ - selectedTreeEntry: typeof NO_SELECTION; + packetFrameTreeMap: Map | null; + /**当前选中的帧数据 */ + selectedTree: typeof NO_SELECTION; /**选择帧的Dump数据标签 */ selectedDataSourceIndex: number; /**处理完成状态 */ @@ -69,11 +69,11 @@ export function usePCAP() { filter: '', filterError: null, currentFilter: '', - selectedFrame: 1, + selectedFrame: 0, /**当前选中的帧数据 */ - selectedPacket: { tree: [], data_sources: [] }, - packetFrameData: null, // 注意：Map 需要额外处理 - selectedTreeEntry: NO_SELECTION, // NO_SELECTION 需要定义 + packetFrame: { tree: [], data_sources: [] }, + packetFrameTreeMap: null, // 注意：Map 需要额外处理 + selectedTree: NO_SELECTION, // NO_SELECTION 需要定义 /**选择帧的Dump数据标签 */ selectedDataSourceIndex: 0, /**处理完成状态 */ @@ -91,9 +91,9 @@ export function usePCAP() { state.nextPageNum = 1; // 选择帧的数据 state.selectedFrame = 0; - state.selectedPacket = { tree: [], data_sources: [] }; - state.packetFrameData = null; - state.selectedTreeEntry = NO_SELECTION; + state.packetFrame = { tree: [], data_sources: [] }; + state.packetFrameTreeMap = null; + state.selectedTree = NO_SELECTION; state.selectedDataSourceIndex = 0; } @@ -121,23 +121,23 @@ export function usePCAP() { } /**帧数据点击选中 */ - function handleSelectedTreeEntry(e: any) { - console.log('fnSelectedTreeEntry', e); - state.selectedTreeEntry = e; + function handleSelectedTree(e: any) { + // console.log('fnSelectedTree', e); + state.selectedTree = e; } /**报文数据点击选中 */ function handleSelectedFindSelection(src_idx: number, pos: number) { - console.log('fnSelectedFindSelection', pos); - if (state.packetFrameData == null) return; + // console.log('fnSelectedFindSelection', pos); + if (state.packetFrameTreeMap == null) return; // find the smallest one let current = null; - for (let [k, pp] of state.packetFrameData) { + for (let [k, pp] of state.packetFrameTreeMap) { if (pp.idx !== src_idx) continue; if (pos >= pp.start && pos <= pp.start + pp.length) { if ( current != null && - state.packetFrameData.get(current).length > pp.length + state.packetFrameTreeMap.get(current).length > pp.length ) { current = k; } else { @@ -146,19 +146,19 @@ export function usePCAP() { } } if (current != null) { - state.selectedTreeEntry = state.packetFrameData.get(current); + state.selectedTree = state.packetFrameTreeMap.get(current); } } /**包数据表点击选中 */ function handleSelectedFrame(no: number) { - console.log('fnSelectedFrame', no, state.totalFrames); + // console.log('fnSelectedFrame', no, state.totalFrames); state.selectedFrame = no; wk.send({ type: 'select', number: state.selectedFrame }); } /**包数据表滚动底部加载 */ function handleScrollBottom() { const totalFetched = state.packetFrames.length; - console.log('fnScrollBottom', totalFetched); + // console.log('fnScrollBottom', totalFetched); if (!state.nextPageLoad && totalFetched < state.totalFrames) { state.nextPageLoad = true; state.nextPageNum++; @@ -167,7 +167,7 @@ export function usePCAP() { } /**包数据表过滤 */ function handleFilterFrames() { - console.log('fnFilterFinish', state.filter); + // console.log('fnFilterFinish', state.filter); wk.send({ type: 'check-filter', filter: state.filter }); } /**包数据表加载 */ @@ -254,9 +254,9 @@ export function usePCAP() { } break; case 'selected': - state.selectedPacket = res.data; - state.packetFrameData = parseFrameData('root', res.data); - state.selectedTreeEntry = NO_SELECTION; + state.packetFrame = res.data; + state.packetFrameTreeMap = parseFrameData('root', res.data); + state.selectedTree = NO_SELECTION; state.selectedDataSourceIndex = 0; break; case 'processed': @@ -306,7 +306,7 @@ export function usePCAP() { return { state, - handleSelectedTreeEntry, + handleSelectedTree, handleSelectedFindSelection, handleSelectedFrame, handleScrollBottom, diff --git a/src/views/traceManage/tshark/index.vue b/src/views/traceManage/tshark/index.vue index cc3b78dc..a888fb71 100644 --- a/src/views/traceManage/tshark/index.vue +++ b/src/views/traceManage/tshark/index.vue @@ -8,11 +8,12 @@ import DissectionDump from './components/DissectionDump.vue'; import PacketTable from './components/PacketTable.vue'; import { usePCAP, NO_SELECTION } from './hooks/usePCAP'; import { parseSizeFromFile } from '@/utils/parse-utils'; +import { parseDateToStr } from '@/utils/date-utils'; import useI18n from '@/hooks/useI18n'; const { t } = useI18n(); const { state, - handleSelectedTreeEntry, + handleSelectedTree, handleSelectedFindSelection, handleSelectedFrame, handleScrollBottom, @@ -49,8 +50,9 @@ function fnUpload(up: UploadRequestOption) { :loading="!state.initialized" :body-style="{ padding: '12px' }" > -
- + + + + - - - + + + + - + @@ -163,15 +202,15 @@ function fnUpload(up: UploadRequestOption) { @@ -184,17 +223,6 @@ function fnUpload(up: UploadRequestOption) {