haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-11 03:41:12 +00:00
Code Issues Releases Wiki Activity

Compare initial size

Browse Source
This commit is contained in:
zxj96
2019-05-30 14:31:24 +08:00
parent 4c68ee85f3
commit 3fc5137409
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/models/dirent.js
View File

@@ -13,6 +13,7 @@ class Dirent {
this.isSelected = false; // is check or not this.isSelected = false; // is check or not
this.starred = json.starred || false; this.starred = json.starred || false;
if (json.type === 'file') { if (json.type === 'file') {
this.Initialsize = json.size;
this.size = Utils.bytesToSize(json.size); this.size = Utils.bytesToSize(json.size);
this.is_locked = json.is_locked || false; this.is_locked = json.is_locked || false;
this.lock_time = json.lock_time || ''; this.lock_time = json.lock_time || '';

1
frontend/src/models/repo.js
View File

@@ -6,6 +6,7 @@ class Repo {
this.repo_name = object.repo_name; this.repo_name = object.repo_name;
this.permission = object.permission; this.permission = object.permission;
this.size = Utils.bytesToSize(object.size); this.size = Utils.bytesToSize(object.size);
this.Initialsize = object.size
this.owner_name = object.owner_name; this.owner_name = object.owner_name;
this.owner_email = object.owner_email; this.owner_email = object.owner_email;
this.owner_contact_email = object.owner_contact_email; this.owner_contact_email = object.owner_contact_email;

33
frontend/src/utils/utils.js
View File

@@ -622,9 +622,7 @@ export const Utils = {
let result = _this.compareTwoWord(a.repo_name, b.repo_name); let result = _this.compareTwoWord(a.repo_name, b.repo_name);
return result; return result;
} }
return a.Initialsize < b.Initialsize ? -1 : 1;
let result = _this.compareTwoSize(a.size, b.size);
return result;
}; };
break; break;
case 'size-desc': case 'size-desc':
@@ -634,8 +632,7 @@ export const Utils = {
return -result; return -result;
} }
let result = _this.compareTwoSize(a.size, b.size); return a.Initialsize < b.Initialsize ? 1 : -1;
return -result;
}; };
break; break;
} }
@@ -676,10 +673,8 @@ export const Utils = {
if (a.type == 'dir' && b.type == 'dir') { if (a.type == 'dir' && b.type == 'dir') {
let result = _this.compareTwoWord(a.name, b.name); let result = _this.compareTwoWord(a.name, b.name);
return result; return result;
} else {
let result = _this.compareTwoSize(a.size, b.size);
return result;
} }
return a.Initialsize < b.Initialsize ? -1 : 1;
}; };
break; break;
case 'size-desc': case 'size-desc':
@@ -687,10 +682,8 @@ export const Utils = {
if (a.type == 'dir' && b.type == 'dir') { if (a.type == 'dir' && b.type == 'dir') {
let result = _this.compareTwoWord(a.name, b.name); let result = _this.compareTwoWord(a.name, b.name);
return -result; return -result;
} else {
let result = _this.compareTwoSize(a.size, b.size);
return -result;
} }
return a.Initialsize < b.Initialsize ? 1 : -1;
}; };
break; break;
} }
@@ -707,24 +700,6 @@ export const Utils = {
return items; return items;
}, },
compareTwoSize: function(a, b) {
let suffix = /[A-Za-z]+/g;
let fileSizeName = /\d+(\.\d+)?/g;
let sizes = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
let aSuffixName = a.match(suffix)[0];
let bSuffixName = b.match(suffix)[0];
let aIndex = sizes.indexOf(aSuffixName);
let bIndex = sizes.indexOf(bSuffixName);
let aSizeName = a.match(fileSizeName)[0];
let bSizeName = b.match(fileSizeName)[0];
let aBytes = aSizeName * (1000 ** aIndex);
let bBytes = bSizeName * (1000 ** bIndex);
return aBytes < bBytes ? -1 : 1;
},
changeMarkdownNodes: function(nodes, fn) { changeMarkdownNodes: function(nodes, fn) {
nodes.map((item) => { nodes.map((item) => {
fn(item); fn(item);