Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-09 11:46:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

minor changes

Browse source 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
Co-Authored-By: Tara Rostami <132676256+TaraRostami@users.noreply.github.com>
This commit is contained in:
MHSanaei 2024-02-22 23:12:26 +03:30
parent fc3ea2dd4b
commit 9a10a3ec48
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/assets/css/custom.css
View file

@ -1171,3 +1171,7 @@ b, strong {
background-color: var(--dark-color-btn-danger-hover); background-color: var(--dark-color-btn-danger-hover);
border-color: var(--dark-color-btn-danger-hover); border-color: var(--dark-color-btn-danger-hover);
} }
.dark .ant-alert-close-icon .anticon-close:hover {
color: rgb(255 255 255);
}

16
web/html/xui/xray_balancer_modal.html
View file

@ -23,7 +23,8 @@
<a-select-option value="roundRobin">Round Robin</a-select-option> <a-select-option value="roundRobin">Round Robin</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label='{{ i18n "pages.xray.balancer.balancerSelectors" }}' has-feedback :validate-status="balancerModal.emptySelector? 'warning' : 'success'"> <a-form-item label='{{ i18n "pages.xray.balancer.balancerSelectors" }}' has-feedback
:validate-status="balancerModal.emptySelector? 'warning' : 'success'">
<a-select v-model="balancerModal.balancer.selector" mode="tags" @change="balancerModal.checkSelector()" <a-select v-model="balancerModal.balancer.selector" mode="tags" @change="balancerModal.checkSelector()"
:dropdown-class-name="themeSwitcher.currentTheme"> :dropdown-class-name="themeSwitcher.currentTheme">
<a-select-option v-for="tag in balancerModal.outboundTags" :value="tag">[[ tag ]]</a-select-option> <a-select-option v-for="tag in balancerModal.outboundTags" :value="tag">[[ tag ]]</a-select-option>
@ -74,17 +75,18 @@
this.balancerTags = balancerTags.filter((tag) => tag != balancer.tag); this.balancerTags = balancerTags.filter((tag) => tag != balancer.tag);
this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag); this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag);
this.isEdit = isEdit; this.isEdit = isEdit;
this.check() this.check();
this.checkSelector();
}, },
close() { close() {
balancerModal.visible = false; this.visible = false;
balancerModal.loading(false); this.loading(false);
}, },
loading(loading=true) { loading(loading=true) {
balancerModal.confirmLoading = loading; this.confirmLoading = loading;
}, },
check() { check() {
if (balancerModal.balancer.tag == '' || balancerModal.balancerTags.includes(balancerModal.balancer.tag)) { if (this.balancer.tag == '' || this.balancerTags.includes(this.balancer.tag)) {
this.duplicateTag = true; this.duplicateTag = true;
this.isValid = false; this.isValid = false;
} else { } else {
@ -93,7 +95,7 @@
} }
}, },
checkSelector() { checkSelector() {
balancerModal.emptySelector = balancerModal.balancer.selector.length == 0; this.emptySelector = this.balancer.selector.length == 0;
} }
}; };

2
web/service/inbound.go
View file

@ -1803,6 +1803,8 @@ func (s *InboundService) MigrationRequirements() {
} }
}() }()
db.Migrator().DropIndex(&model.Inbound{}, "port")
// Fix inbounds based problems // Fix inbounds based problems
var inbounds []*model.Inbound var inbounds []*model.Inbound
err = tx.Model(model.Inbound{}).Where("protocol IN (?)", []string{"vmess", "vless", "trojan"}).Find(&inbounds).Error err = tx.Model(model.Inbound{}).Where("protocol IN (?)", []string{"vmess", "vless", "trojan"}).Find(&inbounds).Error