gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-18 23:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify API calls #218

Browse Source
This commit is contained in:
Alireza Ahmadi
2023-04-18 01:22:33 +02:00
parent 0c755be648
commit f4f8c0d6df
5 changed files with 130 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/html/xui/client_bulk_modal.html
View File

@@ -150,7 +150,6 @@
confirm: null,
dbInbound: new DBInbound(),
inbound: new Inbound(),
clients: [],
quantity: 1,
totalGB: 0,
expiryTime: '',
@@ -164,6 +163,7 @@
flow: "",
delayedStart: false,
ok() {
clients = [];
method=clientsBulkModal.emailMethod;
if(method>1){
start=clientsBulkModal.firstNum;
@@ -186,9 +186,9 @@
if(clientsBulkModal.inbound.canEnableTlsFlow()){
newClient.flow = clientsBulkModal.flow;
}
clientsBulkModal.clients.push(newClient);
clients.push(newClient);
}
ObjectUtil.execute(clientsBulkModal.confirm, clientsBulkModal.inbound, clientsBulkModal.dbInbound);
ObjectUtil.execute(clientsBulkModal.confirm, clients, clientsBulkModal.dbInbound.id);
},
show({ title='', okText='{{ i18n "sure" }}', dbInbound=null, confirm=(inbound, dbInbound)=>{} }) {
this.visible = true;
@@ -208,7 +208,6 @@
this.flow= "";
this.dbInbound = new DBInbound(dbInbound);
this.inbound = dbInbound.toInbound();
this.clients = this.getClients(this.inbound.protocol, this.inbound.settings);
this.delayedStart = false;
},
getClients(protocol, clientSettings) {

9
web/html/xui/client_modal.html
View File

@@ -12,6 +12,7 @@
confirmLoading: false,
title: '',
okText: '',
isEdit: false,
dbInbound: new DBInbound(),
inbound: new Inbound(),
clients: [],
@@ -20,9 +21,13 @@
isExpired: false,
delayedStart: false,
ok() {
ObjectUtil.execute(clientModal.confirm, clientModal.inbound, clientModal.dbInbound, clientModal.index);
if(clientModal.isEdit){
ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id, clientModal.index);
} else {
ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id);
}
},
show({ title='', okText='{{ i18n "sure" }}', index=null, dbInbound=null, confirm=(index, dbInbound)=>{}, isEdit=false }) {
show({ title='', okText='{{ i18n "sure" }}', index=null, dbInbound=null, confirm=()=>{}, isEdit=false }) {
this.visible = true;
this.title = title;
this.okText = okText;

31
web/html/xui/inbounds.html
View File

@@ -209,11 +209,10 @@
</a-layout>
{{template "js" .}}
<script>
const columns = [{
title: '{{ i18n "pages.inbounds.operate" }}',
align: 'center',
width: 30,
width: 40,
scopedSlots: { customRender: 'action' },
}, {
title: '{{ i18n "pages.inbounds.enable" }}',
@@ -221,7 +220,7 @@
width: 40,
scopedSlots: { customRender: 'enable' },
}, {
title: "Id",
title: "ID",
align: 'center',
dataIndex: "id",
width: 30,
@@ -529,9 +528,9 @@
title: '{{ i18n "pages.client.add"}}',
okText: '{{ i18n "pages.client.submitAdd"}}',
dbInbound: dbInbound,
confirm: async (inbound, dbInbound, index) => {
confirm: async (clients, dbInboundId) => {
clientModal.loading();
await this.addClient(inbound, dbInbound);
await this.addClient(clients, dbInboundId);
clientModal.close();
},
isEdit: false
@@ -543,9 +542,9 @@
title: '{{ i18n "pages.client.bulk"}} ' + dbInbound.remark,
okText: '{{ i18n "pages.client.bulk"}}',
dbInbound: dbInbound,
confirm: async (inbound, dbInbound) => {
confirm: async (clients, dbInboundId) => {
clientsBulkModal.loading();
await this.addClient(inbound, dbInbound);
await this.addClient(clients, dbInboundId);
clientsBulkModal.close();
},
});
@@ -559,9 +558,9 @@
okText: '{{ i18n "pages.client.submitEdit"}}',
dbInbound: dbInbound,
index: index,
confirm: async (inbound, dbInbound, index) => {
confirm: async (client, dbInboundId, index) => {
clientModal.loading();
await this.updateClient(inbound, dbInbound, index);
await this.updateClient(client, dbInboundId, index);
clientModal.close();
},
isEdit: true
@@ -571,17 +570,17 @@
firstKey = Object.keys(client)[0];
return clients.findIndex(c => c[firstKey] === client[firstKey]);
},
async addClient(inbound, dbInbound) {
async addClient(clients, dbInboundId) {
const data = {
id: dbInbound.id,
settings: inbound.settings.toString(),
id: dbInboundId,
settings: '{"clients": [' + clients.toString() +']}',
};
await this.submit('/xui/inbound/addClient/', data);
await this.submit(`/xui/inbound/addClient`, data);
},
async updateClient(inbound, dbInbound, index) {
async updateClient(client, dbInboundId, index) {
const data = {
id: dbInbound.id,
settings: inbound.settings.toString(),
id: dbInboundId,
settings: '{"clients": [' + client.toString() +']}',
};
await this.submit(`/xui/inbound/updateClient/${index}`, data);
},