Merge pull request #13 from hans000/dev

Dev

CHANGELOG.md

@@ -1,7 +1,9 @@
 ## v1.16.0
+- 更新icon
 - vite更新到5.0，antd更新到5.0
 - 添加禁用类型，可设置禁用 xhr 或 fetch
 - 添加插件拦截时机，可设置start end delay trigger override
+- 修复fake不生效的问题
 
 ## v1.15.0
 - 添加run at功能

public/manifest.json

@@ -22,12 +22,12 @@
   "browser_action": {
     "default_title": "Easy Interceptor by hans000 - v1.16.0",
     "default_popup": "index.html",
-    "default_icon": "images/48-gray.png"
+    "default_icon": "images/128-gray.png"
   },
   "icons": {
-    "16": "images/16.png",
-    "32": "images/32.png",
-    "48": "images/48.png",
+    "16": "images/128.png",
+    "32": "images/128.png",
+    "48": "images/128.png",
     "128": "images/128.png"
   },
   "content_scripts": [

readme-zh_CN.md

@@ -207,4 +207,4 @@ interface MatchingRule extends ResponseRule {
 
 
 ## License
-[GPL 3.0](./LICENSE)
+[AGPL](./LICENSE)

readme.md

@@ -212,4 +212,4 @@ At first, it was intended to solve the problem of the recurrence of some scenari
 
 
 ## License
-[GPL 3.0](./LICENSE)
+[AGPL](./LICENSE)

src/App.tsx

@@ -7,10 +7,10 @@ import { Badge, Checkbox, BadgeProps, Button, Dropdown, Input, message, Modal, S
 import React, { useEffect, useRef, useState } from 'react'
 import { TagOutlined, ControlOutlined, CodeOutlined, DeleteOutlined, PlusOutlined, SearchOutlined, VerticalAlignBottomOutlined, UploadOutlined, SyncOutlined, RollbackOutlined, BugOutlined, FilterOutlined, FormOutlined, SettingOutlined, AppstoreOutlined, FieldTimeOutlined, StopOutlined, DashboardOutlined } from '@ant-design/icons'
 import { ColumnsType } from 'antd/lib/table'
-import { pathMatch, randID, renderSize } from './utils'
+import { pathMatch, randID, renderSize } from './tools'
 import { getMethodColor } from './tools/mappings'
-import { sizeof } from "./utils"
-import { download } from "./utils"
+import { sizeof } from "./tools"
+import { download } from "./tools"
 import jsonschema from 'json-schema'
 import { ConfigSchema, TransformResultSchema } from './components/MainEditor/validator'
 import useStorage from './hooks/useStorage'
@@ -474,6 +474,9 @@ export default function App() {
                 Table: {
                     headerBorderRadius: 0,
                 },
+                Button: {
+                    borderRadius: 0
+                }
             }
         }}
             locale={{
@@ -592,7 +595,7 @@ export default function App() {
                                 }}></Button>
                             </Tooltip>
                             <Tooltip title={t('action_mode')}>
-                                <Button type={configInfo.faked ? 'primary' : 'default'} icon={<BugOutlined />} onClick={() => {
+                                <Button disabled={disabled} type={configInfo.faked ? 'primary' : 'default'} icon={<BugOutlined />} onClick={() => {
                                     setConfigInfo(info => ({ ...info, faked: !info.faked }))
                                 }}></Button>
                             </Tooltip>

src/background/index.ts

@@ -7,7 +7,7 @@ import { matchPath } from "../tools"
 import { ActiveGroupId, BackgroundMsgKey, ConfigInfoFieldKey, PopupMsgKey, RulesFieldKey, WatchFilterKey } from "../tools/constants"
 import { CustomEventProps, sendMessageToContent } from "../tools/message"
 import updateIcon from "../tools/updateIcon"
-import { arrayBufferToString, createRunFunc, objectToHttpHeaders, randID, trimUrlParams } from "../utils"
+import { arrayBufferToString, createRunFunc, objectToHttpHeaders, randID, trimUrlParams } from "../tools"
 
 let __result = new Map<string, any>()
 let __rules: MatchRule[] = []

src/components/MainEditor/index.tsx

@@ -9,7 +9,7 @@ import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from
 import { useDebounce } from '../../hooks/useDebounce'
 import useStorage from '../../hooks/useStorage'
 import getStorage from '../../tools/getStorage'
-import { equal } from '../../utils'
+import { equal } from '../../tools'
 import config, { FileType } from './config'
 import jsonschema from 'json-schema'
 import { MatchRule } from '../../App'

src/content/tools.ts

@@ -6,7 +6,7 @@ import { ConfigInfoType, MatchRule } from "../App";
 import { ConfigInfoFieldKey, RulesFieldKey, ActiveGroupId, ContentMsgKey, UpdateMsgKey } from "../tools/constants";
 import { log } from "../tools/log";
 import { CustomEventProps, SyncFields, dispatchPageScriptEvent } from "../tools/message";
-import { createScript, noop } from "../utils";
+import { createScript, noop } from "../tools";
 
 export function injectedScript(configInfo: Partial<ConfigInfoType>) {
     createScript('injected.js').then(() => {