UI Improvements (#2067)

sub/subJsonService.go

@@ -44,7 +44,6 @@ func NewSubJsonService(fragment string, mux string, rules string, subService *Su
 		defaultRules, _ := routing["rules"].([]interface{})
 		json.Unmarshal([]byte(rules), &newRules)
 		defaultRules = append(newRules, defaultRules...)
-		fmt.Printf("routing: %#v\n\nRules: %#v\n\n", routing, defaultRules)
 		routing["rules"] = defaultRules
 		configJson["routing"] = routing
 	}

web/assets/css/custom.css

@@ -36,6 +36,7 @@
     --dark-color-codemirror-line-selection: rgba(0, 135, 113, 0.3);
     --dark-color-login-background: var(--dark-color-background);
     --dark-color-login-wave: var(--dark-color-surface-200);
+    --dark-color-tooltip: rgba(61, 76, 104, 0.9);
 }
 
 html[data-theme='ultra-dark'] {
@@ -69,6 +70,7 @@ html[data-theme='ultra-dark'] {
     --dark-color-codemirror-line-selection: rgba(85, 85, 85, 0.4);
     --dark-color-login-background: #0a2227;
     --dark-color-login-wave: #0f2d32;
+    --dark-color-tooltip: rgba(88, 93, 100, 0.9);
     .ant-dropdown-menu-dark {
         background-color: var(--dark-color-surface-500);
     }
@@ -143,10 +145,13 @@ html {
 style attribute {
     text-align: center;
 }
-.ant-table-tbody > tr > td,
+
 .ant-table-thead > tr > th {
+    padding: 16px 8px;
+}
+
+.ant-table-tbody > tr > td {
     padding: 12px 8px;
-    overflow-wrap: break-word;
 }
 .ant-table-thead > tr > th {
     color: rgba(0, 0, 0, 0.85);
@@ -155,10 +160,6 @@ style attribute {
     border-bottom: 1px solid #e8e8e8;
     transition: background 0.3s ease;
 }
-.ant-table-row-cell-break-word {
-    word-wrap: break-word;
-    word-break: break-word;
-}
 
 .ant-table table {
     width: 100%;
@@ -649,11 +650,17 @@ style attribute {
 .dark .ant-modal-footer,
 .dark .ant-collapse-content,
 .dark .ant-calendar-footer,
+.dark .ant-divider-horizontal.ant-divider-with-text-left:before,
+.dark .ant-divider-horizontal.ant-divider-with-text-left:after,
 .dark .ant-divider-horizontal.ant-divider-with-text-center:before,
 .dark .ant-divider-horizontal.ant-divider-with-text-center:after {
     border-top-color: var(--dark-color-surface-300);
 }
 
+.ant-divider-horizontal.ant-divider-with-text-left:before {
+    width: 10%;
+}
+
 .dark .ant-progress-text,
 .dark .ant-card-head,
 .dark .ant-form,
@@ -712,7 +719,6 @@ style attribute {
 .dark .ant-select-dropdown,
 .dark .ant-select-dropdown li,
 .dark .ant-select-dropdown-menu-item,
-.dark .ant-divider:not(.ant-divider-with-text-center),
 .dark .client-table-header,
 .dark .ant-select-selection--multiple .ant-select-selection__choice,
 .dark .ant-calendar-time-picker-inner {
@@ -948,10 +954,15 @@ style attribute {
     background-color: #fff;
 }
 
+.ant-checkbox-wrapper,
+.ant-input-group-addon,
+.ant-tabs-tab,
+.ant-input::placeholder,
+.ant-collapse-header,
 .ant-menu,
 .ant-radio-button-wrapper {
-    user-select: none;
     -webkit-user-select: none;
+    user-select: none;
 }
 
 .ant-calendar-date,
@@ -1065,6 +1076,7 @@ li.ant-select-dropdown-menu-item:empty:after {
     color: rgba(255, 255, 255, 0.35);
 }
 
+.dark .ant-divider:not(.ant-divider-with-text-center, .ant-divider-with-text-left, .ant-divider-with-text-right),
 .ant-dropdown-menu-dark,
 .dark .ant-calendar-year-panel-year:hover,
 .dark .ant-calendar-month-panel-month:hover,
@@ -1216,15 +1228,39 @@ li.ant-select-dropdown-menu-item:empty:after {
     overflow-y: auto;
 }
 
-.qr-bg {
+.qr-cv {
     width: 100%;
     height: 100%;
-    background-color: #fff;
+    opacity: 0.8;
+    transition: all 0.3s;
+}
+
+.qr-cv:hover {
+    opacity: 1;
+}
+
+.qr-cv:active {
+    transform: scale(0.98);
+    transition: all 0.1s;
+}
+
+.dark .qr-cv {
+    filter: invert(1);
+}
+
+.qr-bg {
+    background-color: #ffffff;
     display: flex;
     justify-content: center;
     align-content: center;
-    padding: 0.5rem;
+    padding: 0.8rem;
     border-radius: 1rem;
+    border: solid 1px #e8e8e8;
+}
+
+.dark .qr-bg {
+    background-color: var(--dark-color-surface-700);
+    border-color: var(--dark-color-surface-300);
 }
 
 .ant-input-group-addon:not(:first-child):not(:last-child) {
@@ -1276,3 +1312,104 @@ b, strong {
     background-color: transparent !important;
     cursor: default !important;
 }
+
+.dark .ant-tooltip-inner,
+.dark .ant-tooltip-arrow:before {
+    background-color: var(--dark-color-tooltip);
+}
+
+.ant-select-sm .ant-select-selection__rendered {
+    margin-left: 10px;
+}
+
+.ant-collapse {
+    -moz-animation: collfade 0.3s ease;
+    -webkit-animation: 0.3s collfade 0.3s ease;
+    animation:  collfade 0.3s ease;
+}
+
+@-webkit-keyframes collfade {
+    0% {
+        transform: scaleY(.8);
+        transform-origin: 0% 0%;
+        opacity: 0;
+    }
+
+    100% {
+        transform: scaleY(1);
+        transform-origin: 0% 0%;
+        opacity: 1;
+    }
+}
+
+@keyframes collfade {
+    0% {
+        transform: scaleY(.8);
+        transform-origin: 0% 0%;
+        opacity: 0;
+    }
+
+    100% {
+        transform: scaleY(1);
+        transform-origin: 0% 0%;
+        opacity: 1;
+    }
+}
+
+.ant-table-tbody>tr>td {
+	border-color: #f0f0f0;
+}
+
+.ant-table-row-expand-icon {
+    vertical-align: middle;
+    margin-inline-end: 8px;
+    position: relative;
+    transform: scale(0.9411764705882353);
+}
+
+.ant-table-row-collapsed::before {
+    transform: rotate(-180deg);
+    top: 7px;
+    inset-inline-end: 3px;
+    inset-inline-start: 3px;
+    height: 1px;
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-table-row-collapsed::after {
+    transform: rotate(0deg);
+    top: 3px;
+    bottom: 3px;
+    inset-inline-start: 7px;
+    width: 1px;
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-table-row-expanded::before {
+    top: 7px;
+    inset-inline-end: 3px;
+    inset-inline-start: 3px;
+    height: 1px;
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-table-row-expanded::after {
+    top: 3px;
+    bottom: 3px;
+    inset-inline-start: 7px;
+    width: 1px;
+    transform: rotate(90deg);
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}

web/html/common/qrcode_modal.html

@@ -1,32 +1,23 @@
 {{define "qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-        :dialog-style="{ top: '20px' }"
-        :closable="true"
-        :class="themeSwitcher.currentTheme"
-        :footer="null"
-        width="300px">
-    <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;">
-        {{ i18n "pages.inbounds.clickOnQRcode" }}
-    </a-tag>
-    <template v-if="app.subSettings.enable && qrModal.subId">
-        <a-divider>{{ i18n "pages.settings.subSettings"}}</a-divider>
-        <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))"
-            id="qrCode-sub"
-            class="qr-bg">
-        </canvas>
-        <a-divider>{{ i18n "pages.settings.subSettings"}} Json</a-divider>
-        <canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))"
-            id="qrCode-subJson"
-            style="width: 100%; height: 100%; display: flex; border-radius: 1rem;">
-        </canvas>
-    </template>
-    <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
-    <template v-for="(row, index) in qrModal.qrcodes">
-        <a-tag color="green" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag>
-        <canvas @click="copyToClipboard('qrCode-'+index, row.link)"
-            :id="'qrCode-'+index"
-            class="qr-bg"></canvas>
-    </template>
+    :dialog-style="{ top: '20px' }"
+    :closable="true"
+    :class="themeSwitcher.currentTheme"
+    :footer="null" width="300px">
+  <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;">
+    {{ i18n "pages.inbounds.clickOnQRcode" }}
+  </a-tag>
+  <template v-if="app.subSettings.enable && qrModal.subId">
+    <a-divider>{{ i18n "pages.settings.subSettings"}}</a-divider>
+    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas></div>
+    <a-divider>{{ i18n "pages.settings.subSettings"}} Json</a-divider>
+    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas></div>
+  </template>
+  <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
+  <template v-for="(row, index) in qrModal.qrcodes">
+    <a-tag color="green" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag>
+    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas></div>
+  </template>
 </a-modal>
 
 <script>
@@ -87,8 +78,10 @@
             setQrCode(elmentId, content) {
                 new QRious({
                     element: document.querySelector('#' + elmentId),
-                    size: 260,
+                    size: 300,
                     value: content,
+                    background: 'transparent',
+                    foreground: 'black'
                 });
             },
             genSubLink(subID) {

web/html/xui/inbound_client_table.html

@@ -54,7 +54,7 @@
             <template v-else-if="!client.enable">{{ i18n "disabled" }}</template>
             <template v-else-if="client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
         </template>
-    <a-badge :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'">
+    <a-badge :class="isClientOnline(client.email)? 'online-animation' : ''" :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'">
     </a-badge>
     </a-tooltip>
     [[ client.email ]]
@@ -258,7 +258,7 @@
             </table>
         </template>
         <a-badge>
-            <a-icon v-if="!client.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
+            <a-icon v-if="!client.enable" slot="count" type="pause-circle" theme="filled" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
             <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;"><a-icon type="solution"></a-icon></a-button>
         </a-badge>
     </a-popover>

web/html/xui/inbounds.html

@@ -2,446 +2,459 @@
 <html lang="en">
 {{template "head" .}}
 <style>
-    @media (min-width: 769px) {
-        .ant-layout-content {
-            margin: 24px 16px;
-        }
+  @media (min-width: 769px) {
+    .ant-layout-content {
+      margin: 24px 16px;
     }
-
-    @media (max-width: 768px) {
-        .ant-card-body {
-            padding: .5rem;
-        }
-    }
-
-    .ant-col-sm-24 {
-        margin: 0.5rem -2rem 0.5rem 2rem;
-    }
-    tr.hideExpandIcon .ant-table-row-expand-icon {
-        display: none;
-    }
-    .infinite-tag {
-        padding: 0 5px;
-        border-radius: 2rem;
-        min-width: 50px;
-    }
-    .infinite-bar .ant-progress-inner .ant-progress-bg {
-        background-color: #F2EAF1;
-        border: #D5BED2 solid 1px;
-    }
-    .dark .infinite-bar .ant-progress-inner .ant-progress-bg {
-        background-color: #3c1536;
-        border: #7a316f solid 1px;
+  }
+  @media (max-width: 768px) {
+    .ant-card-body {
+      padding: .5rem;
     }
-    .ant-collapse {
-        margin: 5px 0;
+  }
+  .ant-col-sm-24 {
+    margin: 0.5rem -2rem 0.5rem 2rem;
+  }
+  tr.hideExpandIcon .ant-table-row-expand-icon {
+    display: none;
+  }
+  .infinite-tag {
+    padding: 0 5px;
+    border-radius: 2rem;
+    min-width: 50px;
+  }
+  .infinite-bar .ant-progress-inner .ant-progress-bg {
+    background-color: #F2EAF1;
+    border: #D5BED2 solid 1px;
+  }
+  .dark .infinite-bar .ant-progress-inner .ant-progress-bg {
+    background-color: #7a316f;
+    border: #7a316f solid 1px;
+  }
+  .ant-collapse {
+    margin: 5px 0;
+  }
+  .info-large-tag {
+    max-width: 200px;
+    overflow: hidden;
+  }
+  .online-animation .ant-badge-status-dot {
+    animation: onlineAnimation 1.2s linear infinite;
+  }
+  @keyframes onlineAnimation {
+    0%,
+    50%,
+    100% {
+      transform: scale(1);
+      opacity: 1;
     }
-    .info-large-tag {
-        max-width: 200px;
-        overflow: hidden;
+    10% {
+      transform: scale(1.5);
+      opacity: .2;
     }
+  }
 </style>
 
 <body>
 <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
-    {{ template "commonSider" . }}
-    <a-layout id="content-layout">
-        <a-layout-content>
-            <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
-                <transition name="list" appear>
-                    <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
-                    message='{{ i18n "secAlertTitle" }}'
-                    color="red"
-                    description='{{ i18n "secAlertSsl" }}'
-                    show-icon closable
-                    >
-                    </a-alert>
-                </transition>
-                <transition name="list" appear>
-                    <a-card hoverable>
-                        <a-row>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalDownUp" }}:
-                                <a-tag color="green">[[ sizeFormat(total.up) ]] / [[ sizeFormat(total.down) ]]</a-tag>
-                            </a-col>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalUsage" }}:
-                                <a-tag color="green">[[ sizeFormat(total.up + total.down) ]]</a-tag>
-                            </a-col>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.inboundCount" }}:
-                                <a-tag color="green">[[ dbInbounds.length ]]</a-tag>
-                            </a-col>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                <template>
-                                    <div>
-                                        <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200">
-                                        </a-back-top>
-                                {{ i18n "clients" }}:
-                                <a-tag color="green">[[ total.clients ]]</a-tag>
-                                <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.deactive">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.depleted">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.expiring">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in onlineClients">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="blue" v-if="onlineClients.length">[[ onlineClients.length ]]</a-tag>
-                                </a-popover>
-                            </div>
-                        </template>
-                            </a-col>
-                        </a-row>
-                    </a-card>
-                </transition>
-                <transition name="list" appear>
-                    <a-card hoverable>
-                        <div slot="title">
-                            <a-row>
-                                <a-col :xs="12" :sm="12" :lg="12">
-                                    <a-button type="primary" icon="plus" @click="openAddInbound">
-                                        <template v-if="!isMobile">{{ i18n "pages.inbounds.addInbound" }}</template>
-                                    </a-button>
-                                    <a-dropdown :trigger="['click']">
-                                        <a-button type="primary" icon="menu">
-                                            <template v-if="!isMobile">{{ i18n "pages.inbounds.generalActions" }}</template>
-                                        </a-button>
-                                        <a-menu slot="overlay" @click="a => generalActions(a)" :theme="themeSwitcher.currentTheme">
-                                            <a-menu-item key="import">
-                                                <a-icon type="import"></a-icon>
-                                                {{ i18n "pages.inbounds.importInbound" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="export">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="subs" v-if="subSettings.enable">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetInbounds">
-                                                <a-icon type="reload"></a-icon>
-                                                {{ i18n "pages.inbounds.resetAllTraffic" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetClients">
-                                                <a-icon type="file-done"></a-icon>
-                                                {{ i18n "pages.inbounds.resetAllClientTraffics" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                                                <a-icon type="rest"></a-icon>
-                                                {{ i18n "pages.inbounds.delDepletedClients" }}
-                                            </a-menu-item>
-                                        </a-menu>
-                                    </a-dropdown>
-                                </a-col>
-                                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
-                                    <a-select v-model="refreshInterval"
-                                              style="width: 65px;"
-                                              v-if="isRefreshEnabled"
-                                              @change="changeRefreshInterval"
-                                              :dropdown-class-name="themeSwitcher.currentTheme">
-                                        <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
-                                    </a-select>
-                                    <a-icon type="sync" :spin="refreshing" @click="manualRefresh" style="margin: 0 5px;"></a-icon>
-                                    <a-switch v-model="isRefreshEnabled" @change="toggleRefresh"></a-switch>
-                                </a-col>
-                            </a-row>
-                        </div>
-                        <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
-                            <a-switch v-model="enableFilter"
-                                :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
-                                @change="toggleFilter">
-                                <a-icon slot="checkedChildren" type="search"></a-icon>
-                                <a-icon slot="unCheckedChildren" type="filter"></a-icon>
-                            </a-switch>
-                            <a-input v-if="!enableFilter" v-model.lazy="searchKey" placeholder='{{ i18n "search" }}' autofocus style="max-width: 300px" :size="isMobile ? 'small' : ''"></a-input>
-                            <a-radio-group v-if="enableFilter" v-model="filterBy" @change="filterInbounds" button-style="solid" :size="isMobile ? 'small' : ''">
-                                <a-radio-button value="">{{ i18n "none" }}</a-radio-button>
-                                <a-radio-button value="deactive">{{ i18n "disabled" }}</a-radio-button>
-                                <a-radio-button value="depleted">{{ i18n "depleted" }}</a-radio-button>
-                                <a-radio-button value="expiring">{{ i18n "depletingSoon" }}</a-radio-button>
-                                <a-radio-button value="online">{{ i18n "online" }}</a-radio-button>
-                            </a-radio-group>
-                        </div>
-                        <a-back-top></a-back-top>
-                        <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
-                                 :data-source="searchedInbounds"
-                                 :scroll="isMobile ? {} : { x: 1000 }"
-                                 :pagination=pagination(searchedInbounds)
-                                 :expand-icon-as-cell="false"
-                                 :expand-row-by-click="false"
-                                 :expand-icon-column-index="0"
-                                 :indent-size="0"
-                                 :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
-                                 style="margin-top: 10px">
-                            <template slot="action" slot-scope="text, dbInbound">
-                                <a-dropdown :trigger="['click']">
-                                    <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
-                                    <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="themeSwitcher.currentTheme">
-                                        <a-menu-item key="edit">
-                                            <a-icon type="edit"></a-icon>
-                                            {{ i18n "edit" }}
-                                        </a-menu-item>
-                                        <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
-                                            <a-icon type="qrcode"></a-icon>
-                                            {{ i18n "qrCode" }}
-                                        </a-menu-item>
-                                        <template v-if="dbInbound.isMultiUser()">
-                                            <a-menu-item key="addClient">
-                                                <a-icon type="user-add"></a-icon>
-                                                {{ i18n "pages.client.add"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="addBulkClient">
-                                                <a-icon type="usergroup-add"></a-icon>
-                                                {{ i18n "pages.client.bulk"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetClients">
-                                                <a-icon type="file-done"></a-icon>
-                                                {{ i18n "pages.inbounds.resetInboundClientTraffics"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="export">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="subs" v-if="subSettings.enable">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                                                <a-icon type="rest"></a-icon>
-                                                {{ i18n "pages.inbounds.delDepletedClients" }}
-                                            </a-menu-item>
-                                        </template>
-                                        <template v-else>
-                                            <a-menu-item key="showInfo">
-                                                <a-icon type="info-circle"></a-icon>
-                                                {{ i18n "info"}}
-                                            </a-menu-item>
-                                        </template>
-                                        <a-menu-item key="clipboard">
-                                            <a-icon type="copy"></a-icon>
-                                            {{ i18n "pages.inbounds.exportInbound" }}
-                                        </a-menu-item>
-                                        <a-menu-item key="resetTraffic">
-                                            <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
-                                        </a-menu-item>
-                                        <a-menu-item key="clone">
-                                            <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
-                                        </a-menu-item>
-                                        <a-menu-item key="delete">
-                                            <span style="color: #FF4D4F">
-                                                <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                            </span>
-                                        </a-menu-item>
-                                        <a-menu-item v-if="isMobile">
-                                            <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
-                                            {{ i18n "pages.inbounds.enable" }}
-                                        </a-menu-item>
-                                    </a-menu>
-                                </a-dropdown>
+  {{ template "commonSider" . }}
+  <a-layout id="content-layout">
+    <a-layout-content>
+      <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
+        <transition name="list" appear>
+          <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
+            message='{{ i18n "secAlertTitle" }}'
+            color="red"
+            description='{{ i18n "secAlertSsl" }}'
+            show-icon closable>
+          </a-alert>
+        </transition>
+        <transition name="list" appear>
+          <a-card hoverable>
+            <a-row>
+              <a-col :xs="24" :sm="24" :lg="12">
+                {{ i18n "pages.inbounds.totalDownUp" }}:
+                <a-tag color="green">[[ sizeFormat(total.up) ]] / [[ sizeFormat(total.down) ]]</a-tag>
+              </a-col>
+              <a-col :xs="24" :sm="24" :lg="12">
+                {{ i18n "pages.inbounds.totalUsage" }}:
+                <a-tag color="green">[[ sizeFormat(total.up + total.down) ]]</a-tag>
+              </a-col>
+              <a-col :xs="24" :sm="24" :lg="12">
+                {{ i18n "pages.inbounds.inboundCount" }}:
+                <a-tag color="green">[[ dbInbounds.length ]]</a-tag>
+              </a-col>
+              <a-col :xs="24" :sm="24" :lg="12">
+                <template>
+                  <div>
+                    <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top>
+                    {{ i18n "clients" }}:
+                    <a-tag color="green">[[ total.clients ]]</a-tag>
+                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in total.deactive">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in total.depleted">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in total.expiring">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in onlineClients">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag color="blue" v-if="onlineClients.length">[[ onlineClients.length ]]</a-tag>
+                    </a-popover>
+                  </div>
+                </template>
+              </a-col>
+            </a-row>
+          </a-card>
+        </transition>
+        <transition name="list" appear>
+          <a-card hoverable>
+            <div slot="title">
+              <a-row>
+                <a-col :xs="12" :sm="12" :lg="12">
+                  <a-button type="primary" icon="plus" @click="openAddInbound">
+                    <template v-if="!isMobile">{{ i18n "pages.inbounds.addInbound" }}</template>
+                  </a-button>
+                  <a-dropdown :trigger="['click']">
+                    <a-button type="primary" icon="menu">
+                      <template v-if="!isMobile">{{ i18n "pages.inbounds.generalActions" }}</template>
+                    </a-button>
+                    <a-menu slot="overlay" @click="a => generalActions(a)" :theme="themeSwitcher.currentTheme">
+                      <a-menu-item key="import">
+                        <a-icon type="import"></a-icon>
+                        {{ i18n "pages.inbounds.importInbound" }}
+                      </a-menu-item>
+                      <a-menu-item key="export">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export" }}
+                      </a-menu-item>
+                      <a-menu-item key="subs" v-if="subSettings.enable">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
+                      </a-menu-item>
+                      <a-menu-item key="resetInbounds">
+                        <a-icon type="reload"></a-icon>
+                        {{ i18n "pages.inbounds.resetAllTraffic" }}
+                      </a-menu-item>
+                      <a-menu-item key="resetClients">
+                        <a-icon type="file-done"></a-icon>
+                        {{ i18n "pages.inbounds.resetAllClientTraffics" }}
+                      </a-menu-item>
+                      <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
+                        <a-icon type="rest"></a-icon>
+                        {{ i18n "pages.inbounds.delDepletedClients" }}
+                      </a-menu-item>
+                    </a-menu>
+                  </a-dropdown>
+                </a-col>
+                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
+                  <a-select v-model="refreshInterval"
+                      style="width: 65px;"
+                      v-if="isRefreshEnabled"
+                      @change="changeRefreshInterval"
+                      :dropdown-class-name="themeSwitcher.currentTheme">
+                    <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
+                  </a-select>
+                  <a-icon type="sync" :spin="refreshing" @click="manualRefresh" style="margin: 0 5px;"></a-icon>
+                  <a-switch v-model="isRefreshEnabled" @change="toggleRefresh"></a-switch>
+                </a-col>
+              </a-row>
+            </div>
+            <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
+              <a-switch v-model="enableFilter"
+                  :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
+                  @change="toggleFilter">
+                <a-icon slot="checkedChildren" type="search"></a-icon>
+                <a-icon slot="unCheckedChildren" type="filter"></a-icon>
+              </a-switch>
+              <a-input v-if="!enableFilter" v-model.lazy="searchKey" placeholder='{{ i18n "search" }}' autofocus style="max-width: 300px" :size="isMobile ? 'small' : ''"></a-input>
+              <a-radio-group v-if="enableFilter" v-model="filterBy" @change="filterInbounds" button-style="solid" :size="isMobile ? 'small' : ''">
+                <a-radio-button value="">{{ i18n "none" }}</a-radio-button>
+                <a-radio-button value="deactive">{{ i18n "disabled" }}</a-radio-button>
+                <a-radio-button value="depleted">{{ i18n "depleted" }}</a-radio-button>
+                <a-radio-button value="expiring">{{ i18n "depletingSoon" }}</a-radio-button>
+                <a-radio-button value="online">{{ i18n "online" }}</a-radio-button>
+              </a-radio-group>
+            </div>
+            <a-back-top></a-back-top>
+            <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
+                :data-source="searchedInbounds"
+                :scroll="isMobile ? {} : { x: 1000 }"
+                :pagination=pagination(searchedInbounds)
+                :expand-icon-as-cell="false"
+                :expand-row-by-click="false"
+                :expand-icon-column-index="0"
+                :indent-size="0"
+                :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
+                style="margin-top: 10px">
+              <template slot="action" slot-scope="text, dbInbound">
+                <a-dropdown :trigger="['click']">
+                  <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
+                  <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="themeSwitcher.currentTheme">
+                    <a-menu-item key="edit">
+                      <a-icon type="edit"></a-icon>
+                      {{ i18n "edit" }}
+                    </a-menu-item>
+                    <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
+                      <a-icon type="qrcode"></a-icon>
+                      {{ i18n "qrCode" }}
+                    </a-menu-item>
+                    <template v-if="dbInbound.isMultiUser()">
+                      <a-menu-item key="addClient">
+                        <a-icon type="user-add"></a-icon>
+                        {{ i18n "pages.client.add"}}
+                      </a-menu-item>
+                      <a-menu-item key="addBulkClient">
+                        <a-icon type="usergroup-add"></a-icon>
+                        {{ i18n "pages.client.bulk"}}
+                      </a-menu-item>
+                      <a-menu-item key="resetClients">
+                        <a-icon type="file-done"></a-icon>
+                        {{ i18n "pages.inbounds.resetInboundClientTraffics"}}
+                      </a-menu-item>
+                      <a-menu-item key="export">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export"}}
+                      </a-menu-item>
+                      <a-menu-item key="subs" v-if="subSettings.enable">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
+                      </a-menu-item>
+                      <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
+                        <a-icon type="rest"></a-icon>
+                        {{ i18n "pages.inbounds.delDepletedClients" }}
+                      </a-menu-item>
+                    </template>
+                    <template v-else>
+                      <a-menu-item key="showInfo">
+                        <a-icon type="info-circle"></a-icon>
+                        {{ i18n "info"}}
+                      </a-menu-item>
+                    </template>
+                    <a-menu-item key="clipboard">
+                      <a-icon type="copy"></a-icon>
+                      {{ i18n "pages.inbounds.exportInbound" }}
+                    </a-menu-item>
+                    <a-menu-item key="resetTraffic">
+                      <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
+                    </a-menu-item>
+                    <a-menu-item key="clone">
+                      <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
+                    </a-menu-item>
+                    <a-menu-item key="delete">
+                      <span style="color: #FF4D4F">
+                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                      </span>
+                    </a-menu-item>
+                    <a-menu-item v-if="isMobile">
+                      <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+                      {{ i18n "pages.inbounds.enable" }}
+                    </a-menu-item>
+                  </a-menu>
+                </a-dropdown>
+              </template>
+              <template slot="protocol" slot-scope="text, dbInbound">
+                <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
+                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+                  <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
+                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag>
+                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isXtls" color="blue">XTLS</a-tag>
+                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag>
+                </template>
+              </template>
+              <template slot="clients" slot-scope="text, dbInbound">
+                <template v-if="clientCount[dbInbound.id]">
+                  <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
+                  <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                  </a-popover>
+                  <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                  </a-popover>
+                  <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
+                  </a-popover>
+                  <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" color="blue" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
+                  </a-popover>
+                </template>
+              </template>
+              <template slot="traffic" slot-scope="text, dbInbound">
+                <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                  <template slot="content">
+                    <table cellpadding="2" width="100%">
+                      <tr>
+                        <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
+                        <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
+                      </tr>
+                      <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                        <td>{{ i18n "remained" }}</td>
+                        <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                      </tr>
+                    </table>
+                  </template>
+                  <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
+                    [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                    <template v-if="dbInbound.total > 0">
+                        [[ sizeFormat(dbInbound.total) ]]
+                    </template>
+                    <template v-else>
+                      <svg style="fill: currentColor; height: 10px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
+                        <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" />
+                      </svg>
+                    </template>
+                  </a-tag>
+                </a-popover>
+              </template>
+              <template slot="enable" slot-scope="text, dbInbound">
+                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+              </template>
+              <template slot="expiryTime" slot-scope="text, dbInbound">
+                <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
+                  <template slot="content">
+                    [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                  </template>
+                  <a-tag style="min-width: 50px;" :color="usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
+                    [[ remainedDays(dbInbound._expiryTime) ]]
+                  </a-tag>
+                </a-popover>
+                <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
+              </template>
+              <template slot="info" slot-scope="text, dbInbound">
+                <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
+                  <template slot="content">
+                    <table cellpadding="2">
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.protocol" }}</td>
+                        <td>
+                          <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
+                          <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+                            <a-tag style="margin:0;" color="blue">[[ dbInbound.toInbound().stream.network ]]</a-tag>
+                            <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="green">tls</a-tag>
+                            <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="green">reality</a-tag>
+                          </template>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.port" }}</td>
+                        <td><a-tag>[[ dbInbound.port ]]</a-tag></td>
+                      </tr>
+                      <tr v-if="clientCount[dbInbound.id]">
+                        <td>{{ i18n "clients" }}</td>
+                        <td>
+                          <a-tag style="margin:0;" color="blue">[[ clientCount[dbInbound.id].clients ]]</a-tag>
+                          <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
                             </template>
-                            <template slot="protocol" slot-scope="text, dbInbound">
-                                <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                                    <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isXtls" color="blue">XTLS</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag>
-                                </template>
-                            </template>
-                            <template slot="clients" slot-scope="text, dbInbound">
-                                <template v-if="clientCount[dbInbound.id]">
-                                    <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="blue" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
-                                    </a-popover>  
-                                </template>
+                            <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                          </a-popover>
+                          <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
                             </template>
-                            <template slot="traffic" slot-scope="text, dbInbound">
-                                <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <table cellpadding="2" width="100%">
-                                            <tr>
-                                                <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
-                                                <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
-                                            </tr>
-                                            <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
-                                                <td>{{ i18n "remained" }}</td>
-                                                <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
-                                            </tr>
-                                        </table>
-                                    </template>
-                                    <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                                        [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                                        <template v-if="dbInbound.total > 0">
-                                            [[ sizeFormat(dbInbound.total) ]]
-                                        </template>
-                                        <template v-else>
-                                            <svg style="fill: currentColor; height: 10px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z"/></svg>
-                                        </template>
-                                    </a-tag>
-                                </a-popover>
+                            <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                          </a-popover>
+                          <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
                             </template>
-                            <template slot="enable" slot-scope="text, dbInbound">
-                                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+                            <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
+                          </a-popover>
+                          <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
                             </template>
-                            <template slot="expiryTime" slot-scope="text, dbInbound">
-                                <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
-                                    </template>
-                                    <a-tag style="min-width: 50px;" :color="usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
-                                        [[ remainedDays(dbInbound._expiryTime) ]]
-                                    </a-tag>
-                                </a-popover>
-                                <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
+                            <a-tag style="margin:0; padding: 0 2px;" color="green" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
+                          </a-popover>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.traffic" }}</td>
+                        <td>
+                          <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <table cellpadding="2" width="100%">
+                                <tr>
+                                  <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
+                                  <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
+                                </tr>
+                                <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                                  <td>{{ i18n "remained" }}</td>
+                                  <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                                </tr>
+                              </table>
                             </template>
-                            <template slot="info" slot-scope="text, dbInbound">
-                                <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
-                                    <template slot="content">
-                                        <table cellpadding="2">
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.protocol" }}</td>
-                                                <td>
-                                                    <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                                                    <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                                                        <a-tag style="margin:0;" color="blue">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                                                        <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="green">tls</a-tag>
-                                                        <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="green">reality</a-tag>
-                                                    </template>                    
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.port" }}</td>
-                                                <td><a-tag>[[ dbInbound.port ]]</a-tag></td>
-                                            </tr>
-                                            <tr v-if="clientCount[dbInbound.id]">
-                                                <td>{{ i18n "clients" }}</td>
-                                                <td>
-                                                    <a-tag style="margin:0;" color="blue">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                                                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
-                                                    </a-popover>
-                                                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
-                                                    </a-popover>
-                                                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                                                    </a-popover>
-                                                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" color="green" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
-                                                    </a-popover>                
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.traffic" }}</td>
-                                                <td>
-                                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <table cellpadding="2" width="100%">
-                                                                <tr>
-                                                                    <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
-                                                                    <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
-                                                                </tr>
-                                                                <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
-                                                                    <td>{{ i18n "remained" }}</td>
-                                                                    <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
-                                                                </tr>
-                                                            </table>
-                                                        </template>
-                                                        <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                                                            [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                                                            <template v-if="dbInbound.total > 0">
-                                                                [[ sizeFormat(dbInbound.total) ]]
-                                                            </template>
-                                                            <template v-else>&infin;</template>
-                                                        </a-tag>
-                                                    </a-popover>                    
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.expireDate" }}</td>
-                                                <td>
-                                                    <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
-                                                        [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
-                                                    </a-tag>
-                                                    <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">&infin;</a-tag>                    
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </template>
-                                    <a-badge>
-                                        <a-icon v-if="!dbInbound.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
-                                        <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
-                                            <a-icon type="info"></a-icon>
-                                        </a-button>
-                                    </a-badge>
-                                </a-popover>
-                            </template>
-                            <template slot="expandedRowRender" slot-scope="record">
-                                <a-table
-                                    :row-key="client => client.id"
-                                    :columns="isMobile ? innerMobileColumns : innerColumns"
-                                    :data-source="getInboundClients(record)"
-                                    :pagination=pagination(getInboundClients(record))
-                                    :style="isMobile ? 'margin: -12px 2px -13px;' : 'margin: -12px 22px -13px;'">
-                                    {{template "client_table"}}
-                                </a-table>
-                            </template>
-                        </a-table>
-                    </a-card>
-                </transition>
-            </a-spin>
-        </a-layout-content>
-    </a-layout>
+                            <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
+                                [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                                <template v-if="dbInbound.total > 0">
+                                    [[ sizeFormat(dbInbound.total) ]]
+                                </template>
+                              <template v-else>&infin;</template>
+                            </a-tag>
+                          </a-popover>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.expireDate" }}</td>
+                        <td>
+                          <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
+                            [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                          </a-tag>
+                          <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">&infin;</a-tag>
+                        </td>
+                      </tr>
+                    </table>
+                  </template>
+                  <a-badge>
+                    <a-icon v-if="!dbInbound.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
+                    <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
+                      <a-icon type="info"></a-icon>
+                    </a-button>
+                  </a-badge>
+                </a-popover>
+              </template>
+              <template slot="expandedRowRender" slot-scope="record">
+                <a-table
+                  :row-key="client => client.id"
+                  :columns="isMobile ? innerMobileColumns : innerColumns"
+                  :data-source="getInboundClients(record)"
+                  :pagination=pagination(getInboundClients(record))
+                  :style="isMobile ? 'margin: -12px 2px -13px;' : 'margin: -12px 22px -13px;'">
+                  {{template "client_table"}}
+                </a-table>
+              </template>
+            </a-table>
+          </a-card>
+        </transition>
+      </a-spin>
+    </a-layout-content>
+  </a-layout>
 </a-layout>
 {{template "js" .}}
 <script src="{{ .base_path }}assets/base64/base64.min.js"></script>

web/html/xui/index.html

@@ -19,327 +19,313 @@
 </style>
 
 <body>
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+  <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
     {{ template "commonSider" . }}
     <a-layout id="content-layout">
-        <a-layout-content>
-            <a-spin :spinning="spinning" :delay="200" :tip="loadingTip"/>
-            <transition name="list" appear>
-                <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
-                message='{{ i18n "secAlertTitle" }}'
-                color="red"
-                description='{{ i18n "secAlertSsl" }}'
-                show-icon closable
-                >
-                </a-alert>
-            </transition>
-            <transition name="list" appear>
-                <a-row>
-                    <a-card hoverable>
-                        <a-row>
-                            <a-col :sm="24" :md="12">
-                                <a-row>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.cpu.color"
-                                                    :percent="status.cpu.percent"></a-progress>
-                                        <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]]</div>
-                                        <div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
-                                    </a-col>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.mem.color"
-                                                    :percent="status.mem.percent"></a-progress>
-                                        <div>
-                                            <b>{{ i18n "pages.index.memory"}}:</b> [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
-                                        </div>
-                                    </a-col>
-                                </a-row>
-                            </a-col>
-                            <a-col :sm="24" :md="12">
-                                <a-row>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.swap.color"
-                                                    :percent="status.swap.percent"></a-progress>
-                                        <div>
-                                            <b>Swap:</b> [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
-                                        </div>
-                                    </a-col>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.disk.color"
-                                                    :percent="status.disk.percent"></a-progress>
-                                        <div>
-                                            <b>{{ i18n "pages.index.hard"}}:</b> [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
-                                        </div>
-                                    </a-col>
-                                </a-row>
-                            </a-col>
-                        </a-row>
-                    </a-card>
-                </a-row>
-            </transition>
-            <transition name="list" appear>
-                <a-row>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>3X-UI:</b>
-                            <a rel="noopener" href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
-                            <a rel="noopener" href="https://t.me/panel3xui" target="_blank"><a-tag color="green">@Panel3xui</a-tag></a>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "pages.index.operationHours" }}:</b>
-                            <a-tag :color="status.xray.color">Xray: [[ formatSecond(status.appStats.uptime) ]]</a-tag>
-                            <a-tag color="green">OS: [[ formatSecond(status.uptime) ]]</a-tag>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "pages.index.xrayStatus" }}:</b>
-                            <a-tag style="text-transform: capitalize;" :color="status.xray.color">[[ status.xray.state ]]
-                            </a-tag>
-                            <a-popover v-if="status.xray.state === State.Error"
-                                :overlay-class-name="themeSwitcher.currentTheme">
-                                <span slot="title" style="font-size: 12pt">An error occurred while running Xray
-                                    <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                                </span>
-                                <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"></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>                    
-                            <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">v[[ status.xray.version ]]</a-tag>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "menu.link" }}:</b>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
-                        </a-card>
+      <a-layout-content>
+        <a-spin :spinning="spinning" :delay="200" :tip="loadingTip"></a-spin>
+        <transition name="list" appear>
+          <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
+            message='{{ i18n "secAlertTitle" }}'
+            color="red"
+            description='{{ i18n "secAlertSsl" }}'
+            show-icon closable>
+          </a-alert>
+        </transition>
+        <transition name="list" appear>
+          <a-row>
+            <a-card hoverable>
+              <a-row>
+                <a-col :sm="24" :md="12">
+                  <a-row>
+                    <a-col :span="12" style="text-align: center">
+                      <a-progress type="dashboard" status="normal"
+                        :stroke-color="status.cpu.color"
+                        :percent="status.cpu.percent"></a-progress>
+                      <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]]</div>
+                      <div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
                     </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "pages.index.systemLoad" }}:</b>
-                            <a-tag color="green">
-                            <a-tooltip>
-                                [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
-                                <template slot="title">
-                                    {{ i18n "pages.index.systemLoadDesc" }}
-                                </template>
-                            </a-tooltip>
-                            </a-tag>
-                        </a-card>
+                    <a-col :span="12" style="text-align: center">
+                      <a-progress type="dashboard" status="normal"
+                        :stroke-color="status.mem.color"
+                        :percent="status.mem.percent"></a-progress>
+                      <div>
+                        <b>{{ i18n "pages.index.memory"}}:</b> [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
+                      </div>
                     </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "usage"}}:</b>
-                            <a-tag color="green">
-                                RAM: [[ sizeFormat(status.appStats.mem) ]]
-                            </a-tag>
-                            <a-tag color="green">
-                                Threads: [[ status.appStats.threads ]]
-                            </a-tag>
-                        </a-card>
+                  </a-row>
+                </a-col>
+                <a-col :sm="24" :md="12">
+                  <a-row>
+                    <a-col :span="12" style="text-align: center">
+                      <a-progress type="dashboard" status="normal"
+                        :stroke-color="status.swap.color"
+                        :percent="status.swap.percent"></a-progress>
+                      <div>
+                        <b>Swap:</b> [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
+                      </div>
                     </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="global"></a-icon> IPv4
-                                        <template slot="title">
-                                            [[ status.publicIP.ipv4 ]]
-                                        </template>
-                                    </a-tooltip>
-                                </a-tag>
-                            </a-col>
-                            <a-col :span="12">
-                                <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="global"></a-icon> IPv6
-                                        <template slot="title">
-                                            [[ status.publicIP.ipv6 ]]
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
-                    </a-col>                    
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="swap"></a-icon> TCP:  [[ status.tcpCount ]]
-                                        <template slot="title">
-                                            {{ i18n "pages.index.connectionTcpCountDesc" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="swap"></a-icon> UDP:  [[ status.udpCount ]]
-                                        <template slot="title">
-                                            {{ i18n "pages.index.connectionUdpCountDesc" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="arrow-up"></a-icon>
-                                    Up: [[ sizeFormat(status.netIO.up) ]]/s
-                                        <template slot="title">
-                                            {{ i18n "pages.index.upSpeed" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="arrow-down"></a-icon>
-                                    Down: [[ sizeFormat(status.netIO.down) ]]/s
-                                        <template slot="title">
-                                            {{ i18n "pages.index.downSpeed" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                        <a-icon type="cloud-upload"></a-icon>
-                                        <template slot="title">
-                                            {{ i18n "pages.index.totalSent" }}
-                                        </template> Out: [[ sizeFormat(status.netTraffic.sent) ]]
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                        <a-icon type="cloud-download"></a-icon>
-                                        <template slot="title">
-                                            {{ i18n "pages.index.totalReceive" }}
-                                        </template> In: [[ sizeFormat(status.netTraffic.recv) ]]
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
+                    <a-col :span="12" style="text-align: center">
+                      <a-progress type="dashboard" status="normal"
+                        :stroke-color="status.disk.color"
+                        :percent="status.disk.percent"></a-progress>
+                      <div>
+                        <b>{{ i18n "pages.index.hard"}}:</b> [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
+                      </div>
                     </a-col>
+                  </a-row>
+                </a-col>
+              </a-row>
+            </a-card>
+          </a-row>
+        </transition>
+        <transition name="list" appear>
+          <a-row>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <b>3X-UI:</b>
+                <a rel="noopener" href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
+                <a rel="noopener" href="https://t.me/panel3xui" target="_blank"><a-tag color="green">@Panel3xui</a-tag></a>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <b>{{ i18n "pages.index.operationHours" }}:</b>
+                <a-tag :color="status.xray.color">Xray: [[ formatSecond(status.appStats.uptime) ]]</a-tag>
+                <a-tag color="green">OS: [[ formatSecond(status.uptime) ]]</a-tag>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <b>{{ i18n "pages.index.xrayStatus" }}:</b>
+                <a-tag style="text-transform: capitalize;" :color="status.xray.color">[[ status.xray.state ]] </a-tag>
+                <a-popover v-if="status.xray.state === State.Error" :overlay-class-name="themeSwitcher.currentTheme">
+                  <span slot="title" style="font-size: 12pt">An error occurred while running Xray
+                    <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
+                  </span>
+                  <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"></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>
+                <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">v[[ status.xray.version ]]</a-tag>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <b>{{ i18n "menu.link" }}:</b>
+                <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
+                <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
+                <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <b>{{ i18n "pages.index.systemLoad" }}:</b>
+                <a-tag color="green">
+                  <a-tooltip>
+                      [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
+                    <template slot="title">
+                      {{ i18n "pages.index.systemLoadDesc" }}
+                    </template>
+                  </a-tooltip>
+                </a-tag>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <b>{{ i18n "usage"}}:</b>
+                <a-tag color="green"> RAM: [[ sizeFormat(status.appStats.mem) ]] </a-tag>
+                <a-tag color="green"> Threads: [[ status.appStats.threads ]] </a-tag>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <a-row>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="global"></a-icon> IPv4
+                        <template slot="title">
+                            [[ status.publicIP.ipv4 ]]
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="global"></a-icon> IPv6
+                        <template slot="title">
+                            [[ status.publicIP.ipv6 ]]
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                </a-row>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <a-row>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="swap"></a-icon> TCP: [[ status.tcpCount ]]
+                        <template slot="title">
+                          {{ i18n "pages.index.connectionTcpCountDesc" }}
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="swap"></a-icon> UDP: [[ status.udpCount ]]
+                        <template slot="title">
+                          {{ i18n "pages.index.connectionUdpCountDesc" }}
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
                 </a-row>
-            </transition>
-        </a-layout-content>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <a-row>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="arrow-up"></a-icon> Up: [[ sizeFormat(status.netIO.up) ]]/s
+                        <template slot="title">
+                          {{ i18n "pages.index.upSpeed" }}
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="arrow-down"></a-icon> Down: [[ sizeFormat(status.netIO.down) ]]/s
+                        <template slot="title">
+                          {{ i18n "pages.index.downSpeed" }}
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                </a-row>
+              </a-card>
+            </a-col>
+            <a-col :sm="24" :lg="12">
+              <a-card hoverable>
+                <a-row>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="cloud-upload"></a-icon>
+                        <template slot="title">
+                          {{ i18n "pages.index.totalSent" }}
+                        </template> Out: [[ sizeFormat(status.netTraffic.sent) ]]
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                  <a-col :span="12">
+                    <a-tag>
+                      <a-tooltip>
+                        <a-icon type="cloud-download"></a-icon>
+                        <template slot="title">
+                          {{ i18n "pages.index.totalReceive" }}
+                        </template> In: [[ sizeFormat(status.netTraffic.recv) ]]
+                      </a-tooltip>
+                    </a-tag>
+                  </a-col>
+                </a-row>
+              </a-card>
+            </a-col>
+          </a-row>
+        </transition>
+      </a-layout-content>
     </a-layout>
-
     <a-modal id="version-modal" v-model="versionModal.visible" title='{{ i18n "pages.index.xraySwitch" }}' :closable="true"
         @ok="() => versionModal.visible = false" :class="themeSwitcher.currentTheme" footer="">
-        <a-alert type="warning" style="margin-bottom: 12px; width: fit-content"
-            message='{{ i18n "pages.index.xraySwitchClickDesk" }}' show-icon></a-alert>
-        <template v-for="version, index in versionModal.versions">
-            <a-tag :color="index % 2 == 0 ? 'purple' : 'green'" style="margin-right: 12px; margin-bottom: 12px"
-                @click="switchV2rayVersion(version)">
-                [[ version ]]
-            </a-tag>
-        </template>
+      <a-alert type="warning" style="margin-bottom: 12px; width: fit-content"
+        message='{{ i18n "pages.index.xraySwitchClickDesk" }}' show-icon></a-alert>
+      <template v-for="version, index in versionModal.versions">
+        <a-tag :color="index % 2 == 0 ? 'purple' : 'green'" style="margin-right: 12px; margin-bottom: 12px"
+          @click="switchV2rayVersion(version)">
+          [[ version ]]
+        </a-tag>
+      </template>
     </a-modal>
-
     <a-modal id="log-modal" v-model="logModal.visible"
-             :closable="true" @cancel="() => logModal.visible = false"
-             :class="themeSwitcher.currentTheme"
-             width="800px" footer="">
-        <template slot="title">
-            {{ i18n "pages.index.logs" }}
-            <a-icon :spin="logModal.loading"
-                    type="sync"
-                    style="vertical-align: middle; margin-left: 10px;"
-                    :disabled="logModal.loading"
-                    @click="openLogs()">
-            </a-icon>
-        </template>
-        <a-form layout="inline">
-            <a-form-item>
-                <a-input-group compact>
-                    <a-select v-model="logModal.rows" style="width:70px;"
-                    @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="10">10</a-select-option>
-                        <a-select-option value="20">20</a-select-option>
-                        <a-select-option value="50">50</a-select-option>
-                        <a-select-option value="100">100</a-select-option>
-                    </a-select>
-                    <a-select v-model="logModal.level" style="width:100px;"
-                    @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="debug">Debug</a-select-option>
-                        <a-select-option value="info">Info</a-select-option>
-                        <a-select-option value="notice">Notice</a-select-option>
-                        <a-select-option value="warning">Warning</a-select-option>
-                        <a-select-option value="err">Error</a-select-option>
-                    </a-select>
-                </a-input-group>
-            </a-form-item>
-            <a-form-item>
-                <a-checkbox v-model="logModal.syslog" @change="openLogs()">SysLog</a-checkbox>
-            </a-form-item>
-            <a-form-item style="float: right;">
-                <a-button type="primary" icon="download"
-                :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs.join('\n'))" download="x-ui.log">
-                </a-button>
-            </a-form-item>
-        </a-form>
-        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.formattedLogs"></div>
+        :closable="true" @cancel="() => logModal.visible = false"
+        :class="themeSwitcher.currentTheme"
+        width="800px" footer="">
+      <template slot="title">
+        {{ i18n "pages.index.logs" }}
+        <a-icon :spin="logModal.loading"
+          type="sync"
+          style="vertical-align: middle; margin-left: 10px;"
+          :disabled="logModal.loading"
+          @click="openLogs()">
+        </a-icon>
+      </template>
+      <a-form layout="inline">
+        <a-form-item style="margin-right: 0.5rem;">
+          <a-input-group compact>
+            <a-select size="small" v-model="logModal.rows" style="width:70px;"
+                @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
+              <a-select-option value="10">10</a-select-option>
+              <a-select-option value="20">20</a-select-option>
+              <a-select-option value="50">50</a-select-option>
+              <a-select-option value="100">100</a-select-option>
+            </a-select>
+            <a-select size="small" v-model="logModal.level" style="width:95px;"
+                @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
+              <a-select-option value="debug">Debug</a-select-option>
+              <a-select-option value="info">Info</a-select-option>
+              <a-select-option value="notice">Notice</a-select-option>
+              <a-select-option value="warning">Warning</a-select-option>
+              <a-select-option value="err">Error</a-select-option>
+            </a-select>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item>
+          <a-checkbox v-model="logModal.syslog" @change="openLogs()">SysLog</a-checkbox>
+        </a-form-item>
+        <a-form-item style="float: right;">
+          <a-button type="primary" icon="download"
+            :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs?.join('\n'))" download="x-ui.log">
+          </a-button>
+        </a-form-item>
+      </a-form>
+      <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto; margin-top: 0.5rem;" v-html="logModal.formattedLogs"></div>
     </a-modal>
-
     <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
-            :closable="true" footer=""
-            :class="themeSwitcher.currentTheme">
-            <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
-            :message="backupModal.description"
-            show-icon
-            ></a-alert>
-        <a-space direction="horizontal" style="text-align: center" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="exportDatabase()">
-                [[ backupModal.exportText ]]
-            </a-button>
-            <a-button type="primary" @click="importDatabase()">
-                [[ backupModal.importText ]]
-            </a-button>
-        </a-space>
+        :closable="true" footer=""
+        :class="themeSwitcher.currentTheme">
+      <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
+        :message="backupModal.description"
+        show-icon>
+      </a-alert>
+      <a-space direction="horizontal" style="text-align: center; margin-bottom: 10px;">
+        <a-button type="primary" @click="exportDatabase()">
+            [[ backupModal.exportText ]]
+        </a-button>
+        <a-button type="primary" @click="importDatabase()">
+            [[ backupModal.importText ]]
+        </a-button>
+      </a-space>
     </a-modal>
-
-</a-layout>
+  </a-layout>
 {{template "js" .}}
 <script src="{{ .base_path }}assets/clipboard/clipboard.min.js"></script>
 {{template "component/themeSwitcher" .}}
 {{template "textModal"}}
 <script>
-
     const State = {
         Running: "running",
         Stop: "stop",
@@ -664,7 +650,6 @@
             }
         },
     });
-
 </script>
 </body>
 </html>

web/html/xui/settings.html

@@ -2,362 +2,374 @@
 <html lang="en">
 {{template "head" .}}
 <style>
-    @media (min-width: 769px) {
-        .ant-layout-content {
-            margin: 24px 16px;
-        }
+  @media (min-width: 769px) {
+    .ant-layout-content {
+      margin: 24px 16px;
     }
-
-    @media (max-width: 768px) {
-        .ant-tabs-nav .ant-tabs-tab {
-            margin: 0;
-            padding: 12px .5rem;
-        }
+  }
+  @media (max-width: 768px) {
+    .ant-tabs-nav .ant-tabs-tab {
+      margin: 0;
+      padding: 12px .5rem;
     }
-
-    .ant-tabs-bar {
-        margin: 0;
+  }
+  .ant-tabs-bar {
+    margin: 0;
+  }
+  .ant-list-item {
+    display: block;
+  }
+  .alert-msg {
+    color: rgb(194, 117, 18);
+    font-weight: normal;
+    font-size: 16px;
+    padding: .5rem 1rem;
+    text-align: center;
+    background: rgb(255 145 0 / 15%);
+    margin: 1.5rem 2.5rem 0rem 2.5rem;
+    border-radius: .5rem;
+    transition: all 0.5s;
+    animation: signal 3s cubic-bezier(0.18, 0.89, 0.32, 1.28) infinite;
+  }
+  .alert-msg:hover {
+    cursor: default;
+    transition-duration: .3s;
+    animation: signal 0.9s ease infinite;
+  }
+  @keyframes signal {
+    0% {
+      box-shadow: 0 0 0 0 rgba(194, 118, 18, 0.5);
     }
 
-    .ant-list-item {
-        display: block;
+    50% {
+      box-shadow: 0 0 0 6px rgba(0, 0, 0, 0);
     }
 
-    .alert-msg {
-        color: rgb(194, 117, 18);
-        font-weight: normal;
-        font-size: 16px;
-        padding: .5rem 1rem;
-        text-align: center;
-        background: rgb(255 145 0 / 15%);
-        margin: 1.5rem 2.5rem 0rem 2.5rem;
-        border-radius: .5rem;
-        transition: all 0.5s;
-        animation: signal 3s cubic-bezier(0.18, 0.89, 0.32, 1.28) infinite;
-    }
-    .alert-msg:hover {
-        cursor: default;
-        transition-duration: .3s;
-        animation: signal 0.9s ease infinite;
-    }
-    @keyframes signal{
-    0%{
-        box-shadow: 0 0 0 0 rgba(194, 118, 18, 0.5);
-    }
-    50%{
-        box-shadow: 0 0 0 6px rgba(0 ,0,0,0);
-    }
-    100%{
-        box-shadow: 0 0 0 6px rgba(0 ,0,0,0);
-    }
-    }
-    .alert-msg > i {
-        color: inherit;
-        font-size: 24px;
-    }
-
-    .collapse-title {
-        color: inherit;
-        font-weight: bold;
-        font-size: 18px;
-        padding: 10px 20px;
-        border-bottom: 2px solid;
-    }
-
-    .collapse-title > i {
-        color: inherit;
-        font-size: 24px;
+    100% {
+      box-shadow: 0 0 0 6px rgba(0, 0, 0, 0);
     }
+  }
+  .alert-msg>i {
+    color: inherit;
+    font-size: 24px;
+  }
+  .collapse-title {
+    color: inherit;
+    font-weight: bold;
+    font-size: 18px;
+    padding: 10px 20px;
+    border-bottom: 2px solid;
+  }
+  .collapse-title>i {
+    color: inherit;
+    font-size: 24px;
+  }
+  .ant-collapse-content-box .ant-list-item {
+    border-bottom: none !important;
+  }
 </style>
 <body>
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+  <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
     {{ template "commonSider" . }}
     <a-layout id="content-layout">
-        <a-layout-content>
-            <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
-                <transition name="list" appear>
-                    <a-alert type="error" v-if="confAlerts.length>0" style="margin: 10px 5px;"
-                    message='{{ i18n "secAlertTitle" }}'
-                    color="red"
-                    show-icon
-                    closable
-                    >
-                    <template slot="description">
-                    <b>{{ i18n "secAlertConf" }}</b>
-                    <ul><li v-for="a in confAlerts">[[ a ]]</li></ul>
-                    </template>
-                  </a-alert>
-                    </transition>
-                <a-space direction="vertical">
-                    <a-card hoverable style="margin-bottom: .5rem; overflow-x: hidden;">
-                        <a-row style="display: flex; flex-wrap: wrap; align-items: center;">
-                            <a-col :xs="24" :sm="10" style="padding: 4px;">
-                                <a-space direction="horizontal">
-                                    <a-button type="primary" :disabled="saveBtnDisable" @click="updateAllSetting">{{ i18n "pages.settings.save" }}</a-button>
-                                    <a-button type="danger" :disabled="!saveBtnDisable" @click="restartPanel">{{ i18n "pages.settings.restartPanel" }}</a-button>
-                                </a-space>
+      <a-layout-content>
+        <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
+          <transition name="list" appear>
+            <a-alert type="error" v-if="confAlerts.length>0" style="margin: 10px 5px;"
+                message='{{ i18n "secAlertTitle" }}'
+                color="red"
+                show-icon closable>
+              <template slot="description">
+                <b>{{ i18n "secAlertConf" }}</b>
+                <ul><li v-for="a in confAlerts">[[ a ]]</li></ul>
+              </template>
+            </a-alert>
+          </transition>
+          <a-space direction="vertical">
+            <a-card hoverable style="margin-bottom: .5rem; overflow-x: hidden;">
+              <a-row style="display: flex; flex-wrap: wrap; align-items: center;">
+                <a-col :xs="24" :sm="10" style="padding: 4px;">
+                  <a-space direction="horizontal">
+                    <a-button type="primary" :disabled="saveBtnDisable" @click="updateAllSetting">{{ i18n "pages.settings.save" }}</a-button>
+                    <a-button type="danger" :disabled="!saveBtnDisable" @click="restartPanel">{{ i18n "pages.settings.restartPanel" }}</a-button>
+                  </a-space>
+                </a-col>
+                <a-col :xs="24" :sm="14">
+                  <template>
+                    <div>
+                      <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top>
+                      <a-alert type="warning" style="float: right; width: fit-content"
+                        message='{{ i18n "pages.settings.infoDesc" }}'
+                        show-icon>
+                      </a-alert>
+                    </div>
+                  </template>
+                </a-col>
+              </a-row>
+            </a-card>
+            <a-tabs default-active-key="1">
+              <a-tab-pane key="1" tab='{{ i18n "pages.settings.panelSettings"}}'>
+                <a-list item-layout="horizontal">
+                  <a-list-item>
+                    <a-row style="padding: 20px">
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.remarkModel"}}'>
+                          <template slot="description">{{ i18n "pages.settings.sampleRemark"}}: <i>#[[ remarkSample ]]</i></template>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <a-input-group style="width: 100%;">
+                          <a-select style="padding-right: .5rem; min-width: 80%; width: auto;"
+                              mode="multiple"
+                              v-model="remarkModel"
+                              :dropdown-class-name="themeSwitcher.currentTheme">
+                            <a-select-option v-for="(value, key) in remarkModels" :value="key">[[ value ]]</a-select-option>
+                          </a-select>
+                          <a-select style="width: 20%;" v-model="remarkSeparator" :dropdown-class-name="themeSwitcher.currentTheme">
+                            <a-select-option v-for="key in remarkSeparators" :value="key">[[ key ]]</a-select-option>
+                          </a-select>
+                        </a-input-group>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningIP"}}' desc='{{ i18n "pages.settings.panelListeningIPDesc"}}' v-model="allSetting.webListen"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningDomain"}}' desc='{{ i18n "pages.settings.panelListeningDomainDesc"}}' v-model="allSetting.webDomain"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.panelPort"}}' desc='{{ i18n "pages.settings.panelPortDesc"}}' v-model="allSetting.webPort" :min="1" :max="65531"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.publicKeyPath"}}' desc='{{ i18n "pages.settings.publicKeyPathDesc"}}' v-model="allSetting.webCertFile"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.privateKeyPath"}}' desc='{{ i18n "pages.settings.privateKeyPathDesc"}}' v-model="allSetting.webKeyFile"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.panelUrlPath"}}' desc='{{ i18n "pages.settings.panelUrlPathDesc"}}' v-model="allSetting.webBasePath"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.sessionMaxAge" }}' desc='{{ i18n "pages.settings.sessionMaxAgeDesc" }}' v-model="allSetting.sessionMaxAge" :min="0"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.pageSize" }}' desc='{{ i18n "pages.settings.pageSizeDesc" }}' v-model="allSetting.pageSize" :min="0" :step="5"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.expireTimeDiff" }}' desc='{{ i18n "pages.settings.expireTimeDiffDesc" }}' v-model="allSetting.expireDiff" :min="0"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.trafficDiff" }}' desc='{{ i18n "pages.settings.trafficDiffDesc" }}' v-model="allSetting.trafficDiff" :min="0"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.timeZone"}}' desc='{{ i18n "pages.settings.timeZoneDesc"}}' v-model="allSetting.timeLocation"></setting-list-item>
+                  <a-list-item>
+                    <a-row style="padding: 20px">
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.datepicker"}}'>
+                          <template slot="description">{{ i18n "pages.settings.datepickerDescription"}}</template>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <template>
+                          <a-select style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme" v-model="datepicker">
+                            <a-select-option v-for="item in datepickerList" :value="item.value">
+                              <span v-text="item.name"></span>
+                            </a-select-option>
+                          </a-select>
+                        </template>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                  <a-list-item>
+                    <a-row style="padding: 20px">
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title="Language"></a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <template>
+                          <a-select ref="selectLang"
+                              v-model="lang"
+                              @change="setLang(lang)"
+                              :dropdown-class-name="themeSwitcher.currentTheme"
+                              style="width: 100%">
+                            <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
+                              <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
+                            </a-select-option>
+                          </a-select>
+                        </template>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                </a-list>
+              </a-tab-pane>
+              <a-tab-pane key="2" tab='{{ i18n "pages.settings.securitySettings"}}' style="padding: 20px;">
+                <a-divider>{{ i18n "pages.settings.security.admin"}}</a-divider>
+                <a-form layout="horizontal" :colon="false" style="float: left; margin-bottom: 2rem;" :label-col="{ md: {span:10} }" :wrapper-col="{ md: {span:14} }">
+                  <a-form-item label='{{ i18n "pages.settings.oldUsername"}}'>
+                    <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
+                  </a-form-item>
+                  <a-form-item label='{{ i18n "pages.settings.currentPassword"}}'>
+                    <password-input autocomplete="current-password" v-model="user.oldPassword"></password-input>
+                  </a-form-item>
+                  <a-form-item label='{{ i18n "pages.settings.newUsername"}}'>
+                    <a-input v-model="user.newUsername"></a-input>
+                  </a-form-item>
+                  <a-form-item label='{{ i18n "pages.settings.newPassword"}}'>
+                    <password-input autocomplete="new-password" v-model="user.newPassword"></password-input>
+                  </a-form-item>
+                  <a-form-item label=" ">
+                    <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
+                  </a-form-item>
+                </a-form>
+                <a-divider>{{ i18n "pages.settings.security.secret"}}</a-divider>
+                <a-form style="padding: 0 20px;">
+                  <a-list-item>
+                    <a-row>
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.security.loginSecurity" }}'
+                          description='{{ i18n "pages.settings.security.loginSecurityDesc" }}'>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <template>
+                          <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
+                          <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync" @click="getNewSecret"></a-icon>
+                        </template>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                  <a-list-item>
+                    <a-row>
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.security.secretToken" }}'
+                          description='{{ i18n "pages.settings.security.secretTokenDesc" }}'>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <template>
+                          <a-textarea type="text" :disabled="!allSetting.secretEnable" v-model="user.loginSecret"></a-textarea>
+                        </template>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                  <a-button type="primary" :loading="this.changeSecret" @click="updateSecret">{{ i18n "confirm" }}</a-button>
+                </a-form>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab='{{ i18n "pages.settings.TGBotSettings"}}'>
+                <a-list item-layout="horizontal">
+                  <setting-list-item type="switch" title='{{ i18n "pages.settings.telegramBotEnable" }}' desc='{{ i18n "pages.settings.telegramBotEnableDesc" }}' v-model="allSetting.tgBotEnable"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramToken"}}' desc='{{ i18n "pages.settings.telegramTokenDesc"}}' v-model="allSetting.tgBotToken"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramChatId"}}' desc='{{ i18n "pages.settings.telegramChatIdDesc"}}' v-model="allSetting.tgBotChatId"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramNotifyTime"}}' desc='{{ i18n "pages.settings.telegramNotifyTimeDesc"}}' v-model="allSetting.tgRunTime"></setting-list-item>
+                  <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyBackup" }}' desc='{{ i18n "pages.settings.tgNotifyBackupDesc" }}' v-model="allSetting.tgBotBackup"></setting-list-item>
+                  <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyLogin" }}' desc='{{ i18n "pages.settings.tgNotifyLoginDesc" }}' v-model="allSetting.tgBotLoginNotify"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.tgNotifyCpu" }}' desc='{{ i18n "pages.settings.tgNotifyCpuDesc" }}' v-model="allSetting.tgCpu" :min="0" :max="100"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramProxy"}}' desc='{{ i18n "pages.settings.telegramProxyDesc"}}' v-model="allSetting.tgBotProxy" placeholder="socks5://user:pass@host:port"></setting-list-item>
+                  <a-list-item>
+                    <a-row style="padding: 20px">
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title="Telegram Bot Language" />
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <template>
+                          <a-select ref="selectBotLang" v-model="allSetting.tgLang" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                            <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
+                              <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
+                            </a-select-option>
+                          </a-select>
+                        </template>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                </a-list>
+              </a-tab-pane>
+              <a-tab-pane key="4" tab='{{ i18n "pages.settings.subSettings" }}'>
+                <a-list item-layout="horizontal">
+                  <setting-list-item type="switch" title='{{ i18n "pages.settings.subEnable"}}' desc='{{ i18n "pages.settings.subEnableDesc"}}' v-model="allSetting.subEnable"></setting-list-item>
+                  <setting-list-item type="switch" title='{{ i18n "pages.settings.subEncrypt"}}' desc='{{ i18n "pages.settings.subEncryptDesc"}}' v-model="allSetting.subEncrypt"></setting-list-item>
+                  <setting-list-item type="switch" title='{{ i18n "pages.settings.subShowInfo"}}' desc='{{ i18n "pages.settings.subShowInfoDesc"}}' v-model="allSetting.subShowInfo"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subListen"}}' desc='{{ i18n "pages.settings.subListenDesc"}}' v-model="allSetting.subListen"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subDomain"}}' desc='{{ i18n "pages.settings.subDomainDesc"}}' v-model="allSetting.subDomain"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.subPort"}}' desc='{{ i18n "pages.settings.subPortDesc"}}' v-model.number="allSetting.subPort" :min="1" :max="65531"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subPath"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subCertPath"}}' desc='{{ i18n "pages.settings.subCertPathDesc"}}' v-model="allSetting.subCertFile"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subKeyPath"}}' desc='{{ i18n "pages.settings.subKeyPathDesc"}}' v-model="allSetting.subKeyFile"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
+                  <setting-list-item type="number" title='{{ i18n "pages.settings.subUpdates"}}' desc='{{ i18n "pages.settings.subUpdatesDesc"}}' v-model="allSetting.subUpdates" :min="1"></setting-list-item>
+                </a-list>
+              </a-tab-pane>
+              <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable">
+                <a-list item-layout="horizontal">
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subJsonPath"></setting-list-item>
+                  <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subJsonURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
+                  <a-list-item style="padding: 20px">
+                    <a-row>
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.fragment"}}'>
+                          <template slot="description">{{ i18n "pages.settings.fragmentDesc"}}</template>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <a-switch v-model="fragment"></a-switch>
+                      </a-col>
+                    </a-row>
+                    <a-collapse v-if="fragment" style="margin-top: 14px;">
+                      <a-collapse-panel header='{{ i18n "pages.settings.fragmentSett"}}' v-if="fragment">
+                        <a-list-item style="padding: 10px 20px">
+                          <a-row>
+                            <a-col :lg="24" :xl="12">
+                              <a-list-item-meta title='Packets'></a-list-item-meta>
                             </a-col>
-                            <a-col :xs="24" :sm="14">
-                                <template>
-                                    <div>
-                                        <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200">
-                                        </a-back-top>
-                                        <a-alert type="warning" style="float: right; width: fit-content"
-                                        message='{{ i18n "pages.settings.infoDesc" }}'
-                                        show-icon
-                                        >
-                                    </div>
-                                </template>
+                            <a-col :lg="24" :xl="12">
+                              <a-select v-model="fragmentPackets" style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
+                                <a-select-option :value="p" :label="p" v-for="p in ['1-1', '1-3', 'tlshello']"> [[ p ]] </a-select-option>
+                              </a-select>
                             </a-col>
-                        </a-row>
-                    </a-card>
-                    <a-tabs default-active-key="1">
-                        <a-tab-pane key="1" tab='{{ i18n "pages.settings.panelSettings"}}'>
-                            <a-list item-layout="horizontal">
-                                <a-list-item>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.settings.remarkModel"}}'>
-                                                <template slot="description">{{ i18n "pages.settings.sampleRemark"}}: <i>#[[ remarkSample ]]</i></template>
-                                            </a-list-item-meta>
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <a-input-group style="width: 100%;">
-                                                <a-select style="padding-right: .5rem; min-width: 80%; width: auto;"
-                                                    mode="multiple"
-                                                    v-model="remarkModel"
-                                                    :dropdown-class-name="themeSwitcher.currentTheme">
-                                                    <a-select-option v-for="(value, key) in remarkModels" :value="key">[[ value ]]</a-select-option>
-                                                </a-select>
-                                                <a-select style="width: 20%;" v-model="remarkSeparator" :dropdown-class-name="themeSwitcher.currentTheme">
-                                                    <a-select-option v-for="key in remarkSeparators" :value="key">[[ key ]]</a-select-option>
-                                                </a-select>
-                                            </a-input-group>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningIP"}}' desc='{{ i18n "pages.settings.panelListeningIPDesc"}}' v-model="allSetting.webListen"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningDomain"}}' desc='{{ i18n "pages.settings.panelListeningDomainDesc"}}' v-model="allSetting.webDomain"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.panelPort"}}' desc='{{ i18n "pages.settings.panelPortDesc"}}' v-model="allSetting.webPort" :min="1" :max="65531"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.publicKeyPath"}}' desc='{{ i18n "pages.settings.publicKeyPathDesc"}}' v-model="allSetting.webCertFile"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.privateKeyPath"}}' desc='{{ i18n "pages.settings.privateKeyPathDesc"}}' v-model="allSetting.webKeyFile"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.panelUrlPath"}}' desc='{{ i18n "pages.settings.panelUrlPathDesc"}}' v-model="allSetting.webBasePath"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.sessionMaxAge" }}' desc='{{ i18n "pages.settings.sessionMaxAgeDesc" }}' v-model="allSetting.sessionMaxAge" :min="0"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.pageSize" }}' desc='{{ i18n "pages.settings.pageSizeDesc" }}' v-model="allSetting.pageSize" :min="0" :step="5"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.expireTimeDiff" }}' desc='{{ i18n "pages.settings.expireTimeDiffDesc" }}' v-model="allSetting.expireDiff" :min="0"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.trafficDiff" }}' desc='{{ i18n "pages.settings.trafficDiffDesc" }}' v-model="allSetting.trafficDiff" :min="0"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.timeZone"}}' desc='{{ i18n "pages.settings.timeZoneDesc"}}' v-model="allSetting.timeLocation"></setting-list-item>
-                                <a-list-item>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.settings.datepicker"}}'>
-                                                <template slot="description">{{ i18n "pages.settings.datepickerDescription"}}</template>
-                                            </a-list-item-meta>
-                                        </a-col>
-
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-select style="width: 100%"
-                                                          :dropdown-class-name="themeSwitcher.currentTheme"
-                                                          v-model="datepicker">
-                                                    <a-select-option v-for="item in datepickerList" :value="item.value">
-                                                        <span v-text="item.name"></span>
-                                                    </a-select-option>
-                                                </a-select>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                                <a-list-item>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title="Language" />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-select
-                                                    ref="selectLang"
-                                                    v-model="lang"
-                                                    @change="setLang(lang)"
-                                                    :dropdown-class-name="themeSwitcher.currentTheme"
-                                                    style="width: 100%"
-                                                >
-                                                    <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
-                                                        <span role="img" :aria-label="l.name" v-text="l.icon"></span>
-                                                        &nbsp;&nbsp;<span v-text="l.name"></span>
-                                                    </a-select-option>
-                                                </a-select>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                            </a-list>
-                        </a-tab-pane>
-                        <a-tab-pane key="2" tab='{{ i18n "pages.settings.securitySettings"}}' style="padding: 20px;">
-                            <a-divider>{{ i18n "pages.settings.security.admin"}}</a-divider>
-                            <a-form  layout="horizontal" :colon="false" style="float: left; margin: 10px 0;" :label-col="{ md: {span:10} }" :wrapper-col="{ md: {span:14} }">
-                                <a-form-item label='{{ i18n "pages.settings.oldUsername"}}'>
-                                    <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
-                                </a-form-item>
-                                <a-form-item label='{{ i18n "pages.settings.currentPassword"}}'>
-                                    <password-input autocomplete="current-password" v-model="user.oldPassword"></password-input>
-                                </a-form-item>
-                                <a-form-item label='{{ i18n "pages.settings.newUsername"}}'>
-                                    <a-input v-model="user.newUsername"></a-input>
-                                </a-form-item>
-                                <a-form-item label='{{ i18n "pages.settings.newPassword"}}'>
-                                    <password-input autocomplete="new-password" v-model="user.newPassword"></password-input>
-                                </a-form-item>
-                                <a-form-item label=" ">
-                                    <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
-                                </a-form-item>
-                            </a-form>
-                            <a-divider>{{ i18n "pages.settings.security.secret"}}</a-divider>
-                            <a-form style="padding: 20px;">
-                                <a-list-item>
-                                    <a-row>
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.settings.security.loginSecurity" }}' description='{{ i18n "pages.settings.security.loginSecurityDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
-                                                <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync" @click="getNewSecret"></a-icon>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                                <a-list-item>
-                                    <a-row>
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.settings.security.secretToken" }}' description='{{ i18n "pages.settings.security.secretTokenDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-textarea type="text" :disabled="!allSetting.secretEnable" v-model="user.loginSecret"></a-textarea>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                                <a-button type="primary" :loading="this.changeSecret" @click="updateSecret">{{ i18n "confirm" }}</a-button>
-                            </a-form>
-                        </a-tab-pane>
-                        <a-tab-pane key="3" tab='{{ i18n "pages.settings.TGBotSettings"}}'>
-                            <a-list item-layout="horizontal">
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.telegramBotEnable" }}' desc='{{ i18n "pages.settings.telegramBotEnableDesc" }}' v-model="allSetting.tgBotEnable"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.telegramToken"}}' desc='{{ i18n "pages.settings.telegramTokenDesc"}}' v-model="allSetting.tgBotToken"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.telegramChatId"}}' desc='{{ i18n "pages.settings.telegramChatIdDesc"}}' v-model="allSetting.tgBotChatId"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.telegramNotifyTime"}}' desc='{{ i18n "pages.settings.telegramNotifyTimeDesc"}}' v-model="allSetting.tgRunTime"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyBackup" }}' desc='{{ i18n "pages.settings.tgNotifyBackupDesc" }}' v-model="allSetting.tgBotBackup"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyLogin" }}' desc='{{ i18n "pages.settings.tgNotifyLoginDesc" }}' v-model="allSetting.tgBotLoginNotify"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.tgNotifyCpu" }}' desc='{{ i18n "pages.settings.tgNotifyCpuDesc" }}' v-model="allSetting.tgCpu" :min="0" :max="100"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.telegramProxy"}}' desc='{{ i18n "pages.settings.telegramProxyDesc"}}' v-model="allSetting.tgBotProxy" placeholder="socks5://user:pass@host:port"></setting-list-item>
-                                <a-list-item>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title="Telegram Bot Language" />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-select
-                                                    ref="selectBotLang"
-                                                    v-model="allSetting.tgLang"
-                                                    :dropdown-class-name="themeSwitcher.currentTheme"
-                                                    style="width: 100%">
-                                                    <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
-                                                        <span role="img" :aria-label="l.name" v-text="l.icon"></span>
-                                                        &nbsp;&nbsp;<span v-text="l.name"></span>
-                                                    </a-select-option>
-                                                </a-select>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                            </a-list>
-                        </a-tab-pane>
-                        <a-tab-pane key="4" tab='{{ i18n "pages.settings.subSettings" }}'>
-                            <a-list item-layout="horizontal">
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.subEnable"}}' desc='{{ i18n "pages.settings.subEnableDesc"}}' v-model="allSetting.subEnable"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.subEncrypt"}}' desc='{{ i18n "pages.settings.subEncryptDesc"}}' v-model="allSetting.subEncrypt"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.subShowInfo"}}' desc='{{ i18n "pages.settings.subShowInfoDesc"}}' v-model="allSetting.subShowInfo"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subListen"}}' desc='{{ i18n "pages.settings.subListenDesc"}}' v-model="allSetting.subListen"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subDomain"}}' desc='{{ i18n "pages.settings.subDomainDesc"}}' v-model="allSetting.subDomain"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.subPort"}}' desc='{{ i18n "pages.settings.subPortDesc"}}' v-model.number="allSetting.subPort" :min="1" :max="65531"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subPath"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subCertPath"}}' desc='{{ i18n "pages.settings.subCertPathDesc"}}' v-model="allSetting.subCertFile"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subKeyPath"}}' desc='{{ i18n "pages.settings.subKeyPathDesc"}}' v-model="allSetting.subKeyFile"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.subUpdates"}}' desc='{{ i18n "pages.settings.subUpdatesDesc"}}' v-model="allSetting.subUpdates" :min="1"></setting-list-item>
-                            </a-list>
-                        </a-tab-pane>
-                        <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable">
-                            <a-list item-layout="horizontal">
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subJsonPath"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subJsonURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.settings.fragment"}}' desc='{{ i18n "pages.settings.fragmentDesc"}}' v-model="fragment"></setting-list-item>
-                                <setting-list-item type="switch" title='Mux' v-model="enableMux"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.xray.directCountryConfigs"}}' desc='{{ i18n "pages.xray.directCountryConfigsDesc"}}' v-model="enableDirect"></setting-list-item>
-                            </a-list>
-                            <a-collapse v-if="fragment || enableMux || enableDirect">
-                                <a-collapse-panel header='{{ i18n "pages.settings.fragment"}}' v-if="fragment">
-                                    <a-list-item style="padding: 20px">
-                                        <a-row>
-                                            <a-col :lg="24" :xl="12">
-                                                <a-list-item-meta title='Packets'/>
-                                            </a-col>
-                                            <a-col :lg="24" :xl="12">
-                                                <a-select
-                                                    v-model="fragmentPackets"
-                                                    style="width: 100%"
-                                                    :dropdown-class-name="themeSwitcher.currentTheme">
-                                                    <a-select-option :value="p" :label="p" v-for="p in ['1-1', '1-3', 'tlshello']">
-                                                        [[ p ]]
-                                                    </a-select-option>
-                                                </a-select>
-                                            </a-col>
-                                        </a-row>
-                                    </a-list-item>
-                                    <setting-list-item type="text" title='Length' v-model="fragmentLength" placeholder="100-200"></setting-list-item>
-                                    <setting-list-item type="text" title='Interval' v-model="fragmentInterval" placeholder="10-20"></setting-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='Mux' v-if="enableMux">                                    
-                                    <setting-list-item type="number" title='Concurrency' v-model="muxConcurrency" :min="-1" :max="1024"></setting-list-item>
-                                    <setting-list-item type="number" title='xudp Concurrency' v-model="muxXudpConcurrency" :min="-1" :max="1024"></setting-list-item>
-                                    <a-list-item style="padding: 20px">
-                                        <a-row>
-                                            <a-col :lg="24" :xl="12">
-                                                <a-list-item-meta title='xudp UDP 443'/>
-                                            </a-col>
-                                            <a-col :lg="24" :xl="12">
-                                                <a-select
-                                                    v-model="muxXudpProxyUDP443"
-                                                    style="width: 100%"
-                                                    :dropdown-class-name="themeSwitcher.currentTheme">
-                                                    <a-select-option :value="p" :label="p" v-for="p in ['reject', 'allow', 'skip']">
-                                                        [[ p ]]
-                                                    </a-select-option>
-                                                </a-select>
-                                            </a-col>
-                                        </a-row>
-                                    </a-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.directCountryConfigs"}}' v-if="enableDirect">
-                                    <a-list-item style="padding: 20px">
-                                        <a-checkbox-group
-                                        v-model="directCountries"
-                                        name="Countries"
-                                        :options="countryOptions"
-                                      />
-                                    </a-list-item>
-                                </a-collapse-panel>
-                            </a-collapse>
-                        </a-tab-pane>
-                    </a-tabs>
-                </a-space>
-            </a-spin>
-        </a-layout-content>
+                          </a-row>
+                        </a-list-item>
+                        <setting-list-item style="padding: 10px 20px" type="text" title='Length' v-model="fragmentLength" placeholder="100-200"></setting-list-item>
+                        <setting-list-item style="padding: 10px 20px" type="text" title='Interval' v-model="fragmentInterval" placeholder="10-20"></setting-list-item>
+                      </a-collapse-panel>
+                    </a-collapse>
+                  </a-list-item>
+                  <a-list-item style="padding: 20px">
+                    <a-row>
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.mux"}}'>
+                          <template slot="description">{{ i18n "pages.settings.muxDesc"}}</template>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <a-switch v-model="enableMux"></a-switch>
+                      </a-col>
+                    </a-row>
+                    <a-collapse v-if="enableMux" style="margin-top: 14px;">
+                      <a-collapse-panel header='{{ i18n "pages.settings.muxSett"}}'>
+                        <setting-list-item style="padding: 10px 20px" type="number" title='Concurrency' v-model="muxConcurrency" :min="-1" :max="1024"></setting-list-item>
+                        <setting-list-item style="padding: 10px 20px" type="number" title='xudp Concurrency' v-model="muxXudpConcurrency" :min="-1" :max="1024"></setting-list-item>
+                        <a-list-item style="padding: 10px 20px">
+                          <a-row>
+                            <a-col :lg="24" :xl="12">
+                              <a-list-item-meta title='xudp UDP 443'></a-list-item-meta>
+                            </a-col>
+                            <a-col :lg="24" :xl="12">
+                              <a-select v-model="muxXudpProxyUDP443" style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
+                                <a-select-option :value="p" :label="p" v-for="p in ['reject', 'allow', 'skip']"> [[ p ]] </a-select-option>
+                              </a-select>
+                            </a-col>
+                          </a-row>
+                        </a-list-item>
+                      </a-collapse-panel>
+                    </a-collapse>
+                  </a-list-item>
+                  <a-list-item style="padding: 20px">
+                    <a-row>
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.settings.direct"}}'>
+                          <template slot="description">{{ i18n "pages.settings.directDesc"}}</template>
+                        </a-list-item-meta>
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <a-switch v-model="enableDirect"></a-switch>
+                      </a-col>
+                    </a-row>
+                    <a-collapse v-if="enableDirect" style="margin-top: 14px;">
+                      <a-collapse-panel header='{{ i18n "pages.settings.directSett"}}'>
+                        <a-list-item style="padding: 10px 20px">
+                          <a-checkbox-group v-model="directCountries" name="Countries" :options="countryOptions"></a-checkbox-group>
+                        </a-list-item>
+                      </a-collapse-panel>
+                    </a-collapse>
+                  </a-list-item>
+                </a-list>
+              </a-tab-pane>
+            </a-tabs>
+          </a-space>
+        </a-spin>
+      </a-layout-content>
     </a-layout>
-</a-layout>
+  </a-layout>
 {{template "js" .}}
 <script src="{{ .base_path }}assets/js/model/setting.js?{{ .cur_ver }}"></script>
 {{template "component/themeSwitcher" .}}

web/html/xui/xray.html

@@ -24,7 +24,6 @@
             margin: 24px 16px;
         }
     }
-
     @media (max-width: 768px) {
         .ant-tabs-nav .ant-tabs-tab {
             margin: 0;
@@ -35,15 +34,12 @@
             padding: 10px 0px;
         }
     }
-
     .ant-tabs-bar {
         margin: 0;
     }
-
     .ant-list-item {
         display: block;
     }
-
     .collapse-title {
         color: inherit;
         font-weight: bold;
@@ -51,606 +47,625 @@
         padding: 10px 20px;
         border-bottom: 2px solid;
     }
-
     .collapse-title > i {
         color: inherit;
         font-size: 24px;
     }
+    .ant-collapse-content-box > li {
+        padding: 12px 0 0 0 !important;
+    }
+    .ant-list-item > li {
+        padding: 10px 20px !important;
+    }
 </style>
 <body>
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+  <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
     {{ template "commonSider" . }}
     <a-layout id="content-layout">
-        <a-layout-content>
-            <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
-                <transition name="list" appear>
-                    <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
-                    message='{{ i18n "secAlertTitle" }}'
-                    color="red"
-                    description='{{ i18n "secAlertSsl" }}'
-                    show-icon closable
-                    >
-                    </a-alert>
-                </transition>
-                <a-space direction="vertical">
-                    <a-card hoverable style="margin-bottom: .5rem;">
-                        <a-row style="display: flex; flex-wrap: wrap; align-items: center;">
-                            <a-col :xs="24" :sm="10" style="padding: 4px;">
-                                <a-space direction="horizontal">
-                                    <a-button type="primary" :disabled="saveBtnDisable" @click="updateXraySetting">{{ i18n "pages.xray.save" }}</a-button>
-                                    <a-button type="danger" :disabled="!saveBtnDisable" @click="restartXray">{{ i18n "pages.xray.restart" }}</a-button>
-                                    <a-popover v-if="restartResult"
-                                        :overlay-class-name="themeSwitcher.currentTheme">
-                                        <span slot="title" style="font-size: 12pt">Error in running xray-core</span>
-                                        <template slot="content">
-                                            <p style="max-width: 400px" v-for="line in restartResult.split('\n')">[[ line ]]</p>
-                                        </template>
-                                        <a-icon type="question-circle"></a-icon>
-                                    </a-popover>
-                                </a-space>
-                            </a-col>
-                            <a-col :xs="24" :sm="14">
-                                <template>
-                                    <div>
-                                        <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200">
-                                        </a-back-top>
-                                        <a-alert type="warning" style="float: right; width: fit-content"
-                                        message='{{ i18n "pages.settings.infoDesc" }}'
-                                        show-icon
-                                        >
-                                    </div>
-                                </template>
-                            </a-col>
-                        </a-row>
-                    </a-card>
-                    <a-tabs class="ant-card-dark-box-nohover" default-active-key="1"
-                    @change="(activeKey) => { this.changePage(activeKey); }"
-                    :class="themeSwitcher.currentTheme">
-                        <a-tab-pane key="tpl-basic" tab='{{ i18n "pages.xray.basicTemplate"}}' style="padding-top: 20px;">
-                            <a-collapse>
-                                <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.generalConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                    <a-list-item>
-                                        <a-row style="padding: 20px">
-                                            <a-col :lg="24" :xl="12">
-                                                <a-list-item-meta title='{{ i18n "pages.xray.FreedomStrategy" }}'
-                                                    description='{{ i18n "pages.xray.FreedomStrategyDesc" }}' />
-                                            </a-col>
-                                            <a-col :lg="24" :xl="12">
-                                                <template>
-                                                    <a-select v-model="freedomStrategy" :dropdown-class-name="themeSwitcher.currentTheme"
-                                                        style="width: 100%">
-                                                        <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
-                                                    </a-select>
-                                                </template>
-                                            </a-col>
-                                        </a-row>
-                                    </a-list-item>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.xray.RoutingStrategy" }}'
-                                                description='{{ i18n "pages.xray.RoutingStrategyDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                                <a-select v-model="routingStrategy" :dropdown-class-name="themeSwitcher.currentTheme"
-                                                    style="width: 100%">
-                                                    <a-select-option v-for="s in routingDomainStrategies" :value="s">[[ s ]]</a-select-option>
-                                                </a-select>
-                                        </a-col>
-                                    </a-row>
-                                    </a-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.logConfigs" }}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.logConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.xray.logLevel" }}'
-                                                description='{{ i18n "pages.xray.logLevelDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-select v-model="setLogLevel" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
-                                                    <a-select-option v-for="s in logLevel" :value="s">[[ s ]]</a-select-option>
-                                                </a-select>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.xray.accessLog" }}'
-                                                description='{{ i18n "pages.xray.accessLogDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-select v-model="accessLog" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
-                                                    <a-select-option v-for="s in access" :key="s" :value="s">[[ s ]]</a-select-option>
-                                                </a-select>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.xray.errorLog" }}'
-                                                description='{{ i18n "pages.xray.errorLogDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <template>
-                                                <a-select v-model="errorLog" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
-                                                    <a-select-option v-for="s in error" :key="s" :value="s">[[ s ]]</a-select-option>
-                                                </a-select>
-                                            </template>
-                                        </a-col>
-                                    </a-row>
-                                    </a-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.blockConfigs"}}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.blockConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.Torrent"}}' desc='{{ i18n "pages.xray.TorrentDesc"}}' v-model="torrentSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.PrivateIp"}}' desc='{{ i18n "pages.xray.PrivateIpDesc"}}' v-model="privateIpSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.Ads"}}' desc='{{ i18n "pages.xray.AdsDesc"}}' v-model="AdsSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.Family"}}' desc='{{ i18n "pages.xray.FamilyDesc"}}' v-model="familyProtectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.Security"}}' desc='{{ i18n "pages.xray.SecurityDesc"}}' v-model="SecuritySettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.Speedtest"}}' desc='{{ i18n "pages.xray.SpeedtestDesc"}}' v-model="SpeedTestSettings"></setting-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.blockCountryConfigs"}}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.blockCountryConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.IRIp"}}' desc='{{ i18n "pages.xray.IRIpDesc"}}' v-model="IRIpSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.IRDomain"}}' desc='{{ i18n "pages.xray.IRDomainDesc"}}' v-model="IRDomainSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.ChinaIp"}}' desc='{{ i18n "pages.xray.ChinaIpDesc"}}' v-model="ChinaIpSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.ChinaDomain"}}' desc='{{ i18n "pages.xray.ChinaDomainDesc"}}' v-model="ChinaDomainSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.RussiaIp"}}' desc='{{ i18n "pages.xray.RussiaIpDesc"}}' v-model="RussiaIpSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.RussiaDomain"}}' desc='{{ i18n "pages.xray.RussiaDomainDesc"}}' v-model="RussiaDomainSettings"></setting-list-item>
-				                    <setting-list-item type="switch" title='{{ i18n "pages.xray.VNIp"}}' desc='{{ i18n "pages.xray.VNIpDesc"}}' v-model="VNIpSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.VNDomain"}}' desc='{{ i18n "pages.xray.VNDomainDesc"}}' v-model="VNDomainSettings"></setting-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.directCountryConfigs"}}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.directCountryConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectIRIp"}}' desc='{{ i18n "pages.xray.DirectIRIpDesc"}}' v-model="IRIpDirectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectIRDomain"}}' desc='{{ i18n "pages.xray.DirectIRDomainDesc"}}' v-model="IRDomainDirectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectChinaIp"}}' desc='{{ i18n "pages.xray.DirectChinaIpDesc"}}' v-model="ChinaIpDirectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectChinaDomain"}}' desc='{{ i18n "pages.xray.DirectChinaDomainDesc"}}' v-model="ChinaDomainDirectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectRussiaIp"}}' desc='{{ i18n "pages.xray.DirectRussiaIpDesc"}}' v-model="RussiaIpDirectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectRussiaDomain"}}' desc='{{ i18n "pages.xray.DirectRussiaDomainDesc"}}' v-model="RussiaDomainDirectSettings"></setting-list-item>
-				                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNIp"}}' desc='{{ i18n "pages.xray.DirectVNIpDesc"}}' v-model="VNIpDirectSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNDomain"}}' desc='{{ i18n "pages.xray.DirectVNDomainDesc"}}' v-model="VNDomainDirectSettings"></setting-list-item>									
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.ipv4Configs"}}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.ipv4ConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleIPv4"}}' desc='{{ i18n "pages.xray.GoogleIPv4Desc"}}' v-model="GoogleIPv4Settings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixIPv4"}}' desc='{{ i18n "pages.xray.NetflixIPv4Desc"}}' v-model="NetflixIPv4Settings"></setting-list-item>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.xray.warpConfigs"}}'>
-                                    <a-row :xs="24" :sm="24" :lg="12">
-                                        <a-alert type="warning" style="text-align: center;">
-                                            <template slot="message">
-                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
-                                                {{ i18n "pages.xray.warpConfigsDesc" }}
-                                            </template>
-                                        </a-alert>
-                                    </a-row>
-                                <template v-if="WarpExist">
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleWARP"}}' desc='{{ i18n "pages.xray.GoogleWARPDesc"}}' v-model="GoogleWARPSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.OpenAIWARP"}}' desc='{{ i18n "pages.xray.OpenAIWARPDesc"}}' v-model="OpenAIWARPSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixWARP"}}' desc='{{ i18n "pages.xray.NetflixWARPDesc"}}' v-model="NetflixWARPSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.SpotifyWARP"}}' desc='{{ i18n "pages.xray.SpotifyWARPDesc"}}' v-model="SpotifyWARPSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.MetaWARP"}}' desc='{{ i18n "pages.xray.MetaWARPDesc"}}' v-model="MetaWARPSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.AppleWARP"}}' desc='{{ i18n "pages.xray.AppleWARPDesc"}}' v-model="AppleWARPSettings"></setting-list-item>
-                                    <setting-list-item type="switch" title='{{ i18n "pages.xray.RedditWARP"}}' desc='{{ i18n "pages.xray.RedditWARPDesc"}}' v-model="RedditWARPSettings"></setting-list-item>
-                                </template>
-                                <a-button v-else type="primary" icon="cloud" style="margin: 15px 20px;" @click="showWarp()">WARP</a-button>
-                                </a-collapse-panel>
-                                <a-collapse-panel header='{{ i18n "pages.settings.resetDefaultConfig"}}'>
-                                    <a-space direction="horizontal" style="padding: 0 20px">
-                                        <a-button type="danger" @click="resetXrayConfigToDefault">{{ i18n "pages.settings.resetDefaultConfig" }}</a-button>
-                                    </a-space>
-                                </a-collapse-panel>
-                            </a-collapse>
-                        </a-tab-pane>
-                        <a-tab-pane key="tpl-routing" tab='{{ i18n "pages.xray.Routings"}}' style="padding-top: 20px;">
-                            <a-button type="primary" icon="plus" @click="addRule">{{ i18n "pages.xray.rules.add" }}</a-button>
-                            <a-table-sortable :columns="isMobile ? rulesMobileColumns : rulesColumns" bordered
-                                :row-key="r => r.key"
-                                :data-source="routingRuleData"
-                                :scroll="isMobile ? {} : { x: 1000 }"
-                                :pagination="false"
-                                :indent-size="0"
-                                :style="isMobile ? 'padding: 5px 0' : 'margin-top: 10px;'"
-                                v-on:onSort="replaceRule">
-                                <template slot="action" slot-scope="text, rule, index">
-                                    <table-sort-trigger :item-index="index"></table-sort-trigger>
-                                    <span class="ant-table-row-index">
-                                        [[ index+1 ]]
-                                    </span>
-                                    <a-dropdown :trigger="['click']">
-                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                            <a-menu-item v-if="index>0" @click="replaceRule(index,0)">
-                                                <a-icon type="vertical-align-top"></a-icon>
-                                                {{ i18n "pages.xray.rules.first"}}
-                                            </a-menu-item>
-                                            <a-menu-item v-if="index>0" @click="replaceRule(index,index-1)">
-                                                <a-icon type="arrow-up"></a-icon>
-                                                {{ i18n "pages.xray.rules.up"}}
-                                            </a-menu-item>
-                                            <a-menu-item v-if="index<routingRuleData.length-1" @click="replaceRule(index,index+1)">
-                                                <a-icon type="arrow-down"></a-icon>
-                                                {{ i18n "pages.xray.rules.down"}}
-                                            </a-menu-item>
-                                            <a-menu-item v-if="index<routingRuleData.length-1" @click="replaceRule(index,routingRuleData.length-1)">
-                                                <a-icon type="vertical-align-bottom"></a-icon>
-                                                {{ i18n "pages.xray.rules.last"}}
-                                            </a-menu-item>
-                                            <a-menu-item @click="editRule(index)">
-                                                <a-icon type="edit"></a-icon>
-                                                {{ i18n "edit" }}
-                                            </a-menu-item>
-                                            <a-menu-item @click="deleteRule(index)">
-                                                <span style="color: #FF4D4F">
-                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                </span>
-                                            </a-menu-item>
-                                        </a-menu>
-                                    </a-dropdown>
-                                </template>
-                                <template slot="inbound" slot-scope="text, rule, index">
-                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-if="rule.inboundTag">Inbound Tag: [[ rule.inboundTag ]]</p>
-                                            <p v-if="rule.user">User email: [[ rule.user ]]</p>
-                                        </template>
-                                        [[ [rule.inboundTag,rule.user].join('\n') ]]
-                                    </a-popover>
-                                </template>
-                                <template slot="outbound" slot-scope="text, rule, index">
-                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-if="rule.outboundTag">Outbound Tag: [[ rule.outboundTag ]]</p>
-                                        </template>
-                                        [[ rule.outboundTag ]]
-                                    </a-popover>
-                                </template>
-                                <template slot="balancer" slot-scope="text, rule, index">
-                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-if="rule.balancerTag">Balancer Tag: [[ rule.balancerTag ]]</p>
-                                        </template>
-                                        [[ rule.balancerTag ]]
-                                    </a-popover>
-                                </template>
-                                <template slot="info" slot-scope="text, rule, index">
-                                    <a-popover placement="bottomRight"
-                                        v-if="(rule.source+rule.sourcePort+rule.network+rule.protocol+rule.attrs+rule.ip+rule.domain+rule.port).length>0"
-                                        :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
-                                        <template slot="content">
-                                            <table cellpadding="2" style="max-width: 300px;">
-                                                <tr v-if="rule.source">
-                                                    <td>Source</td>
-                                                    <td><a-tag color="blue" v-for="r in rule.source.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.sourcePort">
-                                                    <td>Source Port</td>
-                                                    <td><a-tag color="green" v-for="r in rule.sourcePort.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.network">
-                                                    <td>Network</td>
-                                                    <td><a-tag color="blue" v-for="r in rule.network.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.protocol">
-                                                    <td>Protocol</td>
-                                                    <td><a-tag color="green" v-for="r in rule.protocol.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.attrs">
-                                                    <td>Attrs</td>
-                                                    <td><a-tag color="blue" v-for="r in rule.attrs.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.ip">
-                                                    <td>IP</td>
-                                                    <td><a-tag color="green" v-for="r in rule.ip.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.domain">
-                                                    <td>Domain</td>
-                                                    <td><a-tag color="blue" v-for="r in rule.domain.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.port">
-                                                    <td>Port</td>
-                                                    <td><a-tag color="green" v-for="r in rule.port.split(',')">[[ r ]]</a-tag></td>
-                                                </tr>
-                                                <tr v-if="rule.balancerTag">
-                                                    <td>Balancer Tag</td>
-                                                    <td><a-tag color="blue">[[ rule.balancerTag ]]</a-tag></td>
-                                                </tr>
-                                            </table>
-                                        </template>
-                                        <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
-                                            <a-icon type="info"></a-icon>
-                                        </a-button>
-                                    </a-popover>
-                                </template>
-                            </a-table-sortable>
-                        </a-tab-pane>
-                        <a-tab-pane key="tpl-outbound" tab='{{ i18n "pages.xray.Outbounds"}}' style="padding-top: 20px;" force-render="true">
-                            <a-row>
-                                <a-col :xs="12" :sm="12" :lg="12">
-                                    <a-button type="primary" icon="plus" @click="addOutbound()" style="margin-bottom: 10px;">{{ i18n
-                                        "pages.xray.outbound.addOutbound" }}</a-button>
-                                    <a-button type="primary" icon="cloud" @click="showWarp()" style="margin-bottom: 10px;">WARP</a-button>
-                                </a-col>
-                                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
-                                    <a-icon type="sync" :spin="refreshing" @click="refreshOutboundTraffic()" style="margin: 0 5px;"></a-icon>
-                                    <a-popconfirm placement="topRight" @confirm="resetOutboundTraffic(-1)"
-                                        title='{{ i18n "pages.inbounds.resetTrafficContent"}}'
-                                        :overlay-class-name="themeSwitcher.currentTheme"
-                                        ok-text='{{ i18n "reset"}}'
-                                        cancel-text='{{ i18n "cancel"}}'>
-                                        <a-icon slot="icon" type="question-circle-o" :style="themeSwitcher.isDarkTheme ? 'color: #008771' : 'color: #008771'"></a-icon>
-                                        <a-icon type="retweet" style="cursor: pointer;"></a-icon>
-                                    </a-popconfirm>
-                                </a-col>
-                            </a-row>
-                            <a-table :columns="outboundColumns" bordered
-                            :row-key="r => r.key"
-                            :data-source="outboundData"
-                            :scroll="isMobile ? {} : { x: 200 }"
-                            :pagination="false"
-                            :indent-size="0"
-                            :style="isMobile ? 'padding: 5px 5px' : 'margin-right: 1px;'">
-                                <template slot="action" slot-scope="text, outbound, index">
-                                    [[ index+1 ]]
-                                    <a-dropdown :trigger="['click']">
-                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                            <a-menu-item v-if="index>0" @click="setFirstOutbound(index)">
-                                                <a-icon type="vertical-align-top"></a-icon>
-                                                {{ i18n "pages.xray.rules.first"}}
-                                            </a-menu-item>
-                                            <a-menu-item @click="editOutbound(index)">
-                                                <a-icon type="edit"></a-icon>
-                                                {{ i18n "edit" }}
-                                            </a-menu-item>
-                                            <a-menu-item @click="resetOutboundTraffic(index)">
-                                                <span>
-                                                    <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic"}}
-                                                </span>
-                                            </a-menu-item>
-                                            <a-menu-item @click="deleteOutbound(index)">
-                                                <span style="color: #FF4D4F">
-                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                </span>
-                                            </a-menu-item>
-                                        </a-menu>
-                                    </a-dropdown>
-                                </template>
-                                <template slot="address" slot-scope="text, outbound, index">
-                                    <p style="margin: 0 5px;" v-for="addr in findOutboundAddress(outbound)">[[ addr ]]</p>
-                                </template>
-                                <template slot="protocol" slot-scope="text, outbound, index">
-                                    <a-tag style="margin:0;" color="purple">[[ outbound.protocol ]]</a-tag>
-                                    <template v-if="[Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
-                                        <a-tag style="margin:0;" color="blue">[[ outbound.streamSettings.network ]]</a-tag>
-                                        <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='tls'" color="green">tls</a-tag>
-                                        <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='reality'" color="green">reality</a-tag>
-                                    </template>
-                                </template>
-                                <template slot="traffic" slot-scope="text, outbound, index">
-                                    <a-tag color="green">[[ findOutboundTraffic(outbound) ]]</a-tag>
-                                </template>
-                            </a-table>
-                        </a-tab-pane>
-                        <a-tab-pane key="tpl-reverse" tab='{{ i18n "pages.xray.outbound.reverse"}}' style="padding-top: 20px;" force-render="true">
-                            <a-button type="primary" icon="plus" @click="addReverse()" style="margin-bottom: 10px;">{{ i18n "pages.xray.outbound.addReverse" }}</a-button>
-                            <a-table :columns="reverseColumns" bordered v-if="reverseData.length>0"
-                            :row-key="r => r.key"
-                            :data-source="reverseData"
-                            :scroll="isMobile ? {} : { x: 200 }"
-                            :pagination="false"
-                            :indent-size="0"
-                            :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                                <template slot="action" slot-scope="text, reverse, index">
-                                    [[ index+1 ]]
-                                    <a-dropdown :trigger="['click']">
-                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                            <a-menu-item @click="editReverse(index)">
-                                                <a-icon type="edit"></a-icon>
-                                                {{ i18n "edit" }}
-                                            </a-menu-item>
-                                            <a-menu-item @click="deleteReverse(index)">
-                                                <span style="color: #FF4D4F">
-                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                </span>
-                                            </a-menu-item>
-                                        </a-menu>
-                                    </a-dropdown>
-                                </template>
-                            </a-table>
-                        </a-tab-pane>
-                        <a-tab-pane key="tpl-balancer" tab='{{ i18n "pages.xray.Balancers"}}' style="padding-top: 20px;" force-render="true">
-                            <a-button type="primary" icon="plus" @click="addBalancer()" style="margin-bottom: 10px;">{{ i18n "pages.xray.balancer.addBalancer"}}</a-button>
-                            <a-table :columns="balancerColumns" bordered v-if="balancersData.length>0"
-                            :row-key="r => r.key"
-                            :data-source="balancersData"
-                            :scroll="isMobile ? {} : { x: 200 }"
-                            :pagination="false"
-                            :indent-size="0"
-                            :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                                <template slot="action" slot-scope="text, balancer, index">
-                                    [[ index+1 ]]
-                                    <a-dropdown :trigger="['click']">
-                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                            <a-menu-item @click="editBalancer(index)">
-                                                <a-icon type="edit"></a-icon>
-                                                {{ i18n "edit" }}
-                                            </a-menu-item>
-                                            <a-menu-item @click="deleteBalancer(index)">
-                                                <span style="color: #FF4D4F">
-                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                </span>
-                                            </a-menu-item>
-                                        </a-menu>
-                                    </a-dropdown>
-                                </template>
-                                <template slot="strategy" slot-scope="text, balancer, index">
-                                    <a-tag style="margin:0;" v-if="balancer.strategy=='random'" color="purple">Random</a-tag>
-                                    <a-tag style="margin:0;" v-if="balancer.strategy=='roundRobin'" color="green">Round Robin</a-tag>
-                                    <a-tag style="margin:0;" v-if="balancer.strategy=='leastload'" color="green">Least Load</a-tag>
-                                    <a-tag style="margin:0;" v-if="balancer.strategy=='leastping'" color="green">Least Ping</a-tag>
-                                </template>
-                                <template slot="selector" slot-scope="text, balancer, index">
-                                    <a-tag class="info-large-tag" style="margin:1;" v-for="sel in balancer.selector">[[ sel ]]</a-tag>
-                                </template>
-                            </a-table>
-                            <a-radio-group
-                                v-model="obsSettings"
-                                v-if="observatoryEnable || burstObservatoryEnable"
-                                @change="changeObsCode"
-                                button-style="solid"
-                                style="margin: 10px 0;"
-                                :size="isMobile ? 'small' : ''">
-                                <a-radio-button value="observatory" v-if="observatoryEnable">Observatory</a-radio-button>
-                                <a-radio-button value="burstObservatory" v-if="burstObservatoryEnable">Burst Observatory</a-radio-button>
-                            </a-radio-group>
-                            <textarea style="position:absolute; left: -800px;" id="obsSetting"></textarea>
-                        </a-tab-pane>
-                        <a-tab-pane key="tpl-dns" tab='DNS' style="padding-top: 20px;" force-render="true">
-                            <setting-list-item type="switch" title='{{ i18n "pages.xray.dns.enable" }}' desc='{{ i18n "pages.xray.dns.enableDesc" }}' v-model="enableDNS"></setting-list-item>
-                            <template v-if="enableDNS">
-                                <setting-list-item type="text" title='{{ i18n "pages.xray.dns.tag" }}' desc='{{ i18n "pages.xray.dns.tagDesc" }}' v-model="dnsTag"></setting-list-item>
-                                <a-list-item>
-                                    <a-row style="padding: 20px">
-                                        <a-col :lg="24" :xl="12">
-                                            <a-list-item-meta title='{{ i18n "pages.xray.dns.strategy" }}' description='{{ i18n "pages.xray.dns.strategyDesc" }}' />
-                                        </a-col>
-                                        <a-col :lg="24" :xl="12">
-                                            <a-select
-                                                v-model="dnsStrategy"
-                                                style="width: 100%"
-                                                :dropdown-class-name="themeSwitcher.currentTheme">
-                                                <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']">
-                                                    [[ l ]]
-                                                </a-select-option>
-                                            </a-select>
-                                        </a-col>
-                                    </a-row>
-                                </a-list-item>
-                                <a-divider>DNS</a-divider>
-                                <a-button type="primary" icon="plus" @click="addDNSServer()" style="margin-bottom: 10px;">{{ i18n "pages.xray.dns.add" }}</a-button>
-                                <a-table :columns="dnsColumns" bordered v-if="dnsServers.length>0"
-                                :row-key="r => r.key"
-                                :data-source="dnsServers"
-                                :scroll="isMobile ? {} : { x: 200 }"
-                                :pagination="false"
-                                :indent-size="0"
-                                :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                                    <template slot="action" slot-scope="text,dns,index">
-                                        [[ index+1 ]]
-                                        <a-dropdown :trigger="['click']">
-                                            <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                            <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                                <a-menu-item @click="editDNSServer(index)">
-                                                    <a-icon type="edit"></a-icon>
-                                                    {{ i18n "edit" }}
-                                                </a-menu-item>
-                                                <a-menu-item @click="deleteDNSServer(index)">
-                                                    <span style="color: #FF4D4F">
-                                                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                    </span>
-                                                </a-menu-item>
-                                            </a-menu>
-                                        </a-dropdown>
-                                    </template>
-                                    <template slot="address" slot-scope="dns,index">
-                                        <span v-if="typeof dns == 'object'">[[ dns.address ]]</span>
-                                        <span v-else>[[ dns ]]</span>
-                                    </template>
-                                    <template slot="domain" slot-scope="dns,index">
-                                        <span v-if="typeof dns == 'object'">[[ dns.domains.join(",") ]]</span>
-                                    </template>
-                                </a-table>
-                                <a-divider>Fake DNS</a-divider>
-                                <a-button type="primary" icon="plus" @click="addFakedns()" style="margin-bottom: 10px;">{{ i18n "pages.xray.fakedns.add" }}</a-button>
-                                <a-table :columns="fakednsColumns" bordered v-if="fakeDns && fakeDns.length>0" :row-key="r => r.key"
-                                    :data-source="fakeDns" :scroll="isMobile ? {} : { x: 200 }" :pagination="false" :indent-size="0"
-                                    :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                                    <template slot="action" slot-scope="text,fakedns,index">
-                                        [[ index+1 ]]
-                                        <a-dropdown :trigger="['click']">
-                                            <a-icon @click="e => e.preventDefault()" type="more"
-                                                style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                            <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                                <a-menu-item @click="editFakedns(index)">
-                                                    <a-icon type="edit"></a-icon>
-                                                    {{ i18n "edit" }}
-                                                </a-menu-item>
-                                                <a-menu-item @click="deleteFakedns(index)">
-                                                    <span style="color: #FF4D4F">
-                                                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                    </span>
-                                                </a-menu-item>
-                                            </a-menu>
-                                        </a-dropdown>
-                                    </template>
-                                </a-table>
-                            </template>
-                        </a-tab-pane>
-                        <a-tab-pane key="tpl-advanced" tab='{{ i18n "pages.xray.advancedTemplate"}}' style="padding-top: 20px;" force-render="true">
-                            <a-list-item-meta title='{{ i18n "pages.xray.Template"}}' description='{{ i18n "pages.xray.TemplateDesc"}}'></a-list-item-meta>
-                            <a-radio-group v-model="advSettings" @change="changeCode" button-style="solid" style="margin: 10px 0;" :size="isMobile ? 'small' : ''">
-                                <a-radio-button value="xraySetting">{{ i18n "pages.xray.completeTemplate"}}</a-radio-button>
-                                <a-radio-button value="inboundSettings">{{ i18n "pages.xray.Inbounds" }}</a-radio-button>
-                                <a-radio-button value="outboundSettings">{{ i18n "pages.xray.Outbounds" }}</a-radio-button>
-                                <a-radio-button value="routingRuleSettings">{{ i18n "pages.xray.Routings" }}</a-radio-button>
-                            </a-radio-group>
-                            <textarea style="position:absolute; left: -800px;" id="xraySetting"></textarea>
-                        </a-tab-pane>
-                    </a-tabs>
-                </a-space>
-            </a-spin>
-        </a-layout-content>
+      <a-layout-content>
+        <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
+          <transition name="list" appear>
+            <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
+              message='{{ i18n "secAlertTitle" }}'
+              color="red"
+              description='{{ i18n "secAlertSsl" }}'
+              show-icon closable>
+            </a-alert>
+          </transition>
+          <a-space direction="vertical">
+            <a-card hoverable style="margin-bottom: .5rem;">
+              <a-row style="display: flex; flex-wrap: wrap; align-items: center;">
+                <a-col :xs="24" :sm="10" style="padding: 4px;">
+                  <a-space direction="horizontal">
+                    <a-button type="primary" :disabled="saveBtnDisable" @click="updateXraySetting">{{ i18n "pages.xray.save" }}</a-button>
+                    <a-button type="danger" :disabled="!saveBtnDisable" @click="restartXray">{{ i18n "pages.xray.restart" }}</a-button>
+                    <a-popover v-if="restartResult"
+                        :overlay-class-name="themeSwitcher.currentTheme">
+                      <span slot="title" style="font-size: 12pt">Error in running xray-core</span>
+                      <template slot="content">
+                        <p style="max-width: 400px" v-for="line in restartResult.split('\n')">[[ line ]]</p>
+                      </template>
+                      <a-icon type="question-circle"></a-icon>
+                    </a-popover>
+                  </a-space>
+                </a-col>
+                <a-col :xs="24" :sm="14">
+                  <template>
+                    <div>
+                      <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top>
+                      <a-alert type="warning" style="float: right; width: fit-content" message='{{ i18n "pages.settings.infoDesc" }}' show-icon>
+                      </a-alert>
+                    </div>
+                  </template>
+                </a-col>
+              </a-row>
+            </a-card>
+            <a-tabs class="ant-card-dark-box-nohover" default-active-key="1"
+                @change="(activeKey) => { this.changePage(activeKey); }"
+                :class="themeSwitcher.currentTheme">
+              <a-tab-pane key="tpl-basic" tab='{{ i18n "pages.xray.basicTemplate"}}' style="padding-top: 20px;">
+                <a-collapse>
+                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.generalConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <a-row style="padding: 10px 20px">
+                        <a-col :lg="24" :xl="12">
+                          <a-list-item-meta title='{{ i18n "pages.xray.FreedomStrategy" }}'
+                            description='{{ i18n "pages.xray.FreedomStrategyDesc" }}'>
+                          </a-list-item-meta>
+                        </a-col>
+                        <a-col :lg="24" :xl="12">
+                          <template>
+                            <a-select v-model="freedomStrategy" :dropdown-class-name="themeSwitcher.currentTheme"
+                                style="width: 100%">
+                              <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
+                            </a-select>
+                          </template>
+                        </a-col>
+                      </a-row>
+                      <a-row style="padding: 10px 20px">
+                        <a-col :lg="24" :xl="12">
+                          <a-list-item-meta title='{{ i18n "pages.xray.RoutingStrategy" }}'
+                            description='{{ i18n "pages.xray.RoutingStrategyDesc" }}'>
+                          </a-list-item-meta>
+                        </a-col>
+                        <a-col :lg="24" :xl="12">
+                          <a-select v-model="routingStrategy" :dropdown-class-name="themeSwitcher.currentTheme"
+                              style="width: 100%">
+                            <a-select-option v-for="s in routingDomainStrategies" :value="s">[[ s ]]</a-select-option>
+                          </a-select>
+                        </a-col>
+                      </a-row>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.xray.logConfigs" }}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.logConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <a-row style="padding: 10px 20px">
+                        <a-col :lg="24" :xl="12">
+                          <a-list-item-meta title='{{ i18n "pages.xray.logLevel" }}'
+                            description='{{ i18n "pages.xray.logLevelDesc" }}'>
+                          </a-list-item-meta>
+                        </a-col>
+                        <a-col :lg="24" :xl="12">
+                          <template>
+                            <a-select v-model="setLogLevel" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                              <a-select-option v-for="s in logLevel" :value="s">[[ s ]]</a-select-option>
+                            </a-select>
+                          </template>
+                        </a-col>
+                      </a-row>
+                      <a-row style="padding: 10px 20px">
+                        <a-col :lg="24" :xl="12">
+                          <a-list-item-meta title='{{ i18n "pages.xray.accessLog" }}'
+                            description='{{ i18n "pages.xray.accessLogDesc" }}'>
+                          </a-list-item-meta>
+                        </a-col>
+                        <a-col :lg="24" :xl="12">
+                          <template>
+                            <a-select v-model="accessLog" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                              <a-select-option v-for="s in access" :key="s" :value="s">[[ s ]]</a-select-option>
+                            </a-select>
+                          </template>
+                        </a-col>
+                      </a-row>
+                      <a-row style="padding: 10px 20px">
+                        <a-col :lg="24" :xl="12">
+                          <a-list-item-meta title='{{ i18n "pages.xray.errorLog" }}'
+                            description='{{ i18n "pages.xray.errorLogDesc" }}'>
+                          </a-list-item-meta>
+                        </a-col>
+                        <a-col :lg="24" :xl="12">
+                          <template>
+                            <a-select v-model="errorLog" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                              <a-select-option v-for="s in error" :key="s" :value="s">[[ s ]]</a-select-option>
+                            </a-select>
+                          </template>
+                        </a-col>
+                      </a-row>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.xray.blockConfigs"}}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.blockConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.Torrent"}}' desc='{{ i18n "pages.xray.TorrentDesc"}}' v-model="torrentSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.PrivateIp"}}' desc='{{ i18n "pages.xray.PrivateIpDesc"}}' v-model="privateIpSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.Ads"}}' desc='{{ i18n "pages.xray.AdsDesc"}}' v-model="AdsSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.Family"}}' desc='{{ i18n "pages.xray.FamilyDesc"}}' v-model="familyProtectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.Security"}}' desc='{{ i18n "pages.xray.SecurityDesc"}}' v-model="SecuritySettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.Speedtest"}}' desc='{{ i18n "pages.xray.SpeedtestDesc"}}' v-model="SpeedTestSettings"></setting-list-item>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.xray.blockCountryConfigs"}}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.blockCountryConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.IRIp"}}' desc='{{ i18n "pages.xray.IRIpDesc"}}' v-model="IRIpSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.IRDomain"}}' desc='{{ i18n "pages.xray.IRDomainDesc"}}' v-model="IRDomainSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.ChinaIp"}}' desc='{{ i18n "pages.xray.ChinaIpDesc"}}' v-model="ChinaIpSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.ChinaDomain"}}' desc='{{ i18n "pages.xray.ChinaDomainDesc"}}' v-model="ChinaDomainSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.RussiaIp"}}' desc='{{ i18n "pages.xray.RussiaIpDesc"}}' v-model="RussiaIpSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.RussiaDomain"}}' desc='{{ i18n "pages.xray.RussiaDomainDesc"}}' v-model="RussiaDomainSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.VNIp"}}' desc='{{ i18n "pages.xray.VNIpDesc"}}' v-model="VNIpSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.VNDomain"}}' desc='{{ i18n "pages.xray.VNDomainDesc"}}' v-model="VNDomainSettings"></setting-list-item>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.xray.directCountryConfigs"}}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.directCountryConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectIRIp"}}' desc='{{ i18n "pages.xray.DirectIRIpDesc"}}' v-model="IRIpDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectIRDomain"}}' desc='{{ i18n "pages.xray.DirectIRDomainDesc"}}' v-model="IRDomainDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectChinaIp"}}' desc='{{ i18n "pages.xray.DirectChinaIpDesc"}}' v-model="ChinaIpDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectChinaDomain"}}' desc='{{ i18n "pages.xray.DirectChinaDomainDesc"}}' v-model="ChinaDomainDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectRussiaIp"}}' desc='{{ i18n "pages.xray.DirectRussiaIpDesc"}}' v-model="RussiaIpDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectRussiaDomain"}}' desc='{{ i18n "pages.xray.DirectRussiaDomainDesc"}}' v-model="RussiaDomainDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNIp"}}' desc='{{ i18n "pages.xray.DirectVNIpDesc"}}' v-model="VNIpDirectSettings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.DirectVNDomain"}}' desc='{{ i18n "pages.xray.DirectVNDomainDesc"}}' v-model="VNDomainDirectSettings"></setting-list-item>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.xray.ipv4Configs"}}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.ipv4ConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleIPv4"}}' desc='{{ i18n "pages.xray.GoogleIPv4Desc"}}' v-model="GoogleIPv4Settings"></setting-list-item>
+                      <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixIPv4"}}' desc='{{ i18n "pages.xray.NetflixIPv4Desc"}}' v-model="NetflixIPv4Settings"></setting-list-item>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.xray.warpConfigs"}}'>
+                    <a-row :xs="24" :sm="24" :lg="12">
+                      <a-alert type="warning" style="text-align: center;">
+                        <template slot="message">
+                          <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                          {{ i18n "pages.xray.warpConfigsDesc" }}
+                        </template>
+                      </a-alert>
+                    </a-row>
+                    <a-list-item>
+                      <template v-if="WarpExist">
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleWARP"}}' desc='{{ i18n "pages.xray.GoogleWARPDesc"}}' v-model="GoogleWARPSettings"></setting-list-item>
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.OpenAIWARP"}}' desc='{{ i18n "pages.xray.OpenAIWARPDesc"}}' v-model="OpenAIWARPSettings"></setting-list-item>
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixWARP"}}' desc='{{ i18n "pages.xray.NetflixWARPDesc"}}' v-model="NetflixWARPSettings"></setting-list-item>
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.SpotifyWARP"}}' desc='{{ i18n "pages.xray.SpotifyWARPDesc"}}' v-model="SpotifyWARPSettings"></setting-list-item>
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.MetaWARP"}}' desc='{{ i18n "pages.xray.MetaWARPDesc"}}' v-model="MetaWARPSettings"></setting-list-item>
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.AppleWARP"}}' desc='{{ i18n "pages.xray.AppleWARPDesc"}}' v-model="AppleWARPSettings"></setting-list-item>
+                        <setting-list-item type="switch" title='{{ i18n "pages.xray.RedditWARP"}}' desc='{{ i18n "pages.xray.RedditWARPDesc"}}' v-model="RedditWARPSettings"></setting-list-item>
+                      </template>
+                      <a-button style="margin-left: 20px;" v-else type="primary" icon="cloud" @click="showWarp()">WARP</a-button>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.resetDefaultConfig"}}'>
+                    <a-space direction="horizontal" style="padding: 0 20px">
+                      <a-button type="danger" @click="resetXrayConfigToDefault">{{ i18n "pages.settings.resetDefaultConfig" }}</a-button>
+                    </a-space>
+                  </a-collapse-panel>
+                </a-collapse>
+              </a-tab-pane>
+              <a-tab-pane key="tpl-routing" tab='{{ i18n "pages.xray.Routings"}}' style="padding-top: 20px;">
+                <a-button type="primary" icon="plus" @click="addRule">{{ i18n "pages.xray.rules.add" }}</a-button>
+                <a-table-sortable :columns="isMobile ? rulesMobileColumns : rulesColumns" bordered
+                    :row-key="r => r.key"
+                    :data-source="routingRuleData"
+                    :scroll="isMobile ? {} : { x: 1000 }"
+                    :pagination="false"
+                    :indent-size="0" 
+                    :style="isMobile ? 'padding: 5px 0' : 'margin-top: 10px;'"
+                    v-on:onSort="replaceRule">
+                  <template slot="action" slot-scope="text, rule, index">
+                    <table-sort-trigger :item-index="index"></table-sort-trigger>
+                    <span class="ant-table-row-index"> [[ index+1 ]] </span>
+                    <a-dropdown :trigger="['click']">
+                      <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                      <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                        <a-menu-item v-if="index>0" @click="replaceRule(index,0)">
+                          <a-icon type="vertical-align-top"></a-icon>
+                          {{ i18n "pages.xray.rules.first"}}
+                        </a-menu-item>
+                        <a-menu-item v-if="index>0" @click="replaceRule(index,index-1)">
+                          <a-icon type="arrow-up"></a-icon>
+                          {{ i18n "pages.xray.rules.up"}}
+                        </a-menu-item>
+                        <a-menu-item v-if="index<routingRuleData.length-1" @click="replaceRule(index,index+1)">
+                          <a-icon type="arrow-down"></a-icon>
+                          {{ i18n "pages.xray.rules.down"}}
+                        </a-menu-item>
+                        <a-menu-item v-if="index<routingRuleData.length-1" @click="replaceRule(index,routingRuleData.length-1)">
+                          <a-icon type="vertical-align-bottom"></a-icon>
+                          {{ i18n "pages.xray.rules.last"}}
+                        </a-menu-item>
+                        <a-menu-item @click="editRule(index)">
+                          <a-icon type="edit"></a-icon>
+                          {{ i18n "edit" }}
+                        </a-menu-item>
+                        <a-menu-item @click="deleteRule(index)">
+                          <span style="color: #FF4D4F">
+                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                          </span>
+                        </a-menu-item>
+                      </a-menu>
+                    </a-dropdown>
+                  </template>
+                  <template slot="inbound" slot-scope="text, rule, index">
+                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-if="rule.inboundTag">Inbound Tag: [[ rule.inboundTag ]]</p>
+                        <p v-if="rule.user">User email: [[ rule.user ]]</p>
+                      </template>
+                      [[ [rule.inboundTag,rule.user].join('\n') ]]
+                    </a-popover>
+                  </template>
+                  <template slot="outbound" slot-scope="text, rule, index">
+                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-if="rule.outboundTag">Outbound Tag: [[ rule.outboundTag ]]</p>
+                      </template>
+                      [[ rule.outboundTag ]]
+                    </a-popover>
+                  </template>
+                  <template slot="balancer" slot-scope="text, rule, index">
+                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-if="rule.balancerTag">Balancer Tag: [[ rule.balancerTag ]]</p>
+                      </template>
+                      [[ rule.balancerTag ]]
+                    </a-popover>
+                  </template>
+                  <template slot="info" slot-scope="text, rule, index">
+                    <a-popover placement="bottomRight"
+                        v-if="(rule.source+rule.sourcePort+rule.network+rule.protocol+rule.attrs+rule.ip+rule.domain+rule.port).length>0"
+                        :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
+                      <template slot="content">
+                        <table cellpadding="2" style="max-width: 300px;">
+                          <tr v-if="rule.source">
+                            <td>Source</td>
+                            <td><a-tag color="blue" v-for="r in rule.source.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.sourcePort">
+                            <td>Source Port</td>
+                            <td><a-tag color="green" v-for="r in rule.sourcePort.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.network">
+                            <td>Network</td>
+                            <td><a-tag color="blue" v-for="r in rule.network.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.protocol">
+                            <td>Protocol</td>
+                            <td><a-tag color="green" v-for="r in rule.protocol.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.attrs">
+                            <td>Attrs</td>
+                            <td><a-tag color="blue" v-for="r in rule.attrs.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.ip">
+                            <td>IP</td>
+                            <td><a-tag color="green" v-for="r in rule.ip.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.domain">
+                            <td>Domain</td>
+                            <td><a-tag color="blue" v-for="r in rule.domain.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.port">
+                            <td>Port</td>
+                            <td><a-tag color="green" v-for="r in rule.port.split(',')">[[ r ]]</a-tag></td>
+                          </tr>
+                          <tr v-if="rule.balancerTag">
+                            <td>Balancer Tag</td>
+                            <td><a-tag color="blue">[[ rule.balancerTag ]]</a-tag></td>
+                          </tr>
+                        </table>
+                      </template>
+                      <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
+                        <a-icon type="info"></a-icon>
+                      </a-button>
+                    </a-popover>
+                  </template>
+                </a-table-sortable>
+              </a-tab-pane>
+              <a-tab-pane key="tpl-outbound" tab='{{ i18n "pages.xray.Outbounds"}}' style="padding-top: 20px;" force-render="true">
+                <a-row>
+                  <a-col :xs="12" :sm="12" :lg="12">
+                    <a-button type="primary" icon="plus" @click="addOutbound()" style="margin-bottom: 10px;">
+                      {{ i18n "pages.xray.outbound.addOutbound" }}
+                    </a-button>
+                    <a-button type="primary" icon="cloud" @click="showWarp()" style="margin-bottom: 10px;">WARP</a-button>
+                  </a-col>
+                  <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
+                    <a-icon type="sync" :spin="refreshing" @click="refreshOutboundTraffic()" style="margin: 0 5px;"></a-icon>
+                    <a-popconfirm placement="topRight" @confirm="resetOutboundTraffic(-1)"
+                        title='{{ i18n "pages.inbounds.resetTrafficContent"}}'
+                        :overlay-class-name="themeSwitcher.currentTheme"
+                        ok-text='{{ i18n "reset"}}'
+                        cancel-text='{{ i18n "cancel"}}'>
+                      <a-icon slot="icon" type="question-circle-o" :style="themeSwitcher.isDarkTheme ? 'color: #008771' : 'color: #008771'"></a-icon>
+                      <a-icon type="retweet" style="cursor: pointer;"></a-icon>
+                    </a-popconfirm>
+                  </a-col>
+                </a-row>
+                <a-table :columns="outboundColumns" bordered
+                    :row-key="r => r.key"
+                    :data-source="outboundData"
+                    :scroll="isMobile ? {} : { x: 200 }"
+                    :pagination="false"
+                    :indent-size="0"
+                    :style="isMobile ? 'padding: 5px 5px' : 'margin-right: 1px;'">
+                  <template slot="action" slot-scope="text, outbound, index">
+                    [[ index+1 ]]
+                    <a-dropdown :trigger="['click']">
+                      <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                      <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                        <a-menu-item v-if="index>0" @click="setFirstOutbound(index)">
+                          <a-icon type="vertical-align-top"></a-icon>
+                          {{ i18n "pages.xray.rules.first"}}
+                        </a-menu-item>
+                        <a-menu-item @click="editOutbound(index)">
+                          <a-icon type="edit"></a-icon>
+                          {{ i18n "edit" }}
+                        </a-menu-item>
+                        <a-menu-item @click="resetOutboundTraffic(index)">
+                          <span>
+                            <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic"}}
+                          </span>
+                        </a-menu-item>
+                        <a-menu-item @click="deleteOutbound(index)">
+                          <span style="color: #FF4D4F">
+                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                          </span>
+                        </a-menu-item>
+                      </a-menu>
+                    </a-dropdown>
+                  </template>
+                  <template slot="address" slot-scope="text, outbound, index">
+                    <p style="margin: 0 5px;" v-for="addr in findOutboundAddress(outbound)">[[ addr ]]</p>
+                  </template>
+                  <template slot="protocol" slot-scope="text, outbound, index">
+                    <a-tag style="margin:0;" color="purple">[[ outbound.protocol ]]</a-tag>
+                    <template v-if="[Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
+                      <a-tag style="margin:0;" color="blue">[[ outbound.streamSettings.network ]]</a-tag>
+                      <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='tls'" color="green">tls</a-tag>
+                      <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='reality'" color="green">reality</a-tag>
+                    </template>
+                  </template>
+                  <template slot="traffic" slot-scope="text, outbound, index">
+                    <a-tag color="green">[[ findOutboundTraffic(outbound) ]]</a-tag>
+                  </template>
+                </a-table>
+              </a-tab-pane>
+              <a-tab-pane key="tpl-reverse" tab='{{ i18n "pages.xray.outbound.reverse"}}' style="padding-top: 20px;" force-render="true">
+                <a-button type="primary" icon="plus" @click="addReverse()" style="margin-bottom: 10px;">
+                  {{ i18n "pages.xray.outbound.addReverse" }}
+                </a-button>
+                <a-table :columns="reverseColumns" bordered v-if="reverseData.length>0"
+                    :row-key="r => r.key"
+                    :data-source="reverseData"
+                    :scroll="isMobile ? {} : { x: 200 }"
+                    :pagination="false"
+                    :indent-size="0"
+                    :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                  <template slot="action" slot-scope="text, reverse, index">
+                    [[ index+1 ]]
+                    <a-dropdown :trigger="['click']">
+                      <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                      <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                        <a-menu-item @click="editReverse(index)">
+                          <a-icon type="edit"></a-icon>
+                          {{ i18n "edit" }}
+                        </a-menu-item>
+                        <a-menu-item @click="deleteReverse(index)">
+                          <span style="color: #FF4D4F">
+                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                          </span>
+                        </a-menu-item>
+                      </a-menu>
+                    </a-dropdown>
+                  </template>
+                </a-table>
+              </a-tab-pane>
+              <a-tab-pane key="tpl-balancer" tab='{{ i18n "pages.xray.Balancers"}}' style="padding-top: 20px;" force-render="true">
+                <a-button type="primary" icon="plus" @click="addBalancer()" style="margin-bottom: 10px;">
+                  {{ i18n "pages.xray.balancer.addBalancer"}}
+                </a-button>
+                <a-table :columns="balancerColumns" bordered v-if="balancersData.length>0"
+                    :row-key="r => r.key"
+                    :data-source="balancersData"
+                    :scroll="isMobile ? {} : { x: 200 }"
+                    :pagination="false"
+                    :indent-size="0"
+                    :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                  <template slot="action" slot-scope="text, balancer, index">
+                    [[ index+1 ]]
+                    <a-dropdown :trigger="['click']">
+                      <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                      <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                        <a-menu-item @click="editBalancer(index)">
+                          <a-icon type="edit"></a-icon>
+                          {{ i18n "edit" }}
+                        </a-menu-item>
+                        <a-menu-item @click="deleteBalancer(index)">
+                          <span style="color: #FF4D4F">
+                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                          </span>
+                        </a-menu-item>
+                      </a-menu>
+                    </a-dropdown>
+                  </template>
+                  <template slot="strategy" slot-scope="text, balancer, index">
+                    <a-tag style="margin:0;" v-if="balancer.strategy=='random'" color="purple">Random</a-tag>
+                    <a-tag style="margin:0;" v-if="balancer.strategy=='roundRobin'" color="green">Round Robin</a-tag>
+                    <a-tag style="margin:0;" v-if="balancer.strategy=='leastLoad'" color="green">Least Load</a-tag>
+                    <a-tag style="margin:0;" v-if="balancer.strategy=='leastPing'" color="green">Least Ping</a-tag>
+                  </template>
+                  <template slot="selector" slot-scope="text, balancer, index">
+                    <a-tag class="info-large-tag" style="margin:1;" v-for="sel in balancer.selector">[[ sel ]]</a-tag>
+                  </template>
+                </a-table>
+                <a-radio-group
+                    v-if="observatoryEnable || burstObservatoryEnable"
+                    v-model="obsSettings"
+                    @change="changeObsCode"
+                    button-style="solid"
+                    style="margin: 10px 0;"
+                    :size="isMobile ? 'small' : ''">
+                  <a-radio-button value="observatory" v-if="observatoryEnable">Observatory</a-radio-button>
+                  <a-radio-button value="burstObservatory" v-if="burstObservatoryEnable">Burst Observatory</a-radio-button>
+                </a-radio-group>
+                <textarea style="position:absolute; left: -800px;" id="obsSetting"></textarea>
+              </a-tab-pane>
+              <a-tab-pane key="tpl-dns" tab='DNS' style="padding-top: 20px;" force-render="true">
+                <setting-list-item type="switch" title='{{ i18n "pages.xray.dns.enable" }}' desc='{{ i18n "pages.xray.dns.enableDesc" }}' v-model="enableDNS"></setting-list-item>
+                <template v-if="enableDNS">
+                  <setting-list-item type="text" title='{{ i18n "pages.xray.dns.tag" }}' desc='{{ i18n "pages.xray.dns.tagDesc" }}' v-model="dnsTag"></setting-list-item>
+                  <a-list-item>
+                    <a-row style="padding: 20px">
+                      <a-col :lg="24" :xl="12">
+                        <a-list-item-meta title='{{ i18n "pages.xray.dns.strategy" }}' description='{{ i18n "pages.xray.dns.strategyDesc" }}' />
+                      </a-col>
+                      <a-col :lg="24" :xl="12">
+                        <a-select
+                            v-model="dnsStrategy"
+                            style="width: 100%"
+                            :dropdown-class-name="themeSwitcher.currentTheme">
+                          <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']">
+                            [[ l ]]
+                          </a-select-option>
+                        </a-select>
+                      </a-col>
+                    </a-row>
+                  </a-list-item>
+                  <a-divider>DNS</a-divider>
+                  <a-button type="primary" icon="plus" @click="addDNSServer()" style="margin-bottom: 10px;">{{ i18n "pages.xray.dns.add" }}</a-button>
+                  <a-table :columns="dnsColumns" bordered v-if="dnsServers.length>0"
+                      :row-key="r => r.key"
+                      :data-source="dnsServers"
+                      :scroll="isMobile ? {} : { x: 200 }"
+                      :pagination="false"
+                      :indent-size="0"
+                      :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                    <template slot="action" slot-scope="text,dns,index">
+                        [[ index+1 ]]
+                      <a-dropdown :trigger="['click']">
+                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                          <a-menu-item @click="editDNSServer(index)">
+                            <a-icon type="edit"></a-icon>
+                            {{ i18n "edit" }}
+                          </a-menu-item>
+                          <a-menu-item @click="deleteDNSServer(index)">
+                            <span style="color: #FF4D4F">
+                              <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                            </span>
+                          </a-menu-item>
+                        </a-menu>
+                      </a-dropdown>
+                    </template>
+                    <template slot="address" slot-scope="dns,index">
+                      <span v-if="typeof dns == 'object'">[[ dns.address ]]</span>
+                      <span v-else>[[ dns ]]</span>
+                    </template>
+                    <template slot="domain" slot-scope="dns,index">
+                      <span v-if="typeof dns == 'object'">[[ dns.domains.join(",") ]]</span>
+                    </template>
+                  </a-table>
+                  <a-divider>Fake DNS</a-divider>
+                  <a-button type="primary" icon="plus" @click="addFakedns()" style="margin-bottom: 10px;">{{ i18n "pages.xray.fakedns.add" }}</a-button>
+                  <a-table :columns="fakednsColumns" bordered v-if="fakeDns && fakeDns.length>0" :row-key="r => r.key"
+                      :data-source="fakeDns" :scroll="isMobile ? {} : { x: 200 }" :pagination="false" :indent-size="0"
+                      :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                    <template slot="action" slot-scope="text,fakedns,index">
+                        [[ index+1 ]]
+                      <a-dropdown :trigger="['click']">
+                        <a-icon @click="e => e.preventDefault()" type="more"
+                          style="font-size: 16px; text-decoration: bold;"></a-icon>
+                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                          <a-menu-item @click="editFakedns(index)">
+                            <a-icon type="edit"></a-icon>
+                            {{ i18n "edit" }}
+                          </a-menu-item>
+                          <a-menu-item @click="deleteFakedns(index)">
+                            <span style="color: #FF4D4F">
+                              <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                            </span>
+                          </a-menu-item>
+                        </a-menu>
+                      </a-dropdown>
+                    </template>
+                  </a-table>
+                </template>
+              </a-tab-pane>
+              <a-tab-pane key="tpl-advanced" tab='{{ i18n "pages.xray.advancedTemplate"}}' style="padding-top: 20px;" force-render="true">
+                <a-list-item-meta title='{{ i18n "pages.xray.Template"}}' description='{{ i18n "pages.xray.TemplateDesc"}}'></a-list-item-meta>
+                <a-radio-group v-model="advSettings" @change="changeCode" button-style="solid" style="margin: 10px 0;" :size="isMobile ? 'small' : ''">
+                  <a-radio-button value="xraySetting">{{ i18n "pages.xray.completeTemplate"}}</a-radio-button>
+                  <a-radio-button value="inboundSettings">{{ i18n "pages.xray.Inbounds" }}</a-radio-button>
+                  <a-radio-button value="outboundSettings">{{ i18n "pages.xray.Outbounds" }}</a-radio-button>
+                  <a-radio-button value="routingRuleSettings">{{ i18n "pages.xray.Routings" }}</a-radio-button>
+                </a-radio-group>
+                <textarea style="position:absolute; left: -800px;" id="xraySetting"></textarea>
+              </a-tab-pane>
+            </a-tabs>
+          </a-space>
+        </a-spin>
+      </a-layout-content>
     </a-layout>
-</a-layout>
+  </a-layout>
 {{template "js" .}}
 {{template "component/themeSwitcher" .}}
 {{template "component/sortableTable" .}}

web/translation/translate.en_US.toml

@@ -310,7 +310,14 @@
 "subURI" = "Reverse Proxy URI"
 "subURIDesc" = "The URI path of the subscription URL for use behind proxies."
 "fragment" = "Fragmentation"
-"fragmentDesc" = "Enable fragmentation for TLS hello packet"
+"fragmentDesc" = "Enable fragmentation for TLS hello packet."
+"fragmentSett" = "Fragmentation Settings"
+"mux" = "Mux"
+"muxDesc" = "Transmit multiple independent data streams within an established data stream."
+"muxSett" = "Mux Settings"
+"direct" = "Direct Connection"
+"directDesc" = "Directly establishes connections with domains or IP ranges of a specific country."
+"directSett" = "Direct Connection Options"
 
 [pages.xray]
 "title" = "Xray Configs"

web/translation/translate.es_ES.toml

@@ -311,6 +311,13 @@
 "subURIDesc" = "Cambiar el URI base de la URL de suscripción para usar detrás de los servidores proxy"
 "fragment" = "Fragmentación"
 "fragmentDesc" = "Habilitar la fragmentación para el paquete de saludo de TLS"
+"fragmentSett" = "Configuración de fragmentación"
+"mux" = "Mux"
+"muxDesc" = "Transmita múltiples flujos de datos independientes dentro de un flujo de datos establecido."
+"muxSett" = "Mux Configuración"
+"direct" = "Conexión directa"
+"directDesc" = "Establece conexiones directamente con dominios o rangos de IP de un país específico."
+"directSett" = "Opciones de conexión directa"
 
 [pages.xray]
 "title" = "Xray Configuración"
@@ -626,4 +633,4 @@
 "removedTGUserSuccess" = "✅ {{ .Email }} : Usuario de Telegram eliminado exitosamente."
 "enableSuccess" = "✅ {{ .Email }} : Habilitado exitosamente."
 "disableSuccess" = "✅ {{ .Email }} : Deshabilitado exitosamente."
-"askToAddUserId" = "¡No se encuentra su configuración!\r\nPor favor, pídale a su administrador que use su ID de usuario de Telegram en su(s) configuración(es).\r\n\r\nSu ID de usuario: <code>{{ .TgUserID }}</code>"
+"askToAddUserId" = "¡No se encuentra su configuración!\r\nPor favor, pídale a su administrador que use su ID de usuario de Telegram en su(s) configuración(es).\r\n\r\nSu ID de usuario: <code>{{ .TgUserID }}</code>"

web/translation/translate.fa_IR.toml

@@ -309,8 +309,15 @@
 "subShowInfoDesc" = "ترافیک و زمان باقی‌مانده را در برنامه‌های کاربری نمایش می‌دهد"
 "subURI" = "پروکسی معکوس URI مسیر"
 "subURIDesc" = "سابسکریپشن را برای استفاده در پشت پراکسی‌ها تغییر می‌دهد URI مسیر"
-"fragment" = "تکه‌تکه شدن"
-"fragmentDesc" = "فعال کردن تکه تکه شدن برای بسته نخست تی‌ال‌اس"
+"fragment" = "فرگمنت"
+"fragmentDesc" = "فعال کردن فرگمنت برای بسته‌ی نخست تی‌ال‌اس"
+"fragmentSett" = "تنظیمات فرگمنت"
+"mux" = "ماکس"
+"muxDesc" = "چندین جریان داده مستقل را در یک جریان داده ثابت منتقل می کند"
+"muxSett" = "تنظیمات ماکس"
+"direct" = "اتصال مستقیم"
+"directDesc" = "به طور مستقیم با دامنه ها یا محدوده آی‌پی یک کشور خاص ارتباط برقرار می کند"
+"directSett" = "گزینه های اتصال مستقیم"
 
 [pages.xray]
 "title" = "پیکربندی ایکس‌ری"

web/translation/translate.id_ID.toml

@@ -311,6 +311,13 @@
 "subURIDesc" = "URI path URL langganan untuk penggunaan di belakang proxy."
 "fragment" = "Fragmentasi"
 "fragmentDesc" = "Aktifkan fragmentasi untuk paket hello TLS"
+"fragmentSett" = "Pengaturan Fragmentasi"
+"mux" = "Mux"
+"muxDesc" = "Mengirimkan beberapa aliran data independen dalam aliran data yang sudah ada."
+"muxSett" = "Pengaturan Mux"
+"direct" = "Koneksi langsung"
+"directDesc" = "Secara langsung membuat koneksi dengan domain atau rentang IP negara tertentu."
+"directSett" = "Opsi Koneksi Langsung"
 
 [pages.xray]
 "title" = "Konfigurasi Xray"

web/translation/translate.ru_RU.toml

@@ -311,6 +311,13 @@
 "subURIDesc" = "Изменить базовый URI URL-адреса подписки для использования за прокси-серверами"
 "fragment" = "Фрагментация"
 "fragmentDesc" = "Включить фрагментацию для пакета приветствия TLS"
+"fragmentSett" = "Настройки фрагментации"
+"mux" = "Mux"
+"muxDesc" = "Передача нескольких независимых потоков данных в рамках установленного потока данных."
+"muxSett" = "Mux Настройки"
+"direct" = "Прямая связь"
+"directDesc" = "Напрямую устанавливает соединения с доменами или диапазонами IP конкретной страны."
+"directSett" = "Варианты прямого подключения"
 
 [pages.xray]
 "title" = "Настройки Xray"

web/translation/translate.uk_UA.toml

@@ -311,6 +311,13 @@
 "subURIDesc" = "URI до URL-адреси підписки для використання за проксі."
 "fragment" = "Фрагментація"
 "fragmentDesc" = "Увімкнути фрагментацію для пакету привітання TLS"
+"fragmentSett" = "Параметри фрагментації"
+"mux" = "Mux"
+"muxDesc" = "Передавати кілька незалежних потоків даних у межах встановленого потоку даних."
+"muxSett" = "Налаштування Mux"
+"direct" = "Пряме підключення"
+"directDesc" = "Безпосередньо встановлює з’єднання з доменами або діапазонами IP певної країни."
+"directSett" = "Параметри прямого підключення"
 
 [pages.xray]
 "title" = "Xray конфігурації"

web/translation/translate.vi_VN.toml

@@ -311,6 +311,13 @@
 "subURIDesc" = "Thay đổi URI cơ sở của URL gói đăng ký để sử dụng cho proxy trung gian"
 "fragment" = "Sự phân mảnh"
 "fragmentDesc" = "Kích hoạt phân mảnh cho gói TLS hello"
+"fragmentSett" = "Cài đặt phân mảnh"
+"mux" = "Mux"
+"muxDesc" = "Truyền nhiều luồng dữ liệu độc lập trong luồng dữ liệu đã thiết lập."
+"muxSett" = "Mux Cài đặt"
+"direct" = "Kết nối trực tiếp"
+"directDesc" = "Trực tiếp thiết lập kết nối với tên miền hoặc dải IP của một quốc gia cụ thể."
+"directSett" = "Tùy chọn kết nối trực tiếp"
 
 [pages.xray]
 "title" = "Cài đặt Xray"

web/translation/translate.zh_Hans.toml

@@ -311,6 +311,13 @@
 "subURIDesc" = "用于代理后面的订阅 URL 的 URI 路径"
 "fragment" = "分片"
 "fragmentDesc" = "启用 TLS hello 数据包分片"
+"fragmentSett" = "设置"
+"mux" = "多路复用器"
+"muxDesc" = "在已建立的数据流内传输多个独立的数据流"
+"muxSett" = "复用器设置"
+"direct" = "直接连接"
+"directDesc" = "直接与特定国家的域或IP范围建立连接"
+"directSett" = "直接连接选项"
 
 [pages.xray]
 "title" = "Xray 配置"