Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
8e54d027
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
338
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,发现更多精彩内容 >>
提交
8e54d027
编写于
9月 16, 2022
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复合并区段阅读状态流转可能报错的问题
上级
5c65e92c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
36 addition
and
14 deletion
+36
-14
o2web/source/x_component_portal_PageDesigner/Module/Application.js
...rce/x_component_portal_PageDesigner/Module/Application.js
+16
-4
o2web/source/x_component_process_Xform/$Elinput.js
o2web/source/x_component_process_Xform/$Elinput.js
+1
-1
o2web/source/x_component_process_Xform/$Input.js
o2web/source/x_component_process_Xform/$Input.js
+1
-1
o2web/source/x_component_process_Xform/$Module.js
o2web/source/x_component_process_Xform/$Module.js
+1
-1
o2web/source/x_component_process_Xform/Application.js
o2web/source/x_component_process_Xform/Application.js
+14
-4
o2web/source/x_component_process_Xform/Org.js
o2web/source/x_component_process_Xform/Org.js
+2
-2
o2web/source/x_component_process_Xform/Textfield.js
o2web/source/x_component_process_Xform/Textfield.js
+1
-1
未找到文件。
o2web/source/x_component_portal_PageDesigner/Module/Application.js
浏览文件 @
8e54d027
...
@@ -236,12 +236,11 @@ MWF.xApplication.portal.PageDesigner.Module.Application = MWF.PCApplication = ne
...
@@ -236,12 +236,11 @@ MWF.xApplication.portal.PageDesigner.Module.Application = MWF.PCApplication = ne
clazz
=
clazz
[
a
];
clazz
=
clazz
[
a
];
});
});
clazz
.
options
=
clazz
.
options
||
{};
clazz
.
options
=
clazz
.
options
||
{};
try
{
MWF
.
xDesktop
.
requireApp
(
app
,
"
lp.
"
+
o2
.
language
,
null
,
false
);
var
_load
=
function
()
{
MWF
.
xDesktop
.
requireApp
(
app
,
"
Main
"
,
null
,
false
);
if
(
clazz
.
Main
){
if
(
clazz
.
Main
){
var
opt
=
options
||
{};
var
opt
=
options
||
{};
opt
.
embededParent
=
this
.
node
;
opt
.
embededParent
=
new
Element
(
"
div
"
).
inject
(
this
.
node
)
;
this
.
application
=
new
clazz
.
Main
(
this
.
form
.
designer
.
desktop
,
opt
);
this
.
application
=
new
clazz
.
Main
(
this
.
form
.
designer
.
desktop
,
opt
);
this
.
application
.
status
=
status
;
this
.
application
.
status
=
status
;
this
.
application
.
load
();
this
.
application
.
load
();
...
@@ -250,6 +249,19 @@ MWF.xApplication.portal.PageDesigner.Module.Application = MWF.PCApplication = ne
...
@@ -250,6 +249,19 @@ MWF.xApplication.portal.PageDesigner.Module.Application = MWF.PCApplication = ne
}
else
{
}
else
{
this
.
form
.
designer
.
notice
(
this
.
form
.
designer
.
lp
.
applicationNotFound
+
"
:
"
+
app
,
"
error
"
);
this
.
form
.
designer
.
notice
(
this
.
form
.
designer
.
lp
.
applicationNotFound
+
"
:
"
+
app
,
"
error
"
);
}
}
}.
bind
(
this
);
try
{
MWF
.
xDesktop
.
requireApp
(
app
,
"
lp.
"
+
o2
.
language
,
null
,
false
);
MWF
.
xDesktop
.
requireApp
(
app
,
"
Main
"
,
null
,
false
);
if
(
clazz
.
loading
&&
clazz
.
loading
.
then
){
clazz
.
loading
.
then
(
function
(){
_load
();
});
}
else
{
_load
();
}
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
form
.
designer
.
notice
(
e
.
message
,
"
error
"
);
this
.
form
.
designer
.
notice
(
e
.
message
,
"
error
"
);
}
}
...
...
o2web/source/x_component_process_Xform/$Elinput.js
浏览文件 @
8e54d027
...
@@ -9,7 +9,7 @@ Object.assign(o2.APP$Elinput.prototype, o2.APP$Input.prototype);
...
@@ -9,7 +9,7 @@ Object.assign(o2.APP$Elinput.prototype, o2.APP$Input.prototype);
Object
.
assign
(
o2
.
APP$Elinput
.
prototype
,
{
Object
.
assign
(
o2
.
APP$Elinput
.
prototype
,
{
isReadonly
:
function
(){
isReadonly
:
function
(){
return
!!
(
this
.
readonly
||
this
.
json
.
isReadonly
||
this
.
form
.
json
.
isReadonly
);
return
!!
(
this
.
readonly
||
this
.
json
.
isReadonly
||
this
.
form
.
json
.
isReadonly
||
this
.
isSectionMergeRead
()
);
},
},
__setValue
:
function
(
value
){
__setValue
:
function
(
value
){
this
.
moduleValueAG
=
null
;
this
.
moduleValueAG
=
null
;
...
...
o2web/source/x_component_process_Xform/$Input.js
浏览文件 @
8e54d027
...
@@ -290,7 +290,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class(
...
@@ -290,7 +290,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class(
* @return {Boolean} 是否只读.
* @return {Boolean} 是否只读.
*/
*/
isReadonly
:
function
(){
isReadonly
:
function
(){
return
!!
(
this
.
readonly
||
this
.
json
.
isReadonly
||
this
.
form
.
json
.
isReadonly
);
return
!!
(
this
.
readonly
||
this
.
json
.
isReadonly
||
this
.
form
.
json
.
isReadonly
||
this
.
isSectionMergeRead
()
);
},
},
getTextData
:
function
(){
getTextData
:
function
(){
//var value = this.node.get("value");
//var value = this.node.get("value");
...
...
o2web/source/x_component_process_Xform/$Module.js
浏览文件 @
8e54d027
...
@@ -247,7 +247,7 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
...
@@ -247,7 +247,7 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
return
null
;
return
null
;
},
},
isReadonly
:
function
(){
isReadonly
:
function
(){
return
!!
(
this
.
readonly
||
this
.
json
.
isReadonly
||
this
.
form
.
json
.
isReadonly
);
return
!!
(
this
.
readonly
||
this
.
json
.
isReadonly
||
this
.
form
.
json
.
isReadonly
||
this
.
isSectionMergeRead
()
);
},
},
isAllSectionShow
:
function
(){
isAllSectionShow
:
function
(){
return
this
.
json
.
showAllSection
&&
this
.
json
.
section
===
"
yes
"
&&
this
.
isSectionData
();
return
this
.
json
.
showAllSection
&&
this
.
json
.
section
===
"
yes
"
&&
this
.
isSectionData
();
...
...
o2web/source/x_component_process_Xform/Application.js
浏览文件 @
8e54d027
...
@@ -78,7 +78,6 @@ MWF.xApplication.process.Xform.Application = MWF.APPApplication = new Class(
...
@@ -78,7 +78,6 @@ MWF.xApplication.process.Xform.Application = MWF.APPApplication = new Class(
var
status
=
this
.
getComponentStatus
()
||
{};
var
status
=
this
.
getComponentStatus
()
||
{};
var
options
=
this
.
getComponentOptions
()
||
{};
var
options
=
this
.
getComponentOptions
()
||
{};
this
.
getComponentPath
(
function
(
componentPath
)
{
this
.
getComponentPath
(
function
(
componentPath
)
{
debugger
;
if
(
componentPath
.
indexOf
(
"
@url:
"
)
===
0
){
if
(
componentPath
.
indexOf
(
"
@url:
"
)
===
0
){
this
.
loadIframe
(
componentPath
.
substring
(
5
,
componentPath
.
length
)
);
this
.
loadIframe
(
componentPath
.
substring
(
5
,
componentPath
.
length
)
);
}
else
{
}
else
{
...
@@ -133,9 +132,8 @@ MWF.xApplication.process.Xform.Application = MWF.APPApplication = new Class(
...
@@ -133,9 +132,8 @@ MWF.xApplication.process.Xform.Application = MWF.APPApplication = new Class(
clazz
=
clazz
[
a
];
clazz
=
clazz
[
a
];
});
});
clazz
.
options
=
clazz
.
options
||
{};
clazz
.
options
=
clazz
.
options
||
{};
try
{
MWF
.
xDesktop
.
requireApp
(
path
,
"
lp.
"
+
o2
.
language
,
null
,
false
);
var
_load
=
function
()
{
MWF
.
xDesktop
.
requireApp
(
path
,
"
Main
"
,
null
,
false
);
if
(
clazz
.
Main
){
if
(
clazz
.
Main
){
var
opt
=
options
||
{};
var
opt
=
options
||
{};
var
stt
=
status
||
{};
var
stt
=
status
||
{};
...
@@ -162,6 +160,18 @@ MWF.xApplication.process.Xform.Application = MWF.APPApplication = new Class(
...
@@ -162,6 +160,18 @@ MWF.xApplication.process.Xform.Application = MWF.APPApplication = new Class(
}
else
{
}
else
{
this
.
form
.
app
.
notice
(
this
.
form
.
app
.
lp
.
applicationNotFound
+
"
:
"
+
path
,
"
error
"
);
this
.
form
.
app
.
notice
(
this
.
form
.
app
.
lp
.
applicationNotFound
+
"
:
"
+
path
,
"
error
"
);
}
}
}.
bind
(
this
);
try
{
MWF
.
xDesktop
.
requireApp
(
path
,
"
lp.
"
+
o2
.
language
,
null
,
false
);
MWF
.
xDesktop
.
requireApp
(
path
,
"
Main
"
,
null
,
false
);
if
(
clazz
.
loading
&&
clazz
.
loading
.
then
){
clazz
.
loading
.
then
(
function
(){
_load
();
});
}
else
{
_load
();
}
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
form
.
app
.
notice
(
e
.
message
,
"
error
"
);
this
.
form
.
app
.
notice
(
e
.
message
,
"
error
"
);
}
}
...
...
o2web/source/x_component_process_Xform/Org.js
浏览文件 @
8e54d027
...
@@ -136,11 +136,11 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class(
...
@@ -136,11 +136,11 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class(
if
(
this
.
json
.
isReadonly
===
"
script
"
){
if
(
this
.
json
.
isReadonly
===
"
script
"
){
if
(
this
.
json
.
readonlyScript
&&
this
.
json
.
readonlyScript
.
code
){
if
(
this
.
json
.
readonlyScript
&&
this
.
json
.
readonlyScript
.
code
){
readonly
=
this
.
form
.
Macro
.
exec
(
this
.
json
.
readonlyScript
.
code
,
this
);
readonly
=
this
.
form
.
Macro
.
exec
(
this
.
json
.
readonlyScript
.
code
,
this
);
return
!!
readonly
;
}
}
}
else
{
}
else
{
re
turn
!!
this
.
json
.
isReadonly
re
adonly
=
!!
this
.
json
.
isReadonly
}
}
return
readonly
||
!!
this
.
isSectionMergeRead
();
},
},
getTextData
:
function
(){
getTextData
:
function
(){
//var value = this.node.get("value");
//var value = this.node.get("value");
...
...
o2web/source/x_component_process_Xform/Textfield.js
浏览文件 @
8e54d027
...
@@ -41,7 +41,7 @@ MWF.xApplication.process.Xform.Textfield = MWF.APPTextfield = new Class({
...
@@ -41,7 +41,7 @@ MWF.xApplication.process.Xform.Textfield = MWF.APPTextfield = new Class({
loadDescription
:
function
(){
loadDescription
:
function
(){
if
(
this
.
isReadonly
())
return
;
if
(
this
.
isReadonly
())
return
;
var
v
=
this
.
_getBusinessData
();
var
v
=
this
.
_getBusinessData
();
if
(
!
v
){
if
(
!
v
&&
v
!==
0
){
if
(
this
.
json
.
description
){
if
(
this
.
json
.
description
){
var
size
=
this
.
node
.
getFirst
().
getSize
();
var
size
=
this
.
node
.
getFirst
().
getSize
();
var
w
=
size
.
x
-
3
;
var
w
=
size
.
x
-
3
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录