owl-cli 6.124.0 → 6.126.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/defaultTemplate/api/src/services/modelService.jsx +7 -4
- package/defaultTemplate/api/src/tasks/export.jsx +13 -2
- package/defaultTemplate/api/src/tasks/exportDoc.jsx +14 -2
- package/defaultTemplate/api/src/tasks/exportExTask.jsx +9 -2
- package/defaultTemplate/api/src/tasks/exportWithTemplateTask.jsx +13 -2
- package/package.json +1 -1
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
//#import HttpUtil.js
|
|
8
8
|
//#import jobs.js
|
|
9
9
|
//#import DigestUtil.js
|
|
10
|
-
//#import moment.min.js
|
|
11
10
|
//#import kafkautil.js
|
|
12
11
|
//#import @services/dblayer.jsx
|
|
13
12
|
//#import @handlers/include/diff.jsx
|
|
@@ -215,7 +214,7 @@ var @projectCodeService = (function (pigeon) {
|
|
|
215
214
|
}
|
|
216
215
|
|
|
217
216
|
//对于unique的字段，检查有没有重复
|
|
218
|
-
if (field.unique === 'true') {
|
|
217
|
+
if (field.unique === 'true' && value) {
|
|
219
218
|
if (f.isDuplicated(data.id, field.key, value)) {
|
|
220
219
|
$.log("duplicated,key=" + field.key + ",value=" + value + ",call removeUniqueValue(data.id, field.key, value)");
|
|
221
220
|
return {'state': 'err', msg: field.fieldLabel + '不能重复。' + value, code: 'duplicated'}
|
|
@@ -274,7 +273,7 @@ var @projectCodeService = (function (pigeon) {
|
|
|
274
273
|
|
|
275
274
|
if(value && typeof(value)=='string'){
|
|
276
275
|
if (f.isDuplicated(data.id, field.key, value)) {
|
|
277
|
-
throw {'state': 'err', msg: field.fieldLabel + '不能重复。', code: 'duplicated'}
|
|
276
|
+
throw {'state': 'err', msg: field.fieldLabel + '不能重复。value=' + value, code: 'duplicated'}
|
|
278
277
|
}
|
|
279
278
|
|
|
280
279
|
//对于没有重复的数据，保存起来
|
|
@@ -367,7 +366,11 @@ var @projectCodeService = (function (pigeon) {
|
|
|
367
366
|
}
|
|
368
367
|
case 'date':
|
|
369
368
|
try{
|
|
370
|
-
|
|
369
|
+
if(isNaN(value)){
|
|
370
|
+
return value;
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
return new Date(Number(value)).toISOString();
|
|
371
374
|
}
|
|
372
375
|
catch(e){
|
|
373
376
|
return null;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
//#import $@projectCode:services/modelService.jsx
|
|
2
|
-
//#import moment.min.js
|
|
3
2
|
//#import excel.js
|
|
4
3
|
|
|
5
4
|
|
|
@@ -47,7 +46,19 @@ function normalizeValue(value,spec){
|
|
|
47
46
|
case 'number':
|
|
48
47
|
return 'n' + value;
|
|
49
48
|
case 'date':
|
|
50
|
-
|
|
49
|
+
try{
|
|
50
|
+
var d = null;
|
|
51
|
+
if(isNaN(value)){
|
|
52
|
+
d = new Date(value).getTime();
|
|
53
|
+
}
|
|
54
|
+
else{
|
|
55
|
+
d = new Date(Number(value)).getTime();
|
|
56
|
+
}
|
|
57
|
+
return 'd'+ d;
|
|
58
|
+
}
|
|
59
|
+
catch(e){
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
51
62
|
case 'choice':
|
|
52
63
|
for(var i=0; i<spec.options.length; i++){
|
|
53
64
|
var option = spec.options[i];
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
//#import $@projectCode:services/modelService.jsx
|
|
2
|
-
//#import moment.min.js
|
|
3
2
|
//#import excel.js
|
|
4
3
|
|
|
5
4
|
var formSpecs = @formSpecs;
|
|
@@ -30,7 +29,20 @@ function normalizeValue(value,spec){
|
|
|
30
29
|
case 'number':
|
|
31
30
|
return 'n' + value;
|
|
32
31
|
case 'date':
|
|
33
|
-
|
|
32
|
+
try{
|
|
33
|
+
var d = null;
|
|
34
|
+
if(isNaN(value)){
|
|
35
|
+
d = new Date(value).getTime();
|
|
36
|
+
}
|
|
37
|
+
else{
|
|
38
|
+
d = new Date(Number(value)).getTime();
|
|
39
|
+
}
|
|
40
|
+
return 'd'+ d;
|
|
41
|
+
}
|
|
42
|
+
catch(e){
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
|
|
34
46
|
case 'choice':
|
|
35
47
|
for(var i=0; i<spec.options.length; i++){
|
|
36
48
|
var option = spec.options[i];
|
|
@@ -67,10 +67,17 @@ function normalizeValue(value,spec){
|
|
|
67
67
|
return 'n' + value;
|
|
68
68
|
case 'date':
|
|
69
69
|
try{
|
|
70
|
-
|
|
70
|
+
var d = null;
|
|
71
|
+
if(isNaN(value)){
|
|
72
|
+
d = new Date(value).getTime();
|
|
73
|
+
}
|
|
74
|
+
else{
|
|
75
|
+
d = new Date(Number(value)).getTime();
|
|
76
|
+
}
|
|
77
|
+
return 'd'+ d;
|
|
71
78
|
}
|
|
72
79
|
catch(e){
|
|
73
|
-
return
|
|
80
|
+
return null;
|
|
74
81
|
}
|
|
75
82
|
|
|
76
83
|
case 'choice':
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
//#import $@projectCode:services/modelService.jsx
|
|
2
|
-
//#import moment.min.js
|
|
3
2
|
//#import excel.js
|
|
4
3
|
//#import $owl_excel_templates:services/modelService.jsx
|
|
5
4
|
//#import $owl_task_info:services/modelService.jsx
|
|
@@ -33,7 +32,19 @@ function normalizeValue(value,spec){
|
|
|
33
32
|
case 'number':
|
|
34
33
|
return 'n' + value;
|
|
35
34
|
case 'date':
|
|
36
|
-
|
|
35
|
+
try{
|
|
36
|
+
var d = null;
|
|
37
|
+
if(isNaN(value)){
|
|
38
|
+
d = new Date(value).getTime();
|
|
39
|
+
}
|
|
40
|
+
else{
|
|
41
|
+
d = new Date(Number(value)).getTime();
|
|
42
|
+
}
|
|
43
|
+
return 'd'+ d;
|
|
44
|
+
}
|
|
45
|
+
catch(e){
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
37
48
|
case 'choice':
|
|
38
49
|
for(var i=0; i<spec.options.length; i++){
|
|
39
50
|
var option = spec.options[i];
|