Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/web/html
diff options
context:
space:
mode:
Diffstat (limited to 'web/html')
-rw-r--r--web/html/xui/form/protocol/trojan.html4
-rw-r--r--web/html/xui/form/protocol/vless.html4
-rw-r--r--web/html/xui/form/protocol/vmess.html4
-rw-r--r--web/html/xui/inbounds.html22
-rw-r--r--web/html/xui/inbounds_client_row.html13
5 files changed, 23 insertions, 24 deletions
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index 48fbfd4e..fa5a2032 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -9,10 +9,10 @@
<a-form layout="inline">
<a-form-item>
<span slot="label">
- Username
+ Email
<a-tooltip>
<template slot="title">
- The Username Must Be Completely Unique
+ The Email Must Be Completely Unique
</template>
<!--Renew Svg Icon-->
<svg
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index f6809c1e..5d56fdd3 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -9,10 +9,10 @@
<a-form layout="inline">
<a-form-item>
<span slot="label">
- Username
+ Email
<a-tooltip>
<template slot="title">
- The Username Must Be Completely Unique
+ The Email Must Be Completely Unique
</template>
<!--Renew Svg Icon-->
<svg
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index c156d6d5..9ed444c6 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -8,10 +8,10 @@
<a-form layout="inline">
<a-form-item>
<span slot="label">
- Username
+ Email
<a-tooltip>
<template slot="title">
- The Username Must Be Completely Unique
+ The Email Must Be Completely Unique
</template>
<!--Renew Svg Icon-->
<svg
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index ba2d1b4c..fa91b923 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -152,7 +152,7 @@
const columns = [{
title: '{{ i18n "pages.inbounds.operate" }}',
align: 'center',
- width: 40,
+ width: 50,
scopedSlots: { customRender: 'action' },
}, {
title: '{{ i18n "pages.inbounds.enable" }}',
@@ -160,6 +160,11 @@
width: 40,
scopedSlots: { customRender: 'enable' },
}, {
+ title: "Id",
+ align: 'center',
+ dataIndex: "id",
+ width: 20,
+ }, {
title: '{{ i18n "pages.inbounds.remark" }}',
align: 'center',
width: 60,
@@ -192,8 +197,8 @@
}];
const innerColumns = [
- { title: '', width: 20, scopedSlots: { customRender: 'actions' } },
- { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
+ { title: '', width: 70, scopedSlots: { customRender: 'actions' } },
+ { title: '{{ i18n "pages.inbounds.client" }}', width: 60, scopedSlots: { customRender: 'client' } },
{ title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 80, scopedSlots: { customRender: 'traffic' } },
{ title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
{ title: 'UID', width: 150, dataIndex: "id" },
@@ -201,15 +206,15 @@
];
const innerTrojanColumns = [
- { title: '', width: 20, scopedSlots: { customRender: 'actions' } },
- { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
+ { title: '', width: 70, scopedSlots: { customRender: 'actions' } },
+ { title: '{{ i18n "pages.inbounds.client" }}', width: 60, scopedSlots: { customRender: 'client' } },
{ title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 80, scopedSlots: { customRender: 'traffic' } },
{ title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
{ title: 'Password', width: 150, dataIndex: "password" },
];
const innerOneColumns = [
- { title: '', width: 50, scopedSlots: { customRender: 'actions' } },
+ { title: '', width: 70, scopedSlots: { customRender: 'actions' } },
];
const app = new Vue({
@@ -276,7 +281,7 @@
this.showQrcode(dbInbound);
break;
case "edit":
- this.openEditInbound(dbInbound);
+ this.openEditInbound(dbInbound.id);
break;
case "resetTraffic":
this.resetTraffic(dbInbound);
@@ -299,7 +304,8 @@
isEdit: false
});
},
- openEditInbound(dbInbound) {
+ openEditInbound(dbInbound_id) {
+ dbInbound = this.dbInbounds.find(row => row.id === dbInbound_id);
const inbound = dbInbound.toInbound();
inModal.show({
title: '{{ i18n "pages.inbounds.modifyInbound"}}',
diff --git a/web/html/xui/inbounds_client_row.html b/web/html/xui/inbounds_client_row.html
index 6e03e4ca..0fe707e4 100644
--- a/web/html/xui/inbounds_client_row.html
+++ b/web/html/xui/inbounds_client_row.html
@@ -1,15 +1,8 @@
{{define "client_row"}}
<template slot="actions" slot-scope="text, client, index">
- <a-dropdown>
- <a-icon @click="e => e.preventDefault()" type="menu"></a-icon>
- <template #overlay>
- <a-menu>
- <a-menu-item v-if="record.hasLink()" @click="showQrcode(record,index);"><a-icon type="qrcode"></a-icon>{{ i18n "qrCode" }}</a-menu-item>
- <a-menu-item @click="showInfo(record,index);"><a-icon type="info-circle"></a-icon>{{ i18n "info" }}</a-menu-item>
- <a-menu-item @click="resetClientTraffic(client,record,$event)" v-if="client.email != ''"><a-icon type="retweet"></a-icon>{{ i18n "pages.inbounds.resetTraffic" }}</a-menu-item>
- </a-menu>
- </template>
- </a-dropdown>
+<a-icon v-if="record.hasLink()" style="font-size: 26px" type="qrcode" @click="showQrcode(record,index);"></a-icon>&nbsp;&nbsp;
+<a-icon v-if="client.email != ''" style="font-size: 26px" type="retweet" @click="resetClientTraffic(client,record,$event)"></a-icon>&nbsp;&nbsp;
+<a-icon type="info-circle" style="font-size: 26px" @click="showInfo(record,index);"></a-icon>
</template>
<template slot="client" slot-scope="text, client">
[[ client.email ]]