From a6d2685e38a1da34fac503539941c2402588c6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Wed, 26 Feb 2025 11:19:26 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E5=9F=9F=E5=90=8D=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8F=8D=E5=90=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=A4=A7=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8D=E4=BB=A3=E7=90=86=EF=BC=8C=E4=B8=AA?=
 =?UTF-8?q?=E5=88=AB=E5=9F=9F=E5=90=8D=E8=AE=BE=E7=BD=AE=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/gui/src/view/App.vue                 |   5 -
 packages/gui/src/view/api.js                  |   3 +
 .../gui/src/view/components/container.vue     |  15 +-
 packages/gui/src/view/mixins/plugin.js        |  12 ++
 packages/gui/src/view/pages/help.vue          |   8 +-
 packages/gui/src/view/pages/index.vue         |  28 +--
 packages/gui/src/view/pages/plugin/git.vue    |  17 +-
 packages/gui/src/view/pages/plugin/node.vue   |  14 +-
 .../gui/src/view/pages/plugin/overwall.vue    |  34 ++--
 packages/gui/src/view/pages/plugin/pip.vue    |   2 +
 packages/gui/src/view/pages/proxy.vue         |   5 +-
 packages/gui/src/view/pages/server.vue        | 159 +++++++++++-------
 packages/gui/src/view/pages/setting.vue       |   6 +-
 packages/gui/src/view/style/theme/dark.scss   |  42 ++---
 .../impl/res/AfterOPTIONSHeaders.js           |   3 +-
 packages/mitmproxy/src/options.js             |   2 +-
 16 files changed, 209 insertions(+), 146 deletions(-)

diff --git a/packages/gui/src/view/App.vue b/packages/gui/src/view/App.vue
index 4ce294d5..8b1bb95a 100644
--- a/packages/gui/src/view/App.vue
+++ b/packages/gui/src/view/App.vue
@@ -5,8 +5,6 @@ import { colorTheme } from './composables/theme'
 
 export default {
   name: 'App',
-  components: {
-  },
   data () {
     return {
       locale: zhCN,
@@ -39,9 +37,6 @@ export default {
     })
   },
   methods: {
-    handleClick (e) {
-      console.log('click', e)
-    },
     titleClick (item) {
       console.log('title click:', item)
     },
diff --git a/packages/gui/src/view/api.js b/packages/gui/src/view/api.js
index 868c942f..9ff814a6 100644
--- a/packages/gui/src/view/api.js
+++ b/packages/gui/src/view/api.js
@@ -27,6 +27,9 @@ export function apiInit (app) {
         ipcRenderer.removeAllListeners(channel)
       },
       invoke,
+      postMessage (channel, ...args) {
+        ipcRenderer.postMessage(channel, ...args)
+      },
       send,
       async openExternal (href) {
         await shell.openExternal(href)
diff --git a/packages/gui/src/view/components/container.vue b/packages/gui/src/view/components/container.vue
index 8df89dd6..e4ef1413 100644
--- a/packages/gui/src/view/components/container.vue
+++ b/packages/gui/src/view/components/container.vue
@@ -8,7 +8,8 @@ export default {
   <div class="ds-container">
     <div class="body-wrapper">
       <div v-if="$slots.header" class="container-header">
-        <slot name="header" />
+        <span><slot name="header" /></span>
+        <span style="color:#999"><slot name="header-right" /></span>
       </div>
       <div class="container-body">
         <slot />
@@ -23,16 +24,16 @@ export default {
 <style lang="scss">
 .ds-container {
   height: 100%;
-  background: #fff;
+  background-color: #fff;
   display: flex;
   position: relative;
 
   .body-wrapper {
     position: absolute;
-    top: 0px;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
     display: flex;
     flex-direction: column;
     overflow: hidden;
@@ -41,7 +42,7 @@ export default {
   .container-header {
     padding: 15px;
     border-bottom: 1px solid #eee;
-    background: #fff;
+    background-color: #fff;
     height: 60px;
     display: flex;
     align-items: center;
diff --git a/packages/gui/src/view/mixins/plugin.js b/packages/gui/src/view/mixins/plugin.js
index afd685e5..7142dd09 100644
--- a/packages/gui/src/view/mixins/plugin.js
+++ b/packages/gui/src/view/mixins/plugin.js
@@ -142,5 +142,17 @@ export default {
       const dir = await this.$api.info.getLogDir()
       this.$api.ipc.openPath(dir)
     },
+    handleHostname (hostname) {
+      if (this.isNotHostname(hostname)) {
+        return ''
+      }
+
+      // 移除所有空白符
+      return hostname.replaceAll(/\s+/g, '')
+    },
+    isNotHostname (hostname) {
+      // 暂时只判断数字
+      return !hostname || /^[\d\s]+$/.test(hostname)
+    },
   },
 }
diff --git a/packages/gui/src/view/pages/help.vue b/packages/gui/src/view/pages/help.vue
index 123f2eb4..487fe3d1 100644
--- a/packages/gui/src/view/pages/help.vue
+++ b/packages/gui/src/view/pages/help.vue
@@ -25,10 +25,10 @@ export default {
   <ds-container>
     <template slot="header">
       帮助中心
-      <span>
-        <a-button class="md-mr-10" @click="openExternal('https://github.com/docmirror/dev-sidecar/issues/new/choose')">反馈问题</a-button>
-        <a-button class="md-mr-10" icon="profile" @click="openLog()">查看日志</a-button>
-      </span>
+    </template>
+    <template slot="header-right">
+      <a-button class="md-mr-10" @click="openExternal('https://github.com/docmirror/dev-sidecar/issues/new/choose')">反馈问题</a-button>
+      <a-button class="md-mr-10" icon="profile" @click="openLog()">查看日志</a-button>
     </template>
 
     <div v-if="config" class="help-list">
diff --git a/packages/gui/src/view/pages/index.vue b/packages/gui/src/view/pages/index.vue
index 307c3955..b1e972e8 100644
--- a/packages/gui/src/view/pages/index.vue
+++ b/packages/gui/src/view/pages/index.vue
@@ -259,20 +259,20 @@ export default {
   <DsContainer class="page_index">
     <template slot="header">
       给开发者的辅助工具
-      <span>
-        <a-button style="margin-right:10px" @click="openSetupCa">
-          <a-badge :count="_rootCaSetuped ? 0 : 1" dot>安装根证书</a-badge>
-        </a-button>
+    </template>
+    <template slot="header-right">
+      <a-button style="margin-right:10px" @click="openSetupCa">
+        <a-badge :count="_rootCaSetuped ? 0 : 1" dot>安装根证书</a-badge>
+      </a-button>
 
-        <a-button
-          style="margin-right:10px" :loading="update.downloading || update.checking" :title="`当前版本:${info.version}`"
-          @click="doCheckUpdate(true)"
-        >
-          <a-badge :count="update.newVersion ? 1 : 0" dot>
-            <span v-if="update.downloading">{{ update.progress }}%</span>{{ update.downloading ? '新版本下载中' : (`检查更新${update.checking ? '中' : ''}`) }}
-          </a-badge>
-        </a-button>
-      </span>
+      <a-button
+        style="margin-right:10px" :loading="update.downloading || update.checking" :title="`当前版本:${info.version}`"
+        @click="doCheckUpdate(true)"
+      >
+        <a-badge :count="update.newVersion ? 1 : 0" dot>
+          <span v-if="update.downloading">{{ update.progress }}%</span>{{ update.downloading ? '新版本下载中' : (`检查更新${update.checking ? '中' : ''}`) }}
+        </a-badge>
+      </a-button>
     </template>
 
     <div class="box">
@@ -319,7 +319,7 @@ export default {
         </div>
         <div :span="12">
           <a-form style="margin-top:20px" :label-col="{ span: 15 }" :wrapper-col="{ span: 9 }">
-            <a-form-item v-for=" (item, key) in switchBtns" :key="key" :label="item.label">
+            <a-form-item v-for="(item, key) in switchBtns" :key="key" :label="item.label">
               <a-tooltip placement="topLeft">
                 <a-switch
                   style="margin-left:10px" :loading="item.loading" :checked="item.status()" default-checked
diff --git a/packages/gui/src/view/pages/plugin/git.vue b/packages/gui/src/view/pages/plugin/git.vue
index 74a71c88..d0605a56 100644
--- a/packages/gui/src/view/pages/plugin/git.vue
+++ b/packages/gui/src/view/pages/plugin/git.vue
@@ -7,6 +7,8 @@ export default {
   data () {
     return {
       key: 'plugin.git',
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
       noProxyUrls: [],
       needRestart: false,
     }
@@ -45,7 +47,7 @@ export default {
       }
     },
     addNoProxyUrl () {
-      this.noProxyUrls.unshift({ key: '', value: true })
+      this.noProxyUrls.unshift({ key: '' })
     },
     delNoProxyUrl (item, index) {
       this.noProxyUrls.splice(index, 1)
@@ -54,7 +56,10 @@ export default {
       const noProxyUrls = {}
       for (const item of this.noProxyUrls) {
         if (item.key) {
-          noProxyUrls[item.key] = item.value
+          const hostname = this.handleHostname(item.key)
+          if (hostname) {
+            noProxyUrls[hostname] = true
+          }
         }
       }
       this.config.plugin.git.setting.noProxyUrls = noProxyUrls
@@ -67,9 +72,9 @@ export default {
   <ds-container>
     <template slot="header">
       Git.exe代理设置
-      <span style="color:#999;">
-        仅针对git命令行的代理设置，github网站的访问无需设置
-      </span>
+    </template>
+    <template slot="header-right">
+      仅针对git命令行的代理设置，github网站的访问无需设置
     </template>
 
     <div v-if="config">
@@ -103,7 +108,7 @@ export default {
             </a-row>
             <a-row v-for="(item, index) of noProxyUrls" :key="index" :gutter="10">
               <a-col :span="22">
-                <a-input v-model="item.key" :disabled="item.value === false" />
+                <a-input v-model="item.key" />
               </a-col>
               <a-col :span="2">
                 <a-button type="danger" icon="minus" @click="delNoProxyUrl(item, index)" />
diff --git a/packages/gui/src/view/pages/plugin/node.vue b/packages/gui/src/view/pages/plugin/node.vue
index 1956c56f..5f05957b 100644
--- a/packages/gui/src/view/pages/plugin/node.vue
+++ b/packages/gui/src/view/pages/plugin/node.vue
@@ -7,6 +7,8 @@ export default {
   data () {
     return {
       key: 'plugin.node',
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
       npmVariables: undefined,
       registry: false,
     }
@@ -51,9 +53,9 @@ export default {
   <ds-container>
     <template slot="header">
       NPM加速
-      <span style="color:#999;">
-        由于nodejs不走系统证书，所以npm加速不是很好用，可以用淘宝registry
-      </span>
+    </template>
+    <template slot="header-right">
+      由于nodejs不走系统证书，所以npm加速不是很好用，可以用淘宝registry
     </template>
 
     <div v-if="config">
@@ -97,7 +99,6 @@ export default {
             设置后立即生效，即使关闭 ds 也会继续保持
           </div>
         </a-form-item>
-
         <a-form-item label="yarn仓库镜像" :label-col="labelCol" :wrapper-col="wrapperCol">
           <a-radio-group v-model="config.plugin.node.setting.yarnRegistry" default-value="null" button-style="solid" @change="onSwitchYarnRegistry">
             <a-radio-button value="default" title="https://registry.yarnpkg.com">
@@ -111,7 +112,6 @@ export default {
             设置后立即生效，即使关闭 ds 也会继续保持
           </div>
         </a-form-item>
-
         <a-form-item label="镜像变量设置" :label-col="labelCol" :wrapper-col="wrapperCol">
           <a-checkbox v-model="config.plugin.node.startup.variables">
             自动设置，启动npm加速开关时将会设置如下环境变量
@@ -123,10 +123,10 @@ export default {
             <a-col :span="10">
               <a-input v-model="item.key" :title="item.key" read-only />
             </a-col>
-            <a-col :span="10">
+            <a-col :span="13">
               <a-input v-model="item.value" :title="item.value" read-only />
             </a-col>
-            <a-col :span="4">
+            <a-col :span="1">
               <a-icon v-if="item.exists && item.hadSet" title="已设置" style="color:green" type="check" />
               <a-icon v-else title="还未设置" style="color:red" type="exclamation-circle" />
             </a-col>
diff --git a/packages/gui/src/view/pages/plugin/overwall.vue b/packages/gui/src/view/pages/plugin/overwall.vue
index 283d5aef..e9660038 100644
--- a/packages/gui/src/view/pages/plugin/overwall.vue
+++ b/packages/gui/src/view/pages/plugin/overwall.vue
@@ -7,6 +7,8 @@ export default {
   data () {
     return {
       key: 'plugin.overwall',
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
       targets: undefined,
       servers: undefined,
       overwallOptions: [
@@ -40,8 +42,8 @@ export default {
       this.initServer()
     },
     async applyBefore () {
-      this.saveTarget()
-      this.saveServer()
+      this.submitTarget()
+      this.submitServer()
     },
     initTarget () {
       this.targets = []
@@ -54,17 +56,20 @@ export default {
         })
       }
     },
-    deleteTarget (item, index) {
-      this.targets.splice(index, 1)
-    },
     addTarget () {
       this.targets.unshift({ key: '', value: 'true' })
     },
-    saveTarget () {
+    deleteTarget (item, index) {
+      this.targets.splice(index, 1)
+    },
+    submitTarget () {
       const map = {}
       for (const item of this.targets) {
         if (item.key) {
-          map[item.key] = item.value === 'true'
+          const hostname = this.handleHostname(item.key)
+          if (hostname) {
+            map[hostname] = (item.value === 'true')
+          }
         }
       }
       this.config.plugin.overwall.targets = map
@@ -90,11 +95,14 @@ export default {
     addServer () {
       this.servers.unshift({ key: '', value: { type: 'path' } })
     },
-    saveServer () {
+    submitServer () {
       const map = {}
       for (const item of this.servers) {
         if (item.key) {
-          map[item.key] = item.value
+          const hostname = this.handleHostname(item.key)
+          if (hostname) {
+            map[hostname] = item.value
+          }
         }
       }
       this.config.plugin.overwall.server = map
@@ -107,9 +115,9 @@ export default {
   <ds-container>
     <template slot="header">
       梯子
-      <span>
-        <a-button type="primary" @click="openExternal('https://github.com/docmirror/dev-sidecar-doc/blob/main/ow.md')">原理说明</a-button>
-      </span>
+    </template>
+    <template slot="header-right">
+      <a-button type="primary" @click="openExternal('https://github.com/docmirror/dev-sidecar-doc/blob/main/ow.md')">原理说明</a-button>
     </template>
 
     <div v-if="config">
@@ -142,7 +150,7 @@ export default {
             注：只要下载成功后，即使关闭自动更新功能，也会优先读取最近下载的文件！
           </div>
         </a-form-item>
-        <a-form-item label="远程PAC文件地址" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form-item label="远程PAC文件" :label-col="labelCol" :wrapper-col="wrapperCol">
           <a-input v-model="config.plugin.overwall.pac.pacFileUpdateUrl" :title="config.plugin.overwall.pac.pacFileUpdateUrl" />
           <div class="form-help">
             远程PAC文件内容可以是<code>base64</code>编码格式，也可以是未经过编码的
diff --git a/packages/gui/src/view/pages/plugin/pip.vue b/packages/gui/src/view/pages/plugin/pip.vue
index c9c7be10..1ea05372 100644
--- a/packages/gui/src/view/pages/plugin/pip.vue
+++ b/packages/gui/src/view/pages/plugin/pip.vue
@@ -7,6 +7,8 @@ export default {
   data () {
     return {
       key: 'plugin.pip',
+      labelCol: { span: 4 },
+      wrapperCol: { span: 20 },
       npmVariables: undefined,
       registry: false,
       trustedHostList: [],
diff --git a/packages/gui/src/view/pages/proxy.vue b/packages/gui/src/view/pages/proxy.vue
index bc38be92..89b5cf07 100644
--- a/packages/gui/src/view/pages/proxy.vue
+++ b/packages/gui/src/view/pages/proxy.vue
@@ -68,7 +68,10 @@ export default {
       const excludeIpList = {}
       for (const item of this.excludeIpList) {
         if (item.key) {
-          excludeIpList[item.key] = item.value === 'true'
+          const hostname = this.handleHostname(item.key)
+          if (hostname) {
+            excludeIpList[hostname] = (item.value === 'true')
+          }
         }
       }
       this.config.proxy.excludeIpList = excludeIpList
diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue
index 25e1a437..b5c87c8e 100644
--- a/packages/gui/src/view/pages/server.vue
+++ b/packages/gui/src/view/pages/server.vue
@@ -12,9 +12,20 @@ export default {
   data () {
     return {
       key: 'server',
+      activeTabKey: '1',
       dnsMappings: [],
       speedTestList: [],
       whiteList: [],
+      whiteListOptions: [
+        {
+          label: '不代理',
+          value: 'true',
+        },
+        {
+          label: '代理',
+          value: 'false',
+        },
+      ],
     }
   },
   computed: {
@@ -58,8 +69,9 @@ export default {
       }
     },
     async applyBefore () {
-      this.submitDnsMapping()
+      this.submitDnsMappings()
       this.submitWhiteList()
+      this.delEmptySpeedHostname()
     },
     async applyAfter () {
       if (this.status.server.enabled) {
@@ -77,20 +89,20 @@ export default {
         })
       }
     },
-    submitDnsMapping () {
+    submitDnsMappings () {
       const dnsMapping = {}
       for (const item of this.dnsMappings) {
         if (item.key) {
-          dnsMapping[item.key] = item.value
+          const hostname = this.handleHostname(item.key)
+          if (hostname) {
+            dnsMapping[hostname] = item.value
+          }
         }
       }
       this.config.server.dns.mapping = dnsMapping
     },
     deleteDnsMapping (item, index) {
       this.dnsMappings.splice(index, 1)
-    },
-    restoreDefDnsMapping (item, index) {
-
     },
     addDnsMapping () {
       this.dnsMappings.unshift({ key: '', value: 'quad9' })
@@ -102,26 +114,29 @@ export default {
       for (const key in this.config.server.whiteList) {
         const value = this.config.server.whiteList[key]
         this.whiteList.push({
-          key,
-          value,
+          key: key || '',
+          value: value === true ? 'true' : 'false',
         })
       }
     },
+    addWhiteList () {
+      this.whiteList.unshift({ key: '', value: 'true' })
+    },
+    deleteWhiteList (item, index) {
+      this.whiteList.splice(index, 1)
+    },
     submitWhiteList () {
       const whiteList = {}
       for (const item of this.whiteList) {
         if (item.key) {
-          whiteList[item.key] = item.value
+          const hostname = this.handleHostname(item.key)
+          if (hostname) {
+            whiteList[hostname] = (item.value === 'true')
+          }
         }
       }
       this.config.server.whiteList = whiteList
     },
-    deleteWhiteList (item, index) {
-      this.whiteList.splice(index, 1)
-    },
-    addWhiteList () {
-      this.whiteList.unshift({ key: '', value: true })
-    },
     getSpeedTestConfig () {
       return this.config.server.dns.speedTest
     },
@@ -131,6 +146,14 @@ export default {
     delSpeedHostname (item, index) {
       this.getSpeedTestConfig().hostnameList.splice(index, 1)
     },
+    delEmptySpeedHostname () {
+      for (let i = this.getSpeedTestConfig().hostnameList.length - 1; i >= 0; i--) {
+        const hostname = this.handleHostname(this.getSpeedTestConfig().hostnameList[i])
+        if (!hostname) {
+          this.getSpeedTestConfig().hostnameList.splice(i, 1)
+        }
+      }
+    },
     reSpeedTest () {
       this.$api.server.reSpeedTest()
     },
@@ -159,14 +182,14 @@ export default {
       }, 5000)
     },
     async handleTabChange (key) {
+      this.activeTabKey = key
       if (key !== '2' && key !== '3' && key !== '5' && key !== '6' && key !== '7') {
-        return
+        // 没有 JsonEditor，启用SearchBar
+        window.config.disableSearchBar = false
+      } else {
+        // 有 JsonEditor，禁用SearchBar
+        window.config.disableSearchBar = true
       }
-
-      // 规避 vue-json-editor 内容只填充输入框一半的问题
-      setTimeout(() => {
-        window.dispatchEvent(new Event('resize'))
-      }, 10)
     },
   },
 }
@@ -181,13 +204,13 @@ export default {
     <div style="height: 100%" class="json-wrapper">
       <a-tabs
         v-if="config"
-        default-active-key="1"
+        :default-active-key="activeTabKey"
         tab-position="left"
         :style="{ height: '100%' }"
         @change="handleTabChange"
       >
         <a-tab-pane key="1" tab="基本设置">
-          <div style="padding-right:10px">
+          <div v-if="activeTabKey === '1'" style="padding-right:10px">
             <a-form-item label="代理服务:" :label-col="labelCol" :wrapper-col="wrapperCol">
               <a-checkbox v-model="config.server.enabled">
                 随应用启动
@@ -260,13 +283,15 @@ export default {
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" tab="拦截设置">
-          <VueJsonEditor
-            ref="editor" v-model="config.server.intercepts" style="height:100%" mode="code"
-            :show-btns="false" :expanded-on-start="true"
-          />
+          <div v-if="activeTabKey === '2'" style="height:100%">
+            <VueJsonEditor
+              v-model="config.server.intercepts" style="height:100%" mode="code"
+              :show-btns="false" :expanded-on-start="true"
+            />
+          </div>
         </a-tab-pane>
         <a-tab-pane key="3" tab="超时时间设置">
-          <div style="height:100%;display:flex;flex-direction:column">
+          <div v-if="activeTabKey === '3'" style="height:100%;display:flex;flex-direction:column">
             <a-form-item label="默认超时时间" :label-col="labelCol" :wrapper-col="wrapperCol">
               请求：<a-input-number v-model="config.server.setting.defaultTimeout" :step="1000" :min="1000" :precision="0" /> ms，对应<code>timeout</code>配置<br>
               连接：<a-input-number v-model="config.server.setting.defaultKeepAliveTimeout" :step="1000" :min="1000" :precision="0" /> ms，对应<code>keepAliveTimeout</code>配置
@@ -274,60 +299,71 @@ export default {
             <hr style="margin-bottom:15px">
             <div>这里指定域名的超时时间：<span class="form-help">（域名配置可使用通配符或正则）</span></div>
             <VueJsonEditor
-              ref="editor" v-model="config.server.setting.timeoutMapping" style="flex-grow:1;min-height:300px;margin-top:10px" mode="code"
+              v-model="config.server.setting.timeoutMapping" style="flex-grow:1;min-height:300px;margin-top:10px" mode="code"
               :show-btns="false" :expanded-on-start="true"
             />
           </div>
         </a-tab-pane>
         <a-tab-pane key="4" tab="域名白名单">
-          <a-row style="margin-top:10px">
-            <a-col span="21">
-              <div>这里配置的域名不会通过代理</div>
-            </a-col>
-            <a-col span="3">
-              <a-button style="margin-left:8px" type="primary" icon="plus" @click="addWhiteList()" />
-            </a-col>
-          </a-row>
-          <a-row v-for="(item, index) of whiteList" :key="index" :gutter="10" style="margin-top: 5px">
-            <a-col :span="21">
-              <a-input v-model="item.key" :disabled="item.value === false" />
-            </a-col>
-            <a-col :span="3">
-              <a-button v-if="item.value !== false" type="danger" icon="minus" @click="deleteWhiteList(item, index)" />
-            </a-col>
-          </a-row>
+          <div v-if="activeTabKey === '4'">
+            <a-row style="margin-top:10px">
+              <a-col span="21">
+                <div>这里配置的域名不会通过代理</div>
+              </a-col>
+              <a-col span="3">
+                <a-button style="margin-left:8px" type="primary" icon="plus" @click="addWhiteList()" />
+              </a-col>
+            </a-row>
+            <a-row v-for="(item, index) of whiteList" :key="index" :gutter="10" style="margin-top: 5px">
+              <a-col :span="16">
+                <a-input v-model="item.key" />
+              </a-col>
+              <a-col :span="5">
+                <a-select v-model="item.value" style="width:100%">
+                  <a-select-option v-for="(item2) of whiteListOptions" :key="item2.value" :value="item2.value">
+                    {{ item2.label }}
+                  </a-select-option>
+                </a-select>
+              </a-col>
+              <a-col :span="3">
+                <a-button type="danger" icon="minus" @click="deleteWhiteList(item, index)" />
+              </a-col>
+            </a-row>
+          </div>
         </a-tab-pane>
         <a-tab-pane key="5" tab="自动兼容程序">
-          <div style="height:100%;display:flex;flex-direction:column">
+          <div v-if="activeTabKey === '5'" style="height:100%;display:flex;flex-direction:column">
             <div>
               说明：<code>自动兼容程序</code>会自动根据错误信息进行兼容性调整，并将兼容设置保存在 <code>~/.dev-sidecar/automaticCompatibleConfig.json</code> 文件中。但并不是所有的兼容设置都是正确的，所以需要通过以下配置来覆盖错误的兼容设置。
             </div>
             <VueJsonEditor
-              ref="editor" v-model="config.server.compatible" style="flex-grow:1;min-height:300px;margin-top:10px;" mode="code"
+              v-model="config.server.compatible" style="flex-grow:1;min-height:300px;margin-top:10px;" mode="code"
               :show-btns="false" :expanded-on-start="true"
             />
           </div>
         </a-tab-pane>
         <a-tab-pane key="6" tab="IP预设置">
-          <div style="height:100%;display:flex;flex-direction:column">
+          <div v-if="activeTabKey === '6'" style="height:100%;display:flex;flex-direction:column">
             <div>
               提示：<code>IP预设置</code>功能，优先级高于 <code>DNS设置</code>
               <span class="form-help">（域名配置可使用通配符或正则）</span>
             </div>
             <VueJsonEditor
-              ref="editor" v-model="config.server.preSetIpList" style="flex-grow:1;min-height:300px;margin-top:10px;" mode="code"
+              v-model="config.server.preSetIpList" style="flex-grow:1;min-height:300px;margin-top:10px;" mode="code"
               :show-btns="false" :expanded-on-start="true"
             />
           </div>
         </a-tab-pane>
         <a-tab-pane key="7" tab="DNS服务管理">
-          <VueJsonEditor
-            ref="editor" v-model="config.server.dns.providers" style="height:100%" mode="code"
-            :show-btns="false" :expanded-on-start="true"
-          />
+          <div v-if="activeTabKey === '7'" style="height:100%">
+            <VueJsonEditor
+              v-model="config.server.dns.providers" style="height:100%" mode="code"
+              :show-btns="false" :expanded-on-start="true"
+            />
+          </div>
         </a-tab-pane>
         <a-tab-pane key="8" tab="DNS设置">
-          <div>
+          <div v-if="activeTabKey === '8'">
             <a-row style="margin-top:10px">
               <a-col span="21">
                 <div>这里配置哪些域名需要通过国外DNS服务器获取IP进行访问</div>
@@ -338,7 +374,7 @@ export default {
             </a-row>
             <a-row v-for="(item, index) of dnsMappings" :key="index" :gutter="10" style="margin-top: 5px">
               <a-col :span="15">
-                <a-input v-model="item.key" :disabled="item.value === false" />
+                <a-input v-model="item.key" />
               </a-col>
               <a-col :span="6">
                 <a-select v-model="item.value" :disabled="item.value === false" style="width: 100%">
@@ -348,14 +384,13 @@ export default {
                 </a-select>
               </a-col>
               <a-col :span="3">
-                <a-button v-if="item.value !== false" type="danger" icon="minus" @click="deleteDnsMapping(item, index)" />
-                <a-button v-if="item.value === false" type="primary" icon="checked" @click="restoreDefDnsMapping(item, index)" />
+                <a-button type="danger" icon="minus" @click="deleteDnsMapping(item, index)" />
               </a-col>
             </a-row>
           </div>
         </a-tab-pane>
         <a-tab-pane key="9" tab="IP测速">
-          <div class="ip-tester" style="padding-right: 10px">
+          <div v-if="activeTabKey === '9'" class="ip-tester" style="padding-right: 10px">
             <a-alert type="info" message="对从DNS获取到的IP进行测速，使用速度最快的IP进行访问（注意：对使用了增强功能的域名没啥用）" />
             <a-form-item label="开启DNS测速" :label-col="labelCol" :wrapper-col="wrapperCol">
               <a-checkbox v-model="getSpeedTestConfig().enabled">
@@ -385,10 +420,7 @@ export default {
                 <a-button style="margin-left:10px" type="primary" icon="plus" @click="addSpeedHostname()" />
               </a-col>
             </a-row>
-            <a-row
-              v-for="(item, index) of getSpeedTestConfig().hostnameList" :key="index" :gutter="10"
-              style="margin-top: 5px"
-            >
+            <a-row v-for="(item, index) of getSpeedTestConfig().hostnameList" :key="index" :gutter="10" style="margin-top: 5px">
               <a-col :span="21">
                 <a-input v-model="getSpeedTestConfig().hostnameList[index]" />
               </a-col>
@@ -471,5 +503,8 @@ export default {
     overflow-y: auto;
     overflow-x: hidden;
   }
+  .ant-input-group-addon:first-child {
+    width: 50px;
+  }
 }
 </style>
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue
index 8e05ba69..2f0386df 100644
--- a/packages/gui/src/view/pages/setting.vue
+++ b/packages/gui/src/view/pages/setting.vue
@@ -338,9 +338,9 @@ export default {
   <ds-container>
     <template slot="header">
       设置
-      <span>
-        <a-button class="md-mr-10" icon="profile" @click="openLog()">查看日志</a-button>
-      </span>
+    </template>
+    <template slot="header-right">
+      <a-button class="md-mr-10" icon="profile" @click="openLog()">查看日志</a-button>
     </template>
 
     <div v-if="config">
diff --git a/packages/gui/src/view/style/theme/dark.scss b/packages/gui/src/view/style/theme/dark.scss
index c914dca8..e11740fa 100644
--- a/packages/gui/src/view/style/theme/dark.scss
+++ b/packages/gui/src/view/style/theme/dark.scss
@@ -17,7 +17,7 @@ $dark-input: #777; //输入框：背景色
   .ds-container,
   .ds-container .container-header,
   .ant-layout-footer {
-    background: $dark-bg;
+    background-color: $dark-bg;
     color: $dark-text;
   }
   div,
@@ -36,7 +36,7 @@ $dark-input: #777; //输入框：背景色
   /* 高亮块：背景色和字体颜色 */
   /* 警告类型 */
   .ant-alert-warning {
-    background: $dark-bg-highlight;
+    background-color: $dark-bg-highlight;
     border-color: $dark-bg-highlight;
     color: $dark-text;
     /* 关闭图标颜色 */
@@ -46,7 +46,7 @@ $dark-input: #777; //输入框：背景色
   }
   /* 消息类型 */
   .ant-alert-info {
-    background: $dark-bg-highlight;
+    background-color: $dark-bg-highlight;
     border-color: $dark-bg-highlight;
     color: $dark-text;
   }
@@ -66,7 +66,7 @@ $dark-input: #777; //输入框：背景色
     background-color: #666;
   }
   .ant-divider {
-    background: $dark-bd;
+    background-color: $dark-bd;
   }
 
   .help-list .title1 {
@@ -76,7 +76,7 @@ $dark-input: #777; //输入框：背景色
   /* 左侧 */
   /** 背景色 **/
   .ant-layout-sider {
-    background: $dark-bg;
+    background-color: $dark-bg;
   }
   /** Logo **/
   .logo {
@@ -84,14 +84,14 @@ $dark-input: #777; //输入框：背景色
   }
   /** 菜单 **/
   .ant-menu {
-    background: $dark-bg;
+    background-color: $dark-bg;
     color: $dark-text;
   }
   /* 菜单选中时，或鼠标移到菜单上时的样式 */
   .ant-menu-item:hover,
   .ant-menu-submenu .ant-menu-submenu-title:hover,
   .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
-    background: $dark-bg-highlight;
+    background-color: $dark-bg-highlight;
     color: #1890ff;
     span {
       color: #1890ff;
@@ -104,7 +104,7 @@ $dark-input: #777; //输入框：背景色
   .ant-input-number,
   .ant-select-selection,
   .ant-input-group-addon {
-    background: $dark-input;
+    background-color: $dark-input;
     border-color: #aaa;
     color: $dark-text;
     &:hover,
@@ -115,7 +115,7 @@ $dark-input: #777; //输入框：背景色
 
   /* 卡片消息：IP测速 */
   .ant-card {
-    background: $dark-input;
+    background-color: $dark-input;
     border-color: $dark-input;
     .ant-card-head {
       border-bottom-color: #929292;
@@ -124,26 +124,26 @@ $dark-input: #777; //输入框：背景色
 
   /* 标签：未启用 */
   .ant-tag-red {
-    background: #4f4749;
+    background-color: #4f4749;
     border-color: #4f4749;
     color: #bf8285;
   }
   /* 标签：已启用 */
   .ant-tag-green {
-    background: #505f5f;
+    background-color: #505f5f;
     border-color: #505f5f;
     color: #90cb9f;
   }
   /* 标签：警告 */
   .ant-tag-orange {
-    background: #5a5750;
+    background-color: #5a5750;
     border-color: #5a5750;
     color: #cfa572;
   }
 
   /* 按钮 */
   .ant-btn:not(.ant-btn-danger, .ant-btn-primary) {
-    background: $dark-btn;
+    background-color: $dark-btn;
     border-color: $dark-btn;
     color: $dark-text;
     &:hover {
@@ -153,7 +153,7 @@ $dark-input: #777; //输入框：背景色
 
   /* 单选框：开关式 */
   .ant-switch:not(.ant-switch-checked) {
-    background: $dark-btn;
+    background-color: $dark-btn;
     border-color: $dark-btn;
     &:hover {
       opacity: 0.8;
@@ -161,7 +161,7 @@ $dark-input: #777; //输入框：背景色
   }
   /* 单选框：按钮式 */
   .ant-radio-button-wrapper {
-    background: $dark-btn;
+    background-color: $dark-btn;
     border-color: $dark-btn;
     color: $dark-text;
     &:hover {
@@ -173,24 +173,24 @@ $dark-input: #777; //输入框：背景色
   .jsoneditor-vue {
     /*整个编辑框：背景色和边框*/
     div.jsoneditor {
-      background: $dark-bg-highlight;
+      background-color: $dark-bg-highlight;
       border: none;
     }
     /* 头部菜单栏：边框  */
     div.jsoneditor-menu {
-      background: $dark-bg-highlight;
+      background-color: $dark-bg-highlight;
       border-color: $dark-bg-highlight;
     }
     /* 内容区域左边：行号 */
     .ace_gutter {
-      background: #444;
+      background-color: #444;
       .ace_gutter-cell {
         color: #aaa;
       }
     }
     /* 内容区域右边：JSON内容 */
     .ace_scroller {
-      background: #555;
+      background-color: #555;
     }
     /* key的颜色 */
     .ace_variable,
@@ -215,12 +215,12 @@ $dark-input: #777; //输入框：背景色
     /* 当前行高亮样式 */
     .ace_gutter-active-line,
     .ace_marker-layer .ace_active-line {
-      background: #838774;
+      background-color: #838774;
     }
     /* 选中行高亮样式 */
     .ace-jsoneditor {
       .ace_marker-layer .ace_selection {
-        background: #8b2929; /* 同时应用于当前选中的搜索结果项的背景色，建议与搜索结果边框颜色保持一致 */
+        background-color: #8b2929; /* 同时应用于当前选中的搜索结果项的背景色，建议与搜索结果边框颜色保持一致 */
       }
 
       /* 光标颜色 */
diff --git a/packages/mitmproxy/src/lib/interceptor/impl/res/AfterOPTIONSHeaders.js b/packages/mitmproxy/src/lib/interceptor/impl/res/AfterOPTIONSHeaders.js
index de721113..20088188 100644
--- a/packages/mitmproxy/src/lib/interceptor/impl/res/AfterOPTIONSHeaders.js
+++ b/packages/mitmproxy/src/lib/interceptor/impl/res/AfterOPTIONSHeaders.js
@@ -17,11 +17,10 @@ module.exports = {
       'Cross-Origin-Resource-Policy': interceptOpt.optionsCrossPolicy || 'cross-origin',
     }
 
-    res.setHeader('DS-AfterOPTIONSHeaders-Interceptor', '1')
-
     // 替换响应头
     if (responseReplaceApi.replaceResponseHeaders({ ...headers }, res, proxyRes)) {
       log.info('AfterOPTIONSHeaders intercept:', JSON.stringify(headers))
+      res.setHeader('DS-AfterOPTIONSHeaders-Interceptor', '1')
     } else {
       res.setHeader('DS-AfterOPTIONSHeaders-Interceptor', '0')
     }
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
index e3b3b89f..6504dee6 100644
--- a/packages/mitmproxy/src/options.js
+++ b/packages/mitmproxy/src/options.js
@@ -108,7 +108,7 @@ module.exports = (serverConfig) => {
       const hostname = req.url.split(':')[0]
 
       // 配置了白名单的域名，将跳过代理
-      const inWhiteList = matchUtil.matchHostname(whiteList, hostname, 'in whiteList') != null
+      const inWhiteList = !!matchUtil.matchHostname(whiteList, hostname, 'in whiteList')
       if (inWhiteList) {
         log.info(`为白名单域名，不拦截: ${hostname}, headers:`, jsonApi.stringify2(req.headers))
         return false // 不拦截