Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
e9b448d2
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,发现更多精彩内容 >>
提交
e9b448d2
编写于
4月 07, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改痕迹保留
上级
38d135e2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
63 addition
and
27 deletion
+63
-27
o2web/source/x_component_process_Xform/$Form/default/doc.wcss
...b/source/x_component_process_Xform/$Form/default/doc.wcss
+28
-8
o2web/source/x_component_process_Xform/widget/DocumentHistory.js
...ource/x_component_process_Xform/widget/DocumentHistory.js
+35
-19
未找到文件。
o2web/source/x_component_process_Xform/$Form/default/doc.wcss
浏览文件 @
e9b448d2
...
...
@@ -159,20 +159,23 @@
"height": "70px",
},
"historyListTitleNode": {
"font-weig
th
": "bold",
"font-size": "1
6
px",
"font-weig
ht
": "bold",
"font-size": "1
4
px",
"height": "30px",
"line-height": "30px"
"line-height": "30px",
"padding": "0px 10px"
},
"historyListTitleInsertNode": {
"font-size": "1
4
px",
"font-size": "1
2
px",
"height": "20px",
"line-height": "20px"
"line-height": "20px",
"padding": "0px 10px"
},
"historyListTitleDeleteNode": {
"font-size": "1
4
px",
"font-size": "1
2
px",
"height": "20px",
"line-height": "20px"
"line-height": "20px",
"padding": "0px 10px"
},
"historyListContentAreaNode": {
"margin": "5px",
...
...
@@ -181,7 +184,24 @@
},
"historyListItemNode": {
"overflow": "hidden",
"padding": "5px"
"padding": "5px 10px",
},
"historyListItemPatchNode": {
"overflow": "hidden",
"margin-bottom": "10px"
},
"historyListItemDiffsNode": {
"overflow": "hidden"
},
"historyListItemDiffNode": {
"overflow": "hidden",
"padding": "5px 10px",
"cursor": "pointer",
"border-radius": "5px",
"background-color": "#ffffff"
},
"historyListItemDiffNode_over": {
}
}
o2web/source/x_component_process_Xform/widget/DocumentHistory.js
浏览文件 @
e9b448d2
...
...
@@ -138,31 +138,24 @@ MWF.xApplication.process.Xform.widget.DocumentHistory = new Class({
h
=
h
-
y
-
title_y
;
this
.
historyListContentAreaNode
.
setStyle
(
"
height
"
,
""
+
h
+
"
px
"
);
this
.
historyListTitleNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListTitleNode
}).
inject
(
this
.
historyListTitleAreaNode
);
this
.
historyListTitleInsertNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListTitleInsertNode
}).
inject
(
this
.
historyListTitleAreaNode
);
this
.
historyListTitleDeleteNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListTitleDeleteNode
}).
inject
(
this
.
historyListTitleAreaNode
);
},
loadHistoryList
:
function
(){
var
text
=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
documentHistory
.
diff_patch_count
;
text
=
text
.
replace
(
/{history}/
,
this
.
historyDataList
.
length
).
replace
(
/{diff}/
,
this
.
diffCount
);
var
insertStr
=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
documentHistory
.
insertTimes
;
var
deleteStr
=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
documentHistory
.
deleteTimes
;
insertStr
=
insertStr
.
replace
(
/{times}/
,
this
.
diffInsertCount
);
deleteStr
=
deleteStr
.
replace
(
/{times}/
,
this
.
diffDeleteCount
);
this
.
historyListTitleNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListTitleNode
,
"
text
"
:
text
}).
inject
(
this
.
historyListAreaNode
);
this
.
historyListTitleInsertNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListTitleInsertNode
,
"
text
"
:
text
}).
inject
(
this
.
historyListAreaNode
);
this
.
historyListTitleDeleteNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListTitleDeleteNode
,
"
text
"
:
text
}).
inject
(
this
.
historyListAreaNode
);
documentHistory
diffDeleteCount
this
.
historyListTitleAreaNode
.
set
(
""
,
text
);
this
.
historyListTitleNode
.
set
(
"
text
"
,
text
);
this
.
historyListTitleInsertNode
.
set
(
"
text
"
,
insertStr
);
this
.
historyListTitleDeleteNode
.
set
(
"
text
"
,
deleteStr
);
},
loadHistoryList
:
function
(){
var
original
=
this
.
historyDataList
[
0
];
this
.
diffPatch
.
each
(
function
(
patchObj
){
this
.
createHistoryListItem
(
patchObj
);
...
...
@@ -757,12 +750,35 @@ MWF.xApplication.process.Xform.widget.DocumentHistory.Item = new Class({
var
obj
=
this
.
patchObj
.
obj
;
this
.
node
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListItemNode
}).
inject
(
this
.
history
.
historyListContentAreaNode
);
var
patchHtml
=
"
<div style='font-weight: bold; height: 30px; line-height: 30px'>
"
+
o2
.
name
.
cn
(
obj
.
person
)
+
"
[
"
+
obj
.
activityName
+
"
]</div><div style='height: 20px; line-height: 20px; color:#666666'>
"
+
obj
.
createTime
+
"
</div>
"
this
.
patchNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListItemPatchNode
,
"
html
"
:
html
}).
inject
(
this
.
node
);
this
.
patchNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListItemPatchNode
,
"
html
"
:
patchHtml
}).
inject
(
this
.
node
);
this
.
diffsNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListItemDiffsNode
}).
inject
(
this
.
node
);
var
_self
=
this
;
patch
.
diffs
.
each
(
function
(
diff
){
diffNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListItemDiffNode
}).
inject
(
this
.
diffsNode
);
if
(
diff
[
0
]
!=
0
){
var
infor
=
((
diff
[
1
].
length
>
50
)
?
diff
[
1
].
substring
(
0
,
50
)
+
"
...
"
:
diff
[
1
]);
var
tmp
=
new
Element
(
"
div
"
,
{
"
html
"
:
infor
});
infor
=
tmp
.
get
(
"
text
"
);
tmp
.
destroy
();
if
(
diff
[
0
]
==-
1
){
infor
=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
documentHistory
.
delete
+
"
:
"
+
"
<span style='color:red'><del>
"
+
infor
+
"
</del></span>
"
}
else
{
infor
=
MWF
.
xApplication
.
process
.
Xform
.
LP
.
documentHistory
.
insert
+
"
:
"
+
"
<span style='color:blue'><ins>
"
+
infor
+
"
</ins></span>
"
}
diffNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
historyListItemDiffNode
,
"
html
"
:
infor
}).
inject
(
this
.
diffsNode
);
diffNode
.
store
(
"
diff
"
,
diff
);
diffNode
.
addEvents
({
"
mouseover
"
:
function
(){
var
diff
=
this
.
retrieve
(
"
diff
"
);
var
color
=
(
diff
[
0
]
==-
1
)
?
"
#fbe0e7
"
:
"
#e2edfb
"
;
this
.
setStyles
({
"
background-color
"
:
color
});
},
"
mouseout
"
:
function
(){
this
.
setStyles
(
_self
.
css
.
historyListItemDiffNode
)
}
});
}
}.
bind
(
this
));
}
})
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录