Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
7dd0c670
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,发现更多精彩内容 >>
提交
7dd0c670
编写于
3月 19, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加视图的上下文
上级
22d25dda
变更
5
展开全部
隐藏空白更改
内联
并排
Showing
5 changed file
with
1159 addition
and
51 deletion
+1159
-51
o2web/source/o2_core/o2/xScript/Macro.js
o2web/source/o2_core/o2/xScript/Macro.js
+44
-0
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
+1094
-0
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+20
-10
o2web/source/x_component_query_ViewDesigner/$View/view_bak.json
...source/x_component_query_ViewDesigner/$View/view_bak.json
+0
-40
o2web/source/x_component_query_ViewDesigner/View.js
o2web/source/x_component_query_ViewDesigner/View.js
+1
-1
未找到文件。
o2web/source/o2_core/o2/xScript/Macro.js
浏览文件 @
7dd0c670
...
...
@@ -165,5 +165,49 @@ MWF.Macro.PageContext = new Class({
}
});
MWF
.
Macro
.
ViewContext
=
new
Class
({
macroFunction
:
null
,
environment
:
{},
initialize
:
function
(
view
){
this
.
form
=
view
;
var
environment
=
{
"
view
"
:
view
,
"
viewInfor
"
:
view
.
viewInfor
,
"
target
"
:
null
,
"
event
"
:
null
};
MWF
.
require
(
"
MWF.xScript.ViewEnvironment
"
,
null
,
false
);
this
.
environment
=
new
MWF
.
xScript
.
ViewEnvironment
(
environment
);
},
setTarget
:
function
(
target
){
if
(
target
){
this
.
environment
.
target
=
target
;
}
else
{
this
.
environment
.
target
=
null
;
}
},
setEvent
:
function
(
event
){
if
(
event
){
this
.
environment
.
event
=
event
;
}
else
{
this
.
environment
.
event
=
null
;
}
},
exec
:
function
(
code
,
target
){
this
.
setTarget
(
target
);
var
returnValue
=
MWF
.
Macro
.
exec
(
code
,
this
.
environment
);
//this.form.businessData.data = Object.merge(this.form.businessData.data, this.environment.data);
return
returnValue
;
//this.environment.data
},
fire
:
function
(
code
,
target
,
event
){
this
.
setTarget
(
target
);
this
.
setEvent
(
event
);
return
MWF
.
Macro
.
exec
(
code
,
this
.
environment
);
}
});
JSONObject
=
function
(
o
){
};
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
0 → 100644
浏览文件 @
7dd0c670
此差异已折叠。
点击以展开。
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
7dd0c670
...
...
@@ -74,12 +74,14 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
}
},
load
:
function
(){
this
.
_loadModuleEvents
();
if
(
this
.
fireEvent
(
"
queryLoad
"
)){
this
.
_loadUserInterface
();
//this._loadStyles();
this
.
_loadDomEvents
();
}
this
.
loadMacro
(
function
()
{
this
.
_loadModuleEvents
();
if
(
this
.
fireEvent
(
"
queryLoad
"
)){
this
.
_loadUserInterface
();
//this._loadStyles();
this
.
_loadDomEvents
();
}
})
},
_loadUserInterface
:
function
(){
this
.
loadLayout
();
...
...
@@ -102,6 +104,16 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
this
.
viewPageNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
viewPageNode
}).
inject
(
this
.
node
);
this
.
viewPageAreaNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
viewPageAreaNode
}).
inject
(
this
.
viewPageNode
);
},
loadMacro
:
function
(
callback
)
{
if
(
!
this
.
Macro
){
//有可能是page\cms\process传入的macro
MWF
.
require
(
"
MWF.xScript.Macro
"
,
function
()
{
this
.
Macro
=
new
MWF
.
Macro
.
ViewContext
(
this
);
if
(
callback
)
callback
();
}.
bind
(
this
));
}
else
{
if
(
callback
)
callback
();
}
},
createExportNode
:
function
(){
if
(
this
.
options
.
export
){
MWF
.
require
(
"
MWF.widget.Toolbar
"
,
function
(){
...
...
@@ -958,7 +970,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
if
(
e
.
code
){
if
(
this
.
options
.
moduleEvents
.
indexOf
(
key
)
!==-
1
){
this
.
addEvent
(
key
,
function
(
event
){
return
this
.
form
.
Macro
.
fire
(
e
.
code
,
this
,
event
);
return
this
.
Macro
.
fire
(
e
.
code
,
this
,
event
);
}.
bind
(
this
));
}
}
...
...
@@ -969,7 +981,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
if
(
e
.
code
){
if
(
this
.
options
.
moduleEvents
.
indexOf
(
key
)
===-
1
){
this
.
node
.
addEvent
(
key
,
function
(
event
){
return
this
.
form
.
Macro
.
fire
(
e
.
code
,
this
,
event
);
return
this
.
Macro
.
fire
(
e
.
code
,
this
,
event
);
}.
bind
(
this
));
}
}
...
...
@@ -1436,8 +1448,6 @@ MWF.xApplication.query.Query.Viewer.Filter = new Class({
}
});
MWF
.
xApplication
.
query
.
Query
.
Viewer
.
Actionbar
=
new
Class
({
Implements
:
[
Events
],
options
:
{
...
...
o2web/source/x_component_query_ViewDesigner/$View/view_bak.json
已删除
100644 → 0
浏览文件 @
22d25dda
{
"name"
:
""
,
"id"
:
""
,
"application"
:
""
,
"alias"
:
""
,
"description"
:
""
,
"display"
:
true
,
"data"
:
{
"exportGrid"
:
true
,
"exportGoupGrid"
:
true
,
"scopeType"
:
"work"
,
"selectEntryList"
:
[],
"restrictWhereEntry"
:
{
"applicationList"
:
[],
"processList"
:
[],
"companyList"
:
[],
"departmentList"
:
[],
"personList"
:
[],
"identityList"
:
[]
},
"restrictFilterEntryList"
:
[],
"restrictDateRangeEntry"
:
{
"dateRangeType"
:
"none"
,
"dateEffectType"
:
"start"
,
"year"
:
""
,
"month"
:
""
,
"date"
:
""
,
"season"
:
0
,
"week"
:
0
,
"adjust"
:
0
},
"orderEntryList"
:
[],
"groupEntry"
:
{},
"calculate"
:
{}
},
"availableIdentityList"
:
[],
"availableDepartmentList"
:
[],
"availableCompanyList"
:
[]
}
\ No newline at end of file
o2web/source/x_component_query_ViewDesigner/View.js
浏览文件 @
7dd0c670
...
...
@@ -171,7 +171,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
json
.
data
.
groupGrid
.
each
(
function
(
line
,
idx
){
var
groupTr
=
new
Element
(
"
tr
"
,
{
"
styles
"
:
this
.
css
.
viewContentTrNode
}).
inject
(
this
.
viewContentTableNode
);
var
colSpan
=
this
.
items
.
length
+
1
;
var
colSpan
=
this
.
items
.
length
;
var
td
=
new
Element
(
"
td
"
,
{
"
styles
"
:
this
.
css
.
viewContentGroupTdNode
,
"
colSpan
"
:
colSpan
}).
inject
(
groupTr
);
var
groupAreaNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
viewContentTdGroupNode
}).
inject
(
td
);
var
groupIconNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
viewContentTdGroupIconNode
}).
inject
(
groupAreaNode
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录