gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 按到期时间排序没有时间应该排到最后

Browse Source
This commit is contained in:
kuaifan 2021-12-24 00:23:53 +08:00
parent a3a9032af7
commit aad3a4e453
8 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.4.27", "version": "0.4.28",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"main": "main.js", "main": "main.js",
"license": "MIT", "license": "MIT",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.4.27", "version": "0.4.28",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"scripts": { "scripts": {
"start": "./cmd dev", "start": "./cmd dev",

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/js/build/274.js → public/js/build/747.js vendored
View File

File diff suppressed because one or more lines are too long

0
public/js/build/274.js.LICENSE.txt → public/js/build/747.js.LICENSE.txt
View File

15
resources/assets/js/pages/manage/components/ProjectList.vue
View File

@ -584,7 +584,10 @@ export default {
if (sortField == 'level') { if (sortField == 'level') {
return a.p_level - b.p_level; return a.p_level - b.p_level;
} else if (sortField == 'end_at') { } else if (sortField == 'end_at') {
return $A.Date(a.end_at) - $A.Date(b.end_at); if (a.end_at == b.end_at) {
return a.p_level - b.p_level;
}
return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59");
} }
}); });
}, },
@ -614,7 +617,10 @@ export default {
if (sortField == 'level') { if (sortField == 'level') {
return a.p_level - b.p_level; return a.p_level - b.p_level;
} else if (sortField == 'end_at') { } else if (sortField == 'end_at') {
return $A.Date(a.end_at) - $A.Date(b.end_at); if (a.end_at == b.end_at) {
return a.p_level - b.p_level;
}
return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59");
} }
}); });
}, },
@ -644,7 +650,10 @@ export default {
if (sortField == 'level') { if (sortField == 'level') {
return a.p_level - b.p_level; return a.p_level - b.p_level;
} else if (sortField == 'end_at') { } else if (sortField == 'end_at') {
return $A.Date(a.end_at) - $A.Date(b.end_at); if (a.end_at == b.end_at) {
return a.p_level - b.p_level;
}
return $A.Date(a.end_at || "2099-12-31 23:59:59") - $A.Date(b.end_at || "2099-12-31 23:59:59");
} }
}); });
}, },

2
resources/assets/sass/pages/components/project-list.scss vendored
View File

@ -700,6 +700,8 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
display: flex;
align-items: center;
> li { > li {
list-style: none; list-style: none;
display: inline-block; display: inline-block;