Skip to content

Commit 90aad17

Browse files
authored
Merge pull request #13 from hans000/dev
Dev
2 parents 691fd9d + 8c24504 commit 90aad17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+424
-921
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
## v1.16.0
2+
- 更新icon
23
- vite更新到5.0,antd更新到5.0
34
- 添加禁用类型,可设置禁用 xhr 或 fetch
45
- 添加插件拦截时机,可设置start end delay trigger override
6+
- 修复fake不生效的问题
57

68
## v1.15.0
79
- 添加run at功能

assets/header-zh_CN.svg

+16
Loading

assets/header.svg

+21-12
Loading

public/images/128-black.png

-1.31 KB
Loading

public/images/128-gray.png

-1.34 KB
Loading

public/images/128-red.png

-1.36 KB
Loading

public/images/128.png

-1.33 KB
Loading

public/images/16-black.png

-380 Bytes
Binary file not shown.

public/images/16-gray.png

-409 Bytes
Binary file not shown.

public/images/16-red.png

-427 Bytes
Binary file not shown.

public/images/16.png

-405 Bytes
Binary file not shown.

public/images/32-black.png

-616 Bytes
Binary file not shown.

public/images/32-gray.png

-646 Bytes
Binary file not shown.

public/images/32-red.png

-662 Bytes
Binary file not shown.

public/images/32.png

-648 Bytes
Binary file not shown.

public/images/48-black.png

-920 Bytes
Binary file not shown.

public/images/48-gray.png

-904 Bytes
Binary file not shown.

public/images/48-red.png

-951 Bytes
Binary file not shown.

public/images/48.png

-949 Bytes
Binary file not shown.

public/manifest.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"browser_action": {
2323
"default_title": "Easy Interceptor by hans000 - v1.16.0",
2424
"default_popup": "index.html",
25-
"default_icon": "images/48-gray.png"
25+
"default_icon": "images/128-gray.png"
2626
},
2727
"icons": {
28-
"16": "images/16.png",
29-
"32": "images/32.png",
30-
"48": "images/48.png",
28+
"16": "images/128.png",
29+
"32": "images/128.png",
30+
"48": "images/128.png",
3131
"128": "images/128.png"
3232
},
3333
"content_scripts": [

readme-zh_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,4 @@ interface MatchingRule extends ResponseRule {
207207

208208

209209
## License
210-
[GPL 3.0](./LICENSE)
210+
[AGPL](./LICENSE)

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,4 @@ At first, it was intended to solve the problem of the recurrence of some scenari
212212

213213

214214
## License
215-
[GPL 3.0](./LICENSE)
215+
[AGPL](./LICENSE)

src/App.tsx

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import { Badge, Checkbox, BadgeProps, Button, Dropdown, Input, message, Modal, S
77
import React, { useEffect, useRef, useState } from 'react'
88
import { TagOutlined, ControlOutlined, CodeOutlined, DeleteOutlined, PlusOutlined, SearchOutlined, VerticalAlignBottomOutlined, UploadOutlined, SyncOutlined, RollbackOutlined, BugOutlined, FilterOutlined, FormOutlined, SettingOutlined, AppstoreOutlined, FieldTimeOutlined, StopOutlined, DashboardOutlined } from '@ant-design/icons'
99
import { ColumnsType } from 'antd/lib/table'
10-
import { pathMatch, randID, renderSize } from './utils'
10+
import { pathMatch, randID, renderSize } from './tools'
1111
import { getMethodColor } from './tools/mappings'
12-
import { sizeof } from "./utils"
13-
import { download } from "./utils"
12+
import { sizeof } from "./tools"
13+
import { download } from "./tools"
1414
import jsonschema from 'json-schema'
1515
import { ConfigSchema, TransformResultSchema } from './components/MainEditor/validator'
1616
import useStorage from './hooks/useStorage'
@@ -474,6 +474,9 @@ export default function App() {
474474
Table: {
475475
headerBorderRadius: 0,
476476
},
477+
Button: {
478+
borderRadius: 0
479+
}
477480
}
478481
}}
479482
locale={{
@@ -592,7 +595,7 @@ export default function App() {
592595
}}></Button>
593596
</Tooltip>
594597
<Tooltip title={t('action_mode')}>
595-
<Button type={configInfo.faked ? 'primary' : 'default'} icon={<BugOutlined />} onClick={() => {
598+
<Button disabled={disabled} type={configInfo.faked ? 'primary' : 'default'} icon={<BugOutlined />} onClick={() => {
596599
setConfigInfo(info => ({ ...info, faked: !info.faked }))
597600
}}></Button>
598601
</Tooltip>

src/background/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { matchPath } from "../tools"
77
import { ActiveGroupId, BackgroundMsgKey, ConfigInfoFieldKey, PopupMsgKey, RulesFieldKey, WatchFilterKey } from "../tools/constants"
88
import { CustomEventProps, sendMessageToContent } from "../tools/message"
99
import updateIcon from "../tools/updateIcon"
10-
import { arrayBufferToString, createRunFunc, objectToHttpHeaders, randID, trimUrlParams } from "../utils"
10+
import { arrayBufferToString, createRunFunc, objectToHttpHeaders, randID, trimUrlParams } from "../tools"
1111

1212
let __result = new Map<string, any>()
1313
let __rules: MatchRule[] = []

src/components/MainEditor/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from
99
import { useDebounce } from '../../hooks/useDebounce'
1010
import useStorage from '../../hooks/useStorage'
1111
import getStorage from '../../tools/getStorage'
12-
import { equal } from '../../utils'
12+
import { equal } from '../../tools'
1313
import config, { FileType } from './config'
1414
import jsonschema from 'json-schema'
1515
import { MatchRule } from '../../App'

src/content/tools.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ConfigInfoType, MatchRule } from "../App";
66
import { ConfigInfoFieldKey, RulesFieldKey, ActiveGroupId, ContentMsgKey, UpdateMsgKey } from "../tools/constants";
77
import { log } from "../tools/log";
88
import { CustomEventProps, SyncFields, dispatchPageScriptEvent } from "../tools/message";
9-
import { createScript, noop } from "../utils";
9+
import { createScript, noop } from "../tools";
1010

1111
export function injectedScript(configInfo: Partial<ConfigInfoType>) {
1212
createScript('injected.js').then(() => {

src/injected/fake/fetch/index.ts

-56
This file was deleted.

src/injected/fake/globalVar.ts

-35
This file was deleted.

src/injected/fake/index.ts

-45
This file was deleted.

0 commit comments

Comments
 (0)