Skip to content

S
schedule
Commit ed819539 by xiexiaoqin
Options

Merge branch 'release/2.0.0' of… 

Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0
parents c9633f2e 5740c2b1
Showing with 87 additions and 31 deletions
pages/createMeeting/createMeeting.axml
......@@ -60,7 +60,7 @@
<view class="iconright iconfont icon" style=" vertical-align: middle" catchTap="goParticipantsDetail"></view>
</view>
<view class="participatorListBottom" catchTap="goParticipantsDetail">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="people" a:for="{{$data.showParticipatorList.length > 10 ? [...$data.showParticipatorList].splice(0, 11) : $data.showParticipatorList}}">
<view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<text
......
pages/createTask/createTask.js
......@@ -173,7 +173,7 @@ create.Page({
} else {
data.taskCreateModel = taskCreateModel
this.updateTask(data, (res) => {
this.updateTasks(data, (res) => {
// 修改动态列表
if (res.data) {
const addData = res.data[0].commentListDataModelList[0];
......
pages/index/index.js
......@@ -181,7 +181,7 @@ create.Page({
},
connect_start() {
dd.connectSocket({
url: `wss://gateway-ding.mingwork.com/meet-websocket/websocket/${dd.getStorageSync({ key: 'mwUserId' }).data}/${uuid}`,
url: `ws://139.196.213.18:9999/meet-websocket/websocket/${dd.getStorageSync({ key: 'mwUserId' }).data}/${uuid}`,
success: (res) => {
......@@ -869,7 +869,7 @@ create.Page({
maxClickCount--;
if (maxClickCount == 0) {
dd.alert({
content: "0.0.25"
content: "0.0.26"
});
maxClickCount = 5;
}
......
pages/meetingDetail/meetingDetail.acss
......@@ -679,7 +679,7 @@ input {
.operation-containt {
border-radius: 8rpx;
padding: 16rpx;
padding: 0 16rpx;
position: absolute;
right: 56rpx;
top: 50%;
......@@ -690,11 +690,28 @@ input {
}
.operation-containt>text {
/* background: red; */
/* background: red; */
display: flex;
justify-content: space-between;
align-items: center;
padding: 16rpx 0;
/* line-height: 28px; */
/* padding: 16px 0; */
/* background: red; */
/* padding-right: 16rpx; */
/* margin-right: 16rpx; */
padding-right: 24rpx;
margin-right: 24rpx;
font-size: 24rpx;
color: #fff;
border-right: 1px solid rgba(255, 255, 255, 0.55);
/* border-right: 1px solid rgba(255, 255, 255, 0.55); */
}
.line {
margin-left: 16rpx;
margin-top: -2rpx;
/* margin-right: 16rpx; */
}
.operation-containt>text:last-child {
......@@ -706,4 +723,11 @@ input {
.text {
white-space: nowrap;
padding-left: 8rpx;
padding-right: 16rpx;
border-right: 1px solid rgba(255, 255, 255, 0.55);
}
.text:last-child {
padding-right: 0;
border-right: none;
}
\ No newline at end of file
pages/meetingDetail/meetingDetail.axml
<!--<block a:if="{{getData}}"> -->
<import src="../../template/loading/loading.axml"/>
<block>
<view catchTap="handleCloseOperation" class=" {{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}">
<view onTap="handleCloseOperation" class="{{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}">
<import src="../../template/deleteBtn/index.axml"/>
<view class="hideDetail" a:if="{{isExpand}}">
<view class="hideTitle">
......@@ -206,20 +206,24 @@
<notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view>
<view class="compose-column-operation" a:if="{{item.commentType !== 'meeting'}}">
<view class="compose-column-operation" catchTap="blank" a:if="{{item.commentType !== 'meeting'}}">
<view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}">
<view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}">
<text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">
<text class="text">编辑</text>
<!--<text class="line">|</text> -->
</text>
<text class="icondescribe11 iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" catchTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">
<text class="text">编辑</text>
<!--<text class="line">|</text> -->
</text>
<text class="icondescribe11 iconfont color4" a:if="{{item.commentType === 'task' &&item.creator.ddUserId === currentPeople }}" catchTap="editTask" data-task="{{item.meetingTaskSimpleViewModel}}" data-commentId="{{item.commentId}}">
<text class="text">编辑</text>
<!--<text class="line">|</text> -->
</text>
<text class="iconcomments1 iconfont color4" data-commentId="{{item.commentId}}" catchTap="openComentModal">
<text class="text">评论</text>
<!--<text class="line">|</text> -->
</text>
<text class="icondelete2 iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" catchTap="handleDeleteMoment" data-commentId="{{item.commentId}}">
<text class="text">删除</text>
......@@ -239,17 +243,17 @@
<view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0 || (affairList.length == 1 && affairList[0].commentType === 'meeting')}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
</view>
<!--<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> -->
<popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
<remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
<comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
<list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" comSelectListId="{{repeat.selectRepeatId}}" onComSelectList="selectRepeatListItem"></list>
<notes a:if="{{popup.type == 'notesModal'}}" isEdit="{{true}}" onGetNotes="getNotes"/>
<meeting-time-picker a:if="{{'time' === popup.type}}" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
<list a:if="{{popup.type=='aheadTime'}}" onClose="closePopup" multiple="{{true}}" onCompelete="handleAheadTimeSave" complete="{{true}}" dataComList="{{aheadTime.aheadTimeList}}" onComSelectList="selectComList" comSelectList="{{aheadTime.aheadTimesListId}}" iconType="{{aheadTime.iconType}}"></list>
</popup>
</view>
</view>
</block>
<!--<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> -->
<popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
<remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
<comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
<list a:if="{{popup.type=='repeat'}}" dataComList="{{repeat.repeatList}}" comSelectListId="{{repeat.selectRepeatId}}" onComSelectList="selectRepeatListItem"></list>
<notes a:if="{{popup.type == 'notesModal'}}" isEdit="{{true}}" onGetNotes="getNotes"/>
<meeting-time-picker a:if="{{'time' === popup.type}}" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}" onComplete="onComplete" isIPX="{{isIPX}}"></meeting-time-picker>
<list a:if="{{popup.type=='aheadTime'}}" onClose="closePopup" multiple="{{true}}" onCompelete="handleAheadTimeSave" complete="{{true}}" dataComList="{{aheadTime.aheadTimeList}}" onComSelectList="selectComList" comSelectList="{{aheadTime.aheadTimesListId}}" iconType="{{aheadTime.iconType}}"></list>
</popup>
<template is="loading" a:if="{{loading.details && loading.dynamic}}">
</template>
\ No newline at end of file
pages/meetingDetail/meetingDetail.js
......@@ -64,7 +64,8 @@ create.Page({
},
needNotice: 0,
placeholder: '',
id: ''
id: '',
saveLoading: false
},
onShow() {
console.log('onshow')
......@@ -1090,9 +1091,9 @@ create.Page({
type: 'notesModal'
}
})
this.handleCloseOperation()
},
getNotes(notes) {
getNotes: throttle(function (notes) {
//编辑
if (this.store.data.notes) {
//是否发送通知
......@@ -1152,7 +1153,7 @@ create.Page({
this.update();
}
})
},
}),
//更新笔记
updateNotes(notes, notice, callBack) {
updateMoment({
......@@ -1181,6 +1182,7 @@ create.Page({
},
//添加评论
openComentModal(e) {
this.handleCloseOperation()
this.store.data.parentCommentId = e.currentTarget.dataset.commentId;
this.update();
this.setData({
......@@ -1222,6 +1224,7 @@ create.Page({
},
// 删除动态
handleDeleteMoment(e) {
this.handleCloseOperation()
this.deleteComment('', e.currentTarget.dataset.commentId)
},
......@@ -1366,9 +1369,11 @@ create.Page({
this.store.data.modifyDynamicId = ''
this.update()
},
blank() {
debugger
}
},
});
......
pages/meetingDetail/uploadFile.js
......@@ -29,10 +29,13 @@ export async function getFileInfo() {
file: { spaceId: permission.data.data, max: 9 },
types: ["photo", "camera", "space", "file"],
success: (res) => {
console.log(permission.data.data)
console.log(res)
resolve(res)
},
fail: (err) => {
console.log(11)
console.log(err)
}
})
})
......
pages/meetingRoomList/meetingRoomList.js
......@@ -1249,15 +1249,20 @@ create.Page({
this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
}
if (this.$store.data.originalData && this.$store.data.locationName) {
if (
this.$store.data.locationName !=
this.$store.data.originalData.location.locationName ||
if (!this.$store.data.originalData.location) {
this.$store.data.updateInfo = {
updateType: "modify_location",
isUpate: true
};
this.update();
} else if (
this.$store.data.locationName != this.$store.data.originalData.location.locationName ||
this.$store.data.roomId != this.$store.data.originalData.meetingRoomId ||
this.$store.data.startTime != this.$store.data.originalData.startTime.replace(/-/g, "/") ||
this.$store.data.endTime != this.$store.data.originalData.endTime.replace(/-/g, "/")
) {
this.$store.data.updateInfo = {
updateType: "modify_location",
isUpate: true
......
pages/participantsDetail/participantsDetail.js
......@@ -19,7 +19,8 @@ create.Page({
contactPeople: {},
showContactPeople: [],
originUsersId: [],
confirmAttendance: null
confirmAttendance: null,
isUpdate: false
},
onLoad(event) {
this.setData({
......@@ -58,6 +59,9 @@ create.Page({
select = selectedelRequired(Object.keys(this.data.contactPeople), require)
}
selectPeople(select, require).then(res => {
this.setData({
isUpdate: true
})
const participatorList = {}
// 创建的 可选 必选
if (!this.data.scheduleItem) {
......@@ -98,6 +102,10 @@ create.Page({
},
// 删除参会人
delParticipants(event) {
this.setData({
isUpdate: true
})
let userId = event.target.dataset.userId
let participatorList = {}
let showParticipatorList = []
......@@ -136,13 +144,18 @@ create.Page({
// 保存信息
saveInfo() {
this.$store.data.participatorList = this.data.contactPeople
this.$store.data.showParticipatorList = this.data.showContactPeople
this.update()
this.$store.data.updateInfo = {
updateType: 'operate_user',
isUpate: true
if (this.data.isUpdate) {
this.$store.data.updateInfo = {
updateType: 'operate_user',
isUpate: true
}
}
this.update()
dd.navigateBack({
delta: 1
......
utils/utils.js
......@@ -298,7 +298,7 @@ export function selectedelRequired(select, require) {
}
// 文件格式化
export function renderSize(value) {
if (null == value || value == '') {
if (null == value || value == '' || value == 0) {
return "0 B";
}
var unitArr = new Array("B", "K", "M", "G", "T", "P", "E", "Z", "Y");
......
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