TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-25 03:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

将部分MB、GB...改成MiB、GiB...

Browse Source
This commit is contained in:
GoEdgeLab
2023-12-03 11:30:02 +08:00
parent 89255cb437
commit c938df5b7e
12 changed files with 378 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/utils/numberutils/utils.go
View File

@@ -30,17 +30,17 @@ func FormatBytes(bytes int64) string {
if bytes < Pow1024(1) { if bytes < Pow1024(1) {
return FormatInt64(bytes) + "B" return FormatInt64(bytes) + "B"
} else if bytes < Pow1024(2) { } else if bytes < Pow1024(2) {
return TrimZeroSuffix(fmt.Sprintf("%.2fKB", float64(bytes)/float64(Pow1024(1)))) return TrimZeroSuffix(fmt.Sprintf("%.2fKiB", float64(bytes)/float64(Pow1024(1))))
} else if bytes < Pow1024(3) { } else if bytes < Pow1024(3) {
return TrimZeroSuffix(fmt.Sprintf("%.2fMB", float64(bytes)/float64(Pow1024(2)))) return TrimZeroSuffix(fmt.Sprintf("%.2fMiB", float64(bytes)/float64(Pow1024(2))))
} else if bytes < Pow1024(4) { } else if bytes < Pow1024(4) {
return TrimZeroSuffix(fmt.Sprintf("%.2fGB", float64(bytes)/float64(Pow1024(3)))) return TrimZeroSuffix(fmt.Sprintf("%.2fGiB", float64(bytes)/float64(Pow1024(3))))
} else if bytes < Pow1024(5) { } else if bytes < Pow1024(5) {
return TrimZeroSuffix(fmt.Sprintf("%.2fTB", float64(bytes)/float64(Pow1024(4)))) return TrimZeroSuffix(fmt.Sprintf("%.2fTiB", float64(bytes)/float64(Pow1024(4))))
} else if bytes < Pow1024(6) { } else if bytes < Pow1024(6) {
return TrimZeroSuffix(fmt.Sprintf("%.2fPB", float64(bytes)/float64(Pow1024(5)))) return TrimZeroSuffix(fmt.Sprintf("%.2fPiB", float64(bytes)/float64(Pow1024(5))))
} else { } else {
return TrimZeroSuffix(fmt.Sprintf("%.2fEB", float64(bytes)/float64(Pow1024(6)))) return TrimZeroSuffix(fmt.Sprintf("%.2fEiB", float64(bytes)/float64(Pow1024(6))))
} }
} }

146
web/public/js/components.js
View File

File diff suppressed because one or more lines are too long

186
web/public/js/components.src.js
View File

File diff suppressed because one or more lines are too long

12
web/public/js/components/common/size-capacity-box.js
View File

@@ -63,12 +63,12 @@ Vue.component("size-capacity-box", {
<div class="ui field"> <div class="ui field">
<select class="ui dropdown" v-model="capacity.unit" @change="change"> <select class="ui dropdown" v-model="capacity.unit" @change="change">
<option value="byte" v-if="supportedUnits.length == 0 || supportedUnits.$contains('byte')">字节</option> <option value="byte" v-if="supportedUnits.length == 0 || supportedUnits.$contains('byte')">字节</option>
<option value="kb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('kb')">KB</option> <option value="kb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('kb')">KiB</option>
<option value="mb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('mb')">MB</option> <option value="mb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('mb')">MiB</option>
<option value="gb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('gb')">GB</option> <option value="gb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('gb')">GiB</option>
<option value="tb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('tb')">TB</option> <option value="tb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('tb')">TiB</option>
<option value="pb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('pb')">PB</option> <option value="pb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('pb')">PiB</option>
<option value="eb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('eb')">EB</option> <option value="eb" v-if="supportedUnits.length == 0 || supportedUnits.$contains('eb')">EiB</option>
</select> </select>
</div> </div>
</div>` </div>`

2
web/public/js/components/plans/plan-price-view.js
View File

@@ -26,7 +26,7 @@ Vue.component("plan-price-view", {
按{{plan.bandwidthPrice.percentile}}th带宽计费 按{{plan.bandwidthPrice.percentile}}th带宽计费
<div> <div>
<div v-for="range in plan.bandwidthPrice.ranges"> <div v-for="range in plan.bandwidthPrice.ranges">
<span class="small grey">{{range.minMB}} - <span v-if="range.maxMB > 0">{{range.maxMB}}MB</span><span v-else>&infin;</span>： <span v-if="range.totalPrice > 0">{{range.totalPrice}}元</span><span v-else="">{{range.pricePerMB}}元/MB</span></span> <span class="small grey">{{range.minMB}} - <span v-if="range.maxMB > 0">{{range.maxMB}}MiB</span><span v-else>&infin;</span>： <span v-if="range.totalPrice > 0">{{range.totalPrice}}元</span><span v-else="">{{range.pricePerMB}}元/MiB</span></span>
</div> </div>
</div> </div>
</div> </div>

2
web/public/js/components/server/http-access-log-config-box.js
View File

@@ -85,7 +85,7 @@ Vue.component("http-access-log-config-box", {
<label :for="'access-log-field-' + index">{{field.name}}</label> <label :for="'access-log-field-' + index">{{field.name}}</label>
</div> </div>
<p class="comment">在基础信息之外要存储的信息。 <p class="comment">在基础信息之外要存储的信息。
<span class="red" v-if="hasRequestBodyField">记录"请求Body"将会显著消耗更多的系统资源，建议仅在调试时启用，最大记录尺寸为2MB。</span> <span class="red" v-if="hasRequestBodyField">记录"请求Body"将会显著消耗更多的系统资源，建议仅在调试时启用，最大记录尺寸为2MiB。</span>
</p> </p>
</td> </td>
</tr> </tr>

12
web/public/js/utils.js
View File

@@ -124,21 +124,21 @@ window.teaweb = {
return bytes + "B"; return bytes + "B";
} }
if (bytes < Math.pow(1024, 2)) { if (bytes < Math.pow(1024, 2)) {
return (Math.round(bytes * 100 / Math.pow(1024, 1)) / 100) + "KB"; return (Math.round(bytes * 100 / Math.pow(1024, 1)) / 100) + "KiB";
} }
if (bytes < Math.pow(1024, 3)) { if (bytes < Math.pow(1024, 3)) {
return (Math.round(bytes * 100 / Math.pow(1024, 2)) / 100) + "MB"; return (Math.round(bytes * 100 / Math.pow(1024, 2)) / 100) + "MiB";
} }
if (bytes < Math.pow(1024, 4)) { if (bytes < Math.pow(1024, 4)) {
return (Math.round(bytes * 100 / Math.pow(1024, 3)) / 100) + "GB"; return (Math.round(bytes * 100 / Math.pow(1024, 3)) / 100) + "GiB";
} }
if (bytes < Math.pow(1024, 5)) { if (bytes < Math.pow(1024, 5)) {
return (Math.round(bytes * 100 / Math.pow(1024, 4)) / 100) + "TB"; return (Math.round(bytes * 100 / Math.pow(1024, 4)) / 100) + "TiB";
} }
if (bytes < Math.pow(1024, 6)) { if (bytes < Math.pow(1024, 6)) {
return (Math.round(bytes * 100 / Math.pow(1024, 5)) / 100) + "PB"; return (Math.round(bytes * 100 / Math.pow(1024, 5)) / 100) + "PiB";
} }
return (Math.round(bytes * 100 / Math.pow(1024, 6)) / 100) + "EB"; return (Math.round(bytes * 100 / Math.pow(1024, 6)) / 100) + "EiB";
}, },
formatBits: function (bits, decimal) { formatBits: function (bits, decimal) {
bits = Math.ceil(bits); bits = Math.ceil(bits);

2
web/public/js/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
web/views/@default/clusters/cluster/node/detail.html
View File

@@ -184,9 +184,9 @@
<td>磁盘预估写入最大速度</td> <td>磁盘预估写入最大速度</td>
<td> <td>
<span v-if="node.status.diskWritingSpeedMB == 0">-</span><span v-if="node.status.diskWritingSpeedMB > 0">&gt; {{node.status.diskWritingSpeedMB}}</span> <span v-if="node.status.diskWritingSpeedMB == 0">-</span><span v-if="node.status.diskWritingSpeedMB > 0">&gt; {{node.status.diskWritingSpeedMB}}</span>
<span v-if="node.status.diskWritingSpeedMB > 1000">MB/s 极快</span> <span v-if="node.status.diskWritingSpeedMB > 1000">MiB/s 极快</span>
<span v-else-if="node.status.diskWritingSpeedMB > 150">MB/s 快</span> <span v-else-if="node.status.diskWritingSpeedMB > 150">MiB/s 快</span>
<span v-else-if="node.status.diskWritingSpeedMB > 0">MB/s 一般</span> <span v-else-if="node.status.diskWritingSpeedMB > 0">MiB/s 一般</span>
</td> </td>
</tr> </tr>
<tr> <tr>

2
web/views/@default/servers/components/cache/createPopup.html vendored
View File

@@ -67,7 +67,7 @@
<td class="color-border">缓存磁盘最小空余空间</td> <td class="color-border">缓存磁盘最小空余空间</td>
<td> <td>
<size-capacity-box :v-name="'fileMinFreeSizeJSON'" :v-count="0" :v-unit="'gb'" :key="'minFreeSizeJSON'"></size-capacity-box> <size-capacity-box :v-name="'fileMinFreeSizeJSON'" :v-count="0" :v-unit="'gb'" :key="'minFreeSizeJSON'"></size-capacity-box>
<p class="comment">缓存磁盘保留的最小空余空间，如果为0表示自动限制（目前默认保留5GB）。</p> <p class="comment">缓存磁盘保留的最小空余空间，如果为0表示自动限制（目前默认保留5GiB）。</p>
</td> </td>
</tr> </tr>
<tr> <tr>

2
web/views/@default/servers/components/cache/update.html vendored
View File

@@ -74,7 +74,7 @@
<td class="color-border">缓存磁盘最小空余空间</td> <td class="color-border">缓存磁盘最小空余空间</td>
<td> <td>
<size-capacity-box :v-name="'fileMinFreeSizeJSON'" :v-value="cachePolicy.options.minFreeSize" :key="'minFreeSizeJSON'"></size-capacity-box> <size-capacity-box :v-name="'fileMinFreeSizeJSON'" :v-value="cachePolicy.options.minFreeSize" :key="'minFreeSizeJSON'"></size-capacity-box>
<p class="comment">缓存磁盘保留的最小空余空间，如果为0表示使用默认（目前默认保留5GB）。</p> <p class="comment">缓存磁盘保留的最小空余空间，如果为0表示使用默认（目前默认保留5GiB）。</p>
</td> </td>
</tr> </tr>
<tr> <tr>

2
web/views/@default/users/update.html
View File

@@ -89,7 +89,7 @@
<option value="avg">平均带宽</option> <option value="avg">平均带宽</option>
</select> </select>
<p class="comment" v-if="user.bandwidthAlgo == 'secondly'">按在计时时间段内（5分钟）最高带宽峰值计算，比如5分钟内最高的某个时间点带宽为100Mbps，那么就认为此时间段内的峰值带宽为100Mbps。</p> <p class="comment" v-if="user.bandwidthAlgo == 'secondly'">按在计时时间段内（5分钟）最高带宽峰值计算，比如5分钟内最高的某个时间点带宽为100Mbps，那么就认为此时间段内的峰值带宽为100Mbps。</p>
<p class="comment" v-if="user.bandwidthAlgo == 'avg'">按在计时时间段内（5分钟）平均带宽计算，即此时间段内的总流量除以时间段的秒数，比如5分钟（300秒）内总流量600MB，那么带宽即为<code-label>600MB * 8bit/300s = 16Mbps</code-label>；通常平均带宽算法要比峰值带宽要少很多。</p> <p class="comment" v-if="user.bandwidthAlgo == 'avg'">按在计时时间段内（5分钟）平均带宽计算，即此时间段内的总流量除以时间段的秒数，比如5分钟（300秒）内总流量600MiB，那么带宽即为<code-label>600MiB * 8bit/300s = 16Mbps</code-label>；通常平均带宽算法要比峰值带宽要少很多。</p>
</td> </td>
</tr> </tr>
<tr> <tr>