owl-cli 6.79.0 → 6.81.0

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

@@ -8,6 +8,99 @@
 //#import $owl_dfiles:services/modelService.jsx
 //#import $owl_task_info:services/modelService.jsx
 //#import $owl_excel_templates:services/modelService.jsx
+//#import excel.js
+//#import file.js
+
+var formSpecs = @formSpecs;
+
+var allChoices = {};
+
+function getAllChoices(fieldSpec){
+   if(fieldSpec._ft==='subform'){
+       var fields = fieldSpec.fields;
+         for(var i=0;i<fields.length;i++){
+             var f = fields[i];
+             if(f._ft==='subform'){
+                 getAllChoices(f);
+             }
+            else{
+                if(f._ft==='field' && f.fieldType==='choice'){
+                    var optiosMap = {};
+                    var options = f.options;
+                    if(options){
+                        for(var j=0;j<options.length;j++){
+                            var option = options[j];
+                            optiosMap[option[0]] = option[1];
+                        }
+                        allChoices[f.key] = optiosMap;
+                    }
+                }
+            }
+         }
+   }
+}
+
+function tranverseFields(formSpec, callback, ctx){
+    formSpec.fields.forEach( function(field){
+        if (field[ '_ft' ] == 'field') {
+            callback( field, ctx );
+        }
+        else if (field[ '_ft' ] == 'subform') {
+            var context = { parentField: field }
+            tranverseFields( field, callback, context );
+        }
+        else if (field[ '_ft' ] == 'array') {
+            var context = { parentField: field }
+            tranverseFields( field, callback, context )
+        }
+    } );
+}
+
+function normalizeValue(value,spec){
+    if(value == null){
+        return null;
+    }
+    switch (spec.fieldType){
+        case 'string':
+            return 's'+value;
+        case 'number':
+            return 'n' + value;
+        case 'date':
+            return 'd'+ moment(value).toDate().getTime();
+        case 'choice':
+            for(var i=0; i<spec.options.length; i++){
+                var option = spec.options[i];
+                if(option[0]==value){
+                    return 's'+option[1];
+                }
+            }
+            return 's'+value;
+        default:
+            return "s"+value;
+    }
+}
+
+function getExportDoc(obj){
+    tranverseFields(formSpecs,function(f,ctx){
+        if (ctx.parentField && ctx.parentField._ft == 'array') {
+            var items = @projectCodeService.getValue( ctx.parentField.key, obj )
+            if(items){
+                for(var i=0; i<items.length; i++){
+                    var item = items[i];
+                    var value = item[f.origKey];
+                    value = normalizeValue(value,f);
+                    item[f.origKey] = value;
+                }
+            }
+        }
+        else{
+            var value = @projectCodeService.getValue( f.key, obj );
+            value = normalizeValue(value,f);
+        @projectCodeService.setValue(f.key,value,obj);
+        }
+    },{});
+    return obj;
+}
 
 function getAllDocs(searchArgs,sort,tableId,roleId,orgId,loginId,permissions){
     var keyword = searchArgs.keyword;
@@ -74,6 +167,7 @@ function getDocsByIds(ids){
 }
 
 function main(){
+    taskParams = JSON.parse(taskParams);
     var templateId = taskParams.templateId;
 
     var template = owl_excel_templatesService.get(templateId);
@@ -108,13 +202,21 @@ function main(){
         docs = getAllDocs(searchArgs,sort,tableId,roleId,orgId,loginId,permissions);
     }
     else{
-        var ids = params.ids;
+        var ids = taskParams.ids;
         docs = getDocsByIds(ids);
     }
+
+    for(var i=0; i<docs.length; i++){
+        var doc = docs[i];
+        doc = getExportDoc(doc);
+        docs[i] = doc;
+    }
+
     if(template.exportType==='doc'){
         if(outputTarget==='multifile'){
             for(var i=0; i<docs.length; i++){
                 var exportDoc = docs[i];
+
                 var fileId = Excel.generateExcelFromTemplate( templateUrl, exportDoc );
                 if(template.toField){
                     var id=exportDoc.id;
@@ -183,7 +285,6 @@ function main(){
                     name:"" + docName
                 }
             }
-
             owl_dfilesService.add(download);
         }
     }

package/package.json

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