Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
a524247c
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,发现更多精彩内容 >>
提交
a524247c
编写于
11月 08, 2022
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复附件权限控制和排序对话框在移动端显示异常的问题
上级
eeff614d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
77 addition
and
19 deletion
+77
-19
o2web/source/x_component_process_Xform/$Form/default/css.wcss
...b/source/x_component_process_Xform/$Form/default/css.wcss
+30
-6
o2web/source/x_component_process_Xform/Attachment.js
o2web/source/x_component_process_Xform/Attachment.js
+47
-13
未找到文件。
o2web/source/x_component_process_Xform/$Form/default/css.wcss
浏览文件 @
a524247c
...
...
@@ -720,10 +720,14 @@
"attachmentPermissionNode": {
"overflow": "hidden",
"width": "500px",
"padding": "0px 40px",
"padding": "0px 40px"
},
"attachmentPermissionNode_mobile": {
"overflow": "hidden",
"padding": "0px 10px"
},
"attachmentPermissionNamesNode": {
"overflow": "hidden"
,
"overflow": "hidden"
},
"attachmentPermissionNamesTitleNode": {
"font-size": "14px",
...
...
@@ -747,7 +751,7 @@
"attachmentPermissionTitleNode": {
"font-size": "14px",
"color": "#666666",
"height": "26px",
"
min-
height": "26px",
"line-height": "26px"
},
"attachmentPermissionInputNode": {
...
...
@@ -1152,10 +1156,13 @@
"height": "600px",
"padding": "10px 10px 5px 10px"
},
"attachmentOrderNode_mobile":{
"padding": "10px 0px 5px 0px"
},
"attachmentOrderInforNode": {
"padding": "1
0px 20px 5
px 20px",
"
height": "3
0px",
"line-height": "
3
0px",
"padding": "1
5px 20px 10
px 20px",
"
min-height": "2
0px",
"line-height": "
2
0px",
"color": "#666666"
},
"attachmentOrderAreaNode": {
...
...
@@ -1164,6 +1171,11 @@
"height": "530px",
"overflow": "auto"
},
"attachmentOrderAreaNode_mobile": {
"padding": "10px 0px 5px 0px",
"background-color": "#ffffff",
"overflow": "auto"
},
"attachmentOrderItemNode": {
"min-height": "30px",
"overflow": "auto",
...
...
@@ -1186,11 +1198,23 @@
"padding": "0px 5px",
"color": "#666666"
},
"attachmentOrderItemTextNode_mobile": {
"margin-left": "30px",
"margin-right": "60px",
"min-height": "30px",
"padding": "0px 5px",
"color": "#666666"
},
"attachmentOrderItemActionNode": {
"width": "130px",
"height": "30px",
"float": "right"
},
"attachmentOrderItemActionNode_mobile": {
"width": "60px",
"height": "30px",
"float": "right"
},
"attachmentOrderItemActionUpNode": {
"border": "1px solid #999999",
"border-radius": "3px",
...
...
o2web/source/x_component_process_Xform/Attachment.js
浏览文件 @
a524247c
...
...
@@ -732,7 +732,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
var
lp
=
MWF
.
xApplication
.
process
.
Xform
.
LP
;
var
css
=
this
.
module
.
form
.
css
;
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentPermissionNode
}).
inject
(
this
.
node
);
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
(
layout
.
mobile
?
css
.
attachmentPermissionNode_mobile
:
css
.
attachmentPermissionNode
)
}).
inject
(
this
.
node
);
var
attNames
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentPermissionNamesNode
}).
inject
(
node
);
var
attNamesTitle
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentPermissionNamesTitleNode
,
"
text
"
:
lp
.
attachmentPermissionInfo
}).
inject
(
attNames
);
var
attNamesArea
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentPermissionNamesAreaNode
}).
inject
(
attNames
);
...
...
@@ -753,7 +753,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
title
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentPermissionTitleNode
,
"
text
"
:
lp
.
attachmentController
}).
inject
(
editArea
);
var
controllerInput
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentPermissionInputNode
}).
inject
(
editArea
);
var
dlg
=
o2
.
DL
.
open
(
Object
.
merge
({
var
options
=
Object
.
merge
({
"
title
"
:
lp
.
attachmentPermission
,
"
style
"
:
this
.
module
.
form
.
json
.
dialogStyle
||
"
user
"
,
"
isResize
"
:
false
,
...
...
@@ -773,7 +773,15 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
"
action
"
:
function
()
{
dlg
.
close
();
}
}
]
},
(
this
.
module
.
form
.
json
.
dialogOptions
||
{})));
},
(
this
.
module
.
form
.
json
.
dialogOptions
||
{}));
if
(
layout
.
mobile
){
var
size
=
$
(
document
.
body
).
getSize
();
options
.
width
=
size
.
x
;
options
.
height
=
size
.
y
;
}
var
dlg
=
o2
.
DL
.
open
(
options
);
if
(
this
.
selectedAttachments
.
length
===
1
)
{
var
data
=
this
.
selectedAttachments
[
0
].
data
;
...
...
@@ -974,9 +982,9 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
var
lp
=
MWF
.
xApplication
.
process
.
Xform
.
LP
;
var
css
=
this
.
module
.
form
.
css
;
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderNode
});
var
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
(
layout
.
mobile
?
css
.
attachmentOrderNode_mobile
:
css
.
attachmentOrderNode
)
});
var
infoNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderInforNode
,
"
text
"
:
lp
.
attachmentOrderInfo
}).
inject
(
node
);
var
attrchmentsNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderAreaNode
}).
inject
(
node
);
var
attrchmentsNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
(
layout
.
mobile
?
css
.
attachmentOrderAreaNode_mobile
:
css
.
attachmentOrderAreaNode
)
}).
inject
(
node
);
var
iconUrl
=
"
../x_component_File/$Main/icon.json
"
;
var
icons
=
null
;
...
...
@@ -993,8 +1001,8 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
var
icon
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderItemIconNode
}).
inject
(
itemNode
);
icon
.
setStyle
(
"
background-image
"
,
"
url('
"
+
iconFolderUrl
+
"
')
"
);
var
actionArea
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderItemActionNode
}).
inject
(
itemNode
);
var
text
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderItemTextNode
,
"
text
"
:
att
.
data
.
name
}).
inject
(
itemNode
);
var
actionArea
=
new
Element
(
"
div
"
,
{
"
styles
"
:
(
layout
.
mobile
?
css
.
attachmentOrderItemActionNode_mobile
:
css
.
attachmentOrderItemActionNode
)
}).
inject
(
itemNode
);
var
text
=
new
Element
(
"
div
"
,
{
"
styles
"
:
(
layout
.
mobile
?
css
.
attachmentOrderItemTextNode_mobile
:
css
.
attachmentOrderItemTextNode
)
,
"
text
"
:
att
.
data
.
name
}).
inject
(
itemNode
);
var
actionUp
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderItemActionUpNode
,
"
text
"
:
lp
.
attachmentOrderUp
}).
inject
(
actionArea
);
var
actionDown
=
new
Element
(
"
div
"
,
{
"
styles
"
:
css
.
attachmentOrderItemActionDownNode
,
"
text
"
:
lp
.
attachmentOrderDown
}).
inject
(
actionArea
);
...
...
@@ -1086,7 +1094,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
}.
bind
(
this
));
var
dlg
=
o2
.
DL
.
open
(
Object
.
merge
({
var
options
=
Object
.
merge
({
"
title
"
:
lp
.
attachmentOrderTitle
,
"
style
"
:
this
.
module
.
form
.
json
.
dialogStyle
||
"
user
"
,
"
isResize
"
:
false
,
...
...
@@ -1130,7 +1138,15 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
});
dlg
.
setContentSize
();
}
},
(
this
.
module
.
form
.
json
.
dialogOptions
||
{})));
},
(
this
.
module
.
form
.
json
.
dialogOptions
||
{}));
if
(
layout
.
mobile
){
var
size
=
$
(
document
.
body
).
getSize
();
options
.
width
=
size
.
x
;
options
.
height
=
size
.
y
;
}
var
dlg
=
o2
.
DL
.
open
(
options
);
}
},
sortAttachment
:
function
(
node
)
{
...
...
@@ -2215,11 +2231,20 @@ MWF.xApplication.process.Xform.AttachmenPreview = new Class({
var
zipViewNode
=
new
Element
(
"
div
"
,{
"
text
"
:
"
loadding...
"
});
o2
.
load
([
"
../o2_lib/jszip/jszip.min.js
"
,
"
../o2_lib/jszip/jszip-utils.min.js
"
],
function
()
{
this
.
app
.
getAttachmentUrl
(
this
.
att
,
function
(
url
)
{
var
width
,
height
;
if
(
layout
.
mobile
){
var
size
=
$
(
document
.
body
).
getSize
();
width
=
size
.
x
+
"
px
"
;
height
=
size
.
y
+
"
px
"
;
}
else
{
width
=
"
660px
"
;
height
=
"
510px
"
;
}
o2
.
require
(
"
MWF.widget.Tree
"
,
function
(){
var
dlg
=
o2
.
DL
.
open
({
"
title
"
:
_self
.
att
.
data
.
name
,
"
width
"
:
"
660px
"
,
"
height
"
:
"
510px
"
,
"
width
"
:
width
,
"
height
"
:
height
,
"
mask
"
:
true
,
"
content
"
:
zipViewNode
,
"
container
"
:
null
,
...
...
@@ -2404,10 +2429,19 @@ MWF.xApplication.process.Xform.AttachmenPreview = new Class({
}.
bind
(
this
));
}.
bind
(
this
));
var
width
,
height
;
if
(
layout
.
mobile
){
var
size
=
$
(
document
.
body
).
getSize
();
width
=
size
.
x
+
"
px
"
;
height
=
size
.
y
+
"
px
"
;
}
else
{
width
=
"
960px
"
;
height
=
"
610px
"
;
}
var
dlg
=
o2
.
DL
.
open
({
"
title
"
:
this
.
att
.
data
.
name
,
"
width
"
:
"
960px
"
,
"
height
"
:
"
610px
"
,
"
width
"
:
width
,
"
height
"
:
height
,
"
mask
"
:
true
,
"
content
"
:
editorNode
,
"
container
"
:
null
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录