Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
2017-02-18 18:42:06 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0af89ba6e457f862d0c35f4ed80692b4350942bd
0af89ba6
1 parent
d725521b
1.文档模块修改切换文档接口,切换当前文档的时候,自动对上一个显示的文件隐藏
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
47 行增加
和
7 行删除
src/apes/DocApe.js
src/apes/DocApe.js
查看文件 @
0af89ba
...
...
@@ -109,7 +109,7 @@ class DocApe extends Ape {
let
docDataModelPdu
=
this
.
packPdu
(
_docDataModel
,
_itemIdx
);
let
tableItemPdu
=
new
pdu
[
'RCRegistryTableItemPdu'
];
tableItemPdu
.
itemIdx
=
_itemIdx
;
//直接用时间戳作为id
tableItemPdu
.
registerObjId
=
ApeConsts
.
DOCSHARING_OBJ_TABLE_ID
;
// tableItemPdu.registerObjId=ApeConsts.DOCSHARING_OBJ_TABLE_ID_H5;
//
tableItemPdu.registerObjId=ApeConsts.DOCSHARING_OBJ_TABLE_ID;// tableItemPdu.registerObjId=ApeConsts.DOCSHARING_OBJ_TABLE_ID_H5;
tableItemPdu
.
owner
=
0
;
//收到flash的是这个值,不清楚先写固定
tableItemPdu
.
itemData
=
docDataModelPdu
.
toArrayBuffer
();
...
...
@@ -181,7 +181,27 @@ class DocApe extends Ape {
//切换文档
documentSwitchDoc
(
paramInfo
){
//console.log(this.docList);
if
(
paramInfo
==
null
||
paramInfo
.
itemIdx
==
null
){
loger
.
warn
(
'documentSwitch失败,参数错误'
,
paramInfo
);
this
.
_emit
(
MessageTypes
.
MCU_ERROR
,
MessageTypes
.
ERR_APE_INTERFACE_PARAM_WRONG
);
return
;
}
if
(
paramInfo
.
itemIdx
==
GlobalConfig
.
activeDocId
&&
GlobalConfig
.
activeDocId
!=
0
){
loger
.
warn
(
'文档已经显示'
,
paramInfo
.
itemIdx
,
GlobalConfig
.
activeDocId
);
return
;
}
//更新切换之前的文档的数据,要显示当前切换的文档,上一个文档需要隐藏
let
oldDocModel
;
if
(
GlobalConfig
.
activeDocId
!=
0
){
oldDocModel
=
this
.
docList
[
GlobalConfig
.
activeDocId
];
if
(
oldDocModel
){
oldDocModel
.
action
=
ApeConsts
.
DOC_ACTION_NORMAL
;
oldDocModel
.
visible
=
false
;
//设置为不可见
}
}
//获取已经存在的数据
let
docDataModel
=
this
.
docList
[
paramInfo
.
itemIdx
];
if
(
docDataModel
==
null
){
...
...
@@ -189,12 +209,23 @@ class DocApe extends Ape {
this
.
_emit
(
MessageTypes
.
MCU_ERROR
,
MessageTypes
.
ERR_APE_INTERFACE_PARAM_WRONG
);
return
;
}
//更新数据的字段
//更新当前选择的文档数据的字段
docDataModel
.
action
=
ApeConsts
.
DOC_ACTION_SWITCH_DOC
;
docDataModel
.
visible
=
paramInfo
.
visible
||
false
;
//默认是false
loger
.
log
(
'切换文档,当前文档和上一个显示的文档都需要更新状态'
);
console
.
log
({
"oldDoc"
:
oldDocModel
,
"nowDoc"
:
docDataModel
});
//更新当前选择的文档
this
.
updaterDoc
(
docDataModel
,
docDataModel
.
itemIdx
);
//更新上一个文档 隐藏
if
(
oldDocModel
){
this
.
updaterDoc
(
oldDocModel
,
oldDocModel
.
itemIdx
);
}
}
//文档翻页
documentSwitchPage
(
paramInfo
){
//console.log(this.docList);
...
...
@@ -277,10 +308,12 @@ class DocApe extends Ape {
let
itemDataInfo
=
this
.
unPackPdu
(
owner
,
itemIdx
,
itemData
);
this
.
docList
[
itemIdx
]
=
itemDataInfo
;
if
(
itemDataInfo
.
visible
==
=
"true"
||
itemDataInfo
.
visible
=
==
true
){
if
(
itemDataInfo
.
visible
==
"true"
||
itemDataInfo
.
visible
==
true
){
GlobalConfig
.
activeDocId
=
itemDataInfo
.
itemIdx
;
//当前激活的文档ID
GlobalConfig
.
activeDocCurPage
=
itemDataInfo
.
curPageNo
;
//当前激活的文档的当前页
loger
.
log
(
'tableInsertHandler 设置当前激活的文档id'
);
}
loger
.
log
(
'tableInsertHandler 发送给客户端'
);
console
.
log
(
itemDataInfo
);
this
.
_emit
(
MessageTypes
.
DOC_UPDATE
,
itemDataInfo
);
//用添加和更新都统一DOC_UPDATE
...
...
@@ -299,6 +332,12 @@ class DocApe extends Ape {
if
(
this
.
docList
[
itemIdxs
[
i
]]){
loger
.
log
(
"删除文档数据:"
,
itemIdxs
[
i
]);
this
.
_emit
(
MessageTypes
.
DOC_DELETE
,
itemIdxs
[
i
]);
let
itemDataInfo
=
this
.
docList
[
itemIdxs
[
i
]];
if
(
itemDataInfo
&&
(
itemDataInfo
.
visible
==
"true"
||
itemDataInfo
.
visible
==
true
)){
GlobalConfig
.
activeDocId
=
0
;
//当前激活的文档ID
GlobalConfig
.
activeDocCurPage
=
1
;
//当前激活的文档的当前页
loger
.
log
(
'tableDeleteHandler 设置当前激活的文档id'
);
}
delete
this
.
docList
[
itemIdxs
[
i
]];
}
}
...
...
@@ -320,11 +359,12 @@ class DocApe extends Ape {
default :
break;
}*/
GlobalConfig
.
activeDocId
=
0
;
//默认id
GlobalConfig
.
activeDocCurPage
=
1
;
//默认页数
if
(
itemDataInfo
&&
(
itemDataInfo
.
visible
===
"true"
||
itemDataInfo
.
visible
===
true
)){
//GlobalConfig.activeDocId=0;//默认id
// GlobalConfig.activeDocCurPage=1;//默认页数
if
(
itemDataInfo
&&
(
itemDataInfo
.
visible
==
"true"
||
itemDataInfo
.
visible
==
true
)){
GlobalConfig
.
activeDocId
=
itemDataInfo
.
itemIdx
;
//当前激活的文档ID
GlobalConfig
.
activeDocCurPage
=
itemDataInfo
.
curPageNo
;
//当前激活的文档的当前页
loger
.
log
(
'tableUpdateHandler 设置当前激活的文档id'
);
}
loger
.
log
(
'tableUpdateHandler 发送给客户端'
);
console
.
log
(
itemDataInfo
);
...
...
请
注册
或
登录
后发表评论