owl-cli 6.204.0 → 6.206.0

package/defaultTemplate/api/src/tasks/export.jsx

@@ -64,7 +64,10 @@ function main(modelService,spec){
                 var value = modelService.getValue(title.field,row);
                 if(title.type==="date"){
                     if(value){
-                        var ts = new Date(value).getTime();
+                        if(!isNaN(value)){
+                            value = Number(value);
+                        }
+                        var ts = new Date(value);
                         value = formatDateWithTimeZone(ts, 8);
                         // value = ts /86400000+25569; //这是excel的特殊的格式，用小数点表示
                     }
@@ -125,6 +128,12 @@ function main(modelService,spec){
     /****************************************/
     var export_fileName = DateUtil.getLongDate(new Date().getTime());
 
+    titleList.forEach(function(title){
+        //date类型的值，已经变成了字符串，不需要再设置导出类型，默认为字符串
+        if(title.type==='date'){
+            delete title.type;
+        }
+    });
     var fileUrl = Excel.createExcelList(export_fileName, titleList, recordList);
 
     var taskInfo = modelService.getExportTaskInfo(taskInfoId);
@@ -193,9 +202,16 @@ function getRows(modelService, spec) {
 
         var sr = modelService.search(mfilters, searchArgs, keyword, from, pageSize, sort);
         if(sr.state==='ok'){
+            var rows = [];
+            sr.list.forEach(function(r){
+                var row = modelService.get(r.id);
+                if(row){
+                    rows.push(row);
+                }
+            });
             return {
-                rows: sr.list,
-                total: sr.list.length
+                rows: rows,
+                total: rows.length
             }
         }
         else{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "6.204.0",
+  "version": "6.206.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {