Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
c9d7e940
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,发现更多精彩内容 >>
提交
c9d7e940
编写于
10月 30, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
视图中增加可以选择行的条件
上级
cd0b68df
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
105 addition
and
44 deletion
+105
-44
o2web/source/x_component_query_Query/$Viewer/default/icon/blank.png
...ce/x_component_query_Query/$Viewer/default/icon/blank.png
+0
-0
o2web/source/x_component_query_Query/$Viewer/default/icon_red/blank.png
..._component_query_Query/$Viewer/default/icon_red/blank.png
+0
-0
o2web/source/x_component_query_Query/$Viewer/select/icon/blank.png
...rce/x_component_query_Query/$Viewer/select/icon/blank.png
+0
-0
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+92
-38
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_blue-simple.json
...ent_query_ViewDesigner/$View/skin/styles_blue-simple.json
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
..._component_query_ViewDesigner/$View/skin/styles_cmcc.json
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json
...mponent_query_ViewDesigner/$View/skin/styles_default.json
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
...ponent_query_ViewDesigner/$View/skin/styles_official.json
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json
...nent_query_ViewDesigner/$View/skin/styles_red-simple.json
+2
-1
o2web/source/x_component_query_ViewDesigner/$View/view.html
o2web/source/x_component_query_ViewDesigner/$View/view.html
+1
-0
未找到文件。
o2web/source/x_component_query_Query/$Viewer/default/icon/blank.png
0 → 100644
浏览文件 @
c9d7e940
2.7 KB
o2web/source/x_component_query_Query/$Viewer/default/icon_red/blank.png
0 → 100644
浏览文件 @
c9d7e940
2.7 KB
o2web/source/x_component_query_Query/$Viewer/select/icon/blank.png
0 → 100644
浏览文件 @
c9d7e940
2.7 KB
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
c9d7e940
...
...
@@ -233,7 +233,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
this
.
selectTitleCell
.
hide
();
}
if
(
this
.
getSelectFlag
()
!==
"
multi
"
||
!
this
.
viewJson
.
allowSelectAll
){
if
(
this
.
getSelectFlag
(
true
)
!==
"
multi
"
||
!
this
.
viewJson
.
allowSelectAll
){
this
.
expandTitleCell
=
this
.
selectTitleCell
;
}
...
...
@@ -293,7 +293,8 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
if
(
this
.
viewJson
&&
this
.
viewJson
.
isExpand
)
return
this
.
viewJson
.
isExpand
;
return
"
no
"
;
},
getSelectFlag
:
function
(){
getSelectFlag
:
function
(
ignoreSelectEnable
){
if
(
!
ignoreSelectEnable
&&
!
this
.
viewSelectedEnable
)
return
"
none
"
;
if
(
this
.
options
&&
this
.
options
.
select
)
return
this
.
options
.
select
;
if
(
this
.
json
&&
this
.
json
.
select
)
return
this
.
json
.
select
;
if
(
this
.
viewJson
&&
this
.
viewJson
.
select
)
return
this
.
viewJson
.
select
;
...
...
@@ -312,6 +313,9 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
if
(
this
.
json
.
defaultSelectedScript
||
this
.
viewJson
.
defaultSelectedScript
){
return
false
;
}
// if( !this.viewSelectedEnable ){
// return true;
// }
if
(
this
.
options
&&
this
.
options
.
select
){
return
this
.
options
.
select
===
"
none
"
;
}
...
...
@@ -501,9 +505,11 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
if
(
this
.
viewJson
.
group
.
column
){
this
.
gridJson
=
json
.
data
.
groupGrid
;
this
.
setSelectedableFlag
();
this
.
loadGroupData
();
}
else
{
this
.
gridJson
=
json
.
data
.
grid
;
this
.
setSelectedableFlag
();
this
.
loadData
();
}
if
(
this
.
gridJson
.
length
)
this
.
_loadPageNode
();
...
...
@@ -520,6 +526,34 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
if
(
callback
)
callback
();
}.
bind
(
this
),
null
,
async
===
false
?
false
:
true
);
},
setSelectedableFlag
:
function
(){
this
.
viewSelectedEnable
=
false
;
var
selectedAbleScript
=
this
.
json
.
selectedAbleScript
||
this
.
viewJson
.
selectedAbleScript
;
if
(
this
.
viewJson
.
group
.
column
){
this
.
gridJson
.
each
(
function
(
d
){
d
.
list
.
each
(
function
(
v
){
if
(
selectedAbleScript
){
v
.
$selectedEnable
=
this
.
Macro
.
exec
(
selectedAbleScript
,
{
"
data
"
:
v
,
"
groupData
"
:
d
,
"
view
"
:
this
});
}
else
{
v
.
$selectedEnable
=
true
;
}
if
(
v
.
$selectedEnable
){
d
.
$selectedEnable
=
true
;
this
.
viewSelectedEnable
=
true
;
}
}.
bind
(
this
))
}.
bind
(
this
))
}
else
{
this
.
gridJson
.
each
(
function
(
v
){
if
(
selectedAbleScript
){
v
.
$selectedEnable
=
this
.
Macro
.
exec
(
selectedAbleScript
,
{
"
data
"
:
v
,
"
view
"
:
this
});
}
else
{
v
.
$selectedEnable
=
true
;
}
if
(
v
.
$selectedEnable
)
this
.
viewSelectedEnable
=
true
;
}.
bind
(
this
))
}
},
getMode
:
function
(){
return
this
.
viewJson
.
group
.
column
?
"
group
"
:
"
item
"
;
},
...
...
@@ -558,6 +592,8 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
}
else
{
this
.
createSelectAllNode
();
}
}
else
if
(
this
.
selectAllNode
){
this
.
clearSelectAllStyle
();
}
if
(
this
.
gridJson
.
length
){
...
...
@@ -617,6 +653,8 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
}
else
{
this
.
createSelectAllNode
();
}
}
else
if
(
this
.
selectAllNode
){
this
.
clearSelectAllStyle
();
}
if
(
this
.
expandTitleCell
){
...
...
@@ -1289,22 +1327,26 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
for
(
var
i
=
0
;
i
<
this
.
items
.
length
;
i
++
){
var
item
=
this
.
items
[
i
];
if
(
item
.
clazzType
===
"
item
"
){
item
.
isSelected
?
(
noneFlag
=
false
)
:
(
allFlag
=
false
);
if
(
item
.
data
.
$selectedEnable
){
item
.
isSelected
?
(
noneFlag
=
false
)
:
(
allFlag
=
false
);
}
}
else
{
var
f
=
item
.
getSelectAllStatus
();
if
(
f
===
"
none
"
){
allFlag
=
false
;
}
else
if
(
f
===
"
all
"
){
noneFlag
=
false
;
}
else
if
(
f
===
"
some
"
){
allFlag
=
false
;
noneFlag
=
false
;
if
(
item
.
data
.
$selectedEnable
)
{
var
f
=
item
.
getSelectAllStatus
();
if
(
f
===
"
none
"
)
{
allFlag
=
false
;
}
else
if
(
f
===
"
all
"
)
{
noneFlag
=
false
;
}
else
if
(
f
===
"
some
"
)
{
allFlag
=
false
;
noneFlag
=
false
;
}
}
}
if
(
!
allFlag
&&
!
noneFlag
)
return
"
some
"
}
if
(
allFlag
)
return
"
all
"
;
if
(
noneFlag
)
return
"
none
"
;
if
(
allFlag
)
return
"
all
"
;
return
"
some
"
;
},
checkSelectAllStatus
:
function
(){
...
...
@@ -1334,20 +1376,28 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
'
../x_component_query_Query/$Viewer/" + this.options.style + "/icon/checkbox.png
'
)
}
},
clearSelectAllStyle
:
function
(){
debugger
;
if
(
!
this
.
selectAllNode
)
return
;
var
viewStyles
=
this
.
viewJson
.
viewStyles
;
var
viewTitleCellNode
=
(
viewStyles
&&
viewStyles
[
"
titleTd
"
])
?
viewStyles
[
"
titleTd
"
]
:
this
.
css
.
viewTitleCellNode
;
if
(
!
viewTitleCellNode
[
"
background
"
]
||
!
viewTitleCellNode
[
"
background-image
"
]
||
!
viewTitleCellNode
[
"
background-color
"
]
){
viewTitleCellNode
[
"
background
"
]
=
"
inherit
"
;
}
this
.
selectAllNode
.
setStyles
(
viewTitleCellNode
);
var
img
=
this
.
selectAllNode
.
getElement
(
"
img
"
);
if
(
img
)
img
.
set
(
"
src
"
,
'
../x_component_query_Query/$Viewer/" + this.options.style + "/icon/blank.png
'
)
},
selectAll
:
function
(){
// var flag = this.json.select || this.viewJson.select || "none";
if
(
this
.
getSelectFlag
()
===
"
multi
"
){
this
.
items
.
each
(
function
(
item
)
{
if
(
item
.
clazzType
===
"
item
"
){
item
.
selected
(
"
view
"
);
}
else
{
item
.
selectAll
(
"
view
"
);
// item.expand();
// if( item.items ){
// item.items.each( function (it) {
// it.selected();
// })
// }
if
(
item
.
data
.
$selectedEnable
){
if
(
item
.
clazzType
===
"
item
"
){
item
.
selected
(
"
view
"
);
}
else
{
item
.
selectAll
(
"
view
"
);
}
}
})
if
(
this
.
viewJson
.
allowSelectAll
)
{
...
...
@@ -1359,15 +1409,12 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
// var flag = this.json.select || this.viewJson.select || "none";
if
(
this
.
getSelectFlag
()
===
"
multi
"
){
this
.
items
.
each
(
function
(
item
)
{
if
(
item
.
clazzType
===
"
item
"
){
item
.
unSelected
(
"
view
"
);
}
else
{
item
.
unSelectAll
(
"
view
"
);
// if(item.items){
// item.items.each( function (it) {
// it.unSelected();
// })
// }
if
(
item
.
data
.
$selectedEnable
)
{
if
(
item
.
clazzType
===
"
item
"
)
{
item
.
unSelected
(
"
view
"
);
}
else
{
item
.
unSelectAll
(
"
view
"
);
}
}
})
if
(
this
.
viewJson
.
allowSelectAll
)
{
...
...
@@ -1546,7 +1593,7 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
//var selectFlag = this.view.json.select || this.view.viewJson.select || "none";
var
selectFlag
=
this
.
view
.
getSelectFlag
();
if
(
[
"
multi
"
,
"
single
"
].
contains
(
selectFlag
)
&&
this
.
view
.
viewJson
.
selectBoxShow
===
"
always
"
)
{
if
(
this
.
data
.
$selectedEnable
&&
[
"
multi
"
,
"
single
"
].
contains
(
selectFlag
)
&&
this
.
view
.
viewJson
.
selectBoxShow
===
"
always
"
)
{
var
viewStyles
=
this
.
view
.
viewJson
.
viewStyles
;
if
(
viewStyles
)
{
if
(
selectFlag
===
"
single
"
)
{
...
...
@@ -1623,6 +1670,7 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
//}
}.
bind
(
this
));
//默认选中
var
defaultSelectedScript
=
this
.
view
.
json
.
defaultSelectedScript
||
this
.
view
.
viewJson
.
defaultSelectedScript
;
if
(
!
this
.
isSelected
&&
defaultSelectedScript
){
...
...
@@ -1824,7 +1872,7 @@ MWF.xApplication.query.Query.Viewer.Item = new Class({
setEvent
:
function
(){
var
flag
=
this
.
view
.
getSelectFlag
();
if
(
flag
===
"
single
"
||
flag
===
"
multi
"
){
if
(
this
.
data
.
$selectedEnable
&&
(
flag
===
"
single
"
||
flag
===
"
multi
"
)
){
this
.
node
.
addEvents
({
"
mouseover
"
:
function
(){
if
(
!
this
.
isSelected
&&
this
.
view
.
viewJson
.
selectBoxShow
!==
"
always
"
){
...
...
@@ -1973,7 +2021,7 @@ MWF.xApplication.query.Query.Viewer.ItemCategory = new Class({
this
.
selectTd
=
new
Element
(
"
td
"
,
{
"
styles
"
:
viewContentCategoryTdNode
}).
inject
(
this
.
node
);
if
(
this
.
view
.
json
.
itemStyles
)
this
.
selectTd
.
setStyles
(
this
.
view
.
json
.
itemStyles
);
if
(
this
.
view
.
getSelectFlag
()
===
"
multi
"
&&
this
.
view
.
viewJson
.
allowSelectAll
){
if
(
this
.
data
.
$selectedEnable
&&
this
.
view
.
getSelectFlag
()
===
"
multi
"
&&
this
.
view
.
viewJson
.
allowSelectAll
){
this
.
selectAllNode
=
this
.
selectTd
;
if
(
viewStyles
&&
viewStyles
[
"
checkboxNode
"
]
){
this
.
selectAllNode
.
setStyles
(
viewStyles
[
"
checkboxNode
"
]
)
...
...
@@ -2071,8 +2119,10 @@ MWF.xApplication.query.Query.Viewer.ItemCategory = new Class({
var
allFlag
=
true
,
noneFlag
=
true
;
for
(
var
i
=
0
;
i
<
this
.
items
.
length
;
i
++
){
var
item
=
this
.
items
[
i
];
item
.
isSelected
?
(
noneFlag
=
false
)
:
(
allFlag
=
false
);
if
(
!
allFlag
&&
!
noneFlag
)
return
"
some
"
if
(
item
.
data
.
$selectedEnable
){
item
.
isSelected
?
(
noneFlag
=
false
)
:
(
allFlag
=
false
);
if
(
!
allFlag
&&
!
noneFlag
)
return
"
some
"
}
}
if
(
allFlag
)
return
"
all
"
;
if
(
noneFlag
)
return
"
none
"
;
...
...
@@ -2110,7 +2160,9 @@ MWF.xApplication.query.Query.Viewer.ItemCategory = new Class({
if
(
this
.
view
.
getSelectFlag
()
===
"
multi
"
){
this
.
expand
();
this
.
items
.
each
(
function
(
item
)
{
item
.
selected
(
from
);
if
(
item
.
data
.
$selectedEnable
){
item
.
selected
(
from
);
}
})
if
(
this
.
view
.
viewJson
.
allowSelectAll
){
this
.
setSelectAllStyle
();
...
...
@@ -2125,7 +2177,9 @@ MWF.xApplication.query.Query.Viewer.ItemCategory = new Class({
// var flag = this.json.select || this.viewJson.select || "none";
if
(
this
.
view
.
getSelectFlag
()
===
"
multi
"
){
this
.
items
.
each
(
function
(
item
)
{
item
.
unSelected
(
from
);
if
(
item
.
data
.
$selectedEnable
)
{
item
.
unSelected
(
from
);
}
})
if
(
this
.
view
.
viewJson
.
allowSelectAll
)
{
this
.
setUnSelectAllStyle
();
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
浏览文件 @
c9d7e940
...
...
@@ -19,7 +19,8 @@
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #dcdfe6"
"border-bottom"
:
"1px solid #dcdfe6"
,
"background"
:
"inherit"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json
浏览文件 @
c9d7e940
...
...
@@ -19,7 +19,8 @@
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #CCC"
"border-bottom"
:
"1px solid #CCC"
,
"background"
:
"inherit"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
浏览文件 @
c9d7e940
...
...
@@ -19,7 +19,8 @@
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #CCC"
"border-bottom"
:
"1px solid #CCC"
,
"background"
:
"inherit"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json
浏览文件 @
c9d7e940
...
...
@@ -19,7 +19,8 @@
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #CCC"
"border-bottom"
:
"1px solid #CCC"
,
"background"
:
"inherit"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
浏览文件 @
c9d7e940
...
...
@@ -19,7 +19,8 @@
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #fd1113"
"border-bottom"
:
"1px solid #fd1113"
,
"background"
:
"inherit"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json
浏览文件 @
c9d7e940
...
...
@@ -19,7 +19,8 @@
"titleTd"
:{
//viewTitleColumnNode
viewTitleCellNode
"font-weight"
:
"bold"
,
"padding"
:
"0px 10px"
,
"border-bottom"
:
"1px solid #CCC"
"border-bottom"
:
"1px solid #CCC"
,
"background"
:
"inherit"
},
"contentTr"
:
{
"background"
:
"#ffffff"
...
...
o2web/source/x_component_query_ViewDesigner/$View/view.html
浏览文件 @
c9d7e940
...
...
@@ -144,6 +144,7 @@
</table>
<div
class=
"MWFFormulaArea"
name=
"data.defaultSelectedScript"
title=
"默认选中行脚本"
></div>
<div
class=
"MWFFormulaArea"
name=
"data.selectedAbleScript"
title=
"允许选择行脚本"
></div>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录