fix: 切换到默认项目角色没有激活状态的bug

4 years ago · 438d448497
4 changed files with 37 additions and 70 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-# 0.1.0 (2021-08-11)
+# 0.1.0 (2021-08-12)

 ### 🌟 新功能
 范围|描述|commitId
@ -14,6 +14,7 @@
 task status | 任务状态切换未完 | 7ffd135
 - | ws storage | 21b3a06
 - | 上传逻辑变化 | 3ff1dc2
+ - | 任务状态时间显示 | 56f5183
 - | 任务进行中状态数字 | 27b7326
 - | 全局插件及默认插件位置修改 | 6c80d08
 - | 向右箭头图标变化 | 8e9ca55
@ -22,6 +23,7 @@
 - | 定期任务面板骨架屏添加 | b2698c0
 富文本插件 | 富文本插件demo测试 | ed3d644
 - | 导入wbs | 1224fcb
+ - | 导入项目,更新项目 | 5e06adf
 - | 导入项目后提示并打开项目详情页 | 410f527
 - | 引入dayjs | 29b8b93
 - | 提交到本地 | 9cbe411
@ -107,38 +109,6 @@
 - | 角色栏修改 | 19228d6
 - | 解决时间轴报错 | da1eece
 - | 骨架屏替换 | e9fdd71
- ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343)
- plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
- project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
- roles | 修复默认显示不是我的角色的问题 | [b69f94f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b69f94f)
- role | 切换角色的逻辑修正完善 | [4ae534f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4ae534f)
- task任务逻辑完善 | 减少初始global及regular的不必要请求 | [bd4bd38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/bd4bd38)
- - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4090d89)
- - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d533a01)
- - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e)
- - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313)
- - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a)
- - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d)
- - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2)
- - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
- - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7091789)
- - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
- - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
- - | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093)
- - | 平车演示临时去掉项目快捷方式的toast提示 | [e0b2c23](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e0b2c23)
- - | 手动展开日常任务 | [0a4a622](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0a4a622)
- - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
- - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
- - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
- - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
- - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
- - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46)
- - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4)
- - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
- - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
- - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
- - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
- - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71)


 ### 📝 文档
@ -207,3 +177,4 @@
 - | style:index | 978f272
 - | !2 基础模板v1.1.0 | f5e61dd
 - | init | c0f1deb
+
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@ -3,12 +3,14 @@
    <view class="home-box u-skeleton">
      <scroll-view :enable-flex="true" :scroll-left="scrollLeft" :throttle="false" scroll-with-animation scroll-x>
        <view class="tab-box">
+          <!-- 角色项 -->
          <view :key="index" @click="changeRole(item.id, index)" class="tab-item" v-for="(item, index) in roles">
            <view :class="setColor(item.mine, item.id)" class="tab-children u-skeleton-fillet u-font-14">{{ item.name }}</view>
          </view>
        </view>
      </scroll-view>
    </view>
+    <!-- 骨架屏 -->
    <u-skeleton :animation="true" :loading="loading" bg-color="#fff"></u-skeleton>
  </view>
 </template>
@ -20,25 +22,13 @@ export default {
  name: 'Roles',
  data() {
    return {
-      tabIndex: 0, //当前访问的 index 默认为0
-      tabList: [], //tab dom节点集合
-      scrollLeft: 0, //scrollview需要滚动的距离
+      tabIndex: 0, // 当前访问的 index 默认为0
+      tabList: [], // tab dom节点集合
+      scrollLeft: 0, // scrollview需要滚动的距离
      loading: false, // 是否显示骨架屏组件
      roles: [
-        {
-          id: 1,
-          name: '项目经理',
-          mine: 0,
-          pm: 1,
-          sequence: 1,
-        },
-        {
-          id: 2,
-          name: '运维',
-          mine: 0,
-          pm: 0,
-          sequence: 2,
-        },
+        { id: 1, name: '项目经理', mine: 0, pm: 1, sequence: 1 },
+        { id: 2, name: '运维', mine: 0, pm: 0, sequence: 2 },
      ],
    };
  },
@ -131,15 +121,12 @@ export default {
    // 设置文字颜色
    setColor(mine, id) {
      const { roleId } = this;
-      if (mine === '1' && roleId === id) {
-        return 'default-tab-choice';
-      }
-      if (mine === '1' && roleId !== id) {
-        return 'default-tab-item';
-      }
-      if (mine === '0' && roleId === id) {
-        return 'tab-choice';
-      }
+      // 是 我的角色 && 当前展示
+      if (+mine === 1 && roleId === id) return 'default-tab-choice';
+      // 是 我的角色 && 当前不展示
+      if (+mine === 1 && roleId !== id) return 'default-tab-item';
+      // 不是我的 && 当前展示
+      if (+mine === 0 && roleId === id) return 'tab-choice';
    },
  },
 };
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@ -2,7 +2,7 @@
  <view class="u-font-14">
    <view class="flex items-center justify-center rounded-full icon-column" :style="{ color: orderStyle.color }" @tap="changeStatus">
      <u-circle-progress
-        :percent="orderStyle.persent"
+        :percent="+orderStyle.persent"
        :active-color="orderStyle.color"
        bg-color="rgba(255,255,255,0)"
        border-width="4"
@ -141,7 +141,6 @@ export default {
        }
        const { realStart, planDuration } = this.task;
        const leftTime = +realStart + +planDuration - Date.now(); // 剩余时间
-        console.log('leftTime: ', leftTime, this.$moment.duration(leftTime));
        if (leftTime < 0) return 0;
        const { years, months, days, hours, minutes, seconds, milliseconds } = this.$moment.duration(leftTime);
        let num = 0;
@ -165,10 +164,17 @@ export default {
        } else if (milliseconds > 0) {
          num = milliseconds;
          time = 16;
+        } else {
+          time = null;
        }
-        this.timer = setTimeout(() => {
-          this.computeDurationText();
-        }, time);
+        console.log('time', time); // DEBUG:
+        this.$nextTick(() => {
+          if (!time) return;
+          this.timer = setTimeout(() => {
+            this.computeDurationText();
+          }, time);
+        });
+
        return num;
      } catch (error) {
        console.error('🚀 ~ file: TimeStatus.vue ~ line 174 ~ computeDurationText ~ error', error);
--- a/src/components/Title/Title.vue
+++ b/src/components/Title/Title.vue
@ -7,19 +7,22 @@
      <view class="mr-2" slot="right">
        <u-icon class="m-1" name="xuanzhong2" custom-prefix="custom-icon" size="20px" @click="lwbs"></u-icon>
        <u-icon class="m-1" name="shuaxin1" custom-prefix="custom-icon" size="20px" @click="projectOverview"></u-icon>
-        <u-icon class="m-1" name="home" custom-prefix="custom-icon" size="20px" @click="statistics"></u-icon>
+        <u-icon class="m-1" name="home" custom-prefix="custom-icon" size="20px" @click="openIndex"></u-icon>
        <u-icon class="m-1" name="xuanxiang" custom-prefix="custom-icon" size="20px" @click="operation"></u-icon>
      </view>
    </u-navbar>
  </view>
 </template>
 <script>
-import { mapState } from 'vuex';
+import { mapGetters, mapState } from 'vuex';

 export default {
  name: 'ProjectTitle',

-  computed: mapState('project', ['project']),
+  computed: {
+    ...mapState('project', ['project']),
+    ...mapGetters('user', ['userId']),
+  },

  methods: {
    // LWBS提示
@ -30,9 +33,9 @@ export default {
    projectOverview() {
      // this.$t.ui.showToast('项目概览');
    },
-    //统计
-    statistics() {
-      // this.$t.ui.showToast('统计');
+    // 回到首页
+    openIndex() {
+      this.$u.route('/', { u: this.userId });
    },
    //操作
    operation() {