Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
e9749a2d
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
339
Star
10
Fork
6
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
e9749a2d
编写于
6月 04, 2021
作者:
U
unknown
1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
导入模型
上级
8c41d204
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
77 addition
and
79 deletion
+77
-79
o2web/source/x_component_query_Query/Importer.js
o2web/source/x_component_query_Query/Importer.js
+54
-77
o2web/source/x_component_query_Query/lp/en.js
o2web/source/x_component_query_Query/lp/en.js
+11
-1
o2web/source/x_component_query_Query/lp/zh-cn.js
o2web/source/x_component_query_Query/lp/zh-cn.js
+12
-1
未找到文件。
o2web/source/x_component_query_Query/Importer.js
浏览文件 @
e9749a2d
...
...
@@ -654,9 +654,13 @@ MWF.xApplication.query.Query.Importer.Row = new Class({
this
.
checkProcess
(
true
);
}
if
(
this
.
errorTextList
.
length
>
0
){
return
false
;
}
return
true
;
},
getCol
Infor
:
function
(
key
,
isExcel
){
getCol
:
function
(
key
,
isExcel
){
var
lp
=
this
.
lp
;
if
(
this
.
pathIndexMap
&&
typeOf
(
this
.
pathIndexMap
[
key
])
===
"
number
"
){
var
i
=
this
.
pathIndexMap
[
key
];
...
...
@@ -671,74 +675,45 @@ MWF.xApplication.query.Query.Importer.Row = new Class({
return
""
},
checkCMS
:
function
(
notCheckName
){
var
lp
=
this
.
lp
;
var
errorTextList
=
[];
var
errorTextListExcel
=
[];
var
data
=
this
.
document
.
identity
;
if
(
!
data
){
this
.
errorTextList
.
push
(
this
.
getColInfor
(
"
identity
"
)
+
"
未设置拟稿人身份或者拟稿人在系统中不存在
"
+
lp
.
fullstop
);
this
.
errorTextListExcel
.
push
(
this
.
getColInfor
(
"
identity
"
,
true
)
+
"
未设置拟稿人身份或者拟稿人在系统中不存在
"
+
lp
.
fullstop
);
errorTextList
.
push
(
this
.
getCol
(
"
identity
"
,
false
)
+
lp
.
noDrafter
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
identity
"
,
true
)
+
lp
.
noDrafter
+
lp
.
fullstop
);
}
else
if
(
data
.
split
(
"
@
"
).
getLast
().
toLowerCase
()
!==
"
i
"
){
this
.
errorTextList
.
push
(
'
"
'
+
data
+
'
"
'
+
"
拟稿人未设置成身份
"
+
lp
.
fullstop
);
this
.
errorTextListExcel
.
push
(
'
"
'
+
data
+
'
"
'
+
"
拟稿人未设置成身份
"
+
lp
.
fullstop
);
errorTextList
.
push
(
this
.
getCol
(
"
identity
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
drafterIsNotIdentity
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
identity
"
,
true
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
drafterIsNotIdentity
+
lp
.
fullstop
);
}
var
data
=
this
.
document
.
publishTime
;
if
(
!
data
){
this
.
errorTextList
.
push
(
"
未设置发布时间或者发布时间在系统中不存在
"
+
lp
.
fullstop
);
this
.
errorTextListExcel
.
push
(
"
未设置发布时间或者发布时间在系统中不存在
"
+
lp
.
fullstop
);
errorTextList
.
push
(
this
.
getCol
(
"
publishTime
"
,
false
)
+
lp
.
noPublishTime
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
publishTime
"
,
false
)
+
lp
.
noPublishTime
+
lp
.
fullstop
);
}
else
if
(
!
new
Date
(
data
).
isValid
(
data
)
){
this
.
errorTextList
.
push
(
'
"
'
+
data
+
'
"
'
+
"
发布时间格式不正确
"
+
lp
.
fullstop
);
this
.
errorTextListExcel
.
push
(
'
"
'
+
data
+
'
"
'
+
"
发布时间格式不正确
"
+
lp
.
fullstop
);
errorTextList
.
push
(
this
.
getCol
(
"
publishTime
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
publishTimeFormatError
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
publishTime
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
publishTimeFormatError
+
lp
.
fullstop
);
}
data
=
this
.
document
.
title
;
if
(
data
&&
data
>
70
){
this
.
errorTextList
.
push
(
'
"
'
+
data
+
'
"
'
+
lp
.
cmsTitleLengthInfor
+
lp
.
fullstop
);
this
.
errorTextListExcel
.
push
(
'
"
'
+
data
+
'
"
'
+
+
lp
.
cmsTitleLengthInfor
+
lp
.
fullstop
);
errorTextList
.
push
(
this
.
getCol
(
"
title
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
cmsTitleLengthInfor
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
title
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
+
lp
.
cmsTitleLengthInfor
+
lp
.
fullstop
);
}
data
=
this
.
document
.
summary
;
if
(
data
&&
data
.
length
>
70
){
this
.
errorTextList
.
push
(
'
"
'
+
data
+
'
"
'
+
lp
.
cmsSummaryLengthInfor
+
lp
.
fullstop
);
this
.
errorTextListExcel
.
push
(
'
"
'
+
data
+
'
"
'
+
lp
.
cmsSummaryLengthInfor
+
lp
.
fullstop
);
errorTextList
.
push
(
this
.
getCol
(
"
summary
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
cmsSummaryLengthInfor
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
summary
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
cmsSummaryLengthInfor
+
lp
.
fullstop
);
}
this
.
importer
.
json
.
data
.
columnList
.
each
(
function
(
columnJson
,
i
)
{
var
colInfor
=
columnText
.
replace
(
"
{n}
"
,
i
+
1
);
var
colInforExcel
=
columnTextExcel
.
replace
(
"
{n}
"
,
this
.
importer
.
excelUtils
.
index2ColName
(
i
)
);
var
value
=
this
.
importedData
[
i
]
||
""
;
var
dataType
=
columnJson
.
dataType_CMSProcess
;
if
(
value
&&
[
"
string
"
,
"
stringList
"
].
contains
(
columnJson
.
dataType_CMSProcess
)
){
if
(
columnJson
.
isTitle
){
if
(
value
.
length
>
70
){
errorTextList
.
push
(
colInfor
+
value
+
lp
.
cmsTitleLengthInfor
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
colInforExcel
+
value
+
lp
.
cmsTitleLengthInfor
+
lp
.
fullstop
);
}
}
if
(
columnJson
.
isSummary
){
if
(
value
.
length
>
70
){
errorTextList
.
push
(
colInfor
+
value
+
lp
.
cmsSummaryLengthInfor
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
colInforExcel
+
value
+
lp
.
cmsSummaryLengthInfor
+
lp
.
fullstop
);
}
}
if
(
columnJson
.
isName
&&
!
notCheckName
){
if
(
columnJson
.
isPublisher
){
//发布者必须要校验
var
arr
=
value
.
split
(
/
\s
*,
\s
*/g
);
//空格,空格
arr
.
each
(
function
(
d
,
idx
){
var
obj
=
this
.
importer
.
getOrgData
(
d
);
if
(
obj
.
errorText
){
errorTextList
.
push
(
colInfor
+
obj
.
errorText
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
colInforExcel
+
obj
.
errorText
+
lp
.
fullstop
);
}
}.
bind
(
this
));
}
}
}
}.
bind
(
this
));
this
.
errorTextList
=
this
.
errorTextList
.
concat
(
errorTextList
);
this
.
errorTextListExcel
=
this
.
errorTextListExcel
.
concat
(
errorTextListExcel
);
...
...
@@ -757,37 +732,39 @@ MWF.xApplication.query.Query.Importer.Row = new Class({
var
errorTextList
=
[];
var
errorTextListExcel
=
[];
var
data
=
this
.
work
.
identity
;
if
(
!
data
){
errorTextList
.
push
(
this
.
getCol
(
"
identity
"
,
false
)
+
lp
.
noDrafter
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
identity
"
,
true
)
+
lp
.
noDrafter
+
lp
.
fullstop
);
}
else
if
(
data
.
split
(
"
@
"
).
getLast
().
toLowerCase
()
!==
"
i
"
){
errorTextList
.
push
(
this
.
getCol
(
"
identity
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
drafterIsNotIdentity
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
identity
"
,
true
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
drafterIsNotIdentity
+
lp
.
fullstop
);
}
this
.
importer
.
json
.
data
.
columnList
.
each
(
function
(
columnJson
,
i
)
{
var
colInfor
=
columnText
.
replace
(
"
{n}
"
,
i
+
1
);
var
colInforExcel
=
columnTextExcel
.
replace
(
"
{n}
"
,
this
.
importer
.
excelUtils
.
index2ColName
(
i
)
);
var
value
=
this
.
importedData
[
i
]
||
""
;
if
(
json
.
data
.
processStatus
===
"
completed
"
){
if
(
!
this
.
work
.
form
){
errorTextList
.
push
(
lp
.
noForm
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
lp
.
noForm
+
lp
.
fullstop
);
}
var
dataType
=
columnJson
.
dataType_CMSProcess
;
if
(
value
&&
[
"
string
"
,
"
stringList
"
].
contains
(
columnJson
.
dataType_CMSProcess
)
){
// if( columnJson.isProcessTitle ){
// if( value.length > 70 ){
// errorTextList.push(colInfor + value + lp.cmsTitleLengthInfor + lp.fullstop );
// errorTextListExcel.push( colInforExcel + value + lp.cmsTitleLengthInfor + lp.fullstop );
// }
// }
if
(
columnJson
.
isName
&&
!
notCheckName
){
if
(
columnJson
.
isProcessDrafter
){
//流程发起人必须要校验
var
arr
=
value
.
split
(
/
\s
*,
\s
*/g
);
//空格,空格
arr
.
each
(
function
(
d
,
idx
){
var
obj
=
this
.
importer
.
getOrgData
(
d
);
if
(
obj
.
errorText
){
errorTextList
.
push
(
colInfor
+
obj
.
errorText
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
colInforExcel
+
obj
.
errorText
+
lp
.
fullstop
);
}
}.
bind
(
this
));
}
}
var
data
=
this
.
work
.
startTime
;
if
(
!
data
){
errorTextList
.
push
(
this
.
getCol
(
"
startTime
"
,
false
)
+
lp
.
noStartTime
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
startTime
"
,
false
)
+
lp
.
noStartTime
+
lp
.
fullstop
);
}
else
if
(
!
new
Date
(
data
).
isValid
(
data
)
){
errorTextList
.
push
(
this
.
getCol
(
"
startTime
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
startTimeFormatError
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
startTime
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
startTimeFormatError
+
lp
.
fullstop
);
}
}.
bind
(
this
));
var
data
=
this
.
work
.
completeTime
;
if
(
!
data
){
errorTextList
.
push
(
this
.
getCol
(
"
completeTime
"
,
false
)
+
lp
.
noEndTime
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
completeTime
"
,
false
)
+
lp
.
noEndTime
+
lp
.
fullstop
);
}
else
if
(
!
new
Date
(
data
).
isValid
(
data
)
){
errorTextList
.
push
(
this
.
getCol
(
"
completeTime
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
endTimeFormatError
+
lp
.
fullstop
);
errorTextListExcel
.
push
(
this
.
getCol
(
"
completeTime
"
,
false
)
+
'
"
'
+
data
+
'
"
'
+
lp
.
endTimeFormatError
+
lp
.
fullstop
);
}
}
this
.
errorTextList
=
this
.
errorTextList
.
concat
(
errorTextList
);
this
.
errorTextListExcel
=
this
.
errorTextListExcel
.
concat
(
errorTextListExcel
);
...
...
o2web/source/x_component_query_Query/lp/en.js
浏览文件 @
e9749a2d
...
...
@@ -172,5 +172,15 @@ MWF.xApplication.query.Query.LP = {
"
canNotBeEmpty
"
:
"
Can not be empty
"
,
"
cmsTitleLengthInfor
"
:
"
Title length cannot exceed 70 characters
"
,
"
cmsSummaryLengthInfor
"
:
"
Summary length cannot exceed 70 characters
"
,
"
caculateFieldValidationText
"
:
"
Calculated field error:
"
"
caculateFieldValidationText
"
:
"
Calculated field error:
"
,
"
noDrafter
"
:
"
The identity of the drafter is not set or the drafter does not exist in the system
"
,
"
drafterIsNotIdentity
"
:
"
The drafter is not an identity
"
,
"
noPublishTime
"
:
"
Publish time is not set
"
,
"
publishTimeFormatError
"
:
"
Publish time format is incorrect
"
,
"
noStartTime
"
:
"
The start time is not set
"
,
"
startTimeFormatError
"
:
"
The start time format is incorrect
"
,
"
noEndTime
"
:
"
The end time is not set
"
,
"
endTimeFormatError
"
:
"
The end time format is incorrect
"
,
"
noForm
"
:
"
The form is not set
"
};
\ No newline at end of file
o2web/source/x_component_query_Query/lp/zh-cn.js
浏览文件 @
e9749a2d
...
...
@@ -172,6 +172,17 @@ MWF.xApplication.query.Query.LP = {
"
canNotBeEmpty
"
:
"
不能为空
"
,
"
cmsTitleLengthInfor
"
:
"
标题长度不能超过70个字
"
,
"
cmsSummaryLengthInfor
"
:
"
摘要长度不能超过70个字
"
,
"
caculateFieldValidationText
"
:
"
计算字段错误:
"
"
caculateFieldValidationText
"
:
"
计算字段错误:
"
,
"
noDrafter
"
:
"
未设置拟稿人身份或者拟稿人在系统中不存在
"
,
"
drafterIsNotIdentity
"
:
"
拟稿人不是身份
"
,
"
noPublishTime
"
:
"
未设置发布时间
"
,
"
publishTimeFormatError
"
:
"
发布时间格式不正确
"
,
"
noStartTime
"
:
"
未设置开始时间
"
,
"
startTimeFormatError
"
:
"
开始时间格式不正确
"
,
"
noEndTime
"
:
"
未设置结束时间
"
,
"
endTimeFormatError
"
:
"
结束时间格式不正确
"
,
"
noForm
"
:
"
未设置表单
"
};
\ No newline at end of file
liyi_hz2008
@liyi_hz2008
mentioned in commit
e87842ea
·
6月 17, 2021
mentioned in commit
e87842ea
mentioned in commit e87842eab94a5fe8368bf31f1a8bbe4aab5abb8a
开关提交列表
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录