Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
d2155d79
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,发现更多精彩内容 >>
提交
d2155d79
编写于
4月 14, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
视图自定义
上级
cbd53790
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
48 addition
and
14 deletion
+48
-14
o2web/source/x_component_portal_PageDesigner/Module/View/view.html
...rce/x_component_portal_PageDesigner/Module/View/view.html
+7
-0
o2web/source/x_component_process_FormDesigner/Module/View.js
o2web/source/x_component_process_FormDesigner/Module/View.js
+11
-2
o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
...rocess_FormDesigner/Module/ViewSelector/ViewSelector.html
+7
-0
o2web/source/x_component_process_Xform/View.js
o2web/source/x_component_process_Xform/View.js
+3
-0
o2web/source/x_component_process_Xform/ViewSelector.js
o2web/source/x_component_process_Xform/ViewSelector.js
+5
-2
o2web/source/x_component_query_Query/$Viewer/select/css.wcss
o2web/source/x_component_query_Query/$Viewer/select/css.wcss
+3
-3
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/blue/export.png
...uery_ViewDesigner/$View/default/actionbar/blue/export.png
+0
-0
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/default/export.png
...y_ViewDesigner/$View/default/actionbar/default/export.png
+0
-0
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/red/export.png
...query_ViewDesigner/$View/default/actionbar/red/export.png
+0
-0
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/white/export.png
...ery_ViewDesigner/$View/default/actionbar/white/export.png
+0
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
...onent_query_ViewDesigner/$View/skin/styles_blue-flat.json
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
..._component_query_ViewDesigner/$View/skin/styles_cmcc.json
+1
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
...ponent_query_ViewDesigner/$View/skin/styles_official.json
+4
-4
o2web/source/x_component_query_ViewDesigner/View.js
o2web/source/x_component_query_ViewDesigner/View.js
+3
-1
未找到文件。
o2web/source/x_component_portal_PageDesigner/Module/View/view.html
浏览文件 @
d2155d79
...
...
@@ -105,6 +105,13 @@
</select>
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
操作条
</td>
<td
class=
"editTableValue"
>
<input
class=
"editTableRadio"
name=
"actionbar"
text
{($
.actionbar=
='show')?'checked':''}
type=
"radio"
value=
"show"
/>
显示
<input
class=
"editTableRadio"
name=
"actionbar"
text
{($.
actionbar
!='
show
')?'
checked
'
:
''}
type=
"radio"
value=
"hidden"
/>
不显示
</td>
</tr>
<!--<tr>-->
<!--<td class="editTableTitle">打开文件</td>-->
<!--<td class="editTableValue">-->
...
...
o2web/source/x_component_process_FormDesigner/Module/View.js
浏览文件 @
d2155d79
...
...
@@ -107,6 +107,10 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
if
(
this
.
viewNode
){
this
.
node
.
setStyle
(
"
background
"
,
"
transparent
"
);
this
.
actionbarNode
=
this
.
viewNode
.
getChildren
(
"
div
"
)[
0
];
if
(
this
.
actionbarNode
){
this
.
actionbarNode
.
destroy
();
this
.
actionbarNode
=
null
;
}
this
.
viewTable
=
this
.
viewNode
.
getElement
(
"
table
"
).
setStyles
(
this
.
css
.
viewTitleTableNode
);
this
.
viewLine
=
this
.
viewTable
.
getElement
(
"
tr
"
).
setStyles
(
this
.
css
.
viewTitleLineNode
);
this
.
viewSelectCell
=
this
.
viewLine
.
getElement
(
"
td
"
);
...
...
@@ -192,7 +196,7 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
this
.
node
.
set
(
"
id
"
,
this
.
json
.
id
);
}
if
(
name
==
"
actionbar
"
){
input
.
get
(
"
value
"
)
===
"
show
"
?
this
.
_showActionbar
()
:
this
.
_hideActionbar
();
this
.
json
.
actionbar
===
"
show
"
?
this
.
_showActionbar
()
:
this
.
_hideActionbar
();
}
this
.
_setEditStyle_custom
(
name
,
input
,
oldValue
);
...
...
@@ -255,7 +259,9 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
if
(
this
.
actionbarNode
)
this
.
actionbarNode
.
hide
();
},
_showActionbar
:
function
(){
if
(
this
.
actionbarLoading
)
return
;
if
(
!
this
.
actionbarNode
)
return
;
this
.
actionbarLoading
=
true
;
MWF
.
require
(
"
MWF.widget.Toolbar
"
,
null
,
false
);
this
.
actionbarNode
.
show
();
if
(
!
this
.
viewData
.
actionbarList
)
this
.
viewData
.
actionbarList
=
[];
...
...
@@ -273,10 +279,13 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
toolbarWidget
.
load
();
this
.
actionbarList
.
push
(
toolbarWidget
);
this
.
actionbarLoading
=
false
;
}.
bind
(
this
));
}
else
{
this
.
actionbarLoading
=
false
;
}
}
else
{
this
.
actionbarLoading
=
false
;
}
},
setToolbars
:
function
(
tools
,
node
,
json
){
...
...
o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
浏览文件 @
d2155d79
...
...
@@ -46,6 +46,13 @@
<input
type=
"radio"
name=
"select"
value=
"multi"
text
{($
.select=
='multi')?'checked':''}/
>
多选
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
操作条
</td>
<td
class=
"editTableValue"
>
<input
class=
"editTableRadio"
name=
"actionbar"
text
{($
.actionbar=
='show')?'checked':''}
type=
"radio"
value=
"show"
/>
显示
<input
class=
"editTableRadio"
name=
"actionbar"
text
{($.
actionbar
!='
show
')?'
checked
'
:
''}
type=
"radio"
value=
"hidden"
/>
不显示
</td>
</tr>
<!--<tr>-->
<!--<td class="editTableTitle"></td>-->
<!--<td class="editTableValue">-->
...
...
o2web/source/x_component_process_Xform/View.js
浏览文件 @
d2155d79
...
...
@@ -59,6 +59,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
"
titleStyles
"
:
this
.
json
.
titleStyles
,
"
itemStyles
"
:
this
.
json
.
itemStyles
,
"
isExpand
"
:
this
.
json
.
isExpand
||
"
no
"
,
"
showActionbar
"
:
this
.
json
.
actionbar
===
"
show
"
,
"
filter
"
:
filter
};
...
...
@@ -102,6 +103,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
"
titleStyles
"
:
this
.
json
.
titleStyles
,
"
itemStyles
"
:
this
.
json
.
itemStyles
,
"
isExpand
"
:
this
.
json
.
isExpand
||
"
no
"
,
"
showActionbar
"
:
this
.
json
.
actionbar
===
"
show
"
,
"
filter
"
:
filter
};
MWF
.
xDesktop
.
requireApp
(
"
process.Application
"
,
"
Viewer
"
,
function
(){
...
...
@@ -131,6 +133,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
"
titleStyles
"
:
this
.
json
.
titleStyles
,
"
itemStyles
"
:
this
.
json
.
itemStyles
,
"
isExpand
"
:
this
.
json
.
isExpand
||
"
no
"
,
"
showActionbar
"
:
this
.
json
.
actionbar
===
"
show
"
,
"
filter
"
:
filter
};
...
...
o2web/source/x_component_process_Xform/ViewSelector.js
浏览文件 @
d2155d79
...
...
@@ -68,6 +68,7 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
"
titleStyles
"
:
this
.
json
.
titleStyles
,
"
itemStyles
"
:
this
.
json
.
itemStyles
,
"
isExpand
"
:
this
.
json
.
isExpand
||
"
no
"
,
"
showActionbar
"
:
this
.
json
.
actionbar
===
"
show
"
,
"
filter
"
:
filter
};
var
options
=
{};
...
...
@@ -175,6 +176,7 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
"
titleStyles
"
:
this
.
json
.
titleStyles
,
"
itemStyles
"
:
this
.
json
.
itemStyles
,
"
isExpand
"
:
this
.
json
.
isExpand
||
"
no
"
,
"
showActionbar
"
:
this
.
json
.
actionbar
===
"
show
"
,
"
filter
"
:
filter
};
var
options
=
{};
...
...
@@ -279,11 +281,12 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
"
titleStyles
"
:
this
.
json
.
titleStyles
,
"
itemStyles
"
:
this
.
json
.
itemStyles
,
"
isExpand
"
:
this
.
json
.
isExpand
||
"
no
"
,
"
showActionbar
"
:
this
.
json
.
actionbar
===
"
show
"
,
"
filter
"
:
filter
};
var
options
=
{};
var
width
=
options
.
width
||
"
8
0
0
"
;
var
height
=
options
.
height
||
"
6
00
"
;
var
width
=
options
.
width
||
"
8
5
0
"
;
var
height
=
options
.
height
||
"
7
00
"
;
if
(
layout
.
mobile
){
var
size
=
document
.
body
.
getSize
();
...
...
o2web/source/x_component_query_Query/$Viewer/select/css.wcss
浏览文件 @
d2155d79
...
...
@@ -13,11 +13,11 @@
},
"viewPageNode": {
"padding-top": "10px",
"height": "30px"
//
"padding-top": "10px",
//
"height": "30px"
},
"viewPageAreaNode": {
"height": "24px"
//
"height": "24px"
//"margin-top": "28px"
},
"viewPageContentNode": {
...
...
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
d2155d79
...
...
@@ -182,6 +182,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
},
createActionbarNode
:
function
(){
this
.
actionbarAreaNode
.
empty
();
if
(
typeOf
(
this
.
json
.
showActionbar
)
===
"
boolean
"
&&
this
.
json
.
showActionbar
!==
true
)
return
;
if
(
typeOf
(
this
.
viewJson
.
actionbarHidden
)
===
"
boolean
"
){
if
(
this
.
viewJson
.
actionbarHidden
===
true
||
!
this
.
viewJson
.
actionbarList
||
!
this
.
viewJson
.
actionbarList
.
length
)
return
;
this
.
actionbar
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
.
Actionbar
(
this
.
actionbarAreaNode
,
this
.
viewJson
.
actionbarList
[
0
],
this
,
{});
...
...
@@ -1987,7 +1988,7 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
"
MWFnodetype
"
:
tool
.
type
,
//"MWFButtonImage": this.form.path+""+this.form.options.style+"/actionbar/"+tool.img,
//"MWFButtonImage": path+(this.options.style||"default") +"/tools/"+ (this.json.style || "default") +"/"+tool.img,
"
MWFButtonImage
"
:
path
+
this
.
options
.
style
+
"
/actionbar/
"
+
tool
.
img
,
"
MWFButtonImage
"
:
path
+
this
.
options
.
style
+
"
/actionbar/
"
+
(
this
.
json
.
iconStyle
||
"
default
"
)
+
"
/
"
+
tool
.
img
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonText
"
:
tool
.
text
...
...
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/blue/export.png
0 → 100644
浏览文件 @
d2155d79
436 字节
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/default/export.png
0 → 100644
浏览文件 @
d2155d79
354 字节
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/red/export.png
0 → 100644
浏览文件 @
d2155d79
426 字节
o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/white/export.png
0 → 100644
浏览文件 @
d2155d79
365 字节
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
浏览文件 @
d2155d79
...
...
@@ -85,7 +85,8 @@
},
"actionbar"
:
{
"style"
:
"xform_blue_flat"
,
"iconOverStyle"
:
"xform_blue_flat_over"
,
"iconStyle"
:
"blue"
,
"iconOverStyle"
:
"white"
,
"customIconStyle"
:
"blue"
,
"customIconOverStyle"
:
"white"
,
"forceStyles"
:
{
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
浏览文件 @
d2155d79
...
...
@@ -85,6 +85,7 @@
},
"actionbar"
:
{
"style"
:
"cmcc"
,
"iconStyle"
:
"white"
,
"customIconStyle"
:
"white"
,
"forceStyles"
:
{
"container"
:
{
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
浏览文件 @
d2155d79
...
...
@@ -13,13 +13,13 @@
"titleTr"
:{
//viewTitleTrNode
viewTitleLineNode
"line-height"
:
"40px"
,
"height"
:
"40px"
,
"color"
:
"#
666666
"
,
"background-color"
:
"#
EEE
"
"color"
:
"#
fd1113
"
,
"background-color"
:
"#
fff
"
},
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #
CCC
"
"border-bottom"
:
"1px solid #
fd1113
"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
@@ -31,7 +31,7 @@
"height"
:
"30px"
,
"line-height"
:
"30px"
,
"padding"
:
"5px 5px"
,
"border-bottom"
:
"1px solid #
CCC
"
"border-bottom"
:
"1px solid #
fd1113
"
},
"contentGroupTd"
:
{
"padding"
:
"5px 5px"
,
...
...
o2web/source/x_component_query_ViewDesigner/View.js
浏览文件 @
d2155d79
...
...
@@ -1661,6 +1661,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
},
setTemplateStyles
:
function
(
styles
){
this
.
json
.
style
=
styles
.
style
;
this
.
json
.
iconStyle
=
styles
.
iconStyle
||
""
;
this
.
json
.
iconOverStyle
=
styles
.
iconOverStyle
||
""
;
this
.
json
.
customIconStyle
=
styles
.
customIconStyle
;
this
.
json
.
customIconOverStyle
=
styles
.
customIconOverStyle
||
""
;
...
...
@@ -1668,6 +1669,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
},
clearTemplateStyles
:
function
(
styles
){
this
.
json
.
style
=
"
form
"
;
this
.
json
.
iconStyle
=
""
;
this
.
json
.
iconOverStyle
=
""
;
this
.
json
.
customIconStyle
=
""
;
this
.
json
.
customIconOverStyle
=
""
;
...
...
@@ -1852,7 +1854,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
tools
.
each
(
function
(
tool
){
var
actionNode
=
new
Element
(
"
div
"
,
{
"
MWFnodetype
"
:
tool
.
type
,
"
MWFButtonImage
"
:
this
.
imagePath_default
+
""
+
this
.
options
.
style
+
"
/actionbar/
"
+
tool
.
img
,
"
MWFButtonImage
"
:
this
.
imagePath_default
+
""
+
this
.
options
.
style
+
"
/actionbar/
"
+
(
this
.
json
.
iconStyle
||
"
default
"
)
+
"
/
"
+
tool
.
img
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonText
"
:
tool
.
text
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录