diff options
Diffstat (limited to 'web/html')
| -rw-r--r-- | web/html/xui/form/client.html | 12 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/trojan.html | 1 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/vless.html | 3 | ||||
| -rw-r--r-- | web/html/xui/form/protocol/vmess.html | 3 | ||||
| -rw-r--r-- | web/html/xui/inbounds.html | 2 |
5 files changed, 12 insertions, 9 deletions
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index 3f91c8e8..1de05ac9 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -27,6 +27,12 @@ <a-form-item label='{{ i18n "additional" }} ID' v-if="inbound.protocol === Protocols.VMESS"> <a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input> </a-form-item> + <a-form-item label="Subscription" v-if="client.email"> + <a-input v-model.trim="client.subId"></a-input> + </a-form-item> + <a-form-item label="Telegram Username" v-if="client.email"> + <a-input v-model.trim="client.tgId"></a-input> + </a-form-item> <a-form-item> <span slot="label"> <span>{{ i18n "pages.inbounds.IPLimit" }}</span> @@ -62,12 +68,6 @@ </a-textarea> </a-form> </a-form-item> - <a-form-item label="Subscription" v-if="client.email"> - <a-input v-model.trim="client.subId"></a-input> - </a-form-item> - <a-form-item label="Telegram Username" v-if="client.email"> - <a-input v-model.trim="client.tgId"></a-input> - </a-form-item> <a-form-item v-if="inbound.XTLS" label="Flow"> <a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"> <a-select-option value="">{{ i18n "none" }}</a-select-option> diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html index 158b64af..79e797c6 100644 --- a/web/html/xui/form/protocol/trojan.html +++ b/web/html/xui/form/protocol/trojan.html @@ -60,6 +60,7 @@ </a-tooltip> </span> <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" + :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''" v-model="client._expiryTime" style="width: 170px;"></a-date-picker> </a-form-item> </a-collapse-panel> diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html index 03069c29..2da4a255 100644 --- a/web/html/xui/form/protocol/vless.html +++ b/web/html/xui/form/protocol/vless.html @@ -66,7 +66,8 @@ </a-tooltip> </span> <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" - v-model="client._expiryTime" style="width: 170px;"></a-date-picker> + :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''" + v-model="client._expiryTime" style="width: 170px;"></a-date-picker> </a-form-item> </a-collapse-panel> </a-collapse> diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html index d425e080..ad2b3960 100644 --- a/web/html/xui/form/protocol/vmess.html +++ b/web/html/xui/form/protocol/vmess.html @@ -57,7 +57,8 @@ </a-tooltip> </span> <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" - v-model="client._expiryTime" style="width: 170px;"></a-date-picker> + :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''" + v-model="client._expiryTime" style="width: 170px;"></a-date-picker> </a-form-item> </a-collapse-panel> </a-collapse> diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html index 728e62a0..2d6016f3 100644 --- a/web/html/xui/inbounds.html +++ b/web/html/xui/inbounds.html @@ -349,7 +349,7 @@ depleted.push(client.email); } else { if ((client.expiryTime > 0 && (client.expiryTime-now < this.expireDiff)) || - (client.total > 0 && (client.total-client.up+client.down < this.trafficDiff ))) expiring.push(client.email); + (client.total > 0 && (client.total-(client.up+client.down) < this.trafficDiff ))) expiring.push(client.email); } }); } else { |