Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-10-27 10:30:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: rename periodicTrafficReset to trafficReset and add lastTrafficResetTime

Browse source
This commit is contained in:
egregors 2025-09-14 10:21:18 +02:00
parent 09933f845d
commit 52196c014d
No known key found for this signature in database
GPG key ID: 78C8DDCC8BB0494A
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/assets/js/model/dbinbound.js
View file

@ -10,7 +10,8 @@ class DBInbound {
this.remark = ""; this.remark = "";
this.enable = true; this.enable = true;
this.expiryTime = 0; this.expiryTime = 0;
this.periodicTrafficReset = "never"; this.trafficReset = "never";
this.lastTrafficResetTime = 0;
this.listen = ""; this.listen = "";
this.port = 0; this.port = 0;

2
web/html/form/inbound.html
View file

@ -54,7 +54,7 @@
<a-icon type="question-circle"></a-icon> <a-icon type="question-circle"></a-icon>
</a-tooltip> </a-tooltip>
</template> </template>
<a-select v-model="dbInbound.periodicTrafficReset" :dropdown-class-name="themeSwitcher.currentTheme"> <a-select v-model="dbInbound.trafficReset" :dropdown-class-name="themeSwitcher.currentTheme">
<a-select-option value="never">{{ i18n "pages.inbounds.periodicTrafficReset.never" }}</a-select-option> <a-select-option value="never">{{ i18n "pages.inbounds.periodicTrafficReset.never" }}</a-select-option>
<a-select-option value="daily">{{ i18n "pages.inbounds.periodicTrafficReset.daily" }}</a-select-option> <a-select-option value="daily">{{ i18n "pages.inbounds.periodicTrafficReset.daily" }}</a-select-option>
<a-select-option value="weekly">{{ i18n "pages.inbounds.periodicTrafficReset.weekly" }}</a-select-option> <a-select-option value="weekly">{{ i18n "pages.inbounds.periodicTrafficReset.weekly" }}</a-select-option>

11
web/html/inbounds.html
View file

@ -648,7 +648,7 @@
<tr> <tr>
<td>{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}</td> <td>{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}</td>
<td> <td>
<a-tag color="blue">[[ i18n("pages.inbounds.periodicTrafficReset." + dbInbound.periodicTrafficReset) ]]</a-tag> <a-tag color="blue">[[ i18n("pages.inbounds.periodicTrafficReset." + dbInbound.trafficReset) ]]</a-tag>
</td> </td>
</tr> </tr>
</table> </table>
@ -1097,7 +1097,8 @@
remark: dbInbound.remark + " - Cloned", remark: dbInbound.remark + " - Cloned",
enable: dbInbound.enable, enable: dbInbound.enable,
expiryTime: dbInbound.expiryTime, expiryTime: dbInbound.expiryTime,
periodicTrafficReset: dbInbound.periodicTrafficReset, trafficReset: dbInbound.trafficReset,
lastTrafficResetTime: dbInbound.lastTrafficResetTime,
listen: '', listen: '',
port: RandomUtil.randomInteger(10000, 60000), port: RandomUtil.randomInteger(10000, 60000),
@ -1142,7 +1143,8 @@
remark: dbInbound.remark, remark: dbInbound.remark,
enable: dbInbound.enable, enable: dbInbound.enable,
expiryTime: dbInbound.expiryTime, expiryTime: dbInbound.expiryTime,
periodicTrafficReset: dbInbound.periodicTrafficReset, trafficReset: dbInbound.trafficReset,
lastTrafficResetTime: dbInbound.lastTrafficResetTime,
listen: inbound.listen, listen: inbound.listen,
port: inbound.port, port: inbound.port,
@ -1166,7 +1168,8 @@
remark: dbInbound.remark, remark: dbInbound.remark,
enable: dbInbound.enable, enable: dbInbound.enable,
expiryTime: dbInbound.expiryTime, expiryTime: dbInbound.expiryTime,
periodicTrafficReset: dbInbound.periodicTrafficReset, trafficReset: dbInbound.trafficReset,
lastTrafficResetTime: dbInbound.lastTrafficResetTime,
listen: inbound.listen, listen: inbound.listen,
port: inbound.port, port: inbound.port,

4
web/html/modals/inbound_info_modal.html
View file

@ -237,10 +237,10 @@
</a-tooltip> </a-tooltip>
</td> </td>
</tr> </tr>
<tr v-if="infoModal.clientSettings.periodicTrafficReset"> <tr v-if="infoModal.clientSettings.trafficReset">
<td>{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}</td> <td>{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}</td>
<td> <td>
<a-tag color="blue">[[ i18n("pages.inbounds.periodicTrafficReset." + infoModal.clientSettings.periodicTrafficReset) ]]</a-tag> <a-tag color="blue">[[ i18n("pages.inbounds.periodicTrafficReset." + infoModal.clientSettings.trafficReset) ]]</a-tag>
</td> </td>
</tr> </tr>
<tr v-if="app.ipLimitEnable"> <tr v-if="app.ipLimitEnable">