|
|
@@ -3200,6 +3200,13 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
|
|
|
_iframe.contentWindow.document.body.appendChild(script4);
|
|
|
U.MD.D.I.getContent(cid, stage, task, tool, _userid, '2', _iframe)
|
|
|
})
|
|
|
+ } else if (str == 'whiteboard'){
|
|
|
+ _iframe.onload = () => {
|
|
|
+ _iframe.contentWindow.document.body.appendChild(script1);
|
|
|
+ _iframe.contentWindow.document.body.appendChild(script2);
|
|
|
+ _iframe.contentWindow.document.body.appendChild(script4);
|
|
|
+ U.MD.D.I.getContent(cid, stage, task, tool, _userid, '3', _iframe)
|
|
|
+ };
|
|
|
} else {
|
|
|
_iframe.onload = () => {
|
|
|
_iframe.contentWindow.document.body.appendChild(script1);
|
|
|
@@ -3210,11 +3217,14 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
|
|
|
}
|
|
|
_jie.onclick = async () => {
|
|
|
let text = ''
|
|
|
- if (aTool == 6) {
|
|
|
+ if (aTool == 1) {
|
|
|
+ text = JSON.stringify(_iframe.contentWindow.h.app.scene.elements)
|
|
|
+ }else if (aTool == 6) {
|
|
|
text = _iframe.contentWindow.$("#U_MD_O_H_wordEditor")[0].innerHTML.escapeQuotes()
|
|
|
} else if (aTool == 3) {
|
|
|
text = await U.MD.D.I.getEditorContent(_iframe);
|
|
|
}
|
|
|
+
|
|
|
_loading.style.display = 'flex'
|
|
|
console.log(_loading);
|
|
|
var _ajs = _iframe.contentWindow.document.createElement("script");
|
|
|
@@ -3313,9 +3323,13 @@ U.MD.D.I.getContent = function (cid, s, task, t, uid, type, iframe) {
|
|
|
if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
|
|
|
if (xmlhttp.response && JSON.parse(xmlhttp.response)[0].length > 0) {
|
|
|
// resolve(res.value[0][0].text);
|
|
|
- iframe.contentWindow.editor.minder.importData('json', JSON.parse(xmlhttp.response)[0][0].text).then(function (data) {
|
|
|
- $(fileInput).val('');
|
|
|
- });
|
|
|
+ if(type == '2'){
|
|
|
+ iframe.contentWindow.editor.minder.importData('json', JSON.parse(xmlhttp.response)[0][0].text).then(function (data) {
|
|
|
+ $(fileInput).val('');
|
|
|
+ });
|
|
|
+ }else if(type == '3'){
|
|
|
+ iframe.contentWindow.h.app.updateScene({elements:JSON.parse(JSON.parse(xmlhttp.response)[0][0].text)})
|
|
|
+ }
|
|
|
}else{
|
|
|
U.MD.D.I.getContents2(cid, s, task, t, uid, type, iframe)
|
|
|
}
|
|
|
@@ -3555,6 +3569,7 @@ U.MD.D.I.openApplicationJieS = function (str, cid, stage, task, tool) {
|
|
|
} else if (aTool == 3) {
|
|
|
text = await U.MD.D.I.getEditorContent(_iframe);
|
|
|
}
|
|
|
+
|
|
|
_loading.style.display = 'flex'
|
|
|
console.log(_loading);
|
|
|
var _ajs = _iframe.contentWindow.document.createElement("script");
|
|
|
@@ -3844,7 +3859,7 @@ U.MD.D.I.openApplicationYu = function (str, cid, stage, task, tool) {
|
|
|
if (aTool == 1) {
|
|
|
text = JSON.stringify(_iframe.contentWindow.h.app.scene.elements)
|
|
|
type = '3'
|
|
|
- }if (aTool == 6) {
|
|
|
+ }else if (aTool == 6) {
|
|
|
text = _iframe.contentWindow.$("#U_MD_O_H_wordEditor")[0].innerHTML.escapeQuotes()
|
|
|
type = '2'
|
|
|
} else if (aTool == 3) {
|
