v2.0.1

8 files changed, 29 insertions, 34 deletions

diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html
index 4be7997d..668f426c 100644
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -72,7 +72,7 @@
                 });
             },
             genSubLink(subID) {
-                return app.subSettings.subURI+subID+'?name='+subID;
+                return app.subSettings.subURI+subID;
             }
         },
         updated() {
diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/client_bulk_modal.html
index 1fa64306..75e9bf6b 100644
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -59,7 +59,7 @@
                         <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
                     </template>
                     Telegram ID
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+                    <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
             </template>
             <a-input v-model.trim="clientsBulkModal.tgId"></a-input>
@@ -71,7 +71,7 @@
                         <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
                     </template>
                     <span>{{ i18n "pages.inbounds.IPLimit" }} </span>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+                    <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
             </template>
             <a-input-number v-model="clientsBulkModal.limitIp" min="0"></a-input-number>
@@ -83,7 +83,7 @@
                         0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
                     </template>
                     {{ i18n "pages.inbounds.totalFlow" }} (GB)
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+                    <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
             </template>
             <a-input-number v-model="clientsBulkModal.totalGB" :min="0"></a-input-number>
@@ -101,7 +101,7 @@
                         <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
                     </template>
                     {{ i18n "pages.inbounds.expireDate" }}
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+                    <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
             </template>
             <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
@@ -114,7 +114,7 @@
                     <template slot="title">
                         <span>{{ i18n "pages.client.renewDesc" }}</span>
                     </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+                    <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
             </template>
             <a-input-number v-model.number="clientsBulkModal.reset" :min="0"></a-input-number>
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index e5236acc..dff1dd5c 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -70,7 +70,7 @@
                     <span>{{ i18n "pages.inbounds.IPLimitDesc"}}</span>
                 </template>
                     <span>{{ i18n "pages.inbounds.IPLimit"}} </span>
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                <a-icon type="question-circle"></a-icon>
             </a-tooltip>
         </template>
         <a-input-number v-model="client.limitIp" min="0"></a-input-number>
@@ -82,7 +82,7 @@
                     <span>{{ i18n "pages.inbounds.IPLimitlogDesc" }}</span>
                 </template>
                     <span>{{ i18n "pages.inbounds.IPLimitlog" }}</span>
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                <a-icon type="question-circle"></a-icon>
             </a-tooltip>
         </template>
         <a-tooltip>
@@ -123,8 +123,7 @@
         </template>
         <a-input-number v-model="client._totalGB" :min="0"></a-input-number>
     </a-form-item>
-    <a-form-item v-if="isEdit && clientStats">
-        {{ i18n "usage" }}
+    <a-form-item v-if="isEdit && clientStats" label='{{ i18n "usage" }}'>
         <a-tag :color="clientUsageColor(clientStats, app.trafficDiff)">
             [[ sizeFormat(clientStats.up) ]] /
             [[ sizeFormat(clientStats.down) ]]
@@ -146,11 +145,9 @@
     <a-form-item v-else>
         <template slot="label">
             <a-tooltip>
-                <template slot="title">
-                    <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                </template>
-                <span>{{ i18n "pages.inbounds.expireDate" }}</span>
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                <template slot="title">{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</template>
+                {{ i18n "pages.inbounds.expireDate" }}
+                <a-icon type="question-circle"></a-icon>
             </a-tooltip>
         </template>
         <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
@@ -160,11 +157,9 @@
     <a-form-item v-if="client.expiryTime != 0">
         <template slot="label">
             <a-tooltip>
-                <template slot="title">
-                    <span>{{ i18n "pages.client.renewDesc" }}</span>
-                </template>
+                <template slot="title">{{ i18n "pages.client.renewDesc" }}</template>
                 {{ i18n "pages.client.renew" }}
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                <a-icon type="question-circle"></a-icon>
             </a-tooltip>
         </template>
         <a-input-number v-model.number="client.reset" :min="0"></a-input-number>
diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index e668805e..a0c9292a 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -172,7 +172,7 @@
                         <span>{{ i18n "pages.client.renew" }}</span>
                     </template>
                     Short Ids
-                    <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId().join(',')" type="sync">
+                    <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId()" type="sync"> </a-icon>
                     </a-icon>
             </template>
             <a-input v-model.trim="inbound.stream.reality.shortIds" style="width:250px"></a-input>
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index c263415a..0d8f850d 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -303,7 +303,7 @@
             infoModal.visible = false;
         },
         genSubLink(subID) {
-            return app.subSettings.subURI+subID+'?name='+subID;
+            return app.subSettings.subURI+subID;
         }
     };
 
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index 675b267d..9920dd90 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -102,7 +102,7 @@
                                 <template slot="content">
                                     <p style="max-width: 400px" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
                                 </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
+                                <a-icon type="question-circle"></a-icon>
                             </a-popover>
                             <a-tag color="purple" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
                             <a-tag color="purple" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>                    
@@ -125,7 +125,7 @@
                                 <template slot="title">
                                     {{ i18n "pages.index.systemLoadDesc" }}
                                 </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
+                                <a-icon type="question-circle"></a-icon>
                             </a-tooltip>
                         </a-card>
                     </a-col>
@@ -146,7 +146,7 @@
                                         <template slot="title">
                                             [[ status.publicIP.ipv4 ]]
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
@@ -155,7 +155,7 @@
                                         <template slot="title">
                                             [[ status.publicIP.ipv6 ]]
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
@@ -170,7 +170,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.connectionTcpCountDesc" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
@@ -179,7 +179,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.connectionUdpCountDesc" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
@@ -195,7 +195,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.upSpeed" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
@@ -205,7 +205,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.downSpeed" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
@@ -221,7 +221,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.totalSent" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
@@ -231,7 +231,7 @@
                                         <template slot="title">
                                             {{ i18n "pages.index.totalReceive" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index b1f62651..c243f825 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -74,7 +74,7 @@
                                         <template slot="content">
                                             <p style="max-width: 400px" v-for="line in restartResult.split('\n')">[[ line ]]</p>
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-popover>
                                 </a-space>
                             </a-col>
diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
index ebf361d6..33c01e1c 100644
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -378,7 +378,7 @@
 "completeTemplate" = "全部"
 
 [pages.xray.rules]
-"firsto" = "第一个"
+"first" = "第一个"
 "last" = "最后"
 "up" = "向上"
 "down" = "向下"
@@ -399,7 +399,7 @@
 "tag" = "标签"
 "tagDesc" = "独特的标签"
 "address" = "地址"
-"rreverse" = "反转"
+"reverse" = "反转"
 "domain" = "域名"
 "type" = "类型"
 "bridge" = "桥"