Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
3762645c
o2oa
项目概览
fuyue82
/
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,发现更多精彩内容 >>
提交
3762645c
编写于
11月 27, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复使用了host映射是表单中的图片、文件等资源可能显示不正确的问题
上级
d871d26b
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
30 addition
and
2 deletion
+30
-2
o2web/source/x_component_cms_FormDesigner/Module/Common.js
o2web/source/x_component_cms_FormDesigner/Module/Common.js
+1
-0
o2web/source/x_component_cms_FormDesigner/Module/Form.js
o2web/source/x_component_cms_FormDesigner/Module/Form.js
+1
-0
o2web/source/x_component_cms_Xform/Package.js
o2web/source/x_component_cms_Xform/Package.js
+3
-0
o2web/source/x_component_portal_PageDesigner/Module/Common.js
...b/source/x_component_portal_PageDesigner/Module/Common.js
+1
-0
o2web/source/x_component_portal_PageDesigner/Module/Image.js
o2web/source/x_component_portal_PageDesigner/Module/Image.js
+2
-1
o2web/source/x_component_portal_PageDesigner/Module/Page.js
o2web/source/x_component_portal_PageDesigner/Module/Page.js
+1
-0
o2web/source/x_component_process_FormDesigner/Module/$Input.js
.../source/x_component_process_FormDesigner/Module/$Input.js
+2
-0
o2web/source/x_component_process_FormDesigner/Module/$Module.js
...source/x_component_process_FormDesigner/Module/$Module.js
+1
-0
o2web/source/x_component_process_FormDesigner/Module/Button.js
.../source/x_component_process_FormDesigner/Module/Button.js
+1
-0
o2web/source/x_component_process_FormDesigner/Module/Common.js
.../source/x_component_process_FormDesigner/Module/Common.js
+1
-0
o2web/source/x_component_process_FormDesigner/Module/Form.js
o2web/source/x_component_process_FormDesigner/Module/Form.js
+2
-1
o2web/source/x_component_process_FormDesigner/Module/Image.js
...b/source/x_component_process_FormDesigner/Module/Image.js
+1
-0
o2web/source/x_component_process_FormDesigner/Module/Table$Td.js
...ource/x_component_process_FormDesigner/Module/Table$Td.js
+2
-0
o2web/source/x_component_process_Xform/$Module.js
o2web/source/x_component_process_Xform/$Module.js
+1
-0
o2web/source/x_component_process_Xform/Form.js
o2web/source/x_component_process_Xform/Form.js
+2
-0
o2web/source/x_component_process_Xform/Image.js
o2web/source/x_component_process_Xform/Image.js
+3
-0
o2web/source/x_component_process_Xform/Table.js
o2web/source/x_component_process_Xform/Table.js
+2
-0
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+2
-0
o2web/source/x_component_query_ViewDesigner/View.js
o2web/source/x_component_query_ViewDesigner/View.js
+1
-0
未找到文件。
o2web/source/x_component_cms_FormDesigner/Module/Common.js
浏览文件 @
3762645c
...
...
@@ -41,6 +41,7 @@ MWF.xApplication.cms.FormDesigner.Module.Common = MWF.CMSFCCommon = new Class({
}
else
if
(
value
.
indexOf
(
"
x_cms_assemble_control
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_cms_assemble_control
"
,
host3
+
"
/x_cms_assemble_control
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
o2web/source/x_component_cms_FormDesigner/Module/Form.js
浏览文件 @
3762645c
...
...
@@ -385,6 +385,7 @@ MWF.xApplication.cms.FormDesigner.Module.Form = MWF.CMSFCForm = new Class({
}
else
if
(
pic
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
pic
=
pic
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
pic
=
o2
.
filterUrl
(
pic
);
}
pic
=
"
url('
"
+
pic
+
"
')
"
;
var
len2
=
pic
.
length
;
...
...
o2web/source/x_component_cms_Xform/Package.js
浏览文件 @
3762645c
...
...
@@ -56,6 +56,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage = new Class({
}
else
if
(
value
.
indexOf
(
"
x_cms_assemble_control
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_cms_assemble_control
"
,
host3
+
"
/x_cms_assemble_control
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
try
{
this
.
node
.
set
(
"
src
"
,
value
);
...
...
@@ -64,6 +65,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage = new Class({
value
=
this
.
json
.
srcfile
;
if
(
typeOf
(
value
)
===
"
object
"
){
var
url
=
(
value
.
portal
)
?
MWF
.
xDesktop
.
getPortalFileUr
(
value
.
id
,
value
.
portal
)
:
MWF
.
xDesktop
.
getProcessFileUr
(
value
.
id
,
value
.
application
);
url
=
o2
.
filterUrl
(
url
);
this
.
node
.
set
(
"
src
"
,
url
);
}
else
{
var
host
=
MWF
.
Actions
.
getHost
(
"
x_portal_assemble_surface
"
);
...
...
@@ -72,6 +74,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage = new Class({
uri
=
uri
.
replace
(
"
{flag}
"
,
value
);
uri
=
uri
.
replace
(
"
{applicationFlag}
"
,
this
.
form
.
json
.
application
);
value
=
host
+
"
/x_portal_assemble_surface
"
+
uri
;
value
=
o2
.
filterUrl
(
value
);
this
.
node
.
set
(
"
src
"
,
value
);
}
}
else
if
(
typeOf
(
this
.
json
.
src
)
==
"
object
"
){
...
...
o2web/source/x_component_portal_PageDesigner/Module/Common.js
浏览文件 @
3762645c
...
...
@@ -139,6 +139,7 @@ MWF.xApplication.portal.PageDesigner.Module.Common = MWF.PCCommon = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
o2web/source/x_component_portal_PageDesigner/Module/Image.js
浏览文件 @
3762645c
...
...
@@ -40,6 +40,7 @@ MWF.xApplication.portal.PageDesigner.Module.Image = MWF.PCImage = new Class({
if
(
value
){
if
(
typeOf
(
value
)
===
"
object
"
){
var
url
=
MWF
.
xDesktop
.
getPortalFileUr
(
value
.
id
,
value
.
portal
);
url
=
o2
.
filterUrl
(
url
);
try
{
this
.
node
.
set
(
"
src
"
,
url
);
}
catch
(
e
){}
...
...
@@ -50,7 +51,7 @@ MWF.xApplication.portal.PageDesigner.Module.Image = MWF.PCImage = new Class({
uri
=
uri
.
replace
(
"
{flag}
"
,
value
);
uri
=
uri
.
replace
(
"
{applicationFlag}
"
,
this
.
form
.
json
.
application
);
value
=
host
+
"
/x_portal_assemble_surface
"
+
uri
;
value
=
o2
.
filterUrl
(
value
);
try
{
this
.
node
.
set
(
"
src
"
,
value
);
}
catch
(
e
){}
...
...
o2web/source/x_component_portal_PageDesigner/Module/Page.js
浏览文件 @
3762645c
...
...
@@ -891,6 +891,7 @@ MWF.xApplication.portal.PageDesigner.Module.Page = MWF.PCPage = new Class({
}
else
if
(
pic
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
pic
=
pic
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
pic
=
o2
.
filterUrl
(
pic
);
}
pic
=
"
url('
"
+
pic
+
"
')
"
;
var
len2
=
pic
.
length
;
...
...
o2web/source/x_component_process_FormDesigner/Module/$Input.js
浏览文件 @
3762645c
...
...
@@ -209,6 +209,7 @@ MWF.xApplication.process.FormDesigner.Module.$Input = MWF.FC$Input = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
@@ -250,6 +251,7 @@ MWF.xApplication.process.FormDesigner.Module.$Input = MWF.FC$Input = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
o2web/source/x_component_process_FormDesigner/Module/$Module.js
浏览文件 @
3762645c
...
...
@@ -989,6 +989,7 @@ MWF.xApplication.process.FormDesigner.Module.$Module = MWF.FC$Module = new Class
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
o2web/source/x_component_process_FormDesigner/Module/Button.js
浏览文件 @
3762645c
...
...
@@ -150,6 +150,7 @@ MWF.xApplication.process.FormDesigner.Module.Button = MWF.FCButton = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
o2web/source/x_component_process_FormDesigner/Module/Common.js
浏览文件 @
3762645c
...
...
@@ -141,6 +141,7 @@ MWF.xApplication.process.FormDesigner.Module.Common = MWF.FCCommon = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
o2web/source/x_component_process_FormDesigner/Module/Form.js
浏览文件 @
3762645c
...
...
@@ -1265,6 +1265,7 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
}
else
if
(
pic
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
pic
=
pic
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
pic
=
o2
.
filterUrl
(
pic
);
}
pic
=
"
url('
"
+
pic
+
"
')
"
;
var
len2
=
pic
.
length
;
...
...
@@ -1275,7 +1276,7 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
return
css
;
},
reloadCss
:
function
(){
cssText
=
(
this
.
json
.
css
)
?
this
.
json
.
css
.
code
:
""
;
var
cssText
=
(
this
.
json
.
css
)
?
this
.
json
.
css
.
code
:
""
;
//var head = (document.head || document.getElementsByTagName("head")[0] || document.documentElement);
var
styleNode
=
$
(
"
style
"
+
this
.
json
.
id
);
...
...
o2web/source/x_component_process_FormDesigner/Module/Image.js
浏览文件 @
3762645c
...
...
@@ -116,6 +116,7 @@ MWF.xApplication.process.FormDesigner.Module.Image = MWF.FCImage = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
if
(
value
){
this
.
node
.
set
(
"
src
"
,
value
);
...
...
o2web/source/x_component_process_FormDesigner/Module/Table$Td.js
浏览文件 @
3762645c
...
...
@@ -274,6 +274,7 @@ MWF.xApplication.process.FormDesigner.Module.Table$Td = MWF.FCTable$Td = new Cla
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
@@ -307,6 +308,7 @@ MWF.xApplication.process.FormDesigner.Module.Table$Td = MWF.FCTable$Td = new Cla
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
if
(
!
key
.
test
(
reg
)){
...
...
o2web/source/x_component_process_Xform/$Module.js
浏览文件 @
3762645c
...
...
@@ -73,6 +73,7 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class({
}
else
if
(
value
.
indexOf
(
"
x_cms_assemble_control
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_cms_assemble_control
"
,
host3
+
"
/x_cms_assemble_control
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
this
.
node
.
setStyle
(
key
,
value
);
}.
bind
(
this
));
...
...
o2web/source/x_component_process_Xform/Form.js
浏览文件 @
3762645c
...
...
@@ -84,6 +84,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
}
else
if
(
pic
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==
-
1
)
{
pic
=
pic
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
pic
=
o2
.
filterUrl
(
pic
);
}
pic
=
"
url('
"
+
pic
+
"
')
"
;
var
len2
=
pic
.
length
;
...
...
@@ -824,6 +825,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
}
value
=
o2
.
filterUrl
(
value
);
this
.
node
.
setStyle
(
key
,
value
);
}.
bind
(
this
));
//this.node.setStyles(this.json.styles);
...
...
o2web/source/x_component_process_Xform/Image.js
浏览文件 @
3762645c
...
...
@@ -23,6 +23,7 @@ MWF.xApplication.process.Xform.Image = MWF.APPImage = new Class({
}
else
if
(
value
.
indexOf
(
"
x_cms_assemble_control
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_cms_assemble_control
"
,
host3
+
"
/x_cms_assemble_control
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
try
{
this
.
node
.
set
(
"
src
"
,
value
);
...
...
@@ -31,6 +32,7 @@ MWF.xApplication.process.Xform.Image = MWF.APPImage = new Class({
value
=
this
.
json
.
srcfile
;
if
(
typeOf
(
value
)
===
"
object
"
){
var
url
=
(
value
.
portal
)
?
MWF
.
xDesktop
.
getPortalFileUr
(
value
.
id
,
value
.
portal
)
:
MWF
.
xDesktop
.
getProcessFileUr
(
value
.
id
,
value
.
application
);
url
=
o2
.
filterUrl
(
url
);
this
.
node
.
set
(
"
src
"
,
url
);
}
else
{
var
host
=
MWF
.
Actions
.
getHost
(
"
x_portal_assemble_surface
"
);
...
...
@@ -39,6 +41,7 @@ MWF.xApplication.process.Xform.Image = MWF.APPImage = new Class({
uri
=
uri
.
replace
(
"
{flag}
"
,
value
);
uri
=
uri
.
replace
(
"
{applicationFlag}
"
,
this
.
form
.
json
.
application
);
value
=
host
+
"
/x_portal_assemble_surface
"
+
uri
;
value
=
o2
.
filterUrl
(
value
);
this
.
node
.
set
(
"
src
"
,
value
);
}
}
else
if
(
typeOf
(
this
.
json
.
src
)
==
"
object
"
){
...
...
o2web/source/x_component_process_Xform/Table.js
浏览文件 @
3762645c
...
...
@@ -114,6 +114,7 @@ MWF.xApplication.process.Xform.Table$Td = MWF.APPTable$Td = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
this
.
node
.
setStyle
(
key
,
value
);
}
else
{
if
(
!
this
.
json
.
preprocessing
)
this
.
node
.
setStyle
(
key
,
value
);
...
...
@@ -135,6 +136,7 @@ MWF.xApplication.process.Xform.Table$Td = MWF.APPTable$Td = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
this
.
node
.
setStyle
(
key
,
value
);
}.
bind
(
this
));
...
...
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
3762645c
...
...
@@ -2379,6 +2379,7 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
}
else
if
(
value
.
indexOf
(
"
x_cms_assemble_control
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_cms_assemble_control
"
,
host3
+
"
/x_cms_assemble_control
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
this
.
node
.
setStyle
(
key
,
value
);
}.
bind
(
this
));
...
...
@@ -2653,6 +2654,7 @@ MWF.xApplication.query.Query.Viewer.Paging = new Class({
}
else
if
(
value
.
indexOf
(
"
x_cms_assemble_control
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_cms_assemble_control
"
,
host3
+
"
/x_cms_assemble_control
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
this
.
node
.
setStyle
(
key
,
value
);
}.
bind
(
this
));
...
...
o2web/source/x_component_query_ViewDesigner/View.js
浏览文件 @
3762645c
...
...
@@ -1215,6 +1215,7 @@ MWF.xApplication.query.ViewDesigner.View.$Module = MWF.QV$Module = new Class({
}
else
if
(
value
.
indexOf
(
"
x_portal_assemble_surface
"
)
!==-
1
){
value
=
value
.
replace
(
"
x_portal_assemble_surface
"
,
host2
+
"
/x_portal_assemble_surface
"
);
}
value
=
o2
.
filterUrl
(
value
);
}
var
reg
=
/^border
\w
*/ig
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录