|
@@ -338,11 +338,12 @@ export default {
|
|
let mindinfo = this.mindInfo2(
|
|
let mindinfo = this.mindInfo2(
|
|
this.dragging,
|
|
this.dragging,
|
|
"move",
|
|
"move",
|
|
- this.data[this.gIndex],
|
|
|
|
|
|
+ dst,
|
|
"us.mindNetwork",
|
|
"us.mindNetwork",
|
|
this.userinfo ? this.userinfo.userid : this.userid,
|
|
this.userinfo ? this.userinfo.userid : this.userid,
|
|
this.RoomInfo.id,
|
|
this.RoomInfo.id,
|
|
- this.draggingE
|
|
|
|
|
|
+ this.draggingE,
|
|
|
|
+ src
|
|
);
|
|
);
|
|
this.updateSocket(mindinfo);
|
|
this.updateSocket(mindinfo);
|
|
this.updateRoomData();
|
|
this.updateRoomData();
|
|
@@ -831,15 +832,15 @@ export default {
|
|
* 参数三 : content 行内容
|
|
* 参数三 : content 行内容
|
|
* 参数四 : next 下一行
|
|
* 参数四 : next 下一行
|
|
*/
|
|
*/
|
|
- // messageInfo: {
|
|
|
|
- // sendId: userid,
|
|
|
|
- // moveIndex1: id, //第几个网格
|
|
|
|
- // moveIndex2: moveIndex, //移动到的网格
|
|
|
|
- // type: type, //类型
|
|
|
|
- // data: content, //内容
|
|
|
|
- // docId: roomid, //文档id
|
|
|
|
- // // pageId: US.pageId, //当前页面id
|
|
|
|
- // },
|
|
|
|
|
|
+ // messageInfo: {
|
|
|
|
+ // sendId: userid,
|
|
|
|
+ // moveIndex1: id, //第几个网格
|
|
|
|
+ // moveIndex2: moveIndex, //移动到的网格
|
|
|
|
+ // type: type, //类型
|
|
|
|
+ // data: content, //内容
|
|
|
|
+ // docId: roomid, //文档id
|
|
|
|
+ // // pageId: US.pageId, //当前页面id
|
|
|
|
+ // },
|
|
mindInfo(id, type, content, navid, userid, roomid, moveIndex) {
|
|
mindInfo(id, type, content, navid, userid, roomid, moveIndex) {
|
|
var _data = {
|
|
var _data = {
|
|
"us.mindNetwork": [
|
|
"us.mindNetwork": [
|
|
@@ -859,7 +860,7 @@ export default {
|
|
};
|
|
};
|
|
return _data;
|
|
return _data;
|
|
},
|
|
},
|
|
- mindInfo2(id, type, content, navid, userid, roomid, moveIndex) {
|
|
|
|
|
|
+ mindInfo2(id, type, content, navid, userid, roomid, moveIndex,moveData) {
|
|
var _data = {
|
|
var _data = {
|
|
"us.mindNetwork": [
|
|
"us.mindNetwork": [
|
|
{
|
|
{
|
|
@@ -874,14 +875,14 @@ export default {
|
|
pageId: top.US.pageId, //当前页面id
|
|
pageId: top.US.pageId, //当前页面id
|
|
},
|
|
},
|
|
},
|
|
},
|
|
- {
|
|
|
|
|
|
+ {
|
|
sendId: userid, //发送人id
|
|
sendId: userid, //发送人id
|
|
receiveId: roomid, //文件id
|
|
receiveId: roomid, //文件id
|
|
type: navid, //消息类型
|
|
type: navid, //消息类型
|
|
messageInfo: {
|
|
messageInfo: {
|
|
id: moveIndex, //操作ID
|
|
id: moveIndex, //操作ID
|
|
type: type, //类型
|
|
type: type, //类型
|
|
- content: content, //内容
|
|
|
|
|
|
+ content: moveData, //内容
|
|
docId: roomid, //文档id
|
|
docId: roomid, //文档id
|
|
pageId: top.US.pageId, //当前页面id
|
|
pageId: top.US.pageId, //当前页面id
|
|
},
|
|
},
|
|
@@ -959,7 +960,7 @@ export default {
|
|
e.data.info.docId == _this.RoomInfo.id &&
|
|
e.data.info.docId == _this.RoomInfo.id &&
|
|
!(e.data.sendId == _this.userinfo.userid)
|
|
!(e.data.sendId == _this.userinfo.userid)
|
|
) {
|
|
) {
|
|
- _this.data[e.data.info.id] = e.data.info.data;
|
|
|
|
|
|
+ _this.data[e.data.info.id] = e.data.info.content;
|
|
} else if (
|
|
} else if (
|
|
e.data.type &&
|
|
e.data.type &&
|
|
e.data.type == "mindNetwork_delete" &&
|
|
e.data.type == "mindNetwork_delete" &&
|
|
@@ -973,7 +974,8 @@ export default {
|
|
e.data.info.docId == _this.RoomInfo.id &&
|
|
e.data.info.docId == _this.RoomInfo.id &&
|
|
!(e.data.sendId == _this.userinfo.userid)
|
|
!(e.data.sendId == _this.userinfo.userid)
|
|
) {
|
|
) {
|
|
- var newItems = [...JSON.parse(JSON.stringify(_this.data))]; //拷贝一份数据进行交换操作。
|
|
|
|
|
|
+ _this.data[e.data.info.id] = e.data.info.content;
|
|
|
|
+ // var newItems = [...JSON.parse(JSON.stringify(_this.data))]; //拷贝一份数据进行交换操作。
|
|
// _this.data[e.data.info.id] = newItems[e.data.info.moveIndex2];
|
|
// _this.data[e.data.info.id] = newItems[e.data.info.moveIndex2];
|
|
// _this.data[e.data.info.moveIndex2] = newItems[e.data.info.moveIndex1];
|
|
// _this.data[e.data.info.moveIndex2] = newItems[e.data.info.moveIndex1];
|
|
}
|
|
}
|