kuaifan hace 5 años
padre
commit
f0fc9bb1f0

+ 14 - 2
resources/assets/js/main/components/project/task/detail/detail.vue

@@ -24,7 +24,7 @@
                         <span>负责人:</span>
                         <em>{{detail.username}}</em>
                     </li>
-                    <li v-if="detail.follower.length > 0" class="text-follower detail-icon">
+                    <li v-if="followerLength(detail.follower) > 0" class="text-follower detail-icon">
                         <span>关注者:</span>
                         <em>
                             <Tag v-for="(fname, findex) in detail.follower" :key="findex" closable @on-close="handleTask('unattention', {username:fname,uisynch:true})">{{fname}}</Tag>
@@ -260,8 +260,20 @@
                 }
             },
 
+            followerLength(follower) {
+                if (follower instanceof Array) {
+                    return follower.length;
+                } else {
+                    return 0;
+                }
+            },
+
             haveAttention(follower) {
-                return follower.filter((uname) => { return uname == this.myUsername }).length > 0
+                if (follower instanceof Array) {
+                    return follower.filter((uname) => { return uname == this.myUsername }).length > 0
+                } else {
+                    return 0;
+                }
             },
 
             getTaskDetail() {

+ 3 - 3
resources/assets/js/main/components/project/task/logs.vue

@@ -42,9 +42,9 @@
             > li {
                 padding-top: 22px;
                 &.logs-loading {
-                    margin: 8px 0;
-                    width: 22px;
-                    height: 22px;
+                    margin: 4px 0;
+                    width: 18px;
+                    height: 18px;
                     display: flex;
                 }
                 &.logs-more {

+ 1 - 1
resources/assets/js/main/pages/project-panel.vue

@@ -152,7 +152,7 @@
             padding: 15px;
             transform: translateZ(0);
             .label-item {
-                flex-grow: 1;
+                flex-grow: 0;
                 flex-shrink: 0;
                 flex-basis: auto;
                 height: 100%;