Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
c3d39ea9
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,发现更多精彩内容 >>
提交
c3d39ea9
编写于
9月 17, 2021
作者:
NoSubject
提交者:
NoSubject
9月 17, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复select组件setData方法
(cherry picked from commit
3d31747e
)
上级
711153c1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
7 deletion
+49
-7
o2web/source/x_component_process_Xform/Documenteditor.js
o2web/source/x_component_process_Xform/Documenteditor.js
+48
-6
o2web/source/x_component_process_Xform/Select.js
o2web/source/x_component_process_Xform/Select.js
+1
-1
未找到文件。
o2web/source/x_component_process_Xform/Documenteditor.js
浏览文件 @
c3d39ea9
...
...
@@ -986,7 +986,13 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
}
}
else
if
(
!
control
.
copyto
||
!
this
.
layout_copytoContent
){
if
(
this
.
layout_copytoContentTr
)
this
.
layout_copytoContentTr
.
dispose
();
if
(
this
.
layout_copyto2ContentTr
)
this
.
layout_copyto2ContentTr
.
inject
(
this
.
layout_copyto2ContentTrP
,
"
top
"
);
if
(
this
.
layout_copyto2ContentTr
){
try
{
this
.
layout_copyto2ContentTr
.
inject
(
this
.
layout_copyto2ContentTrP
,
"
top
"
);
}
catch
(
e
){
this
.
layout_copyto2ContentTrP
.
appendHTML
(
this
.
layout_copyto2ContentTr
.
outerHTML
,
"
top
"
);
}
}
//if (this.layout_copyto2Content) this.layout_edition.getElement("tr").destroy();
// if (this.layout_edition) this.layout_edition.getElement("tr").getElements("td").setStyles({
// "border-top": "solid windowtext 1.5pt",
...
...
@@ -994,18 +1000,54 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor = new Cla
// });
}
else
if
(
!
control
.
copyto2
||
!
this
.
layout_copyto2Content
)
{
if
(
this
.
layout_copyto2ContentTr
)
this
.
layout_copyto2ContentTr
.
dispose
();
if
(
this
.
layout_copytoContentTr
)
this
.
layout_copytoContentTr
.
inject
(
this
.
layout_copytoContentTrP
,
"
top
"
);
// if (this.layout_copytoContentTr) this.layout_copytoContentTr.inject(this.layout_copytoContentTrP, "top");
if
(
this
.
layout_copytoContentTr
){
try
{
this
.
layout_copytoContentTr
.
inject
(
this
.
layout_copytoContentTrP
,
"
top
"
);
}
catch
(
e
){
this
.
layout_copytoContentTrP
.
appendHTML
(
this
.
layout_copytoContentTr
.
outerHTML
,
"
top
"
);
}
}
// if (this.layout_edition) this.layout_edition.getElement("tr").getElements("td").setStyles({
// "border-bottom": "solid windowtext 0.75pt",
// "mso-border-bottom-alt": "solid windowtext 0.75pt"
// });
}
else
{
if
(
this
.
copyToOrder
==
"
copyto2
"
){
if
(
this
.
layout_copytoContentTr
)
this
.
layout_copytoContentTr
.
inject
(
this
.
layout_copytoContentTrP
,
"
top
"
);
if
(
this
.
layout_copyto2ContentTr
)
this
.
layout_copyto2ContentTr
.
inject
(
this
.
layout_copyto2ContentTrP
,
"
top
"
);
// if (this.layout_copytoContentTr) this.layout_copytoContentTr.inject(this.layout_copytoContentTrP, "top");
// if (this.layout_copyto2ContentTr) this.layout_copyto2ContentTr.inject(this.layout_copyto2ContentTrP, "top");
if
(
this
.
layout_copytoContentTr
){
try
{
this
.
layout_copytoContentTr
.
inject
(
this
.
layout_copytoContentTrP
,
"
top
"
);
}
catch
(
e
){
this
.
layout_copytoContentTrP
.
appendHTML
(
this
.
layout_copytoContentTr
.
outerHTML
,
"
top
"
);
}
}
if
(
this
.
layout_copyto2ContentTr
){
try
{
this
.
layout_copyto2ContentTr
.
inject
(
this
.
layout_copyto2ContentTrP
,
"
top
"
);
}
catch
(
e
){
this
.
layout_copyto2ContentTrP
.
appendHTML
(
this
.
layout_copyto2ContentTr
.
outerHTML
,
"
top
"
);
}
}
}
else
{
if
(
this
.
layout_copyto2ContentTr
)
this
.
layout_copyto2ContentTr
.
inject
(
this
.
layout_copyto2ContentTrP
,
"
top
"
);
if
(
this
.
layout_copytoContentTr
)
this
.
layout_copytoContentTr
.
inject
(
this
.
layout_copytoContentTrP
,
"
top
"
);
// if (this.layout_copyto2ContentTr) this.layout_copyto2ContentTr.inject(this.layout_copyto2ContentTrP, "top");
// if (this.layout_copytoContentTr) this.layout_copytoContentTr.inject(this.layout_copytoContentTrP, "top");
if
(
this
.
layout_copyto2ContentTr
){
try
{
this
.
layout_copyto2ContentTr
.
inject
(
this
.
layout_copyto2ContentTrP
,
"
top
"
);
}
catch
(
e
){
this
.
layout_copyto2ContentTrP
.
appendHTML
(
this
.
layout_copyto2ContentTr
.
outerHTML
,
"
top
"
);
}
}
if
(
this
.
layout_copytoContentTr
){
try
{
this
.
layout_copytoContentTr
.
inject
(
this
.
layout_copytoContentTrP
,
"
top
"
);
}
catch
(
e
){
this
.
layout_copytoContentTrP
.
appendHTML
(
this
.
layout_copytoContentTr
.
outerHTML
,
"
top
"
);
}
}
}
}
...
...
o2web/source/x_component_process_Xform/Select.js
浏览文件 @
c3d39ea9
...
...
@@ -445,7 +445,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect = new Class(
// }
},
__setData
:
function
(
data
){
__setData
:
function
(
data
,
fireChange
){
var
old
=
this
.
getInputData
();
this
.
_setBusinessData
(
data
);
if
(
this
.
readonly
||
this
.
json
.
isReadonly
){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录