修复字节大小显示问题，之前是1000进制现在改为1024进制

proxyee-down-org · Nov 1, 2018 · 99cbab9 · 99cbab9
1 parent c36a5c9
commit 99cbab9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/front/src/components/Table/index.vue b/front/src/components/Table/index.vue
@@ -32,9 +32,9 @@
                 @on-change="toggleAll"></Checkbox>
             </div>
             <div class="td">{{ task.response.fileName }}</div>
-            <div class="td">{{ task.response.totalSize?$numeral(task.response.totalSize).format('0.000 ib'):$t('tasks.unknowLeft') }}</div>
+            <div class="td">{{ task.response.totalSize?$numeral(task.response.totalSize).format('0.00 ib'):$t('tasks.unknowLeft') }}</div>
             <div class="td">{{ calcProgress(task) }}</div>
-            <div class="td">{{ $numeral(task.info.speed).format('0.000 ib') }}/S</div>
+            <div class="td">{{ $numeral(task.info.speed).format('0.00 ib') }}/S</div>
             <div class="td">{{ calcStatus(task) }}</div>
             <div class="td">
               <Icon v-if="task.info.status === 1"
@@ -75,15 +75,15 @@
                   </p>
                   <p>
                     <b>{{ $t('tasks.fileSize') }}：</b>
-                    <span>{{ $numeral(task.response.totalSize).format('0.000 ib') }}</span>
+                    <span>{{ $numeral(task.response.totalSize).format('0.00 ib') }}</span>
                   </p>
                   <p>
                     <b>{{ $t('tasks.connections') }}：</b>
                     <span>{{ task.config.connections }}</span>
                   </p>
                   <p>
                     <b>{{ $t('tasks.downloadSpeed') }}：</b>
-                    <span>{{ $numeral(task.info.speed).format('0.000 ib') }}/S</span>
+                    <span>{{ $numeral(task.info.speed).format('0.00 ib') }}/S</span>
                   </p>
                   <p>
                     <b>{{ $t('tasks.status') }}：</b>

diff --git a/front/src/main.js b/front/src/main.js
@@ -59,7 +59,17 @@ Vue.prototype.$http.interceptors.response.use(
   }
 )
 
+//去除字节大小格式化后的i字符
+const format = numeral.prototype.constructor.fn.format
+numeral.prototype.constructor.fn.format = function(fmt) {
+  let result = format.call(this, fmt)
+  if (/^.*ib$/.test(fmt)) {
+    result = result.replace('i', '')
+  }
+  return result
+}
 Vue.prototype.$numeral = numeral
+
 Date.prototype.format = function(fmt) {
   var o = {
     'M+': this.getMonth() + 1, // Month

diff --git a/front/src/views/About.vue b/front/src/views/About.vue
@@ -111,7 +111,7 @@
         <Circle :percent="updateInfo.progress"
           :size="150">
           <h1>{{ updateInfo.progress.toFixed(2) }}%</h1>
-          <p>{{ $numeral(updateInfo.speed).format('0.000 ib') }}/S</p>
+          <p>{{ $numeral(updateInfo.speed).format('0.00 ib') }}/S</p>
         </Circle>
       </Spin>