owl-cli 6.148.0 → 6.149.0

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

@@ -1,128 +1,128 @@
-//#import $@projectCode:services/modelService.jsx
-//#import excel.js
-//#import $owl_excel_templates:services/modelService.jsx
-//#import $owl_task_info:services/modelService.jsx
-//#import file.js
-
-var formSpecs = @formSpecs;
-
-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':
-            try{
-                var d = null;
-                if(isNaN(value)){
-                    d = new Date(value).getTime();
-                }
-                else{
-                    d = new Date(Number(value)).getTime();
-                }
-                return 'd'+ d;
-            }
-            catch(e){
-                return null;
-            }
-        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(){
-    var template = owl_excel_templatesService.get(templateId);
-    if(!template || !template.template){
-        $.log("没有配置模版,templateId=" + templateId);
-        return null;
-    }
-    var taskInfo = owl_task_infoService.get(taskInfoId);
-    taskInfo.state = "running";
-    taskInfo.beginDate = new Date().getTime();
-    owl_task_infoService.update(taskInfo);
-    var doc = @projectCodeService.get(id);
-    var exportDoc = getExportDoc(doc);
-    // var templateExcelUrl = "@{@projectCode.xlsx}@";
-    var templateUrl = template.template[0].url;
-    var  fileId = Excel.generateExcelFromTemplate( templateUrl, exportDoc );
-    if(template.toField){
-        var doc = @projectCodeService.get(id);
-        var url = FileService.getFullPath(fileId);
-        var docName = null;
-        if(typeof pname === 'undefined'){
-            docName = template.name + "_" +fileId;
-        }
-        else{
-            docName = pname;
-        }
-        doc[template.toField] = {
-            url: "" + url,
-            fileId: "" + fileId,
-            name:"" + docName
-        }
-        @projectCodeService.update(doc);
-    }
-
-    var taskInfo = owl_task_infoService.get(taskInfoId);
-    taskInfo.state = "success";
-    taskInfo.percent = 100;
-    taskInfo.fileId = fileId;
-    taskInfo.endDate = new Date().getTime();
-    taskInfo.state = "succeeded";
-    taskInfo.msg = "生成Excel文件成功";
-    taskInfo.fileId = fileId;
-
-    owl_task_infoService.update(taskInfo);
-})();
-
+//#import $@projectCode:services/modelService.jsx
+//#import excel.js
+//#import $owl_excel_templates:services/modelService.jsx
+//#import $owl_task_info:services/modelService.jsx
+//#import file.js
+
+var formSpecs = @formSpecs;
+
+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':
+            try{
+                var d = null;
+                if(isNaN(value)){
+                    d = new Date(value).getTime();
+                }
+                else{
+                    d = new Date(Number(value)).getTime();
+                }
+                return 'd'+ d;
+            }
+            catch(e){
+                return null;
+            }
+        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(){
+    var template = owl_excel_templatesService.get(templateId);
+    if(!template || !template.template){
+        $.log("没有配置模版,templateId=" + templateId);
+        return null;
+    }
+    var taskInfo = owl_task_infoService.get(taskInfoId);
+    taskInfo.state = "running";
+    taskInfo.beginDate = new Date().getTime();
+    owl_task_infoService.update(taskInfo);
+    var doc = @projectCodeService.get(id);
+    var exportDoc = getExportDoc(doc);
+    // var templateExcelUrl = "@{@projectCode.xlsx}@";
+    var templateUrl = template.template[0].url;
+    var  fileId = Excel.generateExcelFromTemplate( templateUrl, exportDoc );
+    if(template.toField){
+        var doc = @projectCodeService.get(id);
+        var url = FileService.getFullPath(fileId);
+        var docName = null;
+        if(typeof pname === 'undefined'){
+            docName = template.name + "_" +fileId;
+        }
+        else{
+            docName = pname;
+        }
+        doc[template.toField] = {
+            url: "" + url,
+            fileId: "" + fileId,
+            name:"" + docName
+        }
+        @projectCodeService.update(doc);
+    }
+
+    var taskInfo = owl_task_infoService.get(taskInfoId);
+    taskInfo.state = "success";
+    taskInfo.percent = 100;
+    taskInfo.fileId = fileId;
+    taskInfo.endDate = new Date().getTime();
+    taskInfo.state = "succeeded";
+    taskInfo.msg = "生成Excel文件成功";
+    taskInfo.fileId = fileId;
+
+    owl_task_infoService.update(taskInfo);
+})();
+

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

@@ -1,49 +1,49 @@
-//#import $@projectCode:services/modelService.jsx
-//#import Util.js
-//#import file.js
-
-
-
-var formSpecs = @formSpecs;
-
-var taskInfo = @projectCodeService.getExportTaskInfo( taskInfoId );
-taskInfo.total = @projectCodeService.getAllSize();
-taskInfo.lastTime = new Date().getTime();
-taskInfo.processState = "processing";
-taskInfo.msg = "获取导出总数成功......";
-taskInfo.percent = "1";
-taskInfo.fileUrls = [];
-
-var from = 0;
-while(from < taskInfo.total){
-    var listObjs = @projectCodeService.getAllObjectsEx(from, 10000);
-
-    taskInfo.lastTime = new Date().getTime();
-    taskInfo.processState = "processing";
-    taskInfo.msg = "导出数据成功，生成zip......";
-    taskInfo.percent = (from + listObjs.length) * 100 / taskInfo.total;
-
-    var s = JSON.stringify(listObjs);
-    var fileId = "" + $.addAsZip(s);
-
-    taskInfo.fileId = fileId;
-    taskInfo.fileUrl = FileService.getFullPath(fileId);
-    taskInfo.fileUrls.push(taskInfo.fileUrl);
-    taskInfo.exportedRows = from + listObjs.length;
-    from = from + listObjs.length;
-    @projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
-}
-
-taskInfo.processState = "success";
-taskInfo.percent = 100;
-taskInfo.msg = "导出文件成功";
-@projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
-
-
-
-
-
-
-
-
-
+//#import $@projectCode:services/modelService.jsx
+//#import Util.js
+//#import file.js
+
+
+
+var formSpecs = @formSpecs;
+
+var taskInfo = @projectCodeService.getExportTaskInfo( taskInfoId );
+taskInfo.total = @projectCodeService.getAllSize();
+taskInfo.lastTime = new Date().getTime();
+taskInfo.processState = "processing";
+taskInfo.msg = "获取导出总数成功......";
+taskInfo.percent = "1";
+taskInfo.fileUrls = [];
+
+var from = 0;
+while(from < taskInfo.total){
+    var listObjs = @projectCodeService.getAllObjectsEx(from, 10000);
+
+    taskInfo.lastTime = new Date().getTime();
+    taskInfo.processState = "processing";
+    taskInfo.msg = "导出数据成功，生成zip......";
+    taskInfo.percent = (from + listObjs.length) * 100 / taskInfo.total;
+
+    var s = JSON.stringify(listObjs);
+    var fileId = "" + $.addAsZip(s);
+
+    taskInfo.fileId = fileId;
+    taskInfo.fileUrl = FileService.getFullPath(fileId);
+    taskInfo.fileUrls.push(taskInfo.fileUrl);
+    taskInfo.exportedRows = from + listObjs.length;
+    from = from + listObjs.length;
+    @projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
+}
+
+taskInfo.processState = "success";
+taskInfo.percent = 100;
+taskInfo.msg = "导出文件成功";
+@projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
+
+
+
+
+
+
+
+
+

package/examples/buildProperties/build.properties

@@ -1,3 +1,3 @@
-deployUrl=http://p12.local.com/appMarket/handler/deploy.jsp
-deployPass=123456
+deployUrl=http://p12.local.com/appMarket/handler/deploy.jsp
+deployPass=123456
 projectName=wushang

package/examples/gitignore/gitignore_example.txt

@@ -1,2 +1,2 @@
-node_modules
+node_modules
 generatedApps

package/examples/models/product.json

@@ -1,53 +1,53 @@
-{
-    "id": "string(32),listSize:16,tab:a1,disabled:true,hidden:false;商品Id",
-    "name": "string(64),listSize:16,tab:a2;名称",
-    "skus": [{
-        "#meta": {
-          "fieldLabel": "子商品",
-          "tab": "f",
-          "addSingle":true,
-          "position": "card"
-        },
-        "spec": "string(32),listSize:14,help:规格尺码等,tab:f1;规格",
-        "buyUnit": "string(6),inputType:letterChina,required:true,listSize:8,tab:f2;采购单位",
-        "buyUnitCount": "number(4),listSize:8,help:每采购单位包含的单品数量,tab:f3;采购单位数量"
-        
-    }],
-    "_t": "product",
-    "#meta": {
-        "rem": "商品",
-        "parent": [
-            "sku"
-        ],
-        "projectName": "商品",
-        
-        "visitType": [
-            "shop",
-            "warehouse",
-            "platform"
-        ],
-        "pos": -1,
-        "group": {
-            "id": "mainData",
-            "name": "主数据",
-            "pos": 1
-        },
-        "project": "example",
-        "export":[
-            {
-              "label":"导出完整单据",
-              "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
-              "subTitleFormat":{"background":"#777777","color":"#ffffff"},
-              "subRecordFormat":{"background":"#ffffff","color":"#000000"},
-              "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
-              "key":"completeDoc",
-              "fields":["*"],
-              "items":{
-                "name":"items",
-                "itemFields":["*"]
-              },
-              "subTitleInterval":20
-            }
-        ]
-    }
+{
+    "id": "string(32),listSize:16,tab:a1,disabled:true,hidden:false;商品Id",
+    "name": "string(64),listSize:16,tab:a2;名称",
+    "skus": [{
+        "#meta": {
+          "fieldLabel": "子商品",
+          "tab": "f",
+          "addSingle":true,
+          "position": "card"
+        },
+        "spec": "string(32),listSize:14,help:规格尺码等,tab:f1;规格",
+        "buyUnit": "string(6),inputType:letterChina,required:true,listSize:8,tab:f2;采购单位",
+        "buyUnitCount": "number(4),listSize:8,help:每采购单位包含的单品数量,tab:f3;采购单位数量"
+        
+    }],
+    "_t": "product",
+    "#meta": {
+        "rem": "商品",
+        "parent": [
+            "sku"
+        ],
+        "projectName": "商品",
+        
+        "visitType": [
+            "shop",
+            "warehouse",
+            "platform"
+        ],
+        "pos": -1,
+        "group": {
+            "id": "mainData",
+            "name": "主数据",
+            "pos": 1
+        },
+        "project": "example",
+        "export":[
+            {
+              "label":"导出完整单据",
+              "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+              "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+              "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+              "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+              "key":"completeDoc",
+              "fields":["*"],
+              "items":{
+                "name":"items",
+                "itemFields":["*"]
+              },
+              "subTitleInterval":20
+            }
+        ]
+    }
 }

package/examples/models/shop.json

@@ -1,72 +1,72 @@
-{
-  "id":"string(32),tab:01,disabled:true;店铺Id",
-  "name":"string(16),tab:02,searchable:true;店铺名称;",
-  "mobile":"string(16),inputType:mobile,tab:03;手机",
-  "logo":"imgfileId,tab:04;店铺logo",
-  "ownerName":"string(16),tab:09,searchable:true;店主",
-  "ownerUserId":"string(16),tab:09,searchable:true;店主Id",
-  "area": "tree,tab:11,dataSource:/owlApi/region/getArea.jsx; 地区",
-  "address":"string(24),tab:10;详细地址",
-  "type":"choice,values:1_商品销售/2_工业生产/3_服务销售,listSize:14,tab:06,listTab:09;店铺类型",
-  "bankInfo":{
-    "#meta":{
-      "fieldLabel":"银行资料",
-      "tab":"11"
-    },
-    "account":"string(19),inputType:number,tab:1101;账号",
-    "bank":"string(10),tab:1102;开户行",
-    "branch":"string(10),tab:1103;支行"
-  },
-  "registrationInfo":{
-    "#meta":{
-      "fieldLabel":"工商资料",
-      "tab":"12"
-    },
-    "address":"string(32),inputType:numberLetter,tab:1201;注册地址",
-    "registrationNumber":"string(19),tab:1202;工商登记号",
-    "businessRange":"string(128),tab:1203;营业范围"
-  },
-  "admins": [
-    {
-      "#meta": {
-        "fieldLabel":"管理员",
-        "tab": "11",
-        "addMulti":{
-          "linkId":"userId",
-          "from":"id",
-          "label":"选择用户...",
-          "dataSource":"/owlApi/user/search.jsx",
-          "fields":["id","loginId","realName","nickName"],
-          "toFields":["userId","loginId","realName","nickName"],
-          "fieldLabels":["id","loginId","真实姓名","昵称"],
-          "fieldWidths":[100,120,120,120]
-        }
-      },
-      "userId": "linkId,dataSource:/owlApi/user/search.jsx,unique:true,fields:id/realName/nickName,toFields:userId/realName/nickName,displayField:id,fieldsWidth:100/120/120,tab:13;用户Id",
-      "loginId":"string(16),disabled:true,inputType:numberLetter,tab:14;loginId",
-      "realName":"string(16),disabled:true,tab:14;姓名",
-      "nickName":"string(16),tab:15;昵称"
-    }
-  ],
-  "_t":"shop",
-  "#meta":{
-    "rem":"店铺",
-    "parent":["subplatform"],
-    "visitType": [
-      "platform"
-    ],
-    "projectName":"店铺",
-    "project":"example",
-    "export":[
-      {
-        "label":"导出完整",
-        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
-        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
-        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
-        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
-        "key":"completeDoc",
-        "fields":["*"]
-      }
-    ]
-  }
+{
+  "id":"string(32),tab:01,disabled:true;店铺Id",
+  "name":"string(16),tab:02,searchable:true;店铺名称;",
+  "mobile":"string(16),inputType:mobile,tab:03;手机",
+  "logo":"imgfileId,tab:04;店铺logo",
+  "ownerName":"string(16),tab:09,searchable:true;店主",
+  "ownerUserId":"string(16),tab:09,searchable:true;店主Id",
+  "area": "tree,tab:11,dataSource:/owlApi/region/getArea.jsx; 地区",
+  "address":"string(24),tab:10;详细地址",
+  "type":"choice,values:1_商品销售/2_工业生产/3_服务销售,listSize:14,tab:06,listTab:09;店铺类型",
+  "bankInfo":{
+    "#meta":{
+      "fieldLabel":"银行资料",
+      "tab":"11"
+    },
+    "account":"string(19),inputType:number,tab:1101;账号",
+    "bank":"string(10),tab:1102;开户行",
+    "branch":"string(10),tab:1103;支行"
+  },
+  "registrationInfo":{
+    "#meta":{
+      "fieldLabel":"工商资料",
+      "tab":"12"
+    },
+    "address":"string(32),inputType:numberLetter,tab:1201;注册地址",
+    "registrationNumber":"string(19),tab:1202;工商登记号",
+    "businessRange":"string(128),tab:1203;营业范围"
+  },
+  "admins": [
+    {
+      "#meta": {
+        "fieldLabel":"管理员",
+        "tab": "11",
+        "addMulti":{
+          "linkId":"userId",
+          "from":"id",
+          "label":"选择用户...",
+          "dataSource":"/owlApi/user/search.jsx",
+          "fields":["id","loginId","realName","nickName"],
+          "toFields":["userId","loginId","realName","nickName"],
+          "fieldLabels":["id","loginId","真实姓名","昵称"],
+          "fieldWidths":[100,120,120,120]
+        }
+      },
+      "userId": "linkId,dataSource:/owlApi/user/search.jsx,unique:true,fields:id/realName/nickName,toFields:userId/realName/nickName,displayField:id,fieldsWidth:100/120/120,tab:13;用户Id",
+      "loginId":"string(16),disabled:true,inputType:numberLetter,tab:14;loginId",
+      "realName":"string(16),disabled:true,tab:14;姓名",
+      "nickName":"string(16),tab:15;昵称"
+    }
+  ],
+  "_t":"shop",
+  "#meta":{
+    "rem":"店铺",
+    "parent":["subplatform"],
+    "visitType": [
+      "platform"
+    ],
+    "projectName":"店铺",
+    "project":"example",
+    "export":[
+      {
+        "label":"导出完整",
+        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+        "key":"completeDoc",
+        "fields":["*"]
+      }
+    ]
+  }
 }