Skip to content

S
schedule
Commit c7747f5f by xiexiaoqin
Options

fix: indexpage dynamiclist page data get

parent 08538a66
Showing with 119 additions and 136 deletions
PageComponents/myDynamic/myDynamic.acss
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
overflow: hidden; overflow: hidden;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 120rpx; padding-bottom: 120rpx;
height: calc(100vh - 120rpx);
} }
.dynamicList { .dynamicList {
......
PageComponents/myDynamic/myDynamic.axml
<import src="../../template/affairBlank/index.axml"/> <import src="../../template/affairBlank/index.axml"/>
<view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe"> <view class="{{isStopBodyScroll ? 'scroll-lock' : ''}}" onTap="closeSwipe" onTouchStart="closeSwipe" onTouchMove="closeSwipe" onTouchEnd="closeSwipe">
<view a:if="{{dynamicList.length !== 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower"> <block a:if="{{!loading}}">
<view class="dynamicList"> <scroll-view a:if="{{dynamicList.length > 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
<swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent"> <view class="dynamicList">
<view class="dynamicDetails"> <swipe onSetBodyDisableScroll="setBodyDisableScroll" rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent">
<view class="meetingtitle"> <view class="dynamicDetails">
<view> <view class="meetingtitle">
{{item.title}} <view>
</view> {{item.title}}{{index}}
<view>
<text a:if="{{item.traceTime !== '1970-03-01 00:00:00'}}" class="iconfont iconicon_top1"></text>
</view>
</view>
<block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
<view class="userDynamic">
<view class="dynamicTime">
<text>{{dynamicItem.content}}</text>
<text>{{dynamicItem.createTime}}</text>
</view> </view>
<file-list a:if="{{dynamicItem.category === '2'}}" fileView="{{dynamicItem.meetingLogResource}}" isCanEdit="{{false}}"/> <view>
<view class="dynamicFile" a:if="{{dynamicItem.category === '3'}}"> <text a:if="{{item.traceTime !== traceTime}}" class="iconfont iconicon_top1"></text>
<task-list onChangeTaskStatusOnList="onChangeTaskStatusOnList" taskList="{{[dynamicItem.meetingLogResource]}}" isCanEdit="{{false}}"/>
</view> </view>
</view> </view>
</block> <block a:for="{{item.meetingLogDataList.slice(0,2)}}" a:for-item="dynamicItem">
</view> <view class="userDynamic">
<view slot="right" class="placedTop" onTap="changeCollection" data-scheduleid="{{item.scheduleId}}" data-index="{{index}}" data-collection="{{item.traceTime === '1970-03-01 00:00:00' ? 'Y':'N'}}"> <view class="dynamicTime">
<text class="iconfont iconicon_top1 {{item.traceTime === '1970-03-01 00:00:00' ? '': 'isTopIcon'}}"></text> <text>{{dynamicItem.content}}</text>
</view> <text>{{dynamicItem.createTime}}</text>
</swipe> </view>
<file-list a:if="{{dynamicItem.category === '2'}}" fileView="{{dynamicItem.meetingLogResource}}" isCanEdit="{{false}}"/>
<view class="dynamicFile" a:if="{{dynamicItem.category === '3'}}">
<task-list onChangeTaskStatusOnList="onChangeTaskStatusOnList" taskList="{{[dynamicItem.meetingLogResource]}}" isCanEdit="{{false}}"/>
</view>
</view>
</block>
</view>
<view slot="right" class="placedTop" onTap="changeCollection" data-scheduleId="{{item.scheduleId}}" data-index="{{index}}" data-collection="{{item.traceTime === traceTime ? 'Y':'N'}}">
<text class="iconfont iconicon_top1 {{item.traceTime === traceTime ? '': 'isTopIcon'}}"></text>
</view>
</swipe>
</view>
</scroll-view>
<view class="noDate" a:else>
<template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/>
</view> </view>
</view> </block>
<view class="noDate" a:else> <view class="noDate" a:else>
<template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/> 正在加载
</view> </view>
</view> </view>
\ No newline at end of file
PageComponents/myDynamic/myDynamic.js
...@@ -9,16 +9,14 @@ import create from 'dd-store'; ...@@ -9,16 +9,14 @@ import create from 'dd-store';
create.Component({ create.Component({
mixins: [], mixins: [],
data: { data: {
traceTime: '1970-03-01 00:00:00',
isStopBodyScroll: false, isStopBodyScroll: false,
isTop: false, loading: true,
isTouchMove: false,
touchMoveId: "",
startX: "",
startY: "",
dynamicList: [], dynamicList: [],
current: 1, current: 1,
size: 10, pages: 1,
noData: false size: 10
}, },
props: {}, props: {},
didMount() { didMount() {
...@@ -34,127 +32,106 @@ create.Component({ ...@@ -34,127 +32,106 @@ create.Component({
}, },
//点击页面关闭侧滑模块 //点击页面关闭侧滑模块
closeSwipe() { closeSwipe() {
this.$store.closeActiveSwipe() if (this.$store.closeActiveSwipe) {
this.$store.closeActiveSwipe()
}
}, },
getPages(current) { getPages(current) {
let that = this; getDynamicList({
let data = { current,
current: current,
size: 10 size: 10
}; }).then(res => {
getDynamicList(data).then(res => {
if (!res.data.data) { if (!res.data.data) {
return; return;
} }
// 第一层日程数据处理 // 第一层日程数据处理
if (res.data.data) { const dynamicList = res.data.data.records.map((item, index) => {
let dynamicList = res.data.data.records.map((item, index) => { // 第二层日程下的动态数据处理
// 第二层日程下的动态数据处理 let meetingLogDataList = {};
let meetingLogDataList = {}; let meetingLogDataListArr = [];
let meetingLogDataListArr = [];
for (let i = 0; i < item.meetingLogDataList.length; i++) { for (let i = 0; i < item.meetingLogDataList.length; i++) {
if (item.meetingLogDataList[i].creatorInfo) { if (item.meetingLogDataList[i].creatorInfo) {
item.meetingLogDataList[i].creatorInfo = JSON.parse( item.meetingLogDataList[i].creatorInfo = JSON.parse(
item.meetingLogDataList[i].creatorInfo item.meetingLogDataList[i].creatorInfo
); );
} }
if (item.meetingLogDataList[i].createTime) { if (item.meetingLogDataList[i].createTime) {
item.meetingLogDataList[i].createTime = getCreateShowTime( item.meetingLogDataList[i].createTime = getCreateShowTime(
item.meetingLogDataList[i].createTime item.meetingLogDataList[i].createTime
); );
} }
let itemData = item.meetingLogDataList[i].meetingLogResource; let itemData = item.meetingLogDataList[i].meetingLogResource;
if (itemData) { if (itemData) {
if (itemData.taskInfos || itemData.fileInfos) { if (itemData.taskInfos || itemData.fileInfos) {
if (itemData.creatorInfo) { if (itemData.creatorInfo) {
itemData.creatorInfo = JSON.parse(itemData.creatorInfo); itemData.creatorInfo = JSON.parse(itemData.creatorInfo);
} }
if (itemData.fileInfos) { if (itemData.fileInfos) {
itemData.fileInfos = JSON.parse(itemData.fileInfos); itemData.fileInfos = JSON.parse(itemData.fileInfos);
} }
if (itemData.taskInfos) { if (itemData.taskInfos) {
itemData.taskInfos = JSON.parse(itemData.taskInfos); itemData.taskInfos = JSON.parse(itemData.taskInfos);
} }
if (itemData.acceptorInfo) { if (itemData.acceptorInfo) {
itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo); itemData.acceptorInfo = JSON.parse(itemData.acceptorInfo);
}
// meetingLogDataList[item.meetingLogDataList[i].resourceId] =
// item.meetingLogDataList[i];
} }
} }
} }
// for (let item in meetingLogDataList) {
// meetingLogDataListArr.push(meetingLogDataList[item]);
// }
return {
scheduleId: item.scheduleId,
title: item.title,
traceTime: item.traceTime,
meetingLogDataList: item.meetingLogDataList
};
});
if (current === 1) {
that.setData({
dynamicList: dynamicList,
current: current,
noData: dynamicList.length === that.data.size ? true : false
});
} else {
let dynamicListData = [...that.data.dynamicList];
dynamicListData.push.apply(dynamicListData, dynamicList);
that.setData({
dynamicList: dynamicListData,
current: current,
noData: dynamicList.length === that.data.size ? true : false
});
} }
return {
scheduleId: item.scheduleId,
title: item.title,
traceTime: item.traceTime,
meetingLogDataList: item.meetingLogDataList
};
});
//第一页数据会重新请求需要替换
if (current === 1) {
this.setData({
dynamicList
});
} else {
const newDynamicList = this.data.dynamicList.concat(dynamicList);
this.setData({
dynamicList: newDynamicList
});
} }
this.setData({
current: res.data.data.current,
pages: res.data.data.pages,
loading: false
});
}); });
}, },
changeCollection(e) { changeCollection(e) {
let that = this; const { index, scheduleId, collection } = e.target.dataset;
let index = e.target.dataset.index; meetingCollection({
let data = { scheduleId,
scheduleId: e.target.dataset.scheduleid, collection
collection: e.target.dataset.collection }).then(res => {
}; //取消置顶
meetingCollection(data).then(res => { if (collection === "N") {
console.log(res); // 重新获取第一页的数据
if (e.target.dataset.collection === "N") { this.getPages(1);
that.setData(
{
current: 1
},
() => {
that.getPages(1);
}
);
} else { } else {
let dynamicList = [...this.data.dynamicList]; //置顶
let ReplaceItem = dynamicList[index]; const dynamicList = this.data.dynamicList;
ReplaceItem.traceTime = res.data.data; const replaceItem = dynamicList[index];
dynamicList[index].traceTime = res.data.data;
dynamicList.splice(index, 1); dynamicList.splice(index, 1);
dynamicList.unshift(ReplaceItem); dynamicList.unshift(replaceItem);
that.setData({ this.setData({
dynamicList: dynamicList dynamicList: dynamicList
}); });
} }
}); });
}, },
previewFileInDingTalk(e) {
let fileMsg = e.currentTarget.dataset.file;
dd.previewFileInDingTalk({
corpId: dd.corpId,
spaceId: fileMsg.spaceId,
fileId: fileMsg.fileId,
fileName: fileMsg.fileName,
fileSize: fileMsg.fileSize,
fileType: fileMsg.fileType
});
},
onScrollToLower() { onScrollToLower() {
if (!this.data.noData) { if (this.data.current < this.data.pages) {
this.getPages(this.data.current + 1); this.getPages(this.data.current + 1);
} }
}, },
...@@ -193,3 +170,4 @@ create.Component({ ...@@ -193,3 +170,4 @@ create.Component({
} }
} }
}); });
components/swipe/swipe.js
...@@ -22,7 +22,6 @@ function range(num, min, max) { ...@@ -22,7 +22,6 @@ function range(num, min, max) {
} }
create.Component({ create.Component({
mixins: [], mixins: [],
offset: 0,
data: { data: {
wrapperStyle: '' wrapperStyle: ''
}, },
...@@ -116,7 +115,7 @@ create.Component({ ...@@ -116,7 +115,7 @@ create.Component({
//恢复页面竖向滚动 //恢复页面竖向滚动
setTimeout(() => { setTimeout(() => {
this.props.onSetBodyDisableScroll(false); this.props.onSetBodyDisableScroll(false);
}, 1000) })
}, },
open: function (position) { open: function (position) {
......
pages/index/index.json
{ {
"disableScroll": true,
"usingComponents": { "usingComponents": {
"my-dynamic": "../../PageComponents/myDynamic/myDynamic", "my-dynamic": "../../PageComponents/myDynamic/myDynamic",
"my-schedule": "../../PageComponents/scheduleList/scheduleList" "my-schedule": "../../PageComponents/scheduleList/scheduleList"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment