Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
fa72cf8d
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fa72cf8d
编写于
10月 21, 2022
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into develop
上级
94a355bc
5f96dbab
变更
32
显示空白变更内容
内联
并排
Showing
32 changed file
with
495 addition
and
200 deletion
+495
-200
o2server/start_aix_debug.sh
o2server/start_aix_debug.sh
+1
-1
o2server/start_arm_debug.sh
o2server/start_arm_debug.sh
+1
-1
o2server/start_linux_debug.sh
o2server/start_linux_debug.sh
+1
-1
o2server/start_macos_debug.sh
o2server/start_macos_debug.sh
+1
-1
o2server/start_mips_debug.sh
o2server/start_mips_debug.sh
+1
-1
o2server/start_raspi_debug.sh
o2server/start_raspi_debug.sh
+1
-1
o2server/start_windows_debug.bat
o2server/start_windows_debug.bat
+1
-1
o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/GBaseDictionary.java
...ava/com/x/base/core/openjpa/jdbc/sql/GBaseDictionary.java
+1
-1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
.../src/main/java/com/x/base/core/project/config/Config.java
+9
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/General.java
...src/main/java/com/x/base/core/project/config/General.java
+1
-1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/Business.java
...ol/src/main/java/com/x/cms/assemble/control/Business.java
+33
-43
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentQueryService.java
.../x/cms/assemble/control/service/DocumentQueryService.java
+1
-1
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/factory/MeetingFactory.java
...om/x/meeting/assemble/control/factory/MeetingFactory.java
+3
-4
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/instant/ActionListWithCurrentPersonWithoutIMDesc.java
...xrs/instant/ActionListWithCurrentPersonWithoutIMDesc.java
+30
-30
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Instant.java
...tity/src/main/java/com/x/message/core/entity/Instant.java
+0
-25
o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java
...nization/assemble/personal/jaxrs/regist/ActionCreate.java
+72
-12
o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ExceptionInvalidUnit.java
.../assemble/personal/jaxrs/regist/ExceptionInvalidUnit.java
+12
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/MessageFactory.java
.../x/processplatform/service/processing/MessageFactory.java
+2
-2
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java
...ssplatform/service/processing/jaxrs/job/ActionDelete.java
+1
-0
o2web/source/o2_core/o2/lp/en.js
o2web/source/o2_core/o2/lp/en.js
+2
-1
o2web/source/o2_core/o2/lp/zh-cn.js
o2web/source/o2_core/o2/lp/zh-cn.js
+2
-1
o2web/source/o2_core/o2/xDesktop/Authentication.js
o2web/source/o2_core/o2/xDesktop/Authentication.js
+55
-39
o2web/source/o2_core/o2/xScript/PageEnvironment.js
o2web/source/o2_core/o2/xScript/PageEnvironment.js
+8
-1
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
+8
-1
o2web/source/x_component_process_FormDesigner/Module/Form/template/form_custom_submit_mobile.json
...igner/Module/Form/template/form_custom_submit_mobile.json
+6
-6
o2web/source/x_component_process_FormDesigner/Module/Form/template/form_custom_submit_pc.json
...mDesigner/Module/Form/template/form_custom_submit_pc.json
+2
-2
o2web/source/x_component_process_FormDesigner/Module/Html.js
o2web/source/x_component_process_FormDesigner/Module/Html.js
+10
-1
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+2
-2
o2web/source/x_desktop/js/base.js
o2web/source/x_desktop/js/base.js
+57
-5
o2web/source/x_desktop/js/base_simple.js
o2web/source/x_desktop/js/base_simple.js
+57
-5
o2web/source/x_desktop/js/base_simple_anonymous.js
o2web/source/x_desktop/js/base_simple_anonymous.js
+57
-5
o2web/source/x_desktop/js/xbase.js
o2web/source/x_desktop/js/xbase.js
+57
-5
未找到文件。
o2server/start_aix_debug.sh
浏览文件 @
fa72cf8d
...
...
@@ -48,4 +48,4 @@ then
exit
1
fi
fi
setsid
${
current_dir
}
/jvm/aix_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
setsid
${
current_dir
}
/jvm/aix_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
0.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
o2server/start_arm_debug.sh
浏览文件 @
fa72cf8d
...
...
@@ -41,4 +41,4 @@ if [ -d ${current_dir}/local/update ]; then
exit
1
fi
fi
setsid
${
current_dir
}
/jvm/arm_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
setsid
${
current_dir
}
/jvm/arm_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
0.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
o2server/start_linux_debug.sh
浏览文件 @
fa72cf8d
...
...
@@ -41,4 +41,4 @@ if [ -d ${current_dir}/local/update ]; then
exit
1
fi
fi
setsid
${
current_dir
}
/jvm/linux_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
setsid
${
current_dir
}
/jvm/linux_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
0.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
o2server/start_macos_debug.sh
浏览文件 @
fa72cf8d
...
...
@@ -42,4 +42,4 @@ if [ -d ${current_dir}/local/update ]; then
exit
1
fi
fi
sudo
${
current_dir
}
/jvm/macos_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
sudo
${
current_dir
}
/jvm/macos_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
0.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
o2server/start_mips_debug.sh
浏览文件 @
fa72cf8d
...
...
@@ -41,4 +41,4 @@ if [ -d ${current_dir}/local/update ]; then
exit
1
fi
fi
setsid
${
current_dir
}
/jvm/mips_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
setsid
${
current_dir
}
/jvm/mips_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
0.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
o2server/start_raspi_debug.sh
浏览文件 @
fa72cf8d
...
...
@@ -41,4 +41,4 @@ if [ -d ${current_dir}/local/update ]; then
exit
1
fi
fi
setsid
${
current_dir
}
/jvm/raspi_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
setsid
${
current_dir
}
/jvm/raspi_java11/bin/java
-Dnashorn
.args
=
--no-deprecation-warning
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL-UNNAMED
--add-exports
jdk.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL-UNNAMED
--add-opens
java.base/java.lang
=
ALL-UNNAMED
-javaagent
:
${
current_dir
}
/console.jar
-server
-Djava
.awt.headless
=
true
-Xms2g
-Duser
.timezone
=
GMT+08
-XX
:+HeapDumpOnOutOfMemoryError
-Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug
-Xrunjdwp
:transport
=
dt_socket,server
=
y,suspend
=
n,address
=
0.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127.0.0.1
-jar
${
current_dir
}
/console.jar
o2server/start_windows_debug.bat
浏览文件 @
fa72cf8d
...
...
@@ -37,4 +37,4 @@ if exist "%~dp0local\update" (
)
)
@echo
on
"
%~dp0
jvm\windows_java11\bin\java"
-javaagent
:
"
%~dp0
console.jar"
-server -Xms
2
g
-Dnashorn
.args
=
--no-deprecation-warning --add-exports
jdk
.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL
-UNNAMED --add-exports
jdk
.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL
-UNNAMED --add-opens
java
.base/java.lang
=
ALL
-UNNAMED -Duser
.timezone
=
GMT
+
08
-XX
:
+HeapDumpOnOutOfMemoryError -Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug -Xrunjdwp
:transport
=
dt_socket
,
server
=
y
,
suspend
=
n
,
address
=
20000
-Djava
.rmi.server.hostname
=
127
.0.0.1
-jar
"
%~dp0
console.jar"
"
%~dp0
jvm\windows_java11\bin\java"
-javaagent
:
"
%~dp0
console.jar"
-server -Xms
2
g
-Dnashorn
.args
=
--no-deprecation-warning --add-exports
jdk
.scripting.nashorn/jdk.nashorn.internal.runtime
=
ALL
-UNNAMED --add-exports
jdk
.scripting.nashorn/jdk.nashorn.internal.runtime.arrays
=
ALL
-UNNAMED --add-opens
java
.base/java.lang
=
ALL
-UNNAMED -Duser
.timezone
=
GMT
+
08
-XX
:
+HeapDumpOnOutOfMemoryError -Dcom
.sun.management.jmxremote
-Dcom
.sun.management.jmxremote.ssl
=
false
-Dcom
.sun.management.jmxremote.port
=
1099
-Dcom
.sun.management.jmxremote.authenticate
=
false
-Xdebug -Xrunjdwp
:transport
=
dt_socket
,
server
=
y
,
suspend
=
n
,
address
=
0
.0.0.0:
20000
-Djava
.rmi.server.hostname
=
127
.0.0.1
-jar
"
%~dp0
console.jar"
o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/GBaseDictionary.java
浏览文件 @
fa72cf8d
...
...
@@ -62,7 +62,7 @@ public class GBaseDictionary extends DBDictionary {
floatTypeName
=
"FLOAT"
;
doubleTypeName
=
"DOUBLE PRECISION"
;
bitTypeName
=
"BOOLEAN"
;
blobTypeName
=
"B
YTE
"
;
blobTypeName
=
"B
LOB
"
;
dateTypeName
=
"DATE"
;
timeTypeName
=
"DATETIME HOUR TO SECOND"
;
timestampTypeName
=
"DATETIME YEAR TO FRACTION(5)"
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
浏览文件 @
fa72cf8d
...
...
@@ -134,6 +134,7 @@ public class Config {
public
static
final
String
DIR_LOCAL_BACKUP
=
"local/backup"
;
public
static
final
String
DIR_LOCAL_DUMP
=
"local/dump"
;
public
static
final
String
DIR_LOCAL_REPOSITORY
=
"local/repository"
;
public
static
final
String
DIR_LOCAL_REPOSITORY_INDEX
=
"local/repository/index"
;
public
static
final
String
DIR_LOCAL_UPDATE
=
"local/update"
;
public
static
final
String
DIR_LOCAL_TEMP
=
"local/temp"
;
public
static
final
String
DIR_LOCAL_TEMP_CLASSES
=
"local/temp/classes"
;
...
...
@@ -1465,4 +1466,12 @@ public class Config {
return
path
;
}
public
static
Path
path_local_repository_index
(
boolean
force
)
throws
IOException
,
URISyntaxException
{
Path
path
=
Paths
.
get
(
base
(),
DIR_LOCAL_REPOSITORY_INDEX
);
if
((!
Files
.
exists
(
path
))
&&
force
)
{
Files
.
createDirectories
(
path
);
}
return
path
;
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/General.java
浏览文件 @
fa72cf8d
...
...
@@ -21,7 +21,7 @@ public class General extends ConfigObject {
private
static
final
Boolean
DEFAULT_WEBSOCKETENABLE
=
true
;
private
static
final
Boolean
DEFAULT_CONFIGAPIENABLE
=
true
;
private
static
final
List
<
String
>
DEFAULT_SCRIPTINGBLOCKEDCLASSES
=
Arrays
.
asList
(
Runtime
.
class
.
getName
(),
File
.
class
.
getName
(),
Path
.
class
.
getName
());
File
.
class
.
getName
(),
Path
.
class
.
getName
()
,
ProcessBuilder
.
class
.
getName
()
);
private
static
final
Boolean
DEFAULT_REQUESTLOGENABLE
=
false
;
private
static
final
Integer
DEFAULT_REQUESTLOGRETAINDAYS
=
7
;
private
static
final
Boolean
DEFAULT_REQUESTLOGBODYENABLE
=
false
;
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/Business.java
浏览文件 @
fa72cf8d
package
com.x.cms.assemble.control
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
com.x.cms.core.entity.CategoryInfo
;
import
com.x.cms.core.entity.Document
;
...
...
@@ -418,6 +420,7 @@ public class Business {
/**
* 是否是文档的编辑者
* 文档不存在判断是否是分类或应用的发布者
* @param person
* @param appInfo
* @return
...
...
@@ -427,8 +430,8 @@ public class Business {
if
(
isManager
(
person
))
{
return
true
;
}
List
<
String
>
unitNames
=
null
;
List
<
String
>
groupNames
=
null
;
List
<
String
>
unitNames
=
this
.
organization
().
unit
().
listWithPersonSupNested
(
person
.
getDistinguishedName
())
;
List
<
String
>
groupNames
=
this
.
organization
().
group
().
listWithPerson
(
person
.
getDistinguishedName
())
;
if
(
document
!=
null
){
if
(
ListTools
.
isNotEmpty
(
document
.
getAuthorPersonList
()
))
{
if
(
document
.
getAuthorPersonList
().
contains
(
getShortTargetFlag
(
person
.
getDistinguishedName
())
)
)
{
...
...
@@ -436,65 +439,52 @@ public class Business {
}
}
if
(
ListTools
.
isNotEmpty
(
document
.
getAuthorUnitList
()
))
{
unitNames
=
this
.
organization
().
unit
()
.
listWithPersonSupNested
(
person
.
getDistinguishedName
());
if
(
ListTools
.
containsAny
(
getShortTargetFlag
(
unitNames
),
document
.
getAuthorUnitList
()))
{
return
true
;
}
}
if
(
ListTools
.
isNotEmpty
(
document
.
getAuthorGroupList
()
))
{
groupNames
=
this
.
organization
().
group
().
listWithPerson
(
person
.
getDistinguishedName
());
if
(
ListTools
.
containsAny
(
getShortTargetFlag
(
groupNames
),
document
.
getAuthorGroupList
()))
{
return
true
;
}
}
}
if
(
categoryInfo
!=
null
)
{
if
(
ListTools
.
isNotEmpty
(
categoryInfo
.
getManageablePersonList
()))
{
if
(
categoryInfo
.
getManageablePersonList
().
contains
(
person
.
getDistinguishedName
()))
{
return
true
;
}
}
if
(
ListTools
.
isNotEmpty
(
categoryInfo
.
getManageableUnitList
()))
{
if
(
unitNames
==
null
)
{
unitNames
=
this
.
organization
().
unit
()
.
listWithPersonSupNested
(
person
.
getDistinguishedName
());
Set
<
String
>
catePersonList
=
new
HashSet
<>(
categoryInfo
.
getManageablePersonList
());
Set
<
String
>
cateUnitList
=
new
HashSet
<>(
categoryInfo
.
getManageableUnitList
());
Set
<
String
>
cateGroupList
=
new
HashSet
<>(
categoryInfo
.
getManageableGroupList
());
if
(
document
==
null
){
catePersonList
.
addAll
(
categoryInfo
.
getPublishablePersonList
());
cateUnitList
.
addAll
(
categoryInfo
.
getPublishableUnitList
());
cateGroupList
.
addAll
(
categoryInfo
.
getPublishableGroupList
());
}
if
(
ListTools
.
containsAny
(
unitNames
,
categoryInfo
.
getManageableUnitList
()))
{
if
(
catePersonList
.
size
()
>
0
&&
catePersonList
.
contains
(
person
.
getDistinguishedName
()))
{
return
true
;
}
}
if
(
ListTools
.
isNotEmpty
(
categoryInfo
.
getManageableGroupList
()))
{
if
(
groupNames
==
null
)
{
groupNames
=
this
.
organization
().
group
().
listWithPerson
(
person
.
getDistinguishedName
());
}
if
(
ListTools
.
containsAny
(
groupNames
,
categoryInfo
.
getManageableGroupList
()))
{
if
(
cateUnitList
.
size
()
>
0
&&
ListTools
.
containsAny
(
unitNames
,
new
ArrayList
<>(
cateUnitList
)))
{
return
true
;
}
}
}
if
(
appInfo
!=
null
)
{
if
(
ListTools
.
isNotEmpty
(
appInfo
.
getManageablePersonList
()))
{
if
(
appInfo
.
getManageablePersonList
().
contains
(
person
.
getDistinguishedName
()))
{
if
(
cateGroupList
.
size
()
>
0
&&
ListTools
.
containsAny
(
groupNames
,
new
ArrayList
<>(
cateGroupList
)))
{
return
true
;
}
}
if
(
ListTools
.
isNotEmpty
(
appInfo
.
getManageableUnitList
()))
{
if
(
unitNames
==
null
)
{
unitNames
=
this
.
organization
().
unit
()
.
listWithPersonSupNested
(
person
.
getDistinguishedName
());
if
(
appInfo
!=
null
)
{
Set
<
String
>
appPersonList
=
new
HashSet
<>(
appInfo
.
getManageablePersonList
());
Set
<
String
>
appUnitList
=
new
HashSet
<>(
appInfo
.
getManageableUnitList
());
Set
<
String
>
appGroupList
=
new
HashSet
<>(
appInfo
.
getManageableGroupList
());
if
(
document
==
null
){
appPersonList
.
addAll
(
appInfo
.
getPublishablePersonList
());
appUnitList
.
addAll
(
appInfo
.
getPublishableUnitList
());
appGroupList
.
addAll
(
appInfo
.
getPublishableGroupList
());
}
if
(
ListTools
.
containsAny
(
unitNames
,
appInfo
.
getManageableUnitList
()))
{
if
(
appPersonList
.
size
()
>
0
&&
appPersonList
.
contains
(
person
.
getDistinguishedName
()))
{
return
true
;
}
}
if
(
ListTools
.
isNotEmpty
(
appInfo
.
getManageableGroupList
()))
{
if
(
groupNames
==
null
)
{
groupNames
=
this
.
organization
().
group
().
listWithPerson
(
person
.
getDistinguishedName
());
}
if
(
ListTools
.
containsAny
(
groupNames
,
appInfo
.
getManageableGroupList
()))
{
if
(
appUnitList
.
size
()
>
0
&&
ListTools
.
containsAny
(
unitNames
,
new
ArrayList
<>(
appUnitList
)))
{
return
true
;
}
if
(
appGroupList
.
size
()
>
0
&&
ListTools
.
containsAny
(
groupNames
,
new
ArrayList
<>(
appGroupList
)))
{
return
true
;
}
}
return
false
;
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentQueryService.java
浏览文件 @
fa72cf8d
...
...
@@ -35,7 +35,7 @@ public class DocumentQueryService {
public
Document
get
(
String
id
)
throws
Exception
{
if
(
StringUtils
.
isEmpty
(
id
)
){
throw
new
Exception
(
"id is null!"
)
;
return
null
;
}
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
()
)
{
return
documentInfoService
.
get
(
emc
,
id
);
...
...
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/factory/MeetingFactory.java
浏览文件 @
fa72cf8d
...
...
@@ -114,7 +114,6 @@ public class MeetingFactory extends AbstractFactory {
Root
<
Meeting
>
root
=
cq
.
from
(
Meeting
.
class
);
Predicate
p
=
cb
.
isMember
(
person
,
root
.
get
(
Meeting_
.
invitePersonList
));
p
=
cb
.
and
(
p
,
cb
.
isMember
(
person
,
root
.
get
(
Meeting_
.
rejectPersonList
)));
p
=
cb
.
and
(
p
,
cb
.
lessThan
(
root
.
get
(
Meeting_
.
completedTime
),
new
Date
()));
cq
.
select
(
root
.
get
(
Meeting_
.
id
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
();
}
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/instant/ActionListWithCurrentPersonWithoutIMDesc.java
浏览文件 @
fa72cf8d
...
...
@@ -13,6 +13,7 @@ import org.apache.commons.lang3.math.NumberUtils;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.JpaObject_
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.http.ActionResult
;
...
...
@@ -26,7 +27,7 @@ import com.x.message.core.entity.Instant_;
class
ActionListWithCurrentPersonWithoutIMDesc
extends
BaseAction
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ActionListWithCurrentPersonWithoutIMDesc
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ActionListWithCurrentPersonWithoutIMDesc
.
class
);
ActionResult
<
List
<
Wo
>>
execute
(
EffectivePerson
effectivePerson
,
Integer
count
)
throws
Exception
{
...
...
@@ -48,8 +49,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
)));
List
<
Instant
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
Instant_
.
createTime
))))
List
<
Instant
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
desc
(
root
.
get
(
JpaObject_
.
createTime
))))
.
setMaxResults
(
count
).
getResultList
();
return
Wo
.
copier
.
copy
(
os
);
}
...
...
o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Instant.java
浏览文件 @
fa72cf8d
package
com.x.message.core.entity
;
import
java.util.List
;
import
javax.persistence.Basic
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
...
...
@@ -10,14 +8,9 @@ import javax.persistence.Id;
import
javax.persistence.Inheritance
;
import
javax.persistence.InheritanceType
;
import
javax.persistence.Lob
;
import
javax.persistence.OrderColumn
;
import
javax.persistence.Table
;
import
javax.persistence.UniqueConstraint
;
import
org.apache.openjpa.persistence.PersistentCollection
;
import
org.apache.openjpa.persistence.jdbc.ContainerTable
;
import
org.apache.openjpa.persistence.jdbc.ElementColumn
;
import
org.apache.openjpa.persistence.jdbc.ElementIndex
;
import
org.apache.openjpa.persistence.jdbc.Index
;
import
com.x.base.core.entity.JpaObject
;
...
...
@@ -99,16 +92,6 @@ public class Instant extends SliceJpaObject {
@CheckPersist
(
allowEmpty
=
false
)
private
Boolean
consumed
;
public
static
final
String
consumerList_FIELDNAME
=
"consumerList"
;
@FieldDescribe
(
"消费对象."
)
@PersistentCollection
(
fetch
=
FetchType
.
EAGER
)
@OrderColumn
(
name
=
ORDERCOLUMNCOLUMN
)
@ContainerTable
(
name
=
TABLE
+
ContainerTableNameMiddle
+
consumerList_FIELDNAME
,
joinIndex
=
@Index
(
name
=
TABLE
+
consumerList_FIELDNAME
+
JoinIndexNameSuffix
))
@ElementColumn
(
length
=
JpaObject
.
length_64B
,
name
=
ColumnNamePrefix
+
consumerList_FIELDNAME
)
@ElementIndex
(
name
=
TABLE
+
consumerList_FIELDNAME
+
ElementIndexNameSuffix
)
private
List
<
String
>
consumerList
;
public
String
getBody
()
{
return
body
;
}
...
...
@@ -125,14 +108,6 @@ public class Instant extends SliceJpaObject {
this
.
type
=
type
;
}
public
List
<
String
>
getConsumerList
()
{
return
consumerList
;
}
public
void
setConsumerList
(
List
<
String
>
consumerList
)
{
this
.
consumerList
=
consumerList
;
}
public
String
getPerson
()
{
return
person
;
}
...
...
o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java
浏览文件 @
fa72cf8d
package
com.x.organization.assemble.personal.jaxrs.regist
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
...
...
@@ -13,21 +10,27 @@ import com.x.base.core.project.config.Config;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WoId
;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.StringTools
;
import
com.x.base.core.project.x_organization_assemble_control
;
import
com.x.organization.assemble.personal.Business
;
import
com.x.organization.assemble.personal.ThisApplication
;
import
com.x.organization.core.entity.Person
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
class
ActionCreate
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionCreate
.
class
);
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
JsonElement
jsonElement
)
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Person
person
;
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
String
name
=
wi
.
getName
();
String
passwd
=
wi
.
getPassword
();
...
...
@@ -65,7 +68,7 @@ class ActionCreate extends BaseAction {
throw
new
ExceptionInvalidPassword
(
Config
.
person
().
getPasswordRegexHint
());
}
if
(
null
==
genderType
)
{
throw
new
ExceptionInvalidGenderType
()
;
genderType
=
GenderType
.
d
;
}
if
(
StringUtils
.
equals
(
com
.
x
.
base
.
core
.
project
.
config
.
Person
.
REGISTER_TYPE_CODE
,
Config
.
person
().
getRegister
()))
{
...
...
@@ -79,15 +82,21 @@ class ActionCreate extends BaseAction {
throw
new
ExceptionInvalidCaptcha
();
}
}
this
.
register
(
business
,
name
,
passwd
,
genderType
,
mobile
,
mail
);
if
(
StringUtils
.
isNotBlank
(
wi
.
getUnit
())
&&
business
.
unit
().
pick
(
wi
.
getUnit
())
==
null
){
throw
new
ExceptionInvalidUnit
(
wi
.
getUnit
());
}
person
=
this
.
register
(
business
,
name
,
passwd
,
genderType
,
mobile
,
mail
);
}
if
(
StringUtils
.
isNotBlank
(
wi
.
getUnit
())){
this
.
createIdentity
(
person
,
wi
.
getUnit
());
}
Wo
wo
=
new
Wo
();
wo
.
setValue
(
true
);
result
.
setData
(
wo
);
return
result
;
}
}
private
void
register
(
Business
business
,
String
name
,
String
password
,
GenderType
genderType
,
String
mobile
,
String
mail
)
private
Person
register
(
Business
business
,
String
name
,
String
password
,
GenderType
genderType
,
String
mobile
,
String
mail
)
throws
Exception
{
Person
o
=
new
Person
();
o
.
setName
(
name
);
...
...
@@ -98,6 +107,46 @@ class ActionCreate extends BaseAction {
business
.
entityManagerContainer
().
beginTransaction
(
Person
.
class
);
business
.
entityManagerContainer
().
persist
(
o
,
CheckPersistType
.
all
);
business
.
entityManagerContainer
().
commit
();
return
o
;
}
private
void
createIdentity
(
Person
person
,
String
unit
)
throws
Exception
{
WrapIdentity
identity
=
new
WrapIdentity
();
identity
.
setName
(
person
.
getName
());
identity
.
setPerson
(
person
.
getId
());
identity
.
setUnit
(
unit
);
ThisApplication
.
context
().
applications
().
postQuery
(
x_organization_assemble_control
.
class
,
"identity"
,
identity
);
}
private
static
class
WrapIdentity
extends
GsonPropertyObject
{
private
String
person
;
private
String
name
;
private
String
unit
;
public
String
getPerson
()
{
return
person
;
}
public
void
setPerson
(
String
person
)
{
this
.
person
=
person
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getUnit
()
{
return
unit
;
}
public
void
setUnit
(
String
unit
)
{
this
.
unit
=
unit
;
}
}
public
static
class
Wi
extends
GsonPropertyObject
{
...
...
@@ -126,6 +175,9 @@ class ActionCreate extends BaseAction {
@FieldDescribe
(
"邮件地址(非必填)."
)
private
String
mail
;
@FieldDescribe
(
"归属组织(非必填)."
)
private
String
unit
;
public
String
getName
()
{
return
name
;
}
...
...
@@ -189,6 +241,14 @@ class ActionCreate extends BaseAction {
public
void
setMail
(
String
mail
)
{
this
.
mail
=
mail
;
}
public
String
getUnit
()
{
return
unit
;
}
public
void
setUnit
(
String
unit
)
{
this
.
unit
=
unit
;
}
}
public
static
class
Wo
extends
WrapBoolean
{
...
...
o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ExceptionInvalidUnit.java
0 → 100644
浏览文件 @
fa72cf8d
package
com.x.organization.assemble.personal.jaxrs.regist
;
import
com.x.base.core.project.exception.PromptException
;
class
ExceptionInvalidUnit
extends
PromptException
{
private
static
final
long
serialVersionUID
=
6647381353782082070L
;
ExceptionInvalidUnit
(
String
unit
)
{
super
(
"指定的组织不存在:{}."
,
unit
);
}
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/MessageFactory.java
浏览文件 @
fa72cf8d
...
...
@@ -54,7 +54,7 @@ public class MessageFactory {
public
static
void
workCompleted_delete
(
WorkCompleted
workCompleted
)
throws
Exception
{
String
title
=
"删除完成工作:"
+
adjustTitle
(
workCompleted
);
MessageConnector
.
send
(
MessageConnector
.
TYPE_WORKCOMPLETED_
CREA
TE
,
title
,
""
,
workCompleted
);
MessageConnector
.
send
(
MessageConnector
.
TYPE_WORKCOMPLETED_
DELE
TE
,
title
,
""
,
workCompleted
);
}
public
static
void
task_press
(
Task
task
,
String
from
)
throws
Exception
{
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java
浏览文件 @
fa72cf8d
...
...
@@ -54,6 +54,7 @@ public class ActionDelete extends BaseAction {
emc
.
beginTransaction
(
WorkCompleted
.
class
);
for
(
WorkCompleted
o
:
emc
.
listEqual
(
WorkCompleted
.
class
,
WorkCompleted
.
job_FIELDNAME
,
job
))
{
emc
.
remove
(
o
);
MessageFactory
.
workCompleted_delete
(
o
);
Wo
wo
=
new
Wo
();
wo
.
setId
(
o
.
getId
());
wos
.
add
(
wo
);
...
...
o2web/source/o2_core/o2/lp/en.js
浏览文件 @
fa72cf8d
...
...
@@ -504,7 +504,8 @@ o2.LP.authentication = {
"
inputYourNewPassword
"
:
"
Enter a new password
"
,
"
changePasswordSuccess
"
:
"
Successfully change password
"
,
"
userAppCameraHtml
"
:
"
<div>open <div styles='bindTipLinkArea'>APP </div> and scan</div>
"
,
"
loginToPage
"
:
"
Login to the page
"
"
loginToPage
"
:
"
Login to the page
"
,
"
accessError
"
:
"
Failed to access background service
"
};
o2
.
LP
.
script
=
{
...
...
o2web/source/o2_core/o2/lp/zh-cn.js
浏览文件 @
fa72cf8d
...
...
@@ -510,7 +510,8 @@ o2.LP.authentication = {
"
inputYourNewPassword
"
:
"
请输入新密码
"
,
"
changePasswordSuccess
"
:
"
修改密码成功
"
,
"
userAppCameraHtml
"
:
"
<div>打开<div styles='bindTipLinkArea'>APP</div>扫一扫</div>
"
,
"
loginToPage
"
:
"
登录网页版
"
"
loginToPage
"
:
"
登录网页版
"
,
"
accessError
"
:
"
访问后台服务失败
"
};
o2
.
LP
.
script
=
{
...
...
o2web/source/o2_core/o2/xDesktop/Authentication.js
浏览文件 @
fa72cf8d
...
...
@@ -46,8 +46,9 @@ MWF.xDesktop.Authentication = new Class({
},
loadLogin
:
function
(
node
)
{
if
(
node
)
this
.
loginNode
=
node
;
if
(
!
node
&&
this
.
loginNode
)
node
=
this
.
loginNode
;
o2
.
Actions
.
load
(
"
x_organization_assemble_authentication
"
).
EchoAction
.
get
(
function
()
{
if
(
node
)
this
.
loginNode
=
node
;
if
(
!
node
&&
this
.
loginNode
)
node
=
this
.
loginNode
;
if
(
layout
.
config
.
loginPage
&&
layout
.
config
.
loginPage
.
enable
&&
layout
.
config
.
loginPage
.
portal
)
{
MWF
.
xDesktop
.
loadPortal
(
layout
.
config
.
loginPage
.
portal
,
this
.
options
.
loginParameter
);
this
.
fireEvent
(
"
openLogin
"
);
...
...
@@ -74,18 +75,33 @@ MWF.xDesktop.Authentication = new Class({
});
user
.
roleList
=
user
.
roleList
.
concat
(
userRoleName
);
}
var
roleLCList
=
(
user
.
roleList
||
[]).
map
(
function
(
role
)
{
var
roleLCList
=
(
user
.
roleList
||
[]).
map
(
function
(
role
)
{
return
role
.
toLowerCase
();
}.
bind
(
this
));
if
(
roleLCList
.
isIntersect
([
"
systemmanager
"
,
"
securitymanager
"
,
"
auditmanager
"
])
)
{
if
(
roleLCList
.
isIntersect
([
"
systemmanager
"
,
"
securitymanager
"
,
"
auditmanager
"
]))
{
window
.
location
=
"
../x_desktop/app.html?app=ThreeMember
"
;
}
else
{
}
else
{
window
.
location
.
reload
();
}
}.
bind
(
this
);
this
.
openLoginForm
(
this
.
popupOptions
);
this
.
fireEvent
(
"
openLogin
"
);
}
}.
bind
(
this
),
function
(
xhr
)
{
var
message
;
if
(
xhr
)
{
try
{
var
responseJSON
=
JSON
.
parse
(
xhr
.
responseText
);
message
=
responseJSON
.
message
;
//message为错误提示文本
}
catch
(
e
)
{
}
}
if
(
!
message
)
message
=
MWF
.
LP
.
authentication
.
accessError
;
new
Element
(
"
div
"
,
{
"
style
"
:
"
font-size:16px;font-weight:bold;
"
,
"
text
"
:
message
}).
inject
(
node
);
}.
bind
(
this
));
},
safeLogout
:
function
(){
o2
.
Actions
.
get
(
"
x_organization_assemble_authentication
"
).
safeLogout
(
function
()
{
...
...
o2web/source/o2_core/o2/xScript/PageEnvironment.js
浏览文件 @
fa72cf8d
...
...
@@ -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
浏览文件 @
fa72cf8d
...
...
@@ -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_component_process_FormDesigner/Module/Form/template/form_custom_submit_mobile.json
浏览文件 @
fa72cf8d
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
o2web/source/x_component_process_FormDesigner/Module/Form/template/form_custom_submit_pc.json
浏览文件 @
fa72cf8d
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
o2web/source/x_component_process_FormDesigner/Module/Html.js
浏览文件 @
fa72cf8d
...
...
@@ -94,7 +94,7 @@ MWF.xApplication.process.FormDesigner.Module.Html = MWF.FCHtml = new Class({
},
_setOtherNodeEvent
:
function
(){
this
.
textarea
.
focus
();
//
this.textarea.focus();
this
.
textarea
.
addEvents
({
"
keydown
"
:
function
(
e
){
...
...
@@ -119,6 +119,15 @@ MWF.xApplication.process.FormDesigner.Module.Html = MWF.FCHtml = new Class({
this
.
json
.
text
=
this
.
textarea
.
get
(
"
value
"
);
}.
bind
(
this
)
});
this
.
node
.
addEvents
({
"
mouseenter
"
:
function
()
{
this
.
textarea
.
disabled
=
false
;
}.
bind
(
this
),
"
mouseleave
"
:
function
()
{
this
.
textarea
.
disabled
=
true
;
}.
bind
(
this
)
})
},
_setEditStyle_custom
:
function
(
name
){
if
(
name
==
"
text
"
){
...
...
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
fa72cf8d
...
...
@@ -2786,13 +2786,13 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
var
actionNode
=
new
Element
(
"
div
"
,
{
"
id
"
:
tool
.
id
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFButtonImage
"
:
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
iconPath
+
tool
.
img
,
"
MWFButtonImage
"
:
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
iconPath
+
tool
.
img
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
"
runCustomAction
"
,
"
MWFButtonText
"
:
tool
.
text
}).
inject
(
node
);
if
(
this
.
json
.
customIconOverStyle
){
actionNode
.
set
(
"
MWFButtonImageOver
"
,
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
this
.
json
.
customIconOverStyle
+
"
/
"
+
tool
.
img
);
actionNode
.
set
(
"
MWFButtonImageOver
"
,
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
this
.
json
.
customIconOverStyle
+
"
/
"
+
tool
.
img
);
}
if
(
tool
.
properties
){
actionNode
.
set
(
tool
.
properties
);
...
...
o2web/source/x_desktop/js/base.js
浏览文件 @
fa72cf8d
...
...
@@ -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
浏览文件 @
fa72cf8d
...
...
@@ -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
浏览文件 @
fa72cf8d
...
...
@@ -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
浏览文件 @
fa72cf8d
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录