Browse Source

fix: 定期任务未加载时,显示空的时间轴并能上下滑动

develop
aBin 4 years ago
parent
commit
ce380933f8
  1. 3
      CHANGELOG.md
  2. 1
      src/components/TimeLine/TimeLine.vue
  3. 86
      src/components/TimeLine/component/TimeBox.vue

3
CHANGELOG.md

@ -1,4 +1,4 @@
# 0.1.0 (2021-08-09) # 0.1.0 (2021-08-10)
### 🌟 新功能 ### 🌟 新功能
范围|描述|commitId 范围|描述|commitId
@ -75,6 +75,7 @@
- | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313) - | 任务开始时间延迟插件 | [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) - | 修改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) - | 修改报错 | [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) - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
- | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c) - | 定期任务接口 | [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) - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)

1
src/components/TimeLine/TimeLine.vue

@ -56,6 +56,7 @@ export default {
// //
async handleScrollTop() { async handleScrollTop() {
console.log('this.topEnd: ', this.topEnd);
if (this.topEnd) return; if (this.topEnd) return;
const startTime = this.tasks[0].planStart - 0; const startTime = this.tasks[0].planStart - 0;
if (this.tasks[0].plugins && this.tasks[0].plugins.length === 0 && !this.topEnd) { if (this.tasks[0].plugins && this.tasks[0].plugins.length === 0 && !this.topEnd) {

86
src/components/TimeLine/component/TimeBox.vue

@ -1,55 +1,61 @@
<template> <template>
<view class="column"> <view class="column">
<view :key="index" v-for="(task, index) in tasks"> <view v-if="tasks && tasks.length">
<view class="flex"> <view :key="index" v-for="(task, index) in tasks">
<TimeStatus :task="task" /> <view class="flex">
<TimeStatus :task="task" />
<view class="flex items-center justify-between flex-1 ml-2 task-column"> <view class="flex items-center justify-between flex-1 ml-2 task-column">
<view>{{ $moment(+task.planStart).format(startTimeFormat) }}</view> <view>{{ $moment(+task.planStart).format(startTimeFormat) }}</view>
<!-- 任务功能菜单 --> <!-- 任务功能菜单 -->
<TaskTools /> <TaskTools />
</view>
</view> </view>
</view> <view class="border-l-2 border-gray-300 plugin">
<view class="border-l-2 border-gray-300 plugin"> <view class="ml-3 overflow-hidden shadow-lg task-box">
<view class="ml-3 overflow-hidden shadow-lg task-box"> <u-card
<u-card :show-foot="false"
:show-foot="false" :show-head="false"
:show-head="false" :style="{ height: setHeight(task.panel) }"
:style="{ height: setHeight(task.panel) }" @click="onClickTask(+task.planStart)"
@click="onClickTask(+task.planStart)" class="h-16"
class="h-16" margin="0"
margin="0" >
v-if="task.plugins && task.plugins.length" <!-- v-if="task.plugins && task.plugins.length" -->
> <!-- 任务面板插件 -->
<!-- 任务面板插件 --> <view slot="body">
<view slot="body"> <!-- TODO: 逻辑不完善 -->
<!-- TODO: 逻辑不完善 --> <view v-if="!task.plugins.length">
<view v-if="!task.plugins.length"> <skeleton :banner="false" :loading="true" :row="2" animate class="mt-2 u-line-2 skeleton"></skeleton>
<skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton> </view>
</view>
<view class="p-0 u-col-between" v-else> <view class="p-0 u-col-between" v-else>
<view :key="pIndex" v-for="(row, pIndex) in task.plugins"> <view :key="pIndex" v-for="(row, pIndex) in task.plugins">
<view class="grid gap-2" v-if="row.length"> <view class="grid gap-2" v-if="row.length">
<Plugin <Plugin
:class="getClass(plugin.col, plugin.row)" :class="getClass(plugin.col, plugin.row)"
:task="task" :task="task"
:key="plugin.pluginTaskId" :key="plugin.pluginTaskId"
:plugin-task-id="plugin.pluginTaskId" :plugin-task-id="plugin.pluginTaskId"
:plugin-id="plugin.pluginId" :plugin-id="plugin.pluginId"
:param="plugin.param" :param="plugin.param"
:style-type="styleType || 0" :style-type="styleType || 0"
v-for="plugin in row" v-for="plugin in row"
/> />
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </u-card>
</u-card> </view>
</view> </view>
</view> </view>
</view> </view>
<view v-else class="flex flex-row items-center ml-1">
<u-icon name="plus-circle" color="#2979ff" size="40" class="mr-2"></u-icon>
新建任务
</view>
<!-- 局部弹框操作栏 --> <!-- 局部弹框操作栏 -->
<Tips /> <Tips />
</view> </view>

Loading…
Cancel
Save