Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
54d36a16
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,发现更多精彩内容 >>
提交
54d36a16
编写于
3月 23, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
视图自定义-2020-3-23
上级
2670dc15
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
44 addition
and
40 deletion
+44
-40
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
+15
-16
o2web/source/x_component_cms_Module/ExcelForm.js
o2web/source/x_component_cms_Module/ExcelForm.js
+1
-1
o2web/source/x_component_process_FormDesigner/widget/EventsEditor.js
...e/x_component_process_FormDesigner/widget/EventsEditor.js
+1
-1
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/Main.js
o2web/source/x_component_query_Query/Main.js
+1
-1
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+16
-9
o2web/source/x_component_query_Query/lp/zh-cn.js
o2web/source/x_component_query_Query/lp/zh-cn.js
+1
-6
o2web/source/x_component_query_ViewDesigner/lp/zh-cn.js
o2web/source/x_component_query_ViewDesigner/lp/zh-cn.js
+4
-1
未找到文件。
o2web/source/o2_core/o2/xScript/CMSEnvironment.js
浏览文件 @
54d36a16
...
...
@@ -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
"
});
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
}
,
_form
.
app
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
o2web/source/o2_core/o2/xScript/Environment.js
浏览文件 @
54d36a16
...
...
@@ -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
"
});
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
}
,
_form
.
app
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
o2web/source/o2_core/o2/xScript/PageEnvironment.js
浏览文件 @
54d36a16
...
...
@@ -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
"
});
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
}
,
_form
.
app
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
浏览文件 @
54d36a16
...
...
@@ -25,16 +25,6 @@ MWF.xScript.ViewEnvironment = function (ev) {
// };
// this.setData(_data);
this
.
viewContext
=
{
getViewInfor
:
function
()
{
return
_form
.
getViewInfor
();
},
getPageInfor
:
function
()
{
return
_form
.
getPageInfor
();
},
getPageData
:
function
()
{
return
_form
.
getPageData
();
},
toPage
:
function
(
pageNumber
)
{
return
_form
.
toPage
(
pageNumber
);
},
selectAll
:
function
()
{
return
_form
.
selectAll
();
},
unSelectAll
:
function
()
{
return
_form
.
unSelectAll
();
},
switchView
:
function
(
options
)
{
return
_form
.
switchView
(
options
);
}
};
//dict
this
.
Dict
=
MWF
.
xScript
.
createDict
();
//org
...
...
@@ -670,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
"
});
this
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
.
getFirst
(),
viewJson
,
{
"
style
"
:
"
select
"
}
,
_form
.
app
);
}.
bind
(
this
));
}.
bind
(
this
));
}
...
...
@@ -757,7 +747,16 @@ MWF.xScript.ViewEnvironment = function (ev) {
//仅前台对象-----------------------------------------
//form
this
.
page
=
this
.
form
=
{
this
.
page
=
this
.
form
=
this
.
queryView
=
{
"
getViewInfor
"
:
function
()
{
return
_form
.
getViewInfor
();
},
"
getPageInfor
"
:
function
()
{
return
_form
.
getPageInfor
();
},
"
getPageData
"
:
function
()
{
return
_form
.
getPageData
();
},
"
toPage
"
:
function
(
pageNumber
,
callback
)
{
return
_form
.
toPage
(
pageNumber
,
callback
);
},
"
selectAll
"
:
function
()
{
return
_form
.
selectAll
();
},
"
unSelectAll
"
:
function
()
{
return
_form
.
unSelectAll
();
},
"
switchView
"
:
function
(
options
)
{
return
_form
.
switchView
(
options
);
},
// "getInfor": function () { return ev.pageInfor; },
// "infor": ev.pageInfor,
"
getApp
"
:
function
()
{
return
_form
.
app
;
},
...
...
@@ -774,7 +773,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
"
getDesktop
"
:
function
()
{
return
_form
.
app
.
desktop
},
// "getData": function () { return new MWF.xScript.JSONData(_form.getData()); },
//"save": function(callback){_form.saveWork(callback);},
"
close
"
:
function
()
{
_form
.
closeWork
();
},
//
"close": function () { _form.closeWork(); },
// "print": function (application, form) {
// _form.printWork(application, form);
...
...
@@ -809,9 +808,9 @@ MWF.xScript.ViewEnvironment = function (ev) {
_form
.
notice
(
content
,
type
,
target
,
where
,
offset
,
option
);
},
"
addEvent
"
:
function
(
e
,
f
)
{
_form
.
addEvent
(
e
,
f
);
},
"
openWindow
"
:
function
(
form
,
app
)
{
_form
.
openWindow
(
form
,
app
);
},
//
"openWindow": function (form, app) {
//
_form.openWindow(form, app);
//
},
// "toPage": function (name, par, nohis) {
// _form.app.toPage(name, par, nohis);
// },
...
...
o2web/source/x_component_cms_Module/ExcelForm.js
浏览文件 @
54d36a16
...
...
@@ -193,7 +193,7 @@ MWF.xApplication.cms.Module.ExportForm = new Class({
"
onSelect
"
:
function
(){
this
.
fireEvent
(
"
select
"
);
}.
bind
(
this
)
});
}
,
this
.
app
);
}.
bind
(
this
));
},
_setNodesSize
:
function
(
width
,
height
,
formContentHeight
,
formTableHeight
){
...
...
o2web/source/x_component_process_FormDesigner/widget/EventsEditor.js
浏览文件 @
54d36a16
...
...
@@ -131,7 +131,7 @@ MWF.xApplication.process.FormDesigner.widget.EventsEditor.Item = new Class({
if
(
form
.
scriptDesigner
)
form
.
scriptDesigner
.
addScriptItem
(
this
.
data
,
"
code
"
,
this
.
editor
.
module
,
this
.
editor
.
scriptPath
+
"
.
"
+
this
.
event
);
},
deleteScriptDesignerItem
:
function
(){
var
form
=
this
.
editor
.
app
.
form
||
this
.
editor
.
app
.
page
;
var
form
=
this
.
editor
.
app
.
form
||
this
.
editor
.
app
.
page
||
this
.
editor
.
app
.
view
;
if
(
form
.
scriptDesigner
){
form
.
scriptDesigner
.
deleteScriptItem
(
this
.
editor
.
module
,
this
.
editor
.
scriptPath
+
"
.
"
+
this
.
event
);
}
...
...
o2web/source/x_component_process_Xform/View.js
浏览文件 @
54d36a16
...
...
@@ -80,7 +80,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
this
.
fireEvent
(
"
openDocument
"
);
this
.
openOptions
=
null
;
}.
bind
(
this
)
});
}
,
this
.
form
.
app
);
//}.bind(this));
},
...
...
o2web/source/x_component_process_Xform/ViewSelector.js
浏览文件 @
54d36a16
...
...
@@ -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
.
view
=
new
MWF
.
xApplication
.
query
.
Query
.
Viewer
(
dlg
.
content
,
viewJson
,
{
"
style
"
:
"
select
"
}
,
this
.
form
.
app
);
}.
bind
(
this
));
}.
bind
(
this
)
});
...
...
o2web/source/x_component_query_Query/Main.js
浏览文件 @
54d36a16
...
...
@@ -195,7 +195,7 @@ MWF.xApplication.query.Query.ViewItem = new Class({
"
application
"
:
this
.
view
.
query
,
"
viewName
"
:
this
.
view
.
name
,
"
isExpand
"
:
data
.
isExpand
},
{
"
export
"
:
true
});
},
{
"
export
"
:
true
}
,
this
.
app
);
}.
bind
(
this
));
}
...
...
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
54d36a16
...
...
@@ -23,7 +23,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
// },
// "actionRoot": "x_query_assemble_surface"
},
initialize
:
function
(
container
,
json
,
options
){
initialize
:
function
(
container
,
json
,
options
,
app
){
//本类有三种事件,
//一种是通过 options 传进来的事件,包括 loadView、openDocument、select
//一种是用户配置的 事件, 在this.options.moduleEvents 中定义的作为类事件
...
...
@@ -36,6 +36,8 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
this
.
_loadCss
();
this
.
lp
=
MWF
.
xApplication
.
query
.
Query
.
LP
;
this
.
app
=
app
;
this
.
container
=
$
(
container
);
this
.
json
=
json
;
...
...
@@ -110,14 +112,10 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
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
{
MWF
.
require
(
"
MWF.xScript.Macro
"
,
function
()
{
this
.
Macro
=
new
MWF
.
Macro
.
ViewContext
(
this
);
if
(
callback
)
callback
();
}
}
.
bind
(
this
));
},
createExportNode
:
function
(){
if
(
this
.
options
.
export
){
...
...
@@ -804,7 +802,16 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
var
newJson
=
Object
.
merge
(
Object
.
clone
(
this
.
originalJson
),
json
);
this
.
container
.
empty
();
this
.
initialize
(
this
.
container
,
newJson
,
Object
.
clone
(
this
.
options
));
this
.
initialize
(
this
.
container
,
newJson
,
Object
.
clone
(
this
.
options
),
this
.
app
);
},
confirm
:
function
(
type
,
e
,
title
,
text
,
width
,
height
,
ok
,
cancel
,
callback
,
mask
,
style
)
{
this
.
app
.
confirm
(
type
,
e
,
title
,
text
,
width
,
height
,
ok
,
cancel
,
callback
,
mask
,
style
)
},
alert
:
function
(
type
,
title
,
text
,
width
,
height
)
{
this
.
app
.
alert
(
type
,
"
center
"
,
title
,
text
,
width
,
height
);
},
notice
:
function
(
content
,
type
,
target
,
where
,
offset
,
option
)
{
this
.
app
.
notice
(
content
,
type
,
target
,
where
,
offset
,
option
)
},
//api 使用 结束
loadCurrentPageData
:
function
(
callback
){
...
...
o2web/source/x_component_query_Query/lp/zh-cn.js
浏览文件 @
54d36a16
...
...
@@ -144,10 +144,5 @@ MWF.xApplication.query.Query.LP = {
"
selecteAllRow
"
:
"
选择所有行
"
,
"
firstPage
"
:
"
第一页
"
,
"
lastPage
"
:
"
最后一页
"
,
"
notice
"
:
{
"
deleteEventTitle
"
:
"
删除事件确认
"
,
"
deleteEvent
"
:
"
是否确定删除当前事件吗?
"
}
"
lastPage
"
:
"
最后一页
"
};
\ No newline at end of file
o2web/source/x_component_query_ViewDesigner/lp/zh-cn.js
浏览文件 @
54d36a16
...
...
@@ -48,7 +48,10 @@ MWF.xApplication.query.ViewDesigner.LP = {
"
numberKey
"
:
"
项目名称不能为数字,请重新输入
"
,
"
inputName
"
:
"
请输入视图名称
"
,
"
noModifyName
"
:
"
不能修改名称或者别名
"
"
noModifyName
"
:
"
不能修改名称或者别名
"
,
"
deleteEventTitle
"
:
"
删除事件确认
"
,
"
deleteEvent
"
:
"
是否确定删除当前事件吗?
"
},
"
actionbar
"
:
{
"
readhide
"
:
"
设置阅读时是否显示
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录