Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
87bce2f9
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,发现更多精彩内容 >>
提交
87bce2f9
编写于
1月 19, 2021
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
内容管理表单组件合并
上级
a0cf6048
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
144 addition
and
6 deletion
+144
-6
o2web/gulpfile.js
o2web/gulpfile.js
+143
-4
o2web/source/o2_core/o2/widget/Calendar.js
o2web/source/o2_core/o2/widget/Calendar.js
+0
-1
o2web/source/x_component_cms_Xform/Package.js
o2web/source/x_component_cms_Xform/Package.js
+1
-1
未找到文件。
o2web/gulpfile.js
浏览文件 @
87bce2f9
...
...
@@ -206,14 +206,13 @@ function createXFormConcatTask(path, isMin, thisOptions) {
});
}
function
createCMSXFormConcatTask
(
path
,
isMin
,
thisOptions
)
{
var
processPath
=
"
x_component_process_Xform
"
;
gulp
.
task
(
path
+
"
: concat
"
,
function
(){
var
option
=
thisOptions
||
options
;
var
src
=
[
'
source/o2_core/o2/widget/AttachmentController.js
'
,
'
source/o2_core/o2/xScript/CMSEnvironment.js
'
,
//
'source/o2_core/o2/xScript/CMSEnvironment.js',
'
source/o2_core/o2/xScript/CMSMacro.js
'
,
'
source/o2_core/o2/widget/Tab.js
'
,
'
source/o2_core/o2/widget/O2Identity.js
'
,
...
...
@@ -236,7 +235,6 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
'
source/
'
+
processPath
+
'
/Calendar.js
'
,
'
source/
'
+
processPath
+
'
/Checkbox.js
'
,
'
source/
'
+
processPath
+
'
/Datagrid.js
'
,
'
source/
'
+
processPath
+
'
/Html.js
'
,
'
source/
'
+
processPath
+
'
/Htmleditor.js
'
,
//'source/' + processPath + '/Iframe.js',
'
source/
'
+
processPath
+
'
/Label.js
'
,
...
...
@@ -272,6 +270,7 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
'
source/
'
+
path
+
'
/Textfield.js
'
,
'
source/
'
+
path
+
'
/Actionbar.js
'
,
'
source/
'
+
path
+
'
/Attachment.js
'
,
'
source/
'
+
path
+
'
/Button.js
'
,
'
source/
'
+
path
+
'
/Calendar.js
'
,
'
source/
'
+
path
+
'
/Checkbox.js
'
,
'
source/
'
+
path
+
'
/Datagrid.js
'
,
...
...
@@ -279,7 +278,6 @@ function createCMSXFormConcatTask(path, isMin, thisOptions) {
'
source/
'
+
path
+
'
/ImageClipper.js
'
,
'
source/
'
+
path
+
'
/Label.js
'
,
'
source/
'
+
path
+
'
/Number.js
'
,
'
source/
'
+
path
+
'
/Html.js
'
,
'
source/
'
+
path
+
'
/Radio.js
'
,
'
source/
'
+
path
+
'
/Select.js
'
,
'
source/
'
+
path
+
'
/Tab.js
'
,
...
...
@@ -844,6 +842,147 @@ function createBasePortalConcatTask(path, isMin, thisOptions){
createBasePortalConcatDelTempTask
(
path
);
gulp
.
task
(
path
+
"
.base_portal
"
,
gulp
.
series
(
path
+
"
.base_portal : action
"
,
path
+
"
.base_portal : style
"
,
path
+
"
.base_portal : concat
"
,
path
+
"
.base_portal : clean
"
));
}
function
createBaseDocumentConcatActionTask
(
path
){
gulp
.
task
(
path
+
"
.base_document : action
"
,
function
(){
return
gulp
.
src
([
"
source/o2_core/o2/xAction/services/x_organization_assemble_authentication.json
"
,
"
source/o2_core/o2/xAction/services/x_organization_assemble_control.json
"
,
"
source/o2_core/o2/xAction/services/x_cms_assemble_control.json
"
,
"
source/o2_core/o2/xAction/services/x_program_center.json
"
,
"
source/o2_core/o2/xAction/services/x_organization_assemble_personal.json
"
])
.
pipe
(
concat_Actions
())
.
pipe
(
concat
(
'
js/base_document_actions_temp.js
'
))
.
pipe
(
gulp
.
dest
(
'
source/x_desktop/
'
))
})
}
function
createBaseDocumentConcatStyleTask
(
path
){
gulp
.
task
(
path
+
"
.base_document : style
"
,
function
(){
return
gulp
.
src
([
"
source/x_component_cms_Document/$Main/default/css.wcss
"
,
"
source/x_component_cms_Xform/$Form/default/css.wcss
"
,
"
source/o2_core/o2/widget/$AttachmentController/default/css.wcss
"
])
.
pipe
(
concat_Style
())
.
pipe
(
concat
(
'
js/base_document_style_temp.js
'
))
.
pipe
(
gulp
.
dest
(
'
source/x_desktop/
'
))
})
}
function
createBaseDocumentConcatBodyTask
(
path
,
isMin
,
thisOptions
)
{
gulp
.
task
(
path
+
"
.base_document : concat
"
,
function
(){
var
option
=
thisOptions
||
options
;
var
src
=
[
'
source/
'
+
path
+
'
/js/base_concat_head.js
'
,
'
source/o2_core/o2/lp/
'
+
(
option
.
lp
||
'
zh-cn
'
)
+
'
.js
'
,
'
source/
'
+
path
+
'
/js/base_document_style_temp.js
'
,
'
source/o2_core/o2/widget/Common.js
'
,
'
source/o2_core/o2/widget/UUID.js
'
,
'
source/o2_core/o2/widget/Menu.js
'
,
'
source/o2_core/o2/widget/Mask.js
'
,
'
source/o2_core/o2/xDesktop/Common.js
'
,
'
source/o2_core/o2/xDesktop/Actions/RestActions.js
'
,
'
source/o2_core/o2/xAction/RestActions.js
'
,
'
source/o2_core/o2/xDesktop/Access.js
'
,
'
source/o2_core/o2/xDesktop/Dialog.js
'
,
'
source/o2_core/o2/xDesktop/Menu.js
'
,
'
source/o2_core/o2/xDesktop/UserData.js
'
,
'
source/o2_core/o2/xDesktop/Authentication.js
'
,
'
source/o2_core/o2/xDesktop/Window.js
'
,
'
source/x_component_Common/Main.js
'
,
'
source/x_component_cms_Document/lp/
'
+
(
option
.
lp
||
'
zh-cn
'
)
+
'
.js
'
,
'
source/x_component_process_Xform/lp/
'
+
(
option
.
lp
||
'
zh-cn
'
)
+
'
.js
'
,
'
source/x_component_Selector/lp/
'
+
(
option
.
lp
||
'
zh-cn
'
)
+
'
.js
'
,
'
source/x_component_cms_xform/lp/
'
+
(
option
.
lp
||
'
zh-cn
'
)
+
'
.js
'
,
'
source/x_component_cms_Document/Main.js
'
,
'
source/x_component_Selector/package.js
'
,
'
source/o2_core/o2/xScript/Actions/UnitActions.js
'
,
'
source/o2_core/o2/xScript/Actions/CMSScriptActions.js
'
,
'
source/o2_core/o2/xScript/CMSEnvironment.js
'
,
'
source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js
'
,
'
source/o2_core/o2/xAction/services/x_cms_assemble_control.js
'
,
'
source/o2_core/o2/xAction/services/x_organization_assemble_control.js
'
,
'
source/o2_core/o2/xAction/services/x_organization_assemble_personal.js
'
,
'
source/
'
+
path
+
'
/js/base_document_actions_temp.js
'
,
'
source/
'
+
path
+
'
/js/base.js
'
];
var
dest
=
option
.
dest
+
'
/
'
+
path
+
'
/
'
;
return
gulp
.
src
(
src
)
.
pipe
(
sourceMap
.
init
())
.
pipe
(
concat
(
'
js/base_document.js
'
))
.
pipe
(
gulpif
((
option
.
upload
==
'
local
'
&&
option
.
location
!=
''
),
gulp
.
dest
(
option
.
location
+
path
+
'
/
'
)))
.
pipe
(
gulpif
((
option
.
upload
==
'
ftp
'
&&
option
.
host
!=
''
),
ftp
({
host
:
option
.
host
,
user
:
option
.
user
||
'
anonymous
'
,
pass
:
option
.
pass
||
'
@anonymous
'
,
port
:
option
.
port
||
21
,
remotePath
:
(
option
.
remotePath
||
'
/
'
)
+
path
})))
.
pipe
(
gulpif
((
option
.
upload
==
'
sftp
'
&&
option
.
host
!=
''
),
sftp
({
host
:
option
.
host
,
user
:
option
.
user
||
'
anonymous
'
,
pass
:
option
.
pass
||
null
,
port
:
option
.
port
||
22
,
remotePath
:
(
option
.
remotePath
||
'
/
'
)
+
path
})))
.
pipe
(
gulp
.
dest
(
dest
))
// .pipe(gulp.src(src))
.
pipe
(
concat
(
'
js/base_document.min.js
'
))
.
pipe
(
uglify
())
.
pipe
(
sourceMap
.
write
(
""
)
)
// .pipe(rename({ extname: '.min.js' }))
.
pipe
(
gulpif
((
option
.
upload
==
'
local
'
&&
option
.
location
!=
''
),
gulp
.
dest
(
option
.
location
+
path
+
'
/
'
)))
.
pipe
(
gulpif
((
option
.
upload
==
'
ftp
'
&&
option
.
host
!=
''
),
ftp
({
host
:
option
.
host
,
user
:
option
.
user
||
'
anonymous
'
,
pass
:
option
.
pass
||
'
@anonymous
'
,
port
:
option
.
port
||
21
,
remotePath
:
(
option
.
remotePath
||
'
/
'
)
+
path
})))
.
pipe
(
gulpif
((
option
.
upload
==
'
sftp
'
&&
option
.
host
!=
''
),
sftp
({
host
:
option
.
host
,
user
:
option
.
user
||
'
anonymous
'
,
pass
:
option
.
pass
||
null
,
port
:
option
.
port
||
22
,
remotePath
:
(
option
.
remotePath
||
'
/
'
)
+
path
})))
.
pipe
(
gulp
.
dest
(
dest
))
});
}
function
createBaseDocumentConcatDelTempTask
(
path
)
{
gulp
.
task
(
path
+
"
.base_document : clean
"
,
function
(
cb
){
var
dest
=
[
'
source/
'
+
path
+
'
/js/base_document_actions_temp.js
'
,
'
source/
'
+
path
+
'
/js/base_document_style_temp.js
'
];
return
del
(
dest
,
cb
);
});
}
function
createBaseDocumentConcatTask
(
path
,
isMin
,
thisOptions
){
createBaseDocumentConcatActionTask
(
path
);
createBaseDocumentConcatStyleTask
(
path
);
createBaseDocumentConcatBodyTask
(
path
,
isMin
,
thisOptions
);
createBaseDocumentConcatDelTempTask
(
path
);
gulp
.
task
(
path
+
"
.base_document
"
,
gulp
.
series
(
path
+
"
.base_document : action
"
,
path
+
"
.base_document : style
"
,
path
+
"
.base_document : concat
"
,
path
+
"
.base_document : clean
"
));
}
function
createBaseConcatTask
(
path
,
isMin
,
thisOptions
){
gulp
.
task
(
path
+
"
.base
"
,
function
(){
var
option
=
thisOptions
||
options
;
...
...
o2web/source/o2_core/o2/widget/Calendar.js
浏览文件 @
87bce2f9
...
...
@@ -884,7 +884,6 @@ o2.widget.Calendar = o2.Calendar = new Class({
}
},
_setTimeDate
:
function
(
node
,
h
,
m
,
s
){
;
if
(
!
this
.
options
.
secondEnable
){
var
div
=
this
.
contentTimeTable
.
getElement
(
"
.MWF_calendar_time_s
"
);
if
(
div
)
div
.
hide
();
...
...
o2web/source/x_component_cms_Xform/Package.js
浏览文件 @
87bce2f9
...
...
@@ -88,7 +88,7 @@ MWF.xApplication.cms.Xform.Image = MWF.CMSImage = new Class({
//MWF.xDesktop.requireApp("cms.Xform", "Table", null, false);
//MWF.xDesktop.requireApp("cms.Xform", "Datagrid", null, false);
MWF
.
xDesktop
.
requireApp
(
"
cm
s.Xform
"
,
"
Html
"
,
null
,
false
);
MWF
.
xDesktop
.
requireApp
(
"
proces
s.Xform
"
,
"
Html
"
,
null
,
false
);
MWF
.
xApplication
.
cms
.
Xform
.
Html
=
MWF
.
CMSHtml
=
new
Class
({
Extends
:
MWF
.
APPHtml
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录