Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 3b8d4f0b 编写于 作者: F fancy
浏览文件
操作

移动端api部分flutter端支持

上级 70c8fabe
隐藏空白更改
内联 并排
Showing with 245 addition and 23 deletion
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/instant/ActionListWithCurrentPersonWithoutIMDesc.java
浏览文件 @ 3b8d4f0b
......@@ -48,7 +48,7 @@ class ActionListWithCurrentPersonWithoutIMDesc extends BaseAction {
Root<Instant> root = cq.from(Instant.class);
Predicate p = cb.equal(root.get(Instant_.person), effectivePerson.getDistinguishedName());
p = cb.and(p, cb.notEqual(root.get(Instant_.type), MessageConnector.TYPE_IM_CREATE));
p = cb.and(p, cb.isNotEmpty(root.get(Instant_.consumerList)));
// p = cb.and(p, cb.isNotEmpty(root.get(Instant_.consumerList)));
List<Instant> os = em.createQuery(cq.select(root).where(p).orderBy(cb.desc(root.get(Instant_.createTime))))
.setMaxResults(count).getResultList();
return Wo.copier.copy(os);
......
o2web/source/o2_core/o2/xScript/PageEnvironment.js
浏览文件 @ 3b8d4f0b
......@@ -2061,7 +2061,14 @@ if (!MWF.xScript || !MWF.xScript.PageEnvironment) {
if (category) {
options["category"] = category
}
if (window.o2android && window.o2android.createO2CmsDocument){
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "createO2CmsDocument",
data: options
};
window.o2android.postMessage(JSON.stringify(body));
return;
} else if (window.o2android && window.o2android.createO2CmsDocument){
window.o2android.createO2CmsDocument(JSON.stringify(options));
return;
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.createO2CmsDocument) {
......
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
浏览文件 @ 3b8d4f0b
......@@ -4569,7 +4569,14 @@ MWF.xScript.ViewEnvironment = function (ev) {
if (category) {
options["category"] = category
}
if (window.o2android && window.o2android.createO2CmsDocument){
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "createO2CmsDocument",
data: options
};
window.o2android.postMessage(JSON.stringify(body));
return;
} else if (window.o2android && window.o2android.createO2CmsDocument){
window.o2android.createO2CmsDocument(JSON.stringify(options));
return;
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.createO2CmsDocument) {
......
o2web/source/x_desktop/js/base.js
浏览文件 @ 3b8d4f0b
......@@ -100,6 +100,21 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
};
var _openWorkAndroid = function (options) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Work",
data: {
title : options.title || ""
}
};
if (options.workId) {
body.data.workId = options.workId;
} else if (options.workCompletedId) {
body.data.workCompletedId = options.workCompletedId;
}
window.o2android.postMessage(JSON.stringify(body));
return true;
}
if (window.o2android && window.o2android.openO2Work) {
if (options.workId) {
window.o2android.openO2Work(options.workId, "", options.title || options.docTitle || "");
......@@ -158,7 +173,17 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
var title = typeOf(options) === "object" ? (options.docTitle || options.title) : "";
title = title || "";
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsDocumentV2) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsDocument",
data: {
docId : options.documentId,
title: title,
options: options
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsDocumentV2) {
window.o2android.openO2CmsDocumentV2(options.documentId, title, JSON.stringify(options));
} else if (window.o2android && window.o2android.openO2CmsDocument) {
window.o2android.openO2CmsDocument(options.documentId, title);
......@@ -173,7 +198,16 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
};
var _openCms = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsApplication) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsApplication",
data: {
appId : options.columnId,
title: options.title || ""
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsApplication) {
window.o2android.openO2CmsApplication(options.columnId, options.title || "");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsApplication) {
window.webkit.messageHandlers.openO2CmsApplication.postMessage(options.columnId);
......@@ -183,7 +217,13 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
};
var _openMeeting = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Meeting) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Meeting",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Meeting) {
window.o2android.openO2Meeting("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Meeting) {
window.webkit.messageHandlers.openO2Meeting.postMessage("");
......@@ -194,7 +234,13 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
var _openCalendar = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Calendar) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Calendar",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Calendar) {
window.o2android.openO2Calendar("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Calendar) {
window.webkit.messageHandlers.openO2Calendar.postMessage("");
......@@ -208,7 +254,13 @@ if (!window.layout || !layout.desktop || !layout.addReady) {
if (tab === "done") tab = "taskCompleted";
if (tab === "readed") tab = "readCompleted";
if (window.o2android && window.o2android.openO2WorkSpace) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2WorkSpace",
data: { type: tab }
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2WorkSpace) {
window.o2android.openO2WorkSpace(tab);
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2WorkSpace) {
window.webkit.messageHandlers.openO2WorkSpace.postMessage(tab);
......
o2web/source/x_desktop/js/base_simple.js
浏览文件 @ 3b8d4f0b
......@@ -285,6 +285,21 @@ o2.addReady(function () {
};
var _openWorkAndroid = function (options) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Work",
data: {
title : options.title || ""
}
};
if (options.workId) {
body.data.workId = options.workId;
} else if (options.workCompletedId) {
body.data.workCompletedId = options.workCompletedId;
}
window.o2android.postMessage(JSON.stringify(body));
return true;
}
if (window.o2android && window.o2android.openO2Work) {
if (options.workId) {
window.o2android.openO2Work(options.workId, "", options.title || "");
......@@ -339,7 +354,17 @@ o2.addReady(function () {
var title = typeOf(options) === "object" ? (options.docTitle || options.title) : "";
title = title || "";
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsDocumentV2) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsDocument",
data: {
docId : options.documentId,
title: title,
options: options
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsDocumentV2) {
window.o2android.openO2CmsDocumentV2(options.documentId, title, JSON.stringify(options));
} else if (window.o2android && window.o2android.openO2CmsDocument) {
window.o2android.openO2CmsDocument(options.documentId, title);
......@@ -351,7 +376,16 @@ o2.addReady(function () {
};
var _openCms = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsApplication) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsApplication",
data: {
appId : options.columnId,
title: options.title || ""
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsApplication) {
window.o2android.openO2CmsApplication(options.columnId, options.title || "");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsApplication) {
window.webkit.messageHandlers.openO2CmsApplication.postMessage(options.columnId);
......@@ -361,7 +395,13 @@ o2.addReady(function () {
};
var _openMeeting = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Meeting) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Meeting",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Meeting) {
window.o2android.openO2Meeting("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Meeting) {
window.webkit.messageHandlers.openO2Meeting.postMessage("");
......@@ -372,7 +412,13 @@ o2.addReady(function () {
var _openCalendar = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Calendar) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Calendar",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Calendar) {
window.o2android.openO2Calendar("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Calendar) {
window.webkit.messageHandlers.openO2Calendar.postMessage("");
......@@ -386,7 +432,13 @@ o2.addReady(function () {
if (tab === "done") tab = "taskCompleted";
if (tab === "readed") tab = "readCompleted";
if (window.o2android && window.o2android.openO2WorkSpace) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2WorkSpace",
data: { type: tab }
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2WorkSpace) {
window.o2android.openO2WorkSpace(tab);
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2WorkSpace) {
window.webkit.messageHandlers.openO2WorkSpace.postMessage(tab);
......
o2web/source/x_desktop/js/base_simple_anonymous.js
浏览文件 @ 3b8d4f0b
......@@ -236,6 +236,21 @@ o2.addReady(function () {
};
var _openWorkAndroid = function (options) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Work",
data: {
title : options.title || ""
}
};
if (options.workId) {
body.data.workId = options.workId;
} else if (options.workCompletedId) {
body.data.workCompletedId = options.workCompletedId;
}
window.o2android.postMessage(JSON.stringify(body));
return true;
}
if (window.o2android && window.o2android.openO2Work) {
if (options.workId) {
window.o2android.openO2Work(options.workId, "", options.title || "");
......@@ -286,7 +301,17 @@ o2.addReady(function () {
var title = typeOf(options) === "object" ? (options.docTitle || options.title) : "";
title = title || "";
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsDocumentV2) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsDocument",
data: {
docId : options.documentId,
title: title,
options: options
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsDocumentV2) {
window.o2android.openO2CmsDocumentV2(options.documentId, title, JSON.stringify(options));
} else if (window.o2android && window.o2android.openO2CmsDocument) {
window.o2android.openO2CmsDocument(options.documentId, title);
......@@ -298,7 +323,16 @@ o2.addReady(function () {
};
var _openCms = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsApplication) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsApplication",
data: {
appId : options.columnId,
title: options.title || ""
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsApplication) {
window.o2android.openO2CmsApplication(options.columnId, options.title || "");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsApplication) {
window.webkit.messageHandlers.openO2CmsApplication.postMessage(options.columnId);
......@@ -308,7 +342,13 @@ o2.addReady(function () {
};
var _openMeeting = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Meeting) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Meeting",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Meeting) {
window.o2android.openO2Meeting("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Meeting) {
window.webkit.messageHandlers.openO2Meeting.postMessage("");
......@@ -319,7 +359,13 @@ o2.addReady(function () {
var _openCalendar = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Calendar) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Calendar",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Calendar) {
window.o2android.openO2Calendar("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Calendar) {
window.webkit.messageHandlers.openO2Calendar.postMessage("");
......@@ -333,7 +379,13 @@ o2.addReady(function () {
if (tab === "done") tab = "taskCompleted";
if (tab === "readed") tab = "readCompleted";
if (window.o2android && window.o2android.openO2WorkSpace) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2WorkSpace",
data: { type: tab }
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2WorkSpace) {
window.o2android.openO2WorkSpace(tab);
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2WorkSpace) {
window.webkit.messageHandlers.openO2WorkSpace.postMessage(tab);
......
o2web/source/x_desktop/js/xbase.js
浏览文件 @ 3b8d4f0b
......@@ -73,6 +73,21 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
};
var _openWorkAndroid = function (options) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Work",
data: {
title : options.title || ""
}
};
if (options.workId) {
body.data.workId = options.workId;
} else if (options.workCompletedId) {
body.data.workCompletedId = options.workCompletedId;
}
window.o2android.postMessage(JSON.stringify(body));
return true;
}
if (window.o2android && window.o2android.openO2Work) {
if (options.workId) {
window.o2android.openO2Work(options.workId, "", options.title || "");
......@@ -123,7 +138,17 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
var title = typeOf(options) === "object" ? (options.docTitle || options.title) : "";
title = title || "";
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsDocumentV2) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsDocument",
data: {
docId : options.documentId,
title: title,
options: options
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsDocumentV2) {
window.o2android.openO2CmsDocumentV2(options.documentId, title, JSON.stringify(options));
} else if (window.o2android && window.o2android.openO2CmsDocument) {
window.o2android.openO2CmsDocument(options.documentId, title);
......@@ -135,7 +160,16 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
};
var _openCms = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2CmsApplication) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2CmsApplication",
data: {
appId : options.columnId,
title: options.title || ""
}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2CmsApplication) {
window.o2android.openO2CmsApplication(options.columnId, options.title || "");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2CmsApplication) {
window.webkit.messageHandlers.openO2CmsApplication.postMessage(options.columnId);
......@@ -145,7 +179,13 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
};
var _openMeeting = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Meeting) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Meeting",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Meeting) {
window.o2android.openO2Meeting("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Meeting) {
window.webkit.messageHandlers.openO2Meeting.postMessage("");
......@@ -156,7 +196,13 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
var _openCalendar = function (appNames, options, statusObj) {
var par = "app=" + encodeURIComponent(appNames) + "&status=" + encodeURIComponent((statusObj) ? JSON.encode(statusObj) : "") + "&option=" + encodeURIComponent((options) ? JSON.encode(options) : "");
if (window.o2android && window.o2android.openO2Calendar) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2Calendar",
data: {}
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2Calendar) {
window.o2android.openO2Calendar("");
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2Calendar) {
window.webkit.messageHandlers.openO2Calendar.postMessage("");
......@@ -170,7 +216,13 @@ o2.xDesktop.requireApp = function (module, clazz, callback, async) {
if (tab === "done") tab = "taskCompleted";
if (tab === "readed") tab = "readCompleted";
if (window.o2android && window.o2android.openO2WorkSpace) {
if (window.o2android && window.o2android.postMessage) {
var body = {
type: "openO2WorkSpace",
data: { type: tab }
};
window.o2android.postMessage(JSON.stringify(body));
} else if (window.o2android && window.o2android.openO2WorkSpace) {
window.o2android.openO2WorkSpace(tab);
} else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.openO2WorkSpace) {
window.webkit.messageHandlers.openO2WorkSpace.postMessage(tab);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或