Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
0c5d5b27
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,发现更多精彩内容 >>
提交
0c5d5b27
编写于
3月 27, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
上下文种添加 getParentEnvirment
上级
f42ee203
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
14 deletion
+19
-14
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
+1
-1
o2web/source/o2_core/o2/xScript/Environment.js
o2web/source/o2_core/o2/xScript/Environment.js
+1
-1
o2web/source/o2_core/o2/xScript/PageEnvironment.js
o2web/source/o2_core/o2/xScript/PageEnvironment.js
+1
-1
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
+2
-2
o2web/source/x_component_process_Xform/View.js
o2web/source/x_component_process_Xform/View.js
+1
-1
o2web/source/x_component_process_Xform/ViewSelector.js
o2web/source/x_component_process_Xform/ViewSelector.js
+1
-1
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+12
-7
未找到文件。
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
浏览文件 @
0c5d5b27
...
...
@@ -688,7 +688,7 @@ MWF.xScript.CMSEnvironment = function(ev){
}
MWF
.
xDesktop
.
requireApp
(
"
query.Query
"
,
"
Viewer
"
,
function
(){
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
);
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
,
_form
.
Macro
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
o2web/source/o2_core/o2/xScript/Environment.js
浏览文件 @
0c5d5b27
...
...
@@ -857,7 +857,7 @@ MWF.xScript.Environment = function(ev){
}
MWF
.
xDesktop
.
requireApp
(
"
query.Query
"
,
"
Viewer
"
,
function
(){
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
);
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
,
_form
.
Macro
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
o2web/source/o2_core/o2/xScript/PageEnvironment.js
浏览文件 @
0c5d5b27
...
...
@@ -736,7 +736,7 @@ MWF.xScript.PageEnvironment = function (ev) {
}
MWF
.
xDesktop
.
requireApp
(
"
query.Query
"
,
"
Viewer
"
,
function
()
{
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
);
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
,
_form
.
Macro
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
浏览文件 @
0c5d5b27
...
...
@@ -660,7 +660,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
}
MWF
.
xDesktop
.
requireApp
(
"
query.Query
"
,
"
Viewer
"
,
function
()
{
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
);
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
},
_form
.
app
,
_form
.
Macro
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
@@ -748,7 +748,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
//仅前台对象-----------------------------------------
//form
this
.
page
=
this
.
form
=
this
.
queryView
=
{
"
getParentEnvironment
"
:
function
()
{
return
_form
.
parentEnvironment
;
},
//视图嵌入的表单或页面的上下文
"
getParentEnvironment
"
:
function
()
{
return
_form
.
getParentEnvironment
()
;
},
//视图嵌入的表单或页面的上下文
"
getViewInfor
"
:
function
()
{
return
_form
.
getViewInfor
();
},
"
getPageInfor
"
:
function
()
{
return
_form
.
getPageInfor
();
},
"
getPageData
"
:
function
()
{
return
_form
.
getPageData
();
},
...
...
o2web/source/x_component_process_Xform/View.js
浏览文件 @
0c5d5b27
...
...
@@ -80,7 +80,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
this
.
fireEvent
(
"
openDocument
"
);
this
.
openOptions
=
null
;
}.
bind
(
this
)
},
this
.
form
.
app
);
},
this
.
form
.
app
,
this
.
form
.
Macro
);
//}.bind(this));
},
...
...
o2web/source/x_component_process_Xform/ViewSelector.js
浏览文件 @
0c5d5b27
...
...
@@ -334,7 +334,7 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
],
"
onPostShow
"
:
function
(){
MWF
.
xDesktop
.
requireApp
(
"
query.Query
"
,
"
Viewer
"
,
function
(){
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
,
viewJson
,
{
"
style
"
:
"
select
"
},
this
.
form
.
app
);
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
,
viewJson
,
{
"
style
"
:
"
select
"
},
this
.
form
.
app
,
this
.
form
.
Macro
);
}.
bind
(
this
));
}.
bind
(
this
)
});
...
...
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
0c5d5b27
...
...
@@ -23,7 +23,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
// },
// "actionRoot": "x_query_assemble_surface"
},
initialize
:
function
(
container
,
json
,
options
,
app
){
initialize
:
function
(
container
,
json
,
options
,
app
,
parentMacro
){
//本类有三种事件,
//一种是通过 options 传进来的事件,包括 loadView、openDocument、select
//一种是用户配置的 事件, 在this.options.moduleEvents 中定义的作为类事件
...
...
@@ -41,6 +41,8 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
this
.
container
=
$
(
container
);
this
.
json
=
json
;
this
.
parentMacro
=
parentMacro
;
debugger
;
this
.
originalJson
=
Object
.
clone
(
json
);
...
...
@@ -736,6 +738,9 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
}.
bind
(
this
));
},
//api 使用 开始
getParentEnvironment
:
function
(){
return
this
.
parentMacro
?
this
.
parentMacro
.
environment
:
null
;
},
getViewInfor
:
function
(){
return
this
.
json
;
},
...
...
@@ -1718,9 +1723,9 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
}
if
(
flag
){
flag
=
true
;
if
(
tool
.
control
){
flag
=
this
.
form
.
businessData
.
control
[
tool
.
control
]
}
//
if (tool.control){
//
flag = this.form.businessData.control[tool.control]
//
}
if
(
tool
.
condition
){
var
hideFlag
=
this
.
form
.
Macro
.
exec
(
tool
.
condition
,
this
);
flag
=
!
hideFlag
;
...
...
@@ -1756,9 +1761,9 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
//var path = "/x_component_process_FormDesigner/Module/Actionbar/";
var
path
=
"
/x_component_query_ViewDesigner/$View/
"
;
var
flag
=
true
;
if
(
tool
.
control
){
flag
=
this
.
form
.
businessData
.
control
[
tool
.
control
]
}
//
if (tool.control){
//
flag = this.form.businessData.control[tool.control]
//
}
if
(
!
noCondition
)
if
(
tool
.
condition
){
var
hideFlag
=
this
.
form
.
Macro
.
exec
(
tool
.
condition
,
this
);
flag
=
flag
&&
(
!
hideFlag
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录