Skip to content

Commit aee0d0e

Browse files
committed
fix: 正则匹配增加匹配调试- 回显内容
1 parent f415918 commit aee0d0e

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

app/renderer/src/main/src/pages/mitm/MITMRule/MITMRuleFromModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ export const RuleContent: React.FC<RuleContentProps> = React.forwardRef((props,
818818
closable={true}
819819
bodyStyle={{padding: 0}}
820820
>
821-
<RegexTester onSave={(v) => onGetRule(v)} defaultCode={defaultCode}/>
821+
<RegexTester onSave={(v) => onGetRule(v)} defaultCode={defaultCode} rule={rule}/>
822822
</YakitModal>
823823
</>
824824
)

app/renderer/src/main/src/pages/mitm/MITMRule/RegexTester.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {useEffect, useState} from "react"
2-
import {useDebounceEffect, useMemoizedFn} from "ahooks"
2+
import {useDebounceEffect, useMemoizedFn, useUpdateEffect} from "ahooks"
33
import {editor} from "monaco-editor"
44
import * as monaco from "monaco-editor"
55
import classNames from "classnames"
@@ -17,6 +17,7 @@ const {ipcRenderer} = window.require("electron")
1717
interface RegexTesterProps {
1818
onSave: (pattern: string) => void
1919
defaultCode?: string
20+
rule?: string
2021
}
2122

2223
interface MatchResult {
@@ -26,10 +27,10 @@ interface MatchResult {
2627
}
2728

2829
export const RegexTester: React.FC<RegexTesterProps> = React.memo((props) => {
29-
const {onSave, defaultCode = ""} = props
30+
const {onSave, defaultCode = "", rule = ''} = props
3031
const {t} = useI18nNamespaces(["mitm", "webFuzzer"])
3132

32-
const [regexPattern, setRegexPattern] = useState("")
33+
const [regexPattern, setRegexPattern] = useState(rule)
3334
const [testText, setTestText] = useState(defaultCode)
3435
const [editorInstance, setEditorInstance] = useState<editor.IStandaloneCodeEditor>()
3536
const [matches, setMatches] = useState<MatchResult[]>([])
@@ -153,9 +154,12 @@ export const RegexTester: React.FC<RegexTesterProps> = React.memo((props) => {
153154
const handleRegexSave = useMemoizedFn((val: string) => {
154155
setActiveMatchIndex(undefined)
155156
setRegexPattern(val)
156-
onSave(val)
157157
})
158158

159+
useUpdateEffect(()=>{
160+
onSave(regexPattern)
161+
},[regexPattern])
162+
159163
return (
160164
<div className={styles["regex-tester"]}>
161165
<div className={styles["regex-tester-left"]}>

0 commit comments

Comments
 (0)