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

kuaifan · Dec 23, 2021 · 6374365 · 6374365
1 parent a3a9032
commit 6374365
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.4.27",
+    "version": "0.4.28",
     "description": "DooTask is task management system.",
     "main": "main.js",
     "license": "MIT",

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

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/build/274.js → public/js/build/747.js b/public/js/build/274.js → public/js/build/747.js
diff --git a/public/js/build/274.js.LICENSE.txt → public/js/build/747.js.LICENSE.txt b/public/js/build/274.js.LICENSE.txt → public/js/build/747.js.LICENSE.txt
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -584,7 +584,10 @@ export default {
                 if (sortField == 'level') {
                     return a.p_level - b.p_level;
                 } 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') {
                     return a.p_level - b.p_level;
                 } 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') {
                     return a.p_level - b.p_level;
                 } 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");
                 }
             });
         },

diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
@@ -698,8 +698,10 @@
                         > ul {
                             height: 32px;
                             overflow: hidden;
-                            text-overflow:ellipsis;
+                            text-overflow: ellipsis;
                             white-space: nowrap;
+                            display: flex;
+                            align-items: center;
                             > li {
                                 list-style: none;
                                 display: inline-block;