Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
108e6831
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,体验更适合开发者的 AI 搜索 >>
提交
108e6831
编写于
11月 02, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
查询中增加视图功能
上级
f4f79182
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
42 addition
and
20 deletion
+42
-20
o2web/source/x_component_process_FormDesigner/Module/StatementSelector/template.json
...ocess_FormDesigner/Module/StatementSelector/template.json
+1
-1
o2web/source/x_component_query_Query/Main.js
o2web/source/x_component_query_Query/Main.js
+3
-2
o2web/source/x_component_query_Query/Statement.js
o2web/source/x_component_query_Query/Statement.js
+21
-5
o2web/source/x_component_query_StatementDesigner/$Statement/statementDesigner.html
...query_StatementDesigner/$Statement/statementDesigner.html
+1
-0
o2web/source/x_component_query_StatementDesigner/$Statement/view.html
.../x_component_query_StatementDesigner/$Statement/view.html
+8
-8
o2web/source/x_component_query_StatementDesigner/Statement.js
...b/source/x_component_query_StatementDesigner/Statement.js
+3
-1
o2web/source/x_component_query_StatementDesigner/widget/ViewFilter.js
.../x_component_query_StatementDesigner/widget/ViewFilter.js
+5
-3
未找到文件。
o2web/source/x_component_process_FormDesigner/Module/StatementSelector/template.json
浏览文件 @
108e6831
{
"id"
:
""
,
"name"
:
""
,
"type"
:
"
s
tatementSelector"
,
"type"
:
"
S
tatementSelector"
,
"description"
:
""
,
"titleStyles"
:
{},
"itemStyles"
:
{},
...
...
o2web/source/x_component_query_Query/Main.js
浏览文件 @
108e6831
...
...
@@ -252,11 +252,12 @@ MWF.xApplication.query.Query.StatementItem = new Class({
loadView
:
function
(){
MWF
.
xDesktop
.
requireApp
(
"
query.Query
"
,
"
Statement
"
,
function
(){
this
.
viewContent
.
empty
();
this
.
viewer
=
new
MWF
.
QStatement
(
this
.
app
,
this
.
viewContent
,
{
debugger
;
this
.
viewer
=
new
MWF
.
QStatement
(
this
.
viewContent
,
{
"
application
"
:
this
.
view
.
query
,
"
statementName
"
:
this
.
view
.
name
,
"
statementId
"
:
this
.
view
.
id
});
}
,{},
this
.
app
);
}.
bind
(
this
));
}
});
\ No newline at end of file
o2web/source/x_component_query_Query/Statement.js
浏览文件 @
108e6831
...
...
@@ -155,7 +155,15 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
if
(
d
.
comparison
===
"
like
"
||
d
.
comparison
===
"
notLike
"
){
this
.
parameter
[
parameterName
]
=
"
%
"
+
d
.
value
+
"
%
"
;
}
else
{
this
.
parameter
[
parameterName
]
=
d
.
value
;
var
value
=
d
.
value
;
if
(
d
.
formatType
===
"
dateTimeValue
"
||
d
.
formatType
===
"
datetimeValue
"
){
value
=
"
{ts '
"
+
value
+
"
'}
"
}
else
if
(
d
.
formatType
===
"
dateValue
"
){
value
=
"
{d '
"
+
value
+
"
'}
"
}
else
if
(
d
.
formatType
===
"
timeValue
"
){
value
=
"
{t '
"
+
value
+
"
'}
"
}
this
.
parameter
[
parameterName
]
=
value
;
}
d
.
value
=
parameterName
;
...
...
@@ -163,6 +171,7 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
}.
bind
(
this
))
},
loadParameter
:
function
(){
this
.
parameter
=
{};
(
this
.
viewJson
.
filterList
||
[]
).
each
(
function
(
f
)
{
var
value
=
f
.
value
;
debugger
;
...
...
@@ -177,17 +186,17 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
case
"
@identityList
"
:
value
=
user
.
identityList
.
map
(
function
(
d
)
{
return
d
.
distinguishedName
;
})
})
;
break
;
case
"
@unitList
"
:
o2
.
Actions
.
load
(
"
x_organization_assemble_express
"
).
UnitAction
.
listWithPerson
({
"
personList
"
:
[
user
.
distinguishedName
]
},
function
(
json
)
{
value
=
json
.
unitList
;
},
null
,
false
)
},
null
,
false
)
;
break
;
case
"
@unitAllList
"
:
o2
.
Actions
.
load
(
"
x_organization_assemble_express
"
).
UnitAction
.
listWithIdentitySupNested
({
"
personList
"
:
[
user
.
distinguishedName
]
},
function
(
json
)
{
value
=
json
.
unitList
;
},
null
,
false
)
},
null
,
false
)
;
break
;
case
"
@year
"
:
value
=
(
new
Date
().
getFullYear
()).
toString
();
...
...
@@ -216,6 +225,13 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
default
:
}
}
if
(
f
.
formatType
===
"
dateTimeValue
"
||
f
.
formatType
===
"
datetimeValue
"
){
value
=
"
{ts '
"
+
value
+
"
'}
"
}
else
if
(
f
.
formatType
===
"
dateValue
"
){
value
=
"
{d '
"
+
value
+
"
'}
"
}
else
if
(
f
.
formatType
===
"
timeValue
"
){
value
=
"
{t '
"
+
value
+
"
'}
"
}
this
.
parameter
[
f
.
parameter
]
=
value
;
}.
bind
(
this
))
},
...
...
@@ -241,7 +257,7 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
//this.createLoadding();
this
.
loadViewRes
=
o2
.
Actions
.
load
(
"
x_query_assemble_surface
"
).
StatementAction
.
executeV2
(
this
.
json
.
statementId
||
this
.
json
.
statementName
,
this
.
options
.
statementId
||
this
.
options
.
statementName
||
this
.
json
.
statementId
||
this
.
json
.
statementName
,
type
||
"
data
"
,
p
,
this
.
json
.
pageSize
,
d
,
function
(
json
){
if
(
type
===
"
all
"
||
type
===
"
count
"
){
...
...
o2web/source/x_component_query_StatementDesigner/$Statement/statementDesigner.html
浏览文件 @
108e6831
...
...
@@ -39,6 +39,7 @@
<div
style=
"margin-left: 30px;"
class=
"o2_statement_statementDesignerTitle"
>
{{$.lp.statementTable}}:
</div>
<div
class=
"o2_statement_statementDesignerOfficialTable"
>
<select>
<option
value=
""
></option>
<option
value=
"com.x.processplatform.core.entity.content.Task"
{{
if
$
.data.entityClassName =
='com.x.processplatform.core.entity.content.Task'}}
selected
{{
end
if
}}
>
待办(Task)
</option>
<option
value=
"com.x.processplatform.core.entity.content.TaskCompleted"
{{
if
$
.data.entityClassName =
='com.x.processplatform.core.entity.content.TaskCompleted'}}
selected
{{
end
if
}}
>
已办(TaskCompleted)
</option>
<option
value=
"com.x.processplatform.core.entity.content.Read"
{{
if
$
.data.entityClassName =
='com.x.processplatform.core.entity.content.Read'}}
selected
{{
end
if
}}
>
待阅(Read)
</option>
...
...
o2web/source/x_component_query_StatementDesigner/$Statement/view.html
浏览文件 @
108e6831
...
...
@@ -111,12 +111,12 @@
<td
class=
"editTableTitle"
>
标题:
</td>
<td
class=
"editTableValue"
><input
type=
"text"
class=
"editTableInput titleInput_vf"
/></td>
</tr>
<tr
id=
"text{$.id}parameterInputSelectTr"
style=
"display: none"
>
<td
class=
"editTableTitle"
>
选择参数:
</td
>
<td
class=
"editTableValue"
>
<select
class=
"parameterInputSelect_vf"
></select
>
</td
>
</tr
>
<!-- <tr id="text{$.id}parameterInputSelectTr" style="display: none">--
>
<!-- <td class="editTableTitle">选择参数:</td>--
>
<!-- <td class="editTableValue">--
>
<!-- <select class="parameterInputSelect_vf"></select>--
>
<!-- </td>--
>
<!-- </tr>--
>
<tr
id=
"text{$.id}parameterInputTr"
style=
"display: none"
>
<td
class=
"editTableTitle"
>
参数:
</td>
<td
class=
"editTableValue"
>
...
...
@@ -174,7 +174,7 @@
debugger;
$('text{$.id}viewFilterRestrict').setStyle('display', 'block');
$('text{$.id}parameterInputTr').setStyle('display', 'table-row');
$('text{$.id}parameterInputSelectTr').setStyle('display', 'table-row');
//
$('text{$.id}parameterInputSelectTr').setStyle('display', 'table-row');
$('text{$.id}viewCustomFilterRestrict').setStyle('display', 'none');
$('text{$.id}pathInputTr').setStyle('display', 'none');
$('text{$.id}pathInputSelectTr').setStyle('display', 'none');
...
...
@@ -182,7 +182,7 @@
<input
type=
"radio"
class=
"customFilterInput_vf"
value=
"custom"
name=
"text{$.id}viewFilterType"
onclick=
"if (this.checked){
$('text{$.id}viewFilterRestrict').setStyle('display', 'none');
$('text{$.id}parameterInputTr').setStyle('display', 'none');
$('text{$.id}parameterInputSelectTr').setStyle('display', 'none');
//
$('text{$.id}parameterInputSelectTr').setStyle('display', 'none');
$('text{$.id}viewCustomFilterRestrict').setStyle('display', 'block');
$('text{$.id}pathInputTr').setStyle('display', 'table-row');
$('text{$.id}pathInputSelectTr').setStyle('display', 'table-row');
...
...
o2web/source/x_component_query_StatementDesigner/Statement.js
浏览文件 @
108e6831
...
...
@@ -576,7 +576,9 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
debugger
;
var
entityClassName
=
e
.
target
.
options
[
e
.
target
.
selectedIndex
].
value
;
this
.
json
.
entityClassName
=
entityClassName
;
this
.
changeEditorEntityClassName
(
entityClassName
.
split
(
"
.
"
).
getLast
()
);
if
(
entityClassName
){
this
.
changeEditorEntityClassName
(
entityClassName
.
split
(
"
.
"
).
getLast
()
);
}
// var className = e.target.options[e.target.selectedIndex].value;
...
...
o2web/source/x_component_query_StatementDesigner/widget/ViewFilter.js
浏览文件 @
108e6831
...
...
@@ -126,7 +126,7 @@ MWF.xApplication.query.StatementDesigner.widget.ViewFilter = new Class({
this
.
pathInput
=
this
.
inputAreaNode
.
getElement
(
"
.pathInput_vf
"
);
this
.
pathInputSelect
=
this
.
inputAreaNode
.
getElement
(
"
.pathInputSelect_vf
"
);
this
.
parameterInput
=
this
.
inputAreaNode
.
getElement
(
"
.parameterInput_vf
"
);
this
.
parameterInputSelect
=
this
.
inputAreaNode
.
getElement
(
"
.parameterInputSelect_vf
"
);
//
this.parameterInputSelect = this.inputAreaNode.getElement(".parameterInputSelect_vf");
this
.
datatypeInput
=
this
.
inputAreaNode
.
getElement
(
"
.datatypeInput_vf
"
);
this
.
restrictFilterInput
=
this
.
inputAreaNode
.
getElement
(
"
.restrictFilterInput_vf
"
);
...
...
@@ -275,6 +275,8 @@ MWF.xApplication.query.StatementDesigner.widget.ViewFilter = new Class({
this
.
switchInputDisplay
();
if
(
this
.
datatypeInput
.
onchange
)
this
.
datatypeInput
.
onchange
();
}
}
else
if
(
type
===
"
official
"
){
}
}.
bind
(
this
))
this
.
setPathInputSelectOptions
()
...
...
@@ -355,7 +357,7 @@ MWF.xApplication.query.StatementDesigner.widget.ViewFilter = new Class({
}
}.
bind
(
this
))
}
else
if
(
d
.
entityCategory
===
'
official
'
){
this
.
pathInputSelect
.
empty
();
}
},
switchInputDisplay
:
function
()
{
...
...
@@ -713,7 +715,7 @@ MWF.xApplication.query.StatementDesigner.widget.ViewFilter = new Class({
break
;
}
}
if
(
flag
)
this
.
pathInputSelect
.
options
[
0
].
set
(
"
selected
"
,
true
);
if
(
flag
&&
this
.
pathInputSelect
.
options
.
length
)
this
.
pathInputSelect
.
options
[
0
].
set
(
"
selected
"
,
true
);
switch
(
data
.
formatType
)
{
case
"
textValue
"
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录