Skip to content

fix: history 内置Tag 加上统计总数的逻辑 #4065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hubin4826 merged 1 commit into from
Jul 31, 2026
Merged

fix: history 内置Tag 加上统计总数的逻辑 #4065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/renderer/src/main/src/components/HTTPHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ const HTTPHistoryInner: React.FC<HTTPHistoryProp> = (props) => {
const [curTags, setCurTags] = useState<string[]>([])
const httpHistoryRef = useRef<HTMLDivElement>(null)
const [inViewport] = useInViewport(httpHistoryRef)
const { builtinTagList, setBuiltinTagList } = useBuiltinTagList(true, inViewport)
const { builtinTagList } = useBuiltinTagList(true, inViewport)
Comment thread
hjhke marked this conversation as resolved.
const [rulesQueryparams, setRulesQueryparams] = useState<string>('')
const [mitmAggregateFilterRows, setMitmAggregateFilterRows] = useState<MitmExtractAggregateFlowFilterRow[]>([])
const [httpFlowTableDataLength, setHttpFlowTableDataLength] = useState<number>(0)
Expand Down Expand Up @@ -358,7 +358,6 @@ const HTTPHistoryInner: React.FC<HTTPHistoryProp> = (props) => {
curTags={curTags}
onSetCurTags={setCurTags}
onSetCurProcess={setCurProcess}
setBuiltinTagList={setBuiltinTagList}
resetTableAndEditorShow={resetTableAndEditorShow}
></HistoryProcess>
</div>
Expand Down Expand Up @@ -880,7 +879,6 @@ interface HistoryProcessProps {
curTags?: string[]
onSetCurTags?: (curTags: string[]) => void
resetTableAndEditorShow?: (table: boolean, editor: boolean) => void // 重置 表格显示-编辑器不显示
setBuiltinTagList?: (builtinTagList: FiltersItemProps[]) => void
}
export const HistoryProcess: React.FC<HistoryProcessProps> = React.memo((props) => {
const {
Expand All @@ -891,7 +889,6 @@ export const HistoryProcess: React.FC<HistoryProcessProps> = React.memo((props)
onSetCurProcess,
onSetCurTags,
resetTableAndEditorShow,
setBuiltinTagList: propsSetBuiltinTagList,
} = props
const processRef = useRef<HTMLDivElement>(null)
const [inViewport] = useInViewport(processRef)
Expand Down Expand Up @@ -992,7 +989,9 @@ export const HistoryProcess: React.FC<HistoryProcessProps> = React.memo((props)
setTagListLoading(true)
fetchHTTPFlowsFieldGroup(refreshRequest)
.then((rsp) => {
const tags = (rsp.Tags || []).filter((item) => item.Value && item.Value !== HTTP_FLOW_FAVORITE_TAG)
const tags = (rsp.Tags || []).filter(
(item) => !!item.Value && item.Value !== HTTP_FLOW_FAVORITE_TAG && (!item.Builtin || !!item.Total),
)
const toFilterItem = (Value: string) => ({ label: Value, value: Value })
let TagList: FiltersItemProps[] = [],
builtinTagList: FiltersItemProps[] = []
Expand All @@ -1005,7 +1004,6 @@ export const HistoryProcess: React.FC<HistoryProcessProps> = React.memo((props)
})
setTagList(TagList)
setBuiltinTagList(builtinTagList)
propsSetBuiltinTagList?.(builtinTagList)
})
.catch((error) => {
yakitNotify('error', `query HTTP Flows Field Group failed: ${error}`)
Expand Down
3 changes: 1 addition & 2 deletions app/renderer/src/main/src/pages/hTTPHistoryAnalysis/HTTPHistory/HTTPHistoryFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ const HTTPHistoryFilterInner: React.FC<HTTPHistoryFilterProps> = React.memo((pro
// #endregion
const httpHistoryFilterRef = useRef<HTMLDivElement>(null)
const [inViewport] = useInViewport(httpHistoryFilterRef)
const { builtinTagList, setBuiltinTagList } = useBuiltinTagList(true, inViewport)
const { builtinTagList } = useBuiltinTagList(true, inViewport)

return (
<div className={styles['HTTPHistoryFilter']} ref={httpHistoryFilterRef}>
Expand Down Expand Up @@ -332,7 +332,6 @@ const HTTPHistoryFilterInner: React.FC<HTTPHistoryFilterProps> = React.memo((pro
curTags={curTags}
onSetCurTags={setCurTags}
onSetCurProcess={setCurProcess}
setBuiltinTagList={setBuiltinTagList}
></HistoryProcess>
</div>
<div className={styles['process-wrapper']} style={{ display: activeKey === 'rules' ? 'block' : 'none' }}>
Expand Down
Loading