Skip to content

S
schedule
Commit 10d7a25c 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 70d0bf4c b1fbd8b3
Showing with 50 additions and 60 deletions
components/comment/comment.axml
......@@ -12,7 +12,7 @@
<view>{{item.creator.name}}: {{item.remark}}</view>
<view>{{item.updateTime}}</view>
</view>
<view class="delete-btn" onTap="deleteComment" data-commentId="{{item.commentId}}" data-parentCommentId="{{parentCommentId}}">
<view a:if="{{currentPeople === item.creator.ddUserId}}" class="delete-btn" onTap="deleteComment" data-commentId="{{item.commentId}}" data-parentCommentId="{{parentCommentId}}">
删除
</view>
</view>
......
components/fileList/fileList.axml
......@@ -2,14 +2,14 @@
<view class="desc" a:if='{{fileView.remark}}'>
{{fileView.remark}}
</view>
<view class="file-list {{customClass}}" a:for="{{fileInfos}}">
<view class="file-list {{customClass}}" a:for="{{fileList}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" catchTap="preview" data-file="{{item}}">
<view class="file-icon {{item.mimeType}}"></view>
<view class="file-title">
<text>{{item.name.slice(0, item.name.length - 5)}}</text>
<text>{{item.name.slice(-5)}}</text>
</view>
<view class="file-size">{{item.size}}</view>
<view class="file-size">{{item.sizeShow}}</view>
<view a:if="{{showName}}" class="file-showName">{{item.userDetail.name}}</view>
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
</view>
......
components/fileList/fileList.js
import create from 'dd-store';
import { renderSize } from "../../utils/utils"
import pageStore from '../../pages/meetingDetail/store';
import { previewPermissions, previewOss, uploadPermissions, getThirdUserPlatForm } from '../../api/request.js'
import openLink from "dingtalk-jsapi/api/biz/util/openLink";
import { uploadPermissions } from '../../api/request.js'
create.Component({
store: pageStore,
mixins: [],
data: {
logId: '', //store
fileList: []
},
props: {
isCanEdit: true,
......@@ -17,6 +17,14 @@ create.Component({
isPreview: true, // 是否点击预览,
},
didMount() {
const fileList = []
for (let i = 0; i < this.props.fileInfos.length; i++) {
this.props.fileInfos[i].sizeShow = renderSize(this.props.fileInfos[i].size)
fileList.push(this.props.fileInfos[i])
}
this.setData({
fileList: fileList
})
},
didUpdate() {
......
pages/meetingDetail/meetingDetail.acss
......@@ -99,7 +99,6 @@ page {
}
.footer>view {
width: 35rpx;
margin: 0 38rpx;
font-size: 16rpx;
color: rgba(10, 10, 10, 0.56);
......@@ -495,6 +494,7 @@ input {
margin: 0 38rpx;
font-size: 16rpx;
text-align: center;
white-space: nowrap;
}
.footerBottom>view>.iconfont {
......
pages/meetingDetail/meetingDetail.axml
......@@ -162,17 +162,17 @@
</view>
<view class="footerBottom">
<view onTap="goCreateTask">
<text class="iconfont iconicon_task1"></text>任务
<view class="iconfont iconicon_task1"></view>
任务
</view>
<!--<view onTap="addMeetingFile"><text class="iconfont iconicon_data"></text>文件</view> -->
<view onTap="handleAddFile">
<text class="iconfont iconicon_data"></text>
<view>
文件
</view>
<view class="iconfont iconicon_data"></view>
文件
</view>
<view onTap="openNoteModal">
<text class="iconfont iconicon_task1"></text>笔记
<view class="iconfont iconicon_task1"></view>
笔记
</view>
<!--<text class="devider"></text><view onTap="onShareAppMessage"><text class="iconfont iconicon_share1"></text></view> -->
</view>
......@@ -214,13 +214,13 @@
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view>
<view class="compose-column-operation">
<text a:if="{{item.fileDetailList}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
<text a:if="{{item.notes}}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
<text a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
<text a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
<text data-commentId="{{item.commentId}}" onTap="openComentModal">评论</text>
<text onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
<text a:if="{{item.creator.ddUserId === currentPeople}}" onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
</view>
<view class="compose-column">
<comment a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
<comment currentPeople="{{currentPeople}}" a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
</view>
<view a:if="{{index == separateIndex}}" class="separate">
<view class="line"></view>
......
pages/meetingDetail/meetingDetail.js
......@@ -25,11 +25,6 @@ create.Page({
details: true,
dynamic: true
},
conToastData: {
showToast: false,
title: '保存成功'
},
title: ``,
meetingRemark: '',
isShowRemark: false,
......@@ -69,15 +64,11 @@ create.Page({
},
needNotice: 0,
placeholder: '',
week: '',
lock: false,
mrReserveStatus: '',
id: ''
},
onShow() {
console.log('onshow')
this.update()
if (this.store.data.isNeedReloadList) {
this.store.data.isNeedReloadList = false
this.loadAffairList();
......@@ -91,7 +82,7 @@ create.Page({
this.$store.data.isIndexAffairListNeedUpdate = true;
this.update();
}
// 修改地点 或者 参会人保存
if (this.$store.data.updateInfo.isUpate) {
if (this.$store.data.updateInfo.updateType === "modify_location") {
this.setData({
......@@ -172,8 +163,7 @@ create.Page({
recurrenceModel: res.data.data.repeatable ? res.data.data.recurrenceModel : { model: 'no_repeat' },
selectRepeatId: res.data.data.repeatable === 0 ? 0 : getSelectRepeatId(res.data.data.recurrenceModel, repeatList)
},
// organizer: res.data.data.organizer,
organizer: getApp().globalData.userid,
organizer: res.data.data.organizer.split("::")[0],
isExpand: res.data.data.confirmAttendance === 1 ? true : false,
confirmAttendance: res.data.data.confirmAttendance === null ? -9 : res.data.data.confirmAttendance,
aheadTime: {
......@@ -915,12 +905,6 @@ create.Page({
this.store.data.affairList = [];
},
// toast 消失之后的回调
onToastHidden() {
this.setData({
'conToastData.showToast': false
})
},
// 页面卸载
onUnload() {
// 页面被关闭
......@@ -929,22 +913,6 @@ create.Page({
//获取动态列表
loadAffairList(id) {
// if (this.data.repeatable == 1) {
// if (!this.data.scheduleItem.groupId) {
// console.log(`groupId不存在`)
// return
// }
// this.getRepeatAffairList(this.data.scheduleItem.groupId, current)
// } else {
// if (!this.data.scheduleItem.id) {
// console.log(`scheduleItem.id不存在`)
// return
// }
// this.getAffairList(this.data.scheduleItem.id)
// }
// //重置
// this.store.data.isNeedReloadList = false;
// this.update();
if (!id) {
id = this.store.data.scheduleId;
}
......
pages/meetingDetail/uploadFile.js
......@@ -22,7 +22,8 @@ export async function getFileInfo() {
dd.uploadAttachmentToDingTalk({
image: { multiple: true, compress: true, max: 9, spaceId: permission.data.data },
space: { spaceId: permission.data.data, compress: true, isCopy: 1, max: 9 },
types: ["photo", "camera", "space"],
file: { spaceId: permission.data.data, max: 9 },
types: ["photo", "camera", "space", "file"],
success: (res) => {
console.log(res)
resolve(res)
......
pages/meetingDetail/utils.js
......@@ -20,8 +20,6 @@ export function getInitialPsarticipants(participants) {
}
// 比较增减的人
export function handleChangePeople(originUsers, nowUsers) {
console.log(originUsers)
console.log(nowUsers)
let originMap = new Map()
let nowMap = new Map()
for (let x of originUsers) {
......
pages/meetingRoomList/meetingRoomList.js
......@@ -173,7 +173,10 @@ create.Page({
},
// 获取当前id 的祖先
getParentStr(parentId) {
if (parentId !== "0") {
if (parentId !== "0" && this.data.areaMap.get(parentId)) {
// if ()) {
// return this.parentStr
// }
this.parentStr =
this.data.areaMap.get(parentId).name + "-" + this.parentStr;
// 此处一定return
......
pages/participantsDetail/participantsDetail.axml
......@@ -4,7 +4,7 @@
<view class="headImg">
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<text a:else>{{item.username.substring(0, 1)}}</text>
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflict iconicon_conflict iconfont"></text>
<!--<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflict iconicon_conflict iconfont"></text> -->
</view>
<view class="info">
<text class="name">{{item.username}}</text>
......
pages/participantsDetail/participantsDetail.js
......@@ -52,8 +52,7 @@ create.Page({
}
// 编辑 参会人可选必选
else {
require = [Object.keys(this.$store.data.participatorList)]
require = Object.keys(this.$store.data.participatorList)
select = selectedelRequired(Object.keys(this.data.contactPeople), require)
}
selectPeople(select, require).then(res => {
......@@ -73,9 +72,9 @@ create.Page({
}
// 编辑 参会人可选必选
else {
const showContactPeople = this.data.showContactPeople.length
const showContactPeople = this.data.showContactPeople
for (let i = 0; i < this.data.showContactPeople.length; i++) {
participatorList[showContactPeople[i].userId] = { userId: showContactPeople[i].userId, username: howContactPeople[i].username, headUrl: howContactPeople[i].headUrl, platform: 'dingtalk' }
participatorList[showContactPeople[i].userId] = { userId: showContactPeople[i].userId, username: showContactPeople[i].username, headUrl: showContactPeople[i].headUrl, platform: 'dingtalk' }
}
}
for (let i = 0; i < res.users.length; i++) {
......
utils/utils.js
......@@ -296,6 +296,19 @@ export function selectedelRequired(select, require) {
return !require.includes(it)
})
}
// 文件格式化
export function renderSize(value) {
if (null == value || value == '') {
return "0 B";
}
var unitArr = new Array("B", "K", "M", "G", "T", "P", "E", "Z", "Y");
var index = 0;
var srcsize = parseFloat(value);
index = Math.floor(Math.log(srcsize) / Math.log(1024));
var size = srcsize / Math.pow(1024, index);
size = size.toFixed(2);//保留的小数位数
return size + unitArr[index];
}
export function isJSON(str) {
......
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