Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
c9857b39
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
c9857b39
编写于
11月 06, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加查询语句相关API方法
上级
4a0cbed1
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
30 addition
and
22 deletion
+30
-22
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
+5
-3
o2web/source/x_component_query_Query/Statement.js
o2web/source/x_component_query_Query/Statement.js
+25
-19
未找到文件。
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
浏览文件 @
c9857b39
...
...
@@ -669,7 +669,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
this
.
statement
=
{
"
execute
"
:
function
(
statement
,
callback
,
async
)
{
var
obj
=
{
"
filterList
"
:
(
statement
.
filter
List
||
[]),
parameter
:
(
statement
.
parameter
||
{})
};
var
obj
=
{
"
filterList
"
:
(
statement
.
filter
||
[]),
parameter
:
(
statement
.
parameter
||
{})
};
MWF
.
Actions
.
load
(
"
x_query_assemble_surface
"
).
StatementAction
.
executeV2
(
statement
.
name
,
statement
.
mode
||
"
data
"
,
statement
.
page
||
1
,
statement
.
pageSize
||
20
,
obj
,
function
(
json
)
{
...
...
@@ -683,7 +683,8 @@ MWF.xScript.ViewEnvironment = function (ev) {
"
statementName
"
:
statement
.
statement
||
""
,
"
isTitle
"
:
(
statement
.
isTitle
===
false
)
?
"
no
"
:
"
yes
"
,
"
select
"
:
(
statement
.
isMulti
===
false
)
?
"
single
"
:
"
multi
"
,
"
filter
"
:
statement
.
filter
"
filter
"
:
statement
.
filter
,
"
parameter
"
:
statement
.
parameter
};
if
(
!
options
)
options
=
{};
options
.
width
=
statement
.
width
;
...
...
@@ -872,7 +873,8 @@ MWF.xScript.ViewEnvironment = function (ev) {
"
selectAll
"
:
function
()
{
return
_form
.
selectAll
();
},
"
unSelectAll
"
:
function
()
{
return
_form
.
unSelectAll
();
},
"
getSelectedData
"
:
function
()
{
return
_form
.
getSelectedData
();
},
"
setFilter
"
:
function
(
filter
)
{
return
_form
.
setFilter
(
filter
);
},
"
setFilter
"
:
function
(
filter
,
callback
)
{
return
_form
.
setFilter
(
filter
,
callback
);
},
"
setStatementFilter
"
:
function
(
filter
,
parameter
,
callback
)
{
return
_form
.
setFilter
(
filter
,
parameter
,
callback
);
},
"
switchView
"
:
function
(
options
)
{
return
_form
.
switchView
(
options
);
},
"
switchStatement
"
:
function
(
options
)
{
if
(
_form
.
switchStatement
)
_form
.
switchStatement
(
options
)
;
},
"
reload
"
:
function
()
{
_form
.
reload
();
},
...
...
o2web/source/x_component_query_Query/Statement.js
浏览文件 @
c9857b39
...
...
@@ -53,6 +53,7 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
if
(
this
.
json
.
view
){
this
.
viewJson
=
JSON
.
decode
(
this
.
json
.
view
);
this
.
statementJson
=
this
.
json
;
this
.
statementJson
.
viewJson
=
this
.
viewJson
;
if
(
callback
)
callback
();
}
else
{
this
.
getView
(
callback
);
...
...
@@ -181,6 +182,7 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
},
loadParameter
:
function
(){
this
.
parameter
=
{};
debugger
;
var
parameter
=
this
.
json
.
parameter
?
Object
.
clone
(
this
.
json
.
parameter
)
:
{};
//系统默认的参数
(
this
.
viewJson
.
parameterList
||
[]
).
each
(
function
(
f
)
{
...
...
@@ -189,36 +191,31 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
value
=
parameter
[
f
.
parameter
];
delete
parameter
[
f
.
parameter
];
}
debugger
;
if
(
typeOf
(
value
)
===
"
date
"
){
value
=
value
.
format
(
"
db
"
);
}
if
(
f
.
valueType
===
"
script
"
){
value
=
this
.
Macro
.
exec
(
f
.
valueScript
?
f
.
valueScript
.
code
:
""
,
this
);
}
else
{
//
var user = layout.user;
var
user
=
layout
.
user
;
switch
(
f
.
value
)
{
case
"
@person
"
:
case
"
person
"
:
//value = user.distinguishedName;
value
=
user
.
distinguishedName
;
break
;
case
"
@identityList
"
:
case
"
identityList
"
:
//value = user.identityList.map( function (d) {
// return d.distinguishedName;
//});
value
=
user
.
identityList
.
map
(
function
(
d
)
{
return
d
.
distinguishedName
;
});
break
;
case
"
@unitList
"
:
case
"
unitList
"
:
//o2.Actions.load("x_organization_assemble_express").UnitAction.listWithPerson({ "personList" : [user.distinguishedName] }, function (json) {
// value = json.unitList;
//}, null, false);
o2
.
Actions
.
load
(
"
x_organization_assemble_express
"
).
UnitAction
.
listWithPerson
({
"
personList
"
:
[
user
.
distinguishedName
]
},
function
(
json
)
{
value
=
json
.
unitList
;
},
null
,
false
);
break
;
case
"
@unitAllList
"
:
case
"
unitAllList
"
:
//o2.Actions.load("x_organization_assemble_express").UnitAction.listWithIdentitySupNested({ "personList" : [user.distinguishedName] }, function (json) {
// value = json.unitList;
//}, null, false);
o2
.
Actions
.
load
(
"
x_organization_assemble_express
"
).
UnitAction
.
listWithIdentitySupNested
({
"
personList
"
:
[
user
.
distinguishedName
]
},
function
(
json
)
{
value
=
json
.
unitList
;
},
null
,
false
);
break
;
case
"
@year
"
:
value
=
(
new
Date
().
getFullYear
()).
toString
();
...
...
@@ -260,9 +257,9 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
for
(
var
p
in
parameter
){
var
value
=
parameter
[
p
];
if
(
typeOf
(
value
)
===
"
date
"
){
value
=
"
{ts '
"
+
value
+
"
'}
"
value
=
"
{ts '
"
+
value
.
format
(
"
db
"
)
+
"
'}
"
}
parameter
[
p
]
=
value
;
this
.
parameter
[
p
]
=
value
;
}
},
loadCurrentPageData
:
function
(
callback
,
async
,
type
){
...
...
@@ -332,6 +329,7 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
this
.
json
.
application
=
json
.
data
.
query
;
//this.json = Object.merge(this.json, json.data);
this
.
statementJson
=
json
.
data
;
this
.
statementJson
.
viewJson
=
this
.
viewJson
;
if
(
callback
)
callback
();
}.
bind
(
this
));
},
...
...
@@ -480,7 +478,15 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
},
//搜索相关结束
getStatementInfor
:
function
()
{
return
this
.
json
;
debugger
;
return
this
.
statementJson
;
},
getPageInfor
:
function
(){
return
{
pages
:
this
.
pages
,
perPageCount
:
this
.
json
.
pageSize
,
currentPageNumber
:
this
.
currentPage
};
},
switchStatement
:
function
(
json
)
{
this
.
switchView
(
json
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录