owl-cli 6.71.0 → 6.74.0

package/defaultTemplate/api/src/handlers/exportEx.jsx

@@ -0,0 +1,77 @@
+//#import Util.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+//#import  @handlers/include/util.jsx
+
+
+
+function main(){
+    var env = checklogin();
+    if(!env){
+        return;
+    }
+    var shopId = env.shopId;
+    var warehouseId = env.warehouseId;
+    var loginId = env.loginId;
+    var roleId = env.roleId;
+    var orgId = env.orgId;
+    var spec = @spec;
+    var tableId = 'owl_' + spec._t;
+    var m = shopId;
+    ///////////////////////////////
+
+//判断是subplatform,还是shop,还是platform
+    var params = JSON.parse($body);
+    var searchArgs = params.searchArgs;
+    var templateId = params.templateId;
+
+    var sort = params.sort;
+    var exportRange = params.exportRange;
+    var outputTarget = params.outputTarget;
+    var docs = null;
+
+    var taskParams = {
+        searchArgs:searchArgs,
+        roleId:roleId,
+        tableId:tableId,
+        sort:sort,
+        orgId:orgId,
+        loginId:loginId,
+        exportRange:exportRange,
+        outputTarget:outputTarget,
+        templateId:templateId
+    }
+
+    var now = new Date().getTime();
+    var taskInfo = {
+        submitDate: now,
+        appId:'@projectCode',
+        pageId:'tasks/exportExTask.jsx',
+        state:'notstart',
+        params:JSON.stringify(taskParams)
+    };
+    owl_task_infoService.add(taskInfo);
+    var taskInfoId = taskInfo.id;
+    JobsService.submitExportTask('@projectCode', 'tasks/exportExTask.jsx',{
+        taskParams:taskParams,
+        taskInfoId:"" + taskInfoId
+    },now);
+
+    var ret = {
+        state:'ok',
+        taskInfoId : taskInfoId
+    }
+    out.print(JSON.stringify(ret));
+    return;
+
+
+
+
+
+
+
+}
+main();

package/defaultTemplate/api/src/handlers/include/diff.jsx

@@ -9,7 +9,7 @@ function isScalar(o){
 }
 
 function isEqual(r1,r2){
-    var ignoreKeys = ['_type','_matched','_v','_m'];
+    var ignoreKeys = ['_type','_matched','_v','_m','key'];
     if(r1==null && r2==null){
         return true;
     }
@@ -141,7 +141,7 @@ function isArrayEqual(a1,a2){
         return false;
     }
     for(var i=0; i<a1.length; i++){
-        if(a1[i]!==a2[i]){
+        if(!isEqual(a1[i],a2[i])){
             return false;
         }
     }

package/defaultTemplate/api/src/handlers/include/util.jsx

@@ -0,0 +1,61 @@
+function buildSort(sort){
+    if(!sort){
+        return {};
+    }
+    var result = [];
+    for(var k in sort){
+        var direction = sort[k];
+        if(direction === 'ascend'){
+            var sortItem = {};
+            sortItem[k] = [{"order":"asc"}]
+            result.push(sortItem);
+        }
+        else if(direction === 'descend'){
+            var sortItem = {};
+            sortItem[k] = [{"order":"desc"}]
+            result.push(sortItem);
+        }
+    }
+    return result;
+}
+
+function getKeywordQuery(keyword){
+    if(keyword && trim(keyword).length>0){
+        return "\"" + trim(keyword) + "\""
+    }
+    else{
+        return "*"
+    }
+}
+
+function getFilters(searchArgs){
+    delete searchArgs.keyword;
+    var filters = [];
+    for(var k in searchArgs){
+        var v = searchArgs[k];
+        if(typeof(v)=='object' && Array.isArray(v)){
+            var range={}
+            range[k] = {
+                'gte':v[0],
+                'lte':v[1]
+            }
+            filters.push({range:range});
+        }
+        else if(typeof(v)=='object' && v.type==='terms'){
+            var terms = {};
+            if(v.values){
+                terms[k + ".keyword"] = v.values;
+                filters.push({terms:terms});
+            }
+        }
+        else{
+            var term = {};
+            if(v){
+                term[k+".keyword"] = trim('' + v)
+                filters.push({term:term})
+            }
+        }
+    }
+
+    return filters;
+}

package/defaultTemplate/api/src/handlers/list.jsx

@@ -133,6 +133,7 @@ function buildSort(sort){
           })
         }
       }
+
     }
     return filters;
   }

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

@@ -0,0 +1,217 @@
+//#import Util.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+//#import @handlers/include/util.jsx
+//#import $owl_dfiles:services/modelService.jsx
+
+function getAllDocs(searchArgs,sort,tableId,roleId,orgId,loginId,permissions){
+    var keyword = searchArgs.keyword;
+    var effectiveSort = buildSort(sort);
+    var filters = getFilters(searchArgs);
+    var permissionFilter = getListPermissionFilter(tableId,roleId,orgId,loginId,permissions);
+
+    if(permissionFilter){
+        filters.push(permissionFilter);
+    }
+
+    var from = 0;
+    var size = 9999;
+    var query = {
+        "query": {
+            "bool": {
+                "must": {
+                    "query_string": {
+                        "query":getKeywordQuery(keyword)
+                    }
+                },
+                "must_not": {
+                    "match": {
+                        "del": "T"
+                    }
+                },
+                "filter": filters
+            }
+        },
+        "from" : from, "size" : size,
+        sort:effectiveSort || [{owl_createTime:{order:"desc"}}]
+    }
+
+    var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
+
+    var headers = { "Content-Type": "application/json;charset=utf-8" };
+    var elasticSearchUser = $.getEnv("elasticSearchUser");
+    var elasticSearchPass = $.getEnv("elasticSearchPass");
+    if(elasticSearchUser && elasticSearchPass){
+        var auth =Base64.encode(elasticSearchUser + ":" + elasticSearchPass);
+        var basicAuth = "Basic " + auth;
+        headers["Authorization"] = basicAuth;
+    }
+    var searchUrl = elasticSearchUrl+"/@projectCode/_search";
+    var sndTxt = JSON.stringify(query);
+    $.log(sndTxt);
+
+    var s = HttpUtils.postRaw( searchUrl, sndTxt, headers);
+    var result = JSON.parse(s);
+
+    var hits = result.hits.hits;
+
+    if(hits){
+        var objs = hits.map(function(hit){return hit._source});
+        return objs;
+    }
+    return [];
+
+}
+
+function getDocsByIds(ids){
+    var docs = @projectCodeService.getObjects(ids);
+    return docs;
+}
+
+function main(){
+
+    var template = owl_excel_templatesService.get(templateId);
+    if(!template || !template.template){
+        $.log("没有配置模版,templateId=" + templateId);
+        return null;
+    }
+
+    var templateId = taskParams.templateId;
+
+    var templateUrl = template.template[0].url;
+
+    var loginId = taskParams.loginId;
+    var roleId = taskParams.roleId;
+    var orgId = taskParams.orgId;
+    var spec = @spec;
+    var tableId = taskParams.tableId;
+    var permissions = getPermissions(roleId,tableId);
+
+    ///////////////////////////////
+
+//判断是subplatform,还是shop,还是platform
+    var searchArgs = taskParams.searchArgs;
+
+    var sort = taskParams.sort;
+    var exportRange = taskParams.exportRange;
+    var outputTarget = taskParams.outputTarget;
+    var docs = null;
+
+
+    if(exportRange === "all"){
+        docs = getAllDocs(searchArgs,sort,tableId,roleId,orgId,loginId,permissions);
+    }
+    else{
+        var ids = params.ids;
+        docs = getDocsByIds(ids);
+    }
+    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;
+                    var doc = @projectCodeService.get(id);
+                    var url = FileService.getFullPath(fileId);
+                    var docName =template.name + "_" +fileId;
+
+                    doc[template.toField] = {
+                        url: "" + url,
+                        fileId: "" + fileId,
+                        name:"" + docName
+                    }
+                    @projectCodeService.update(doc);
+                }
+                else{
+                    var url = FileService.getFullPath(fileId);
+
+                    var docName =template.name + "_" +fileId;
+
+                    if(exportDoc.name){
+                        docName =  exportDoc.name + "_" +template.name;
+                    }
+                    else{
+                        docName =  exportDoc.id + "_" +template.name;
+                    }
+
+                    var download = {
+                        templateId:templateId,
+                        templateName:template.name,
+                        description:docName,
+                        _orgId:orgId,
+                        _orgIds:[orgId],
+                        file:{
+                            url: "" + url,
+                            fileId: "" + fileId,
+                            name:"" + docName
+                        }
+                    }
+
+                    owl_dfilesService.add(download);
+                }
+            }
+        }
+        else if(outputTarget==='singlefile'){
+            //single file
+            var urls = [];
+            for(var i=0; i<docs.length; i++){
+                var exportDoc = docs[i];
+                var fileId = Excel.generateExcelFromTemplate( templateUrl, exportDoc );
+                var url = FileService.getFullPath(fileId);
+                urls.push(url);
+            }
+
+            var fileId = $.zipUrls(urls,taskParams.password);
+            var fileUrl = FileService.getFullPath(fileId);
+            var docName =template.name + "_" +fileId;
+            var download = {
+                templateId:templateId,
+                templateName:template.name,
+                description:JSON.stringify(taskParams),
+                _orgId:orgId,
+                _orgIds:[orgId],
+                file:{
+                    url: "" + fileUrl,
+                    fileId: "" + fileId,
+                    name:"" + docName
+                }
+            }
+
+            owl_dfilesService.add(download);
+        }
+    }
+    else if(template.exportType==='list'){
+        var theDoc = {docs:docs}
+        var fileId = Excel.generateExcelFromTemplate( templateUrl, theDoc );
+        var fileUrl = FileService.getFullPath(fileId);
+        var docName =template.name + "_" +fileId;
+        var download = {
+            templateId:templateId,
+            templateName:template.name,
+            description:JSON.stringify(taskParams),
+            _orgId:orgId,
+            _orgIds:[orgId],
+            file:{
+                url: "" + fileUrl,
+                fileId: "" + fileId,
+                name:"" + docName
+            }
+        }
+        owl_dfilesService.add(download);
+    }
+
+    var taskInfo = owl_task_infoService.get(taskInfoId);
+    taskInfo.state = "success";
+    taskInfo.percent = 100;
+    taskInfo.endDate = new Date().getTime();
+    taskInfo.state = "succeeded";
+    taskInfo.msg = "生成Excel文件成功";
+    owl_task_infoService.update(taskInfo);
+
+
+}
+main();

package/package.json

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