Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
db98813a
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
339
Star
10
Fork
6
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
db98813a
编写于
6月 26, 2021
作者:
蔡
蔡祥熠
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'wrdp' into 'develop'
Wrdp See merge request o2oa/o2oa!4238
上级
68a04d47
4b88d267
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
2 deletion
+14
-2
o2web/source/o2_core/o2/widget/JavascriptEditor.js
o2web/source/o2_core/o2/widget/JavascriptEditor.js
+2
-1
o2web/source/o2_core/o2/widget/ScriptArea.js
o2web/source/o2_core/o2/widget/ScriptArea.js
+3
-1
o2web/source/x_component_Profile/Main.js
o2web/source/x_component_Profile/Main.js
+6
-0
o2web/source/x_component_Profile/lp/en.js
o2web/source/x_component_Profile/lp/en.js
+1
-0
o2web/source/x_component_Profile/lp/zh-cn.js
o2web/source/x_component_Profile/lp/zh-cn.js
+1
-0
o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js
...ource/x_component_query_ViewDesigner/widget/ViewFilter.js
+1
-0
未找到文件。
o2web/source/o2_core/o2/widget/JavascriptEditor.js
浏览文件 @
db98813a
...
...
@@ -6,6 +6,7 @@ o2.widget.JavascriptEditor = new Class({
options
:
{
//"type": "ace",
"
type
"
:
"
monaco
"
,
"
forceType
"
:
null
,
"
title
"
:
"
JavascriptEditor
"
,
"
style
"
:
"
default
"
,
"
option
"
:
{
...
...
@@ -55,7 +56,7 @@ o2.widget.JavascriptEditor = new Class({
},
load
:
function
(
callback
){
this
.
getEditorTheme
(
function
(
json
){
this
.
options
.
type
=
o2
.
editorData
.
javascriptEditor
.
editor
||
"
monaco
"
;
this
.
options
.
type
=
this
.
options
.
forceType
||
o2
.
editorData
.
javascriptEditor
.
editor
||
"
monaco
"
;
if
(
this
.
options
.
type
.
toLowerCase
()
==
"
ace
"
){
this
.
loadAce
(
callback
);
}
...
...
o2web/source/o2_core/o2/widget/ScriptArea.js
浏览文件 @
db98813a
...
...
@@ -13,7 +13,8 @@ o2.widget.ScriptArea = new Class({
"
isbind
"
:
true
,
"
mode
"
:
"
javascript
"
,
"
runtime
"
:
"
all
"
,
"
key
"
:
"
code
"
"
key
"
:
"
code
"
,
"
forceType
"
:
null
},
initialize
:
function
(
node
,
options
){
this
.
setOptions
(
options
);
...
...
@@ -187,6 +188,7 @@ o2.widget.ScriptArea = new Class({
value
=
(
value
)
?
value
:
""
;
this
.
jsEditor
=
new
o2
.
widget
.
JavascriptEditor
(
this
.
contentNode
,{
"
runtime
"
:
this
.
options
.
runtime
||
"
all
"
,
"
forceType
"
:
this
.
options
.
forceType
,
"
option
"
:
{
"
value
"
:
value
,
"
lineNumbers
"
:
false
,
...
...
o2web/source/x_component_Profile/Main.js
浏览文件 @
db98813a
...
...
@@ -1297,6 +1297,12 @@ MWF.xApplication.Profile.emPowerPopupForm = new Class({
sdata
.
toPerson
=
data
.
toPerson
.
split
(
"
@
"
)[
0
];
sdata
.
startTime
=
data
.
startDateInput
+
"
"
+
data
.
startTimeInput
+
"
:00
"
;
sdata
.
completedTime
=
data
.
endDateInput
+
"
"
+
data
.
endTimeInput
+
"
:00
"
;
if
(
Date
.
parse
(
sdata
.
completedTime
)
-
Date
.
parse
(
sdata
.
startTime
)
<
0
){
this
.
app
.
notice
(
this
.
lp
.
startTimeEarlyCompleteTime
,
"
error
"
);
return
;
}
sdata
.
enable
=
true
;
if
(
data
.
type
==
"
all
"
){
...
...
o2web/source/x_component_Profile/lp/en.js
浏览文件 @
db98813a
...
...
@@ -90,6 +90,7 @@ MWF.xApplication.Profile.LP = {
"
type_process
"
:
"
Process
"
,
"
type_filter
"
:
"
File type
"
,
"
saveNotAll
"
:
"
Partial save failed
"
,
"
startTimeEarlyCompleteTime
"
:
"
The start time cannot be later than the end time
"
,
"
title
"
:
"
Title
"
,
"
activityName
"
:
"
Activity
"
,
"
createTime
"
:
"
Commission time
"
,
...
...
o2web/source/x_component_Profile/lp/zh-cn.js
浏览文件 @
db98813a
...
...
@@ -91,6 +91,7 @@ MWF.xApplication.Profile.LP = {
"
type_process
"
:
"
流程
"
,
"
type_filter
"
:
"
文件类型
"
,
"
saveNotAll
"
:
"
部分保存失败
"
,
"
startTimeEarlyCompleteTime
"
:
"
开始时间不能晚于结束时间
"
,
"
title
"
:
"
标题
"
,
"
activityName
"
:
"
状态
"
,
"
createTime
"
:
"
委托时间
"
,
...
...
o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js
浏览文件 @
db98813a
...
...
@@ -73,6 +73,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
"
title
"
:
title
,
"
isload
"
:
true
,
"
isbind
"
:
false
,
"
forceType
"
:
"
ace
"
,
"
maxObj
"
:
this
.
app
.
formContentNode
||
this
.
app
.
pageContentNode
,
"
onChange
"
:
function
(){
this
.
customFilterValueScriptData
=
this
.
customFilterValueScriptArea
.
toJson
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录