owl-cli 6.205.0 → 6.206.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.
|
@@ -64,7 +64,10 @@ function main(modelService,spec){
|
|
|
64
64
|
var value = modelService.getValue(title.field,row);
|
|
65
65
|
if(title.type==="date"){
|
|
66
66
|
if(value){
|
|
67
|
-
|
|
67
|
+
if(!isNaN(value)){
|
|
68
|
+
value = Number(value);
|
|
69
|
+
}
|
|
70
|
+
var ts = new Date(value);
|
|
68
71
|
value = formatDateWithTimeZone(ts, 8);
|
|
69
72
|
// value = ts /86400000+25569; //这是excel的特殊的格式，用小数点表示
|
|
70
73
|
}
|
|
@@ -199,9 +202,16 @@ function getRows(modelService, spec) {
|
|
|
199
202
|
|
|
200
203
|
var sr = modelService.search(mfilters, searchArgs, keyword, from, pageSize, sort);
|
|
201
204
|
if(sr.state==='ok'){
|
|
205
|
+
var rows = [];
|
|
206
|
+
sr.list.forEach(function(r){
|
|
207
|
+
var row = modelService.get(r.id);
|
|
208
|
+
if(row){
|
|
209
|
+
rows.push(row);
|
|
210
|
+
}
|
|
211
|
+
});
|
|
202
212
|
return {
|
|
203
|
-
rows:
|
|
204
|
-
total:
|
|
213
|
+
rows: rows,
|
|
214
|
+
total: rows.length
|
|
205
215
|
}
|
|
206
216
|
}
|
|
207
217
|
else{
|