Browse Source

fix: 时间轴上下滑动

develop
lucky 4 years ago
parent
commit
4d0ae46d45
  1. 6
      CHANGELOG.md
  2. 2
      src/components/Globals/index.vue
  3. 2
      src/components/Project/Project.vue
  4. 2
      src/components/Roles/Roles.vue
  5. 8
      src/components/TimeLine/components/TimeBox.vue
  6. 15
      src/components/TimeLine/index.vue
  7. 9
      src/pages/index/index.vue
  8. 6
      src/pages/rich-text/rich-text.vue

6
CHANGELOG.md

@ -6,6 +6,7 @@
- | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4) - | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4)
- | 角色栏实现 | [94cd671](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/94cd671) - | 角色栏实现 | [94cd671](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/94cd671)
- | 时间轴界面 | [33927e9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/33927e9) - | 时间轴界面 | [33927e9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/33927e9)
- | 提交到本地 | [9cbe411](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9cbe411)
- | db store | [6414c4f](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/6414c4f) - | db store | [6414c4f](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/6414c4f)
- | indexedDB | [687394e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/687394e) - | indexedDB | [687394e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/687394e)
富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644) 富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644)
@ -15,7 +16,11 @@
### 🎨 代码样式 ### 🎨 代码样式
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | 更新代码 | [8c27e68](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/8c27e68)
- | 更新代码 | [1f40a76](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1f40a76) - | 更新代码 | [1f40a76](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1f40a76)
- | 任务快捷方式图标增加 | [4aba872](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/4aba872)
- | 日常任务修改 | [dfa7ee2](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/dfa7ee2)
- | 图标修改 | [54bca09](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/54bca09)
- | 无基本变化 | [21ac4bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/21ac4bb) - | 无基本变化 | [21ac4bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/21ac4bb)
- | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035) - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035)
@ -43,6 +48,7 @@
### 🚀 性能优化 ### 🚀 性能优化
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | 角色栏文字颜色修改 | [215c6b3](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/215c6b3)
- | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b) - | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b)
- | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9) - | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9)
- | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504) - | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504)

2
src/components/Globals/index.vue

@ -6,7 +6,7 @@
* @LastEditTime: 2021-07-20 14:20:46 * @LastEditTime: 2021-07-20 14:20:46
--> -->
<template> <template>
<view> <view class="p-2">
<u-card :show-foot="false" :show-head="false" border-radius="25" margin="0"> <u-card :show-foot="false" :show-head="false" border-radius="25" margin="0">
<view slot="body"> <view slot="body">
<view class="u-col-between p-0 u-skeleton"> <view class="u-col-between p-0 u-skeleton">

2
src/components/Project/Project.vue

@ -1,7 +1,7 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<time-bar /> <time-bar />
<view class="container p-4"> <view class="container p-2">
<time-line /> <time-line />
</view> </view>
</view> </view>

2
src/components/Roles/Roles.vue

@ -7,7 +7,7 @@
--> -->
<template> <template>
<view class="wrap bg-white"> <view class="wrap bg-white">
<view class="px-4"> <view class="px-2">
<role-list /> <role-list />
</view> </view>
</view> </view>

8
src/components/TimeLine/components/TimeBox.vue

@ -6,8 +6,8 @@
* @LastEditTime: 2021-07-19 18:54:55 * @LastEditTime: 2021-07-19 18:54:55
--> -->
<template> <template>
<view class="px-4"> <view class="px-3 pb-10">
<view :key="item" class="mt-2" v-for="item in list"> <view :key="index" v-for="(item, index) in list">
<view class="flex items-center"> <view class="flex items-center">
<TimeStatus :status="item" /> <TimeStatus :status="item" />
<view class="flex-1 ml-2 flex justify-between items-center"> <view class="flex-1 ml-2 flex justify-between items-center">
@ -21,7 +21,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="border-l-2 border-gray-300 ml-3.5"> <view class="border-l-2 border-gray-300 ml-3.5 my-2">
<view class="ml-4 shadow-lg"> <view class="ml-4 shadow-lg">
<u-card :show-foot="false" :show-head="false" border-radius="25" class="h-16" margin="0"> <u-card :show-foot="false" :show-head="false" border-radius="25" class="h-16" margin="0">
<view slot="body"> <view slot="body">
@ -42,7 +42,7 @@ export default {
name: 'TimeBox', name: 'TimeBox',
components: { TimeStatus }, components: { TimeStatus },
data() { data() {
return { list: [0, 1, 2, 3] }; return { list: [0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3] };
}, },
}; };
</script> </script>

15
src/components/TimeLine/index.vue

@ -6,25 +6,24 @@
* @LastEditTime: 2021-07-20 14:22:11 * @LastEditTime: 2021-07-20 14:22:11
--> -->
<template> <template>
<view class="main"> <!-- <Barrier /> -->
<Barrier /> <scroll-view :scrollTop="scrollTop" :scrollY="true" :style="{ height: height }" @scroll="scroll">
<scroll-view :scrollY="true" :scrollTop="scrollTop" :style="{ height: height }" @scroll="scroll"> <!-- :style="{ height: height }" -->
<!-- <scroll-view scroll-y="true" style="height: 400px"> -->
<TimeBox /> <TimeBox />
</scroll-view> </scroll-view>
</view>
</template> </template>
<script> <script>
import Barrier from './components/Barrier.vue'; // import Barrier from './components/Barrier.vue';
import TimeBox from './components/TimeBox.vue'; import TimeBox from './components/TimeBox.vue';
export default { export default {
name: 'TimeLine', name: 'TimeLine',
components: { Barrier, TimeBox }, components: { TimeBox },
data() { data() {
return { height: '', scrollTop: 0 }; return { height: '', scrollTop: 0 };
}, },
mounted() { mounted() {
this.height = document.getElementsByClassName('main')[0].clientHeight - 30 + 'px'; this.height = document.getElementsByClassName('main')[0].clientHeight + 'px';
console.log(this.height); console.log(this.height);
}, },
methods: { methods: {

9
src/pages/index/index.vue

@ -8,10 +8,10 @@
<template> <template>
<view :style="{ height: height }" class="flex flex-col overflow-hidden"> <view :style="{ height: height }" class="flex flex-col overflow-hidden">
<Title /> <Title />
<view class="flex flex-col flex-1 container bg-gray-100"> <view class="flex flex-col flex-1 overflow-hidden container bg-gray-100">
<Roles /> <Roles />
<Globals class="p-4" /> <Globals />
<TimeLine class="flex-1" /> <TimeLine class="flex-1 overflow-hidden" />
<!-- <view class="mt-5"> <!-- <view class="mt-5">
<view class="mt-5"> <view class="mt-5">
<u-button type="primary" size="default" @click="$u.route('/pages/plugin-test/plugin-test')">iframe 验证</u-button> <u-button type="primary" size="default" @click="$u.route('/pages/plugin-test/plugin-test')">iframe 验证</u-button>
@ -38,7 +38,7 @@ import TimeLine from 'components/TimeLine/index.vue';
export default { export default {
components: { Globals, TimeLine, Roles, Title }, components: { Globals, TimeLine, Roles, Title },
data() { data() {
return { title: 'Hello', height: '' }; return { title: 'Hello', height: '', scrollHeight: null };
}, },
onLoad() { onLoad() {
console.log(this.$u.config.v); console.log(this.$u.config.v);
@ -46,7 +46,6 @@ export default {
}, },
mounted() { mounted() {
this.height = window.screen.height + 'px'; this.height = window.screen.height + 'px';
console.log(this.height);
}, },
methods: { methods: {
openPage() { openPage() {

6
src/pages/rich-text/rich-text.vue

@ -1,8 +1,8 @@
<template> <template>
<view class="p-3"> <view class="p-2">
<!-- <view v-if="!plugins">加载中...</view> <!-- <view v-if="!plugins">加载中...</view>
<template v-else> --> <template v-else>-->
<view id="container" class="my-3"></view> <view class="my-3" id="container"></view>
<!-- </template> --> <!-- </template> -->
</view> </view>
</template> </template>

Loading…
Cancel
Save