From 1a19c7520adb72e5acc02fda0b58829df18149db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Mon, 23 May 2022 14:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../@default/servers/components/index.html    | 74 ++++++++++---------
 .../@default/servers/components/index.js      | 15 +++-
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/web/views/@default/servers/components/index.html b/web/views/@default/servers/components/index.html
index 1554e05a..a84d711a 100644
--- a/web/views/@default/servers/components/index.html
+++ b/web/views/@default/servers/components/index.html
@@ -19,43 +19,45 @@
                     <p class="comment">如果选择了严格匹配域名，找不到匹配的域名时会采取对应的动作。</p>
                 </td>
             </tr>
-            <tr>
-                <td>默认域名</td>
-                <td>
-                    <input type="text" name="defaultDomain" v-model="globalConfig.httpAll.defaultDomain" maxlength="100"/>
-                    <p class="comment">当找不到匹配的域名时，自动使用此域名。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>允许不匹配的域名</td>
-                <td>
-                    <values-box :name="'allowMismatchDomains'" :values="globalConfig.httpAll.allowMismatchDomains" :size="40" :maxlength="100" :placeholder="'域名'"></values-box>
-                    <p class="comment">允许这些域名即时不匹配也可以访问。</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="color-border">域名不匹配时的动作</td>
-                <td>
-                    <radio name="domainMismatchAction" :v-value="'close'" v-model="domainMismatchAction">断开连接</radio>
-                    &nbsp; &nbsp;
-                    <radio name="domainMismatchAction" :v-value="'page'" v-model="domainMismatchAction">显示提示页面</radio>
+            <tbody v-show="globalConfig.httpAll.matchDomainStrictly">
+                <tr>
+                    <td>默认域名</td>
+                    <td>
+                        <input type="text" name="defaultDomain" v-model="globalConfig.httpAll.defaultDomain" maxlength="100"/>
+                        <p class="comment">当找不到匹配的域名时，自动使用此域名。</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td>允许不匹配的域名</td>
+                    <td>
+                        <values-box :name="'allowMismatchDomains'" :values="globalConfig.httpAll.allowMismatchDomains" :size="40" :maxlength="100" :placeholder="'域名'"></values-box>
+                        <p class="comment">允许这些域名即时不匹配也可以访问。</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="color-border">域名不匹配时的动作</td>
+                    <td>
+                        <radio name="domainMismatchAction" :v-value="'close'" v-model="domainMismatchAction">断开连接</radio>
+                        &nbsp; &nbsp;
+                        <radio name="domainMismatchAction" :v-value="'page'" v-model="domainMismatchAction">显示提示页面</radio>
 
-                    <p class="comment" v-if="domainMismatchAction == 'close'">当找不到要访问的域名时关闭客户端连接。</p>
-                    <p class="comment" v-if="domainMismatchAction == 'page'">当找不到访问的域名时显示一个提示页面。</p>
-                </td>
-            </tr>
-            <tr v-if="domainMismatchAction == 'page'">
-                <td class="color-border">响应代码</td>
-                <td>
-                    <input type="text" name="domainMismatchActionPageStatusCode" v-model="domainMismatchActionPageOptions.statusCode" style="width:4em" maxlength="3"/>
-                </td>
-            </tr>
-            <tr v-if="domainMismatchAction == 'page'">
-                <td class="color-border">域名不匹配时的动作页面</td>
-                <td>
-                    <textarea name="domainMismatchActionPageContentHTML" v-model="domainMismatchActionPageOptions.contentHTML" rows="3"></textarea>
-                </td>
-            </tr>
+                        <p class="comment" v-if="domainMismatchAction == 'close'">当找不到要访问的域名时关闭客户端连接。</p>
+                        <p class="comment" v-if="domainMismatchAction == 'page'">当找不到访问的域名时显示一个提示页面。</p>
+                    </td>
+                </tr>
+                <tr v-show="domainMismatchAction == 'page'">
+                    <td class="color-border">响应代码</td>
+                    <td>
+                        <input type="text" name="domainMismatchActionPageStatusCode" v-model="domainMismatchActionPageOptions.statusCode" style="width:4em" maxlength="3"/>
+                    </td>
+                </tr>
+                <tr v-show="domainMismatchAction == 'page'">
+                    <td class="color-border">域名不匹配时显示的页面</td>
+                    <td>
+                        <textarea name="domainMismatchActionPageContentHTML" v-model="domainMismatchActionPageOptions.contentHTML" rows="15"></textarea>
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </div>
 
diff --git a/web/views/@default/servers/components/index.js b/web/views/@default/servers/components/index.js
index 6b728af6..06b68785 100644
--- a/web/views/@default/servers/components/index.js
+++ b/web/views/@default/servers/components/index.js
@@ -30,13 +30,20 @@ Tea.context(function () {
 <head>
 <meta charset="UTF-8"/>
 <title>404 not found</title>
+<style type="text/css">
+* { font-family: Roboto, system-ui, sans-serif; }    
+h3, p { text-align: center; }
+p { color: grey; }
+</style>
 </head>
 <body>
-<h4>找不到您要访问的页面.</h4>
-<h4>Sorry, page not found.</h4>
+<h3>Error: 404 Page Not Found</h3>
+<h3>找不到您要访问的页面。</h3>
+
+<p>原因：找不到当前访问域名对应的网站，请联系网站管理员。</p>
+
 </body>
-</html>
-`
+</html>`
     }
     if (this.globalConfig.httpAll.domainMismatchAction != null) {
         this.domainMismatchAction = this.globalConfig.httpAll.domainMismatchAction.code