Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
41b78424
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,发现更多精彩内容 >>
提交
41b78424
编写于
11月 19, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复日期选择组件的清除没有触发change的问题
上级
f546fd41
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
60 addition
and
50 deletion
+60
-50
o2web/source/o2_core/o2/widget/Calendar.js
o2web/source/o2_core/o2/widget/Calendar.js
+6
-0
o2web/source/x_component_cms_Index/Main.js
o2web/source/x_component_cms_Index/Main.js
+1
-1
o2web/source/x_component_cms_Module/Main.js
o2web/source/x_component_cms_Module/Main.js
+53
-49
未找到文件。
o2web/source/o2_core/o2/widget/Calendar.js
浏览文件 @
41b78424
...
...
@@ -260,7 +260,9 @@ o2.widget.Calendar = o2.Calendar = new Class({
this
.
container
.
setStyle
(
"
height
"
,
"
auto
"
);
this
.
clearButton_month
=
new
Element
(
"
div
"
,
{
"
text
"
:
"
清除
"
}).
inject
(
this
.
buttonArea
);
this
.
clearButton_month
.
addEvent
(
"
click
"
,
function
(){
var
t
=
this
.
node
.
get
(
"
value
"
);
this
.
node
.
set
(
"
value
"
,
""
);
if
(
t
)
this
.
fireEvent
(
"
change
"
);
this
.
fireEvent
(
"
clear
"
);
this
.
hide
();
}.
bind
(
this
));
...
...
@@ -872,7 +874,9 @@ o2.widget.Calendar = o2.Calendar = new Class({
if
(
!
this
.
clearButton
){
this
.
clearButton
=
new
Element
(
"
button
"
,
{
"
text
"
:
"
清除
"
}).
inject
(
this
.
showActionNode
);
this
.
clearButton
.
addEvent
(
"
click
"
,
function
(){
var
t
=
this
.
node
.
get
(
"
value
"
);
this
.
node
.
set
(
"
value
"
,
""
);
if
(
t
)
this
.
fireEvent
(
"
change
"
);
this
.
fireEvent
(
"
clear
"
);
this
.
hide
();
}.
bind
(
this
));
...
...
@@ -1003,7 +1007,9 @@ o2.widget.Calendar = o2.Calendar = new Class({
if
(
!
this
.
clearButton
){
this
.
clearButton
=
new
Element
(
"
button
"
,
{
"
text
"
:
"
清除
"
}).
inject
(
this
.
showActionNode
);
this
.
clearButton
.
addEvent
(
"
click
"
,
function
(){
var
t
=
this
.
node
.
get
(
"
value
"
);
this
.
node
.
set
(
"
value
"
,
""
);
if
(
t
)
this
.
fireEvent
(
"
change
"
);
this
.
fireEvent
(
"
clear
"
);
this
.
hide
();
}.
bind
(
this
));
...
...
o2web/source/x_component_cms_Index/Main.js
浏览文件 @
41b78424
...
...
@@ -556,7 +556,7 @@ MWF.xApplication.cms.Index.Column = new Class({
}
}
this
.
app
.
desktop
.
openApplication
(
e
,
"
cms.Module
"
,
{
"
columnData
"
:
this
.
data
,
"
columnData
"
:
{
"
id
"
:
this
.
data
.
id
}
,
"
appId
"
:
appId
,
"
categoryId
"
:
categoryId
,
//"viewId" : "default",
...
...
o2web/source/x_component_cms_Module/Main.js
浏览文件 @
41b78424
...
...
@@ -66,16 +66,20 @@ MWF.xApplication.cms.Module.Main = new Class({
}).
inject
(
this
.
titleBar
);
},
loadApplicationContent
:
function
(){
if
(
this
.
options
.
columnData
){
this
.
setColumnDataConfig
();
this
.
setTitle
(
this
.
options
.
columnData
.
appName
);
this
.
loadController
(
function
(){
this
.
loadTitle
(
function
(){
this
.
loadMenu
();
}.
bind
(
this
));
}.
bind
(
this
))
}
else
if
(
(
this
.
status
&&
this
.
status
.
columnId
)
||
this
.
options
.
columnId
){
var
columnId
=
this
.
options
.
columnId
||
this
.
status
.
columnId
;
var
columnId
=
(
this
.
options
.
columnData
&&
this
.
options
.
columnData
.
id
)
||
(
this
.
status
&&
this
.
status
.
columnId
)
||
this
.
options
.
columnId
;
var
columnAlias
=
this
.
options
.
columnAlias
||
(
this
.
options
.
columnData
&&
this
.
options
.
columnData
.
columnAlias
)
||
(
this
.
status
&&
this
.
status
.
columnAlias
);
// if( this.options.columnData ){
// this.setColumnDataConfig();
// this.setTitle(this.options.columnData.appName);
// this.loadController(function(){
// this.loadTitle(function(){
// this.loadMenu();
// }.bind(this));
// }.bind(this))
// }else
if
(
columnId
){
this
.
loadColumnData
(
columnId
,
function
(){
this
.
loadController
(
function
(){
this
.
loadTitle
(
function
(){
...
...
@@ -83,11 +87,11 @@ MWF.xApplication.cms.Module.Main = new Class({
}.
bind
(
this
));
}.
bind
(
this
))
}.
bind
(
this
))
}
else
if
(
this
.
options
.
columnAlias
){
this
.
restActions
.
getColumnByAlias
(
this
.
options
.
columnAlias
,
function
(
json
){
this
.
options
.
columnData
=
json
.
data
;
}
else
if
(
columnAlias
){
this
.
restActions
.
getColumnByAlias
(
columnAlias
,
function
(
json
){
this
.
columnData
=
json
.
data
;
this
.
setColumnDataConfig
();
this
.
setTitle
(
this
.
options
.
columnData
.
appName
);
this
.
setTitle
(
this
.
columnData
.
appName
);
this
.
loadController
(
function
(){
this
.
loadTitle
(
function
(){
this
.
loadMenu
();
...
...
@@ -97,25 +101,25 @@ MWF.xApplication.cms.Module.Main = new Class({
}
},
setColumnDataConfig
:
function
(){
if
(
!
this
.
options
.
columnData
.
config
){
this
.
options
.
columnData
.
config
=
{};
}
else
if
(
typeOf
(
this
.
options
.
columnData
.
config
)
===
"
string
"
){
this
.
options
.
columnData
.
config
=
JSON
.
parse
(
this
.
option
s
.
columnData
.
config
||
{}
);
if
(
!
this
.
columnData
.
config
){
this
.
columnData
.
config
=
{};
}
else
if
(
typeOf
(
this
.
columnData
.
config
)
===
"
string
"
){
this
.
columnData
.
config
=
JSON
.
parse
(
thi
s
.
columnData
.
config
||
{}
);
}
},
loadColumnData
:
function
(
columnId
,
callback
){
this
.
restActions
.
getColumn
(
columnId
,
function
(
json
){
this
.
options
.
columnData
=
json
.
data
;
this
.
setTitle
(
this
.
options
.
columnData
.
appName
);
this
.
columnData
=
json
.
data
;
this
.
setTitle
(
this
.
columnData
.
appName
);
this
.
setColumnDataConfig
();
//MWF.require("MWF.xScript.Actions.CMSScriptActions", null, false);
//MWF.require("o2.xScript.Macro", null, false);
//var scriptAction = new MWF.xScript.Actions.CMSScriptActions();
//scriptAction.getScriptByName( this.
options.
columnData.id, "_config", [], function(json){
//scriptAction.getScriptByName( this.columnData.id, "_config", [], function(json){
// if (json.data){
// try{
// this.
options.columnData = Object.merge(this.option
s.columnData,JSON.parse(json.data.text));
// this.
columnData = Object.merge(thi
s.columnData,JSON.parse(json.data.text));
// }catch(e){
// }
// }
...
...
@@ -125,7 +129,7 @@ MWF.xApplication.cms.Module.Main = new Class({
}.
bind
(
this
))
},
loadController
:
function
(
callback
){
//this.restActions.listColumnController(this.
options.
columnData.id, function( json ){
//this.restActions.listColumnController(this.columnData.id, function( json ){
// json.data = json.data || [];
// json.data.each(function(item){
// this.controllers.push(item.adminUid)
...
...
@@ -133,7 +137,7 @@ MWF.xApplication.cms.Module.Main = new Class({
// this.isAdmin = MWF.AC.isCMSManager() || this.controllers.contains(layout.desktop.session.user.distinguishedName);
// if(callback)callback(json);
//}.bind(this));
this
.
restActions
.
isAppInfoManager
(
this
.
options
.
columnData
.
id
,
function
(
json
){
this
.
restActions
.
isAppInfoManager
(
this
.
columnData
.
id
,
function
(
json
){
this
.
isAdmin
=
MWF
.
AC
.
isCMSManager
()
||
json
.
data
.
value
;
if
(
callback
)
callback
(
json
);
}.
bind
(
this
))
...
...
@@ -212,7 +216,7 @@ MWF.xApplication.cms.Module.Main = new Class({
}
},
loadCreateDocumentActionNode
:
function
(
callback
){
this
.
restActions
.
listCategoryByPublisher
(
this
.
options
.
columnData
.
id
,
function
(
json
){
this
.
restActions
.
listCategoryByPublisher
(
this
.
columnData
.
id
,
function
(
json
){
if
(
json
.
data
&&
json
.
data
.
length
){
this
.
createDocumentAction
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
createDocumentAction
,
...
...
@@ -222,10 +226,10 @@ MWF.xApplication.cms.Module.Main = new Class({
"
click
"
:
function
(
e
){
MWF
.
xDesktop
.
requireApp
(
"
cms.Index
"
,
"
Newer
"
,
null
,
false
);
//if(this.
options.columnData.latest===undefined) this.option
s.columnData.latest = true;
//if(this.
options.columnData.ignoreTitle===undefined) this.option
s.columnData.ignoreTitle = false;
//if(this.
columnData.latest===undefined) thi
s.columnData.latest = true;
//if(this.
columnData.ignoreTitle===undefined) thi
s.columnData.ignoreTitle = false;
this
.
creater
=
new
MWF
.
xApplication
.
cms
.
Index
.
Newer
(
this
.
options
.
columnData
,
null
,
this
,
this
.
view
,
{
this
.
creater
=
new
MWF
.
xApplication
.
cms
.
Index
.
Newer
(
this
.
columnData
,
null
,
this
,
this
.
view
,
{
restrictToColumn
:
true
// onAfterPublish : function () {
// try{
...
...
@@ -235,8 +239,8 @@ MWF.xApplication.cms.Module.Main = new Class({
// }catch (e) {
// }
// }.bind(this)
//ignoreTitle : this.
options.
columnData.ignoreTitle,
//latest : this.
options.
columnData.latest
//ignoreTitle : this.columnData.ignoreTitle,
//latest : this.columnData.latest
});
this
.
creater
.
load
();
}.
bind
(
this
),
...
...
@@ -547,7 +551,7 @@ MWF.xApplication.cms.Module.Main = new Class({
this
.
publishableCategoryInfoObject_name
=
{};
this
.
categoryTransformMap
=
{};
this
.
categoryRadioHtml
=
""
;
o2
.
Actions
.
load
(
"
x_cms_assemble_control
"
).
CategoryInfoAction
.
listPublishableCategoryInfo
(
this
.
options
.
columnData
.
id
,
function
(
json
){
o2
.
Actions
.
load
(
"
x_cms_assemble_control
"
).
CategoryInfoAction
.
listPublishableCategoryInfo
(
this
.
columnData
.
id
,
function
(
json
){
(
json
.
data
||
[]
).
each
(
function
(
c
){
this
.
publishableCategoryInfoObject_id
[
c
.
id
]
=
c
;
this
.
publishableCategoryInfoObject_alias
[
c
.
categoryAlias
]
=
c
;
...
...
@@ -739,7 +743,7 @@ MWF.xApplication.cms.Module.Main = new Class({
},
saveItemAsNew
:
function
(
data
,
success
,
failure
,
clearId
,
newCategory
){
var
columnData
=
this
.
options
.
columnData
;
var
columnData
=
this
.
columnData
;
var
doc
=
data
.
document
;
if
(
clearId
){
...
...
@@ -812,7 +816,7 @@ MWF.xApplication.cms.Module.Main = new Class({
loadSelectCategoryDialog
:
function
(
title
,
callback
){
if
(
!
this
.
categoryList
){
this
.
categoryList
=
[];
this
.
restActions
.
listCategory
(
this
.
options
.
columnData
.
id
,
function
(
json
){
this
.
restActions
.
listCategory
(
this
.
columnData
.
id
,
function
(
json
){
json
.
data
.
each
(
function
(
d
){
this
.
categoryList
.
push
(
{
name
:
d
.
categoryName
,
...
...
@@ -890,8 +894,8 @@ MWF.xApplication.cms.Module.Main = new Class({
var
iconNode
=
this
.
iconNode
=
new
Element
(
"
img
"
,{
"
styles
"
:
this
.
css
.
titleIconNode
}).
inject
(
iconAreaNode
);
if
(
this
.
options
.
columnData
.
appIcon
){
this
.
iconNode
.
set
(
"
src
"
,
"
data:image/png;base64,
"
+
this
.
options
.
columnData
.
appIcon
+
""
);
if
(
this
.
columnData
.
appIcon
){
this
.
iconNode
.
set
(
"
src
"
,
"
data:image/png;base64,
"
+
this
.
columnData
.
appIcon
+
""
);
}
else
{
this
.
iconNode
.
set
(
"
src
"
,
this
.
defaultColumnIcon
)
}
...
...
@@ -901,13 +905,13 @@ MWF.xApplication.cms.Module.Main = new Class({
},
_getLnkPar
:
function
(){
var
lnkIcon
=
this
.
defaultColumnIcon
;
if
(
this
.
options
.
columnData
.
appIcon
)
lnkIcon
=
"
data:image/png;base64,
"
+
this
.
option
s
.
columnData
.
appIcon
;
if
(
this
.
columnData
.
appIcon
)
lnkIcon
=
"
data:image/png;base64,
"
+
thi
s
.
columnData
.
appIcon
;
var
appId
=
"
cms.Module
"
+
this
.
options
.
columnData
.
id
;
var
appId
=
"
cms.Module
"
+
this
.
columnData
.
id
;
return
{
"
icon
"
:
lnkIcon
,
"
title
"
:
this
.
options
.
columnData
.
appName
,
"
par
"
:
"
cms.Module#{
\"
columnId
\"
:
\"
"
+
this
.
options
.
columnData
.
id
+
"
\"
,
\"
appId
\"
:
\"
"
+
appId
+
"
\"
}
"
"
title
"
:
this
.
columnData
.
appName
,
"
par
"
:
"
cms.Module#{
\"
columnId
\"
:
\"
"
+
this
.
columnData
.
id
+
"
\"
,
\"
appId
\"
:
\"
"
+
appId
+
"
\"
}
"
};
},
loadTitleContentNode
:
function
(){
...
...
@@ -917,14 +921,14 @@ MWF.xApplication.cms.Module.Main = new Class({
this
.
titleTextNode
=
new
Element
(
"
div.titleTextNode
"
,
{
"
styles
"
:
this
.
css
.
titleTextNode
,
"
text
"
:
this
.
options
.
columnData
.
appName
,
"
title
"
:
this
.
options
.
columnData
.
appName
"
text
"
:
this
.
columnData
.
appName
,
"
title
"
:
this
.
columnData
.
appName
}).
inject
(
this
.
titleContentNode
);
this
.
titleDescriptionNode
=
new
Element
(
"
div.titleDescriptionNode
"
,
{
"
styles
"
:
this
.
css
.
titleDescriptionNode
,
"
text
"
:
this
.
options
.
columnData
.
description
?
this
.
option
s
.
columnData
.
description
:
this
.
lp
.
noDescription
,
"
title
"
:
this
.
options
.
columnData
.
description
?
this
.
option
s
.
columnData
.
description
:
this
.
lp
.
noDescription
"
text
"
:
this
.
columnData
.
description
?
thi
s
.
columnData
.
description
:
this
.
lp
.
noDescription
,
"
title
"
:
this
.
columnData
.
description
?
thi
s
.
columnData
.
description
:
this
.
lp
.
noDescription
}).
inject
(
this
.
titleContentNode
);
},
loadSearchNode
:
function
(){
...
...
@@ -982,7 +986,7 @@ MWF.xApplication.cms.Module.Main = new Class({
}
},
_loadMenu
:
function
(
options
){
this
.
navi
=
new
MWF
.
xApplication
.
cms
.
Module
.
Navi
(
this
,
this
.
naviNode
,
this
.
options
.
columnData
,
options
);
this
.
navi
=
new
MWF
.
xApplication
.
cms
.
Module
.
Navi
(
this
,
this
.
naviNode
,
this
.
columnData
,
options
);
this
.
setNaviSize
();
},
clearContent
:
function
(){
...
...
@@ -1010,7 +1014,7 @@ MWF.xApplication.cms.Module.Main = new Class({
this
.
view
=
new
MWF
.
xApplication
.
cms
.
Module
.
ViewExplorer
(
this
.
moduleContent
,
this
,
this
.
options
.
columnData
,
this
.
columnData
,
categoryData
,
revealData
,
{
"
isAdmin
"
:
this
.
isAdmin
,
"
searchKey
"
:
searchKey
},
...
...
@@ -1032,7 +1036,7 @@ MWF.xApplication.cms.Module.Main = new Class({
this
.
view
=
new
MWF
.
xApplication
.
cms
.
Module
.
ListExplorer
(
this
.
moduleContent
,
this
.
restActions
,
this
.
options
.
columnData
,
this
.
columnData
,
categoryData
,
revealData
,
{
"
isAdmin
"
:
this
.
isAdmin
,
"
searchKey
"
:
searchKey
},
...
...
@@ -1049,16 +1053,16 @@ MWF.xApplication.cms.Module.Main = new Class({
var
categoryId
=
currentObject
.
getCategoryId
();
if
(
categoryId
){
return
{
"
columnId
"
:
this
.
options
.
columnData
.
id
,
"
columnId
"
:
this
.
columnData
.
id
,
"
categoryId
"
:
categoryId
,
"
isCategory
"
:
currentObject
.
isCategory
,
"
viewId
"
:
currentObject
.
data
.
id
};
}
else
{
return
{
"
columnId
"
:
this
.
options
.
columnData
.
id
,
"
categoryId
"
:
"
whole
"
}
return
{
"
columnId
"
:
this
.
columnData
.
id
,
"
categoryId
"
:
"
whole
"
}
}
}
else
{
return
{
"
columnId
"
:
this
.
options
.
columnData
.
id
,
"
categoryId
"
:
"
whole
"
}
return
{
"
columnId
"
:
this
.
columnData
.
id
,
"
categoryId
"
:
"
whole
"
}
}
},
setNaviSize
:
function
(){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录