Merge remote-tracking branch 'origin/lucky' into temp

4 years ago · ff303a94ad
5 changed files with 82 additions and 36 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -107,6 +107,38 @@
 - | 角色栏修改 | 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)


 ### 📝 文档
@ -175,4 +207,3 @@
 - | style:index | 978f272
 - | !2 基础模板v1.1.0 | f5e61dd
 - | init | c0f1deb
-
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@ -1,17 +1,5 @@
 <template>
  <view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
-    <!-- 全局提示框 -->
-    <u-alert-tips
-      class="top-0 -inset-x-0"
-      style="position: fixed !important; z-index: 999"
-      type="error"
-      :close-able="true"
-      :title="alert.title"
-      :show="alert.show"
-      :description="alert.description"
-      @close="alert.show = false"
-    ></u-alert-tips>
-
    <!-- 标题栏 -->
    <Title />

@ -40,7 +28,6 @@ export default {
    ...mapState('user', ['user', 'token']),
    ...mapState('role', ['visibleRoles', 'roleId']),
    ...mapState('task', ['timeNode', 'timeUnit', 'tasks']),
-    ...mapState('project', ['alert']),
    ...mapGetters('task', ['timeGranularity']),
  },

--- a/src/plugins/p-wbs-import/p-wbs-import.vue
+++ b/src/plugins/p-wbs-import/p-wbs-import.vue
@ -1,11 +1,14 @@
 <template>
  <view>
-    <view @tap="handleUpload">{{ task.name }}</view>
+    <view @tap="handleUpload" v-if="task.name === '导入WBS新建项目'">{{ task.name }}</view>
+    <view @tap="handleUpdate" v-if="task.name === '导入WBS更新项目'">{{ task.name }}</view>
+    <!-- 全局提示框 -->
+    <u-top-tips ref="uTips"></u-top-tips>
  </view>
 </template>

 <script>
-import { mapState, mapMutations } from 'vuex';
+import { mapGetters, mapMutations } from 'vuex';

 export default {
  name: 'p-wbs-import',
@ -19,7 +22,10 @@ export default {
    return {};
  },

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

  methods: {
    ...mapMutations('project', ['setShowAlert']),
@ -30,11 +36,51 @@ export default {
        const data = await this.$u.api.import();
        // 导入WBS成功后
        // 直接打开导入的项目
+        this.onUploadSuccess();
+        setTimeout(() => {
+          this.$u.route('/pages/project/project', {
+            u: this.userId,
+            p: data.id,
+            pname: data.pname,
+            url: data.url,
+          });
+        }, 2000);
+      } catch (error) {
+        this.onUploadError(error);
+      }
+    },
+
+    // 更新项目
+    // TODO: 更新接口没写完
+    async handleUpdate() {
+      try {
+        const data = await this.$u.api.import({ projectId: this.projectId });
        console.log('data: ', data);
+        // 导入WBS成功后
+        // 直接打开导入的项目
+        this.onUploadSuccess();
      } catch (error) {
-        this.setShowAlert(error);
+        this.onUploadError(error);
      }
    },
+
+    // 导入成功
+    onUploadSuccess() {
+      this.$refs.uTips.show({
+        title: '导入成功，即将打开新项目',
+        type: 'success',
+        duration: '3000',
+      });
+    },
+
+    // 导入失败
+    onUploadError(error) {
+      this.$refs.uTips.show({
+        title: error || '导入失败',
+        type: 'error',
+        duration: '6000',
+      });
+    },
  },
 };
 </script>
--- a/src/store/project/mutations.js
+++ b/src/store/project/mutations.js
@ -30,18 +30,6 @@ const mutations = {
    state.project.name = data;
  },

-  /**
-   * 设置alert展示消息
-   * @param { object } state
-   * @param { Boolean } event
-   */
-  setShowAlert(state, event) {
-    state.alert.description = event || '发生了点小意外';
-    state.alert.show = true;
-
-    setTimeout(() => (state.alert.show = false), 10000);
-  },
-
  /**
   * 设置小红点
   * @param { object } state
--- a/src/store/project/state.js
+++ b/src/store/project/state.js
@ -2,12 +2,6 @@
 const state = {
  project: { name: '加载中...' }, // 当前项目信息
  projects: [], // 项目列表
-  alert: {
-    // 全局提示框
-    show: false,
-    title: '',
-    description: '',
-  },
  dotList: [], // 小红点
 };