mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-11-29 02:42:51 +00:00
chore: use Intl for date formatting
This commit is contained in:
parent
784ed39930
commit
db97eda391
9 changed files with 57 additions and 277 deletions
|
|
@ -1,151 +0,0 @@
|
||||||
const oneMinute = 1000 * 60; // MilliseConds in a Minute
|
|
||||||
const oneHour = oneMinute * 60; // The milliseconds of one hour
|
|
||||||
const oneDay = oneHour * 24; // The Number of MilliseConds A Day
|
|
||||||
const oneWeek = oneDay * 7; // The milliseconds per week
|
|
||||||
const oneMonth = oneDay * 30; // The milliseconds of a month
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decrease according to the number of days
|
|
||||||
*
|
|
||||||
* @param days to reduce the number of days to be reduced
|
|
||||||
*/
|
|
||||||
Date.prototype.minusDays = function (days) {
|
|
||||||
return this.minusMillis(oneDay * days);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Increase according to the number of days
|
|
||||||
*
|
|
||||||
* @param days The number of days to be increased
|
|
||||||
*/
|
|
||||||
Date.prototype.plusDays = function (days) {
|
|
||||||
return this.plusMillis(oneDay * days);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A few
|
|
||||||
*
|
|
||||||
* @param hours to be reduced
|
|
||||||
*/
|
|
||||||
Date.prototype.minusHours = function (hours) {
|
|
||||||
return this.minusMillis(oneHour * hours);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Increase hourly
|
|
||||||
*
|
|
||||||
* @param hours to increase the number of hours
|
|
||||||
*/
|
|
||||||
Date.prototype.plusHours = function (hours) {
|
|
||||||
return this.plusMillis(oneHour * hours);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make reduction in minutes
|
|
||||||
*
|
|
||||||
* @param minutes to reduce the number of minutes
|
|
||||||
*/
|
|
||||||
Date.prototype.minusMinutes = function (minutes) {
|
|
||||||
return this.minusMillis(oneMinute * minutes);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add in minutes
|
|
||||||
*
|
|
||||||
* @param minutes to increase the number of minutes
|
|
||||||
*/
|
|
||||||
Date.prototype.plusMinutes = function (minutes) {
|
|
||||||
return this.plusMillis(oneMinute * minutes);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decrease in milliseconds
|
|
||||||
*
|
|
||||||
* @param millis to reduce the milliseconds
|
|
||||||
*/
|
|
||||||
Date.prototype.minusMillis = function(millis) {
|
|
||||||
let time = this.getTime() - millis;
|
|
||||||
let newDate = new Date();
|
|
||||||
newDate.setTime(time);
|
|
||||||
return newDate;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add in milliseconds to increase
|
|
||||||
*
|
|
||||||
* @param millis to increase the milliseconds to increase
|
|
||||||
*/
|
|
||||||
Date.prototype.plusMillis = function(millis) {
|
|
||||||
let time = this.getTime() + millis;
|
|
||||||
let newDate = new Date();
|
|
||||||
newDate.setTime(time);
|
|
||||||
return newDate;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Setting time is 00: 00: 00.000 on the day
|
|
||||||
*/
|
|
||||||
Date.prototype.setMinTime = function () {
|
|
||||||
this.setHours(0);
|
|
||||||
this.setMinutes(0);
|
|
||||||
this.setSeconds(0);
|
|
||||||
this.setMilliseconds(0);
|
|
||||||
return this;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Setting time is 23: 59: 59.999 on the same day
|
|
||||||
*/
|
|
||||||
Date.prototype.setMaxTime = function () {
|
|
||||||
this.setHours(23);
|
|
||||||
this.setMinutes(59);
|
|
||||||
this.setSeconds(59);
|
|
||||||
this.setMilliseconds(999);
|
|
||||||
return this;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Formatting date
|
|
||||||
*/
|
|
||||||
Date.prototype.formatDate = function () {
|
|
||||||
return this.getFullYear() + "-" + NumberFormatter.addZero(this.getMonth() + 1) + "-" + NumberFormatter.addZero(this.getDate());
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Format time
|
|
||||||
*/
|
|
||||||
Date.prototype.formatTime = function () {
|
|
||||||
return NumberFormatter.addZero(this.getHours()) + ":" + NumberFormatter.addZero(this.getMinutes()) + ":" + NumberFormatter.addZero(this.getSeconds());
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Formatting date plus time
|
|
||||||
*
|
|
||||||
* @param split Date and time separation symbols, default is a space
|
|
||||||
*/
|
|
||||||
Date.prototype.formatDateTime = function (split = ' ') {
|
|
||||||
return this.formatDate() + split + this.formatTime();
|
|
||||||
};
|
|
||||||
|
|
||||||
class DateUtil {
|
|
||||||
// String to date object
|
|
||||||
static parseDate(str) {
|
|
||||||
return new Date(str.replace(/-/g, '/'));
|
|
||||||
}
|
|
||||||
|
|
||||||
static formatMillis(millis) {
|
|
||||||
return moment(millis).format('YYYY-M-D HH:mm:ss');
|
|
||||||
}
|
|
||||||
|
|
||||||
static firstDayOfMonth() {
|
|
||||||
const date = new Date();
|
|
||||||
date.setDate(1);
|
|
||||||
date.setMinTime();
|
|
||||||
return date;
|
|
||||||
}
|
|
||||||
|
|
||||||
static convertToJalalian(date) {
|
|
||||||
return date && moment.isMoment(date) ? date.format('jYYYY/jMM/jDD HH:mm:ss') : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -882,4 +882,35 @@ class FileManager {
|
||||||
|
|
||||||
link.remove();
|
link.remove();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class IntlUtil {
|
||||||
|
static formatDate(date) {
|
||||||
|
const language = LanguageManager.getLanguage()
|
||||||
|
|
||||||
|
let intlOptions = {
|
||||||
|
year: "numeric",
|
||||||
|
month: "numeric",
|
||||||
|
day: "numeric",
|
||||||
|
hour: "numeric",
|
||||||
|
minute: "numeric",
|
||||||
|
second: "numeric"
|
||||||
|
}
|
||||||
|
|
||||||
|
const intl = new Intl.DateTimeFormat(
|
||||||
|
language,
|
||||||
|
intlOptions
|
||||||
|
)
|
||||||
|
|
||||||
|
return intl.format(new Date(date))
|
||||||
|
}
|
||||||
|
static formatRelativeTime(date) {
|
||||||
|
const language = LanguageManager.getLanguage()
|
||||||
|
const now = new Date()
|
||||||
|
|
||||||
|
const diff = Math.round((date - now) / (1000 * 60 * 60 * 24))
|
||||||
|
const formatter = new Intl.RelativeTimeFormat(language, { numeric: 'auto' })
|
||||||
|
|
||||||
|
return formatter.format(diff, 'day');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -44,7 +44,6 @@
|
||||||
<script src="{{ .base_path }}assets/axios/axios.min.js?{{ .cur_ver }}"></script>
|
<script src="{{ .base_path }}assets/axios/axios.min.js?{{ .cur_ver }}"></script>
|
||||||
<script src="{{ .base_path }}assets/qs/qs.min.js"></script>
|
<script src="{{ .base_path }}assets/qs/qs.min.js"></script>
|
||||||
<script src="{{ .base_path }}assets/js/axios-init.js?{{ .cur_ver }}"></script>
|
<script src="{{ .base_path }}assets/js/axios-init.js?{{ .cur_ver }}"></script>
|
||||||
<script src="{{ .base_path }}assets/js/util/date-util.js?{{ .cur_ver }}"></script>
|
|
||||||
<script src="{{ .base_path }}assets/js/util/index.js?{{ .cur_ver }}"></script>
|
<script src="{{ .base_path }}assets/js/util/index.js?{{ .cur_ver }}"></script>
|
||||||
<script>
|
<script>
|
||||||
const basePath = '{{ .base_path }}';
|
const basePath = '{{ .base_path }}';
|
||||||
|
|
|
||||||
|
|
@ -111,20 +111,12 @@
|
||||||
<template v-if="client.expiryTime !=0 && client.reset >0">
|
<template v-if="client.expiryTime !=0 && client.reset >0">
|
||||||
<a-popover :overlay-class-name="themeSwitcher.currentTheme">
|
<a-popover :overlay-class-name="themeSwitcher.currentTheme">
|
||||||
<template slot="content">
|
<template slot="content">
|
||||||
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
|
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
|
||||||
</span>
|
<span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
|
||||||
<span v-else>
|
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
|
||||||
[[ DateUtil.formatMillis(client._expiryTime) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
|
|
||||||
</template>
|
|
||||||
</span>
|
|
||||||
</template>
|
</template>
|
||||||
<table>
|
<table>
|
||||||
<tr class="tr-table-box">
|
<tr class="tr-table-box">
|
||||||
<td class="tr-table-rt"> [[ remainedDays(client.expiryTime) ]] </td>
|
<td class="tr-table-rt"> [[ IntlUtil.formatRelativeTime(client.expiryTime) ]] </td>
|
||||||
<td class="infinite-bar tr-table-bar">
|
<td class="infinite-bar tr-table-bar">
|
||||||
<a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
|
<a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
|
||||||
</td>
|
</td>
|
||||||
|
|
@ -136,18 +128,10 @@
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
|
<a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
|
||||||
<template slot="content">
|
<template slot="content">
|
||||||
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
|
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
|
||||||
</span>
|
<span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
|
||||||
<span v-else>
|
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
|
||||||
[[ DateUtil.formatMillis(client._expiryTime) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
|
|
||||||
</template>
|
|
||||||
</span>
|
|
||||||
</template>
|
</template>
|
||||||
<a-tag :style="{ minWidth: '50px', border: 'none' }" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
|
<a-tag :style="{ minWidth: '50px', border: 'none' }" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ IntlUtil.formatRelativeTime(client.expiryTime) ]] </a-tag>
|
||||||
</a-popover>
|
</a-popover>
|
||||||
<a-tag v-else :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)" :style="{ border: 'none' }" class="infinite-tag">
|
<a-tag v-else :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)" :style="{ border: 'none' }" class="infinite-tag">
|
||||||
<svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
|
<svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
|
||||||
|
|
@ -232,20 +216,12 @@
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<template v-if="client.expiryTime !=0 && client.reset >0">
|
<template v-if="client.expiryTime !=0 && client.reset >0">
|
||||||
<td width="80px" :style="{ margin: '0', textAlign: 'right', fontSize: '1em' }"> [[ remainedDays(client.expiryTime) ]] </td>
|
<td width="80px" :style="{ margin: '0', textAlign: 'right', fontSize: '1em' }"> [[ IntlUtil.formatRelativeTime(client.expiryTime) ]] </td>
|
||||||
<td width="120px" class="infinite-bar">
|
<td width="120px" class="infinite-bar">
|
||||||
<a-popover :overlay-class-name="themeSwitcher.currentTheme">
|
<a-popover :overlay-class-name="themeSwitcher.currentTheme">
|
||||||
<template slot="content">
|
<template slot="content">
|
||||||
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
|
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
|
||||||
</span>
|
<span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
|
||||||
<span v-else>
|
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
|
||||||
[[ DateUtil.formatMillis(client._expiryTime) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
|
|
||||||
</template>
|
|
||||||
</span>
|
|
||||||
</template>
|
</template>
|
||||||
<a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
|
<a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
|
||||||
</a-popover>
|
</a-popover>
|
||||||
|
|
@ -256,18 +232,10 @@
|
||||||
<td colspan="3" :style="{ textAlign: 'center' }">
|
<td colspan="3" :style="{ textAlign: 'center' }">
|
||||||
<a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
|
<a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
|
||||||
<template slot="content">
|
<template slot="content">
|
||||||
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
|
<span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
|
||||||
</span>
|
<span v-else>[[ IntlUtil.formatDate(client._expiryTime) ]]</span>
|
||||||
<span v-else>
|
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
|
||||||
[[ DateUtil.formatMillis(client._expiryTime) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
|
|
||||||
</template>
|
|
||||||
</span>
|
|
||||||
</template>
|
</template>
|
||||||
<a-tag :style="{ minWidth: '50px', border: 'none' }" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
|
<a-tag :style="{ minWidth: '50px', border: 'none' }" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ IntlUtil.formatRelativeTime(client.expiryTime) ]] </a-tag>
|
||||||
</a-popover>
|
</a-popover>
|
||||||
<a-tag v-else :color="client.enable ? 'purple' : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'" class="infinite-tag">
|
<a-tag v-else :color="client.enable ? 'purple' : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'" class="infinite-tag">
|
||||||
<svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
|
<svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
|
||||||
|
|
@ -289,12 +257,7 @@
|
||||||
</template>
|
</template>
|
||||||
<template slot="createdAt" slot-scope="text, client, index">
|
<template slot="createdAt" slot-scope="text, client, index">
|
||||||
<template v-if="client.created_at">
|
<template v-if="client.created_at">
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
[[ IntlUtil.formatDate(client.created_at) ]]
|
||||||
[[ DateUtil.formatMillis(client.created_at) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(client.created_at)) ]]
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
-
|
-
|
||||||
|
|
@ -302,12 +265,7 @@
|
||||||
</template>
|
</template>
|
||||||
<template slot="updatedAt" slot-scope="text, client, index">
|
<template slot="updatedAt" slot-scope="text, client, index">
|
||||||
<template v-if="client.updated_at">
|
<template v-if="client.updated_at">
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
[[ IntlUtil.formatDate(client.updated_at) ]]
|
||||||
[[ DateUtil.formatMillis(client.updated_at) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(client.updated_at)) ]]
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
-
|
-
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@
|
||||||
<br v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
|
<br v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
|
||||||
<span v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
|
<span v-if="dbInbound.lastTrafficResetTime && dbInbound.lastTrafficResetTime > 0">
|
||||||
<strong>{{ i18n "pages.inbounds.lastReset" }}:</strong>
|
<strong>{{ i18n "pages.inbounds.lastReset" }}:</strong>
|
||||||
<span v-if="datepicker == 'gregorian'">[[
|
<span v-if="datepicker == 'gregorian'">[[ IntlUtil.formatDate(dbInbound.lastTrafficResetTime) ]]</span>
|
||||||
moment(dbInbound.lastTrafficResetTime).format('YYYY-MM-DD HH:mm:ss') ]]</span>
|
|
||||||
<span v-else>[[ DateUtil.convertToJalalian(moment(dbInbound.lastTrafficResetTime)) ]]</span>
|
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}
|
{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}
|
||||||
|
|
|
||||||
|
|
@ -384,15 +384,12 @@
|
||||||
</template>
|
</template>
|
||||||
<template slot="expiryTime" slot-scope="text, dbInbound">
|
<template slot="expiryTime" slot-scope="text, dbInbound">
|
||||||
<a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
|
<a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
|
||||||
<template slot="content" v-if="app.datepicker === 'gregorian'">
|
<template slot="content">
|
||||||
[[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
|
[[ IntlUtil.formatDate(dbInbound.expiryTime) ]]
|
||||||
</template>
|
|
||||||
<template v-else slot="content">
|
|
||||||
[[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
|
|
||||||
</template>
|
</template>
|
||||||
<a-tag :style="{ minWidth: '50px' }"
|
<a-tag :style="{ minWidth: '50px' }"
|
||||||
:color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
|
:color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
|
||||||
[[ remainedDays(dbInbound._expiryTime) ]]
|
[[ IntlUtil.formatRelativeTime(dbInbound._expiryTime) ]]
|
||||||
</a-tag>
|
</a-tag>
|
||||||
</a-popover>
|
</a-popover>
|
||||||
<a-tag v-else color="purple" class="infinite-tag">
|
<a-tag v-else color="purple" class="infinite-tag">
|
||||||
|
|
@ -549,12 +546,7 @@
|
||||||
<td>
|
<td>
|
||||||
<a-tag :style="{ minWidth: '50px', textAlign: 'center' }"
|
<a-tag :style="{ minWidth: '50px', textAlign: 'center' }"
|
||||||
v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
|
v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
[[ IntlUtil.formatDate(dbInbound.expiryTime) ]]
|
||||||
[[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
|
|
||||||
</template>
|
|
||||||
</a-tag>
|
</a-tag>
|
||||||
<a-tag v-else :style="{ textAlign: 'center' }" color="purple" class="infinite-tag">
|
<a-tag v-else :style="{ textAlign: 'center' }" color="purple" class="infinite-tag">
|
||||||
<svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
|
<svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
|
||||||
|
|
@ -1407,13 +1399,6 @@
|
||||||
if (remainedSeconds >= resetSeconds) return 0;
|
if (remainedSeconds >= resetSeconds) return 0;
|
||||||
return 100 * (1 - (remainedSeconds / resetSeconds));
|
return 100 * (1 - (remainedSeconds / resetSeconds));
|
||||||
},
|
},
|
||||||
remainedDays(expTime) {
|
|
||||||
if (expTime == 0) return null;
|
|
||||||
if (expTime < 0) return TimeFormatter.formatSecond(expTime / -1000);
|
|
||||||
now = new Date().getTime();
|
|
||||||
if (expTime < now) return '{{ i18n "depleted" }}';
|
|
||||||
return TimeFormatter.formatSecond((expTime - now) / 1000);
|
|
||||||
},
|
|
||||||
statsExpColor(dbInbound, email) {
|
statsExpColor(dbInbound, email) {
|
||||||
if (email.length == 0) return '#7a316f';
|
if (email.length == 0) return '#7a316f';
|
||||||
clientStats = dbInbound.clientStats.find(stats => stats.email === email);
|
clientStats = dbInbound.clientStats.find(stats => stats.email === email);
|
||||||
|
|
@ -1458,10 +1443,7 @@
|
||||||
formatLastOnline(email) {
|
formatLastOnline(email) {
|
||||||
const ts = this.getLastOnline(email)
|
const ts = this.getLastOnline(email)
|
||||||
if (!ts) return '-'
|
if (!ts) return '-'
|
||||||
if (this.datepicker === 'gregorian') {
|
return IntlUtil.formatDate(ts)
|
||||||
return DateUtil.formatMillis(ts)
|
|
||||||
}
|
|
||||||
return DateUtil.convertToJalalian(moment(ts))
|
|
||||||
},
|
},
|
||||||
isRemovable(dbInboundId) {
|
isRemovable(dbInboundId) {
|
||||||
return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInboundId)).length > 1;
|
return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInboundId)).length > 1;
|
||||||
|
|
|
||||||
|
|
@ -844,11 +844,9 @@
|
||||||
text = `<td>${log.Email}</td>`;
|
text = `<td>${log.Email}</td>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { locale, timeZone } = Intl.DateTimeFormat().resolvedOptions();
|
|
||||||
|
|
||||||
formattedLogs += `
|
formattedLogs += `
|
||||||
<tr ${outboundColor}>
|
<tr ${outboundColor}>
|
||||||
<td><b>${new Date(log.DateTime).toLocaleString(locale, { timeZone })}</b></td>
|
<td><b>${IntlUtil.formatDate(log.DateTime)}</b></td>
|
||||||
<td>${log.FromAddress}</td>
|
<td>${log.FromAddress}</td>
|
||||||
<td>${log.ToAddress}</td>
|
<td>${log.ToAddress}</td>
|
||||||
<td>${log.Inbound}</td>
|
<td>${log.Inbound}</td>
|
||||||
|
|
|
||||||
|
|
@ -199,12 +199,7 @@
|
||||||
<td>{{ i18n "pages.inbounds.createdAt" }}</td>
|
<td>{{ i18n "pages.inbounds.createdAt" }}</td>
|
||||||
<td>
|
<td>
|
||||||
<template v-if="infoModal.clientSettings && infoModal.clientSettings.created_at">
|
<template v-if="infoModal.clientSettings && infoModal.clientSettings.created_at">
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
<a-tag>[[ IntlUtil.formatDate(infoModal.clientSettings.created_at) ]]</a-tag>
|
||||||
<a-tag>[[ DateUtil.formatMillis(infoModal.clientSettings.created_at) ]]</a-tag>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<a-tag>[[ DateUtil.convertToJalalian(moment(infoModal.clientSettings.created_at)) ]]</a-tag>
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<a-tag>-</a-tag>
|
<a-tag>-</a-tag>
|
||||||
|
|
@ -215,12 +210,7 @@
|
||||||
<td>{{ i18n "pages.inbounds.updatedAt" }}</td>
|
<td>{{ i18n "pages.inbounds.updatedAt" }}</td>
|
||||||
<td>
|
<td>
|
||||||
<template v-if="infoModal.clientSettings && infoModal.clientSettings.updated_at">
|
<template v-if="infoModal.clientSettings && infoModal.clientSettings.updated_at">
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
<a-tag>[[ IntlUtil.formatDate(infoModal.clientSettings.updated_at) ]]</a-tag>
|
||||||
<a-tag>[[ DateUtil.formatMillis(infoModal.clientSettings.updated_at) ]]</a-tag>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<a-tag>[[ DateUtil.convertToJalalian(moment(infoModal.clientSettings.updated_at)) ]]</a-tag>
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<a-tag>-</a-tag>
|
<a-tag>-</a-tag>
|
||||||
|
|
@ -282,12 +272,7 @@
|
||||||
<td>
|
<td>
|
||||||
<template v-if="infoModal.clientSettings.expiryTime > 0">
|
<template v-if="infoModal.clientSettings.expiryTime > 0">
|
||||||
<a-tag :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)">
|
<a-tag :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)">
|
||||||
<template v-if="app.datepicker === 'gregorian'">
|
[[ IntlUtil.formatDate(infoModal.clientSettings.expiryTime) ]]
|
||||||
[[ DateUtil.formatMillis(infoModal.clientSettings.expiryTime) ]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[ DateUtil.convertToJalalian(moment(infoModal.clientSettings.expiryTime)) ]]
|
|
||||||
</template>
|
|
||||||
</a-tag>
|
</a-tag>
|
||||||
</template>
|
</template>
|
||||||
<a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="green">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}
|
<a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="green">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}
|
||||||
|
|
|
||||||
|
|
@ -141,17 +141,7 @@
|
||||||
<a-descriptions-item
|
<a-descriptions-item
|
||||||
label='{{ i18n "lastOnline" }}'>
|
label='{{ i18n "lastOnline" }}'>
|
||||||
<template v-if="app.lastOnlineMs > 0">
|
<template v-if="app.lastOnlineMs > 0">
|
||||||
<template
|
[[ IntlUtil.formatDate(app.lastOnlineMs) ]]
|
||||||
v-if="app.datepicker === 'gregorian'">
|
|
||||||
[[
|
|
||||||
DateUtil.formatMillis(app.lastOnlineMs)
|
|
||||||
]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[
|
|
||||||
DateUtil.convertToJalalian(moment(app.lastOnlineMs))
|
|
||||||
]]
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<span>-</span>
|
<span>-</span>
|
||||||
|
|
@ -163,17 +153,7 @@
|
||||||
{{ i18n "subscription.noExpiry" }}
|
{{ i18n "subscription.noExpiry" }}
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<template
|
[[ IntlUtil.formatDate(app.expireMs) ]]
|
||||||
v-if="app.datepicker === 'gregorian'">
|
|
||||||
[[
|
|
||||||
DateUtil.formatMillis(app.expireMs)
|
|
||||||
]]
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
[[
|
|
||||||
DateUtil.convertToJalalian(moment(app.expireMs))
|
|
||||||
]]
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
</a-descriptions-item>
|
</a-descriptions-item>
|
||||||
</a-descriptions>
|
</a-descriptions>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue