owl-cli 6.179.0 → 6.180.0

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

@@ -27,80 +27,19 @@ var spec = @spec;
 //判断是subplatform,还是shop,还是platform
   var params = JSON.parse($body);
   var searchArgs = params.searchArgs;
-  var keyword = searchArgs.keyword;
-  var pageSize = params.pageSize;
-  var exportKey = params.exportKey;
-  env.exportKey = exportKey;
-
-  function getKeywordQuery(){
-    if(keyword && trim(keyword).length>0){
-      return "\"" + trim(keyword) + "\""
-    }
-    else{
-      return "*"
-    }
-  }
-
-  function getFilters(){
-    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{
-        var term = {};
-        term[k+".keyword"] = trim('' + v)
-        filters.push({term:term})
-      }
-
-    }
-    return filters;
-  }
-
-  var filters = getFilters();
-
-  if(m!=='0'){
-    filters = filters.concat([
-      {"term": { "_m.keyword": m }},
-      {"term":{"_t":spec["_t"]}}
-    ]);
-  }
-  else{
-    filters = filters.concat([
-      {"term":{"_t":spec["_t"]}}
-    ]);
-  }
+  var searchArgs = params.searchArgs;
+  var templateId = params.templateId;
 
+  var sort = params.sort;
+  var exportRange = params.exportRange;
+  var outputTarget = params.outputTarget;
+  var ids = params.ids;
+  var key = params.key;
+  env.params = params;
 
-  var query = {
-    "query": {
-      "bool": {
-        "must": {
-          "query_string": {
-            "query":getKeywordQuery()
-          }
-        },
-        "must_not": {
-          "match": {
-            "del": "T"
-          }
-        },
-        "filter": filters
-      }
-    },
-    "from" : 0, "size" : 1,
-    sort:[{owl_createTime:{order:"desc"}}]
-  }
 
 
-  var taskInfoId = @projectCodeService.addExportTask(query,env);
+  var taskInfoId = @projectCodeService.addExportTask(null,env);
 
   var ret = {
     state:'ok',

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

@@ -34,7 +34,7 @@ function checklogin() {
             now: new Date().getTime(),
             loginUserId: 'internal',
             loginId: 'internal',
-            loginUser:user,
+            // loginUser:user,
             shopId: m,
             warehouseId: "",
             roleId: 'internal',
@@ -61,7 +61,7 @@ function checklogin() {
                     now: new Date().getTime(),
                     loginUserId: loginUserId,
                     loginId: loginUserId,
-                    loginUser:loginUser,
+                    // loginUser:loginUser,
                     shopId: m,
                     warehouseId: "",
                     roleId: roleId,

package/defaultTemplate/api/src/services/modelService.jsx

@@ -8,7 +8,7 @@
 //#import kafkautil.js
 //#import @services/dblayer.jsx
 //#import @handlers/include/diff.jsx
-//#import $owl_change_logs:services/modelService.jsx
+//#import $owl_task_info:services/modelService.jsx
 
 function trim(s){
     if(s){
@@ -790,33 +790,36 @@ var @projectCodeService = (function (pigeon) {
         addExportTask: function (query, env) {
             var now = new Date().getTime()
             var taskInfo = {
-                loginUser: f.getEnvValue('$loginUser', env),
+                submitUserId:env.loginId,
                 submitTime: now,
-                startTime: 0,
-                processState: 'processing',
-                percent: 0,
-                _v: 0,
+                beginTime: null,
+                processState: 'notstart',
+                appId:"owl_" + spec['_t'],
+                params:JSON.stringify(env.params),
+                taskId:null
             }
             //这个key如果不多加一个export，会把原有的单据数据覆盖
-            var taskInfoId = objPrefix + '_export_' + pigeon.getId()
+            // var taskInfoId = objPrefix + '_export_' + pigeon.getId()
             var taskId = JobsService.submitExportTask('@projectCode', 'tasks/export.jsx', {
                 query: query,
                 env: env,
                 taskInfoId: taskInfoId,
             }, now)
             taskInfo.taskId = '' + taskId
-            taskInfo.id = taskInfoId
-            var key = pigeon.getRKey(taskInfo.submitTime, 13)
-            pigeon.addToList(f.getExportRunningList(), key, taskInfoId)
-            pigeon.saveObject(taskInfoId, taskInfo)
+            // taskInfo.id = taskInfoId
+            // var key = pigeon.getRKey(taskInfo.submitTime, 13)
+            // pigeon.addToList(f.getExportRunningList(), key, taskInfoId)
+            // pigeon.saveObject(taskInfoId, taskInfo)
+            owl_task_infoService.add(taskInfo);
 
-            return taskInfoId
+            return taskInfo.id
         },
 
         addDocExportTask: function (docId, env) {
             var now = new Date().getTime()
             var taskInfo = {
-                loginUser: f.getEnvValue('$loginUser', env),
+                // loginUser: f.getEnvValue('$loginUser', env),
+                loginUserId:env.loginUserId,
                 submitTime: now,
                 startTime: 0,
                 processState: 'processing',
@@ -843,7 +846,8 @@ var @projectCodeService = (function (pigeon) {
         addZipExportTask : function(env){
             var now = new Date().getTime()
             var taskInfo = {
-                loginUser: f.getEnvValue('$loginUser', env),
+                // loginUser: f.getEnvValue('$loginUser', env),
+                loginUserId:env.loginUserId,
                 submitTime: now,
                 startTime: 0,
                 processState: 'processing',
@@ -866,15 +870,11 @@ var @projectCodeService = (function (pigeon) {
         },
 
         getExportTaskInfo: function (taskInfoId) {
-            return pigeon.getObject(taskInfoId)
+           return owl_task_infoService.get(taskInfoId);
         },
 
         updateExportTaskInfo: function (taskInfoId, taskInfo) {
-            var oInfo = f.getExportTaskInfo(taskInfoId)
-            if (oInfo._v == taskInfo._v) {
-                taskInfo._v += 1
-                pigeon.saveObject(taskInfoId, taskInfo)
-            }
+            return owl_task_infoService.update(taskInfo);
         },
 
 

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

@@ -1,358 +1,154 @@
+//#import Util.js
+//#import @handlers/include/checklogin.jsx
 //#import $@projectCode:services/modelService.jsx
 //#import excel.js
+//#import DateUtil.js
 
 
 var formSpecs = @formSpecs;
+var spec = @spec;
 
-function getFieldByKey(fullKey){
-  var keys = fullKey.split(".");
-  var curField = formSpecs;
-  for(var i=0; i<keys.length; i++){
-    if(curField._ft=='field'){
-      if(curField.key == fullKey){
-        return curField;
-      }
-      else{
-        return null;
-      }
-    }
-    else{
-      var key = keys[i];
-      var fields = curField.fields;
-      curField == null;
-      for(var j=0; j<fields.length; j++){
-        var f = fields[j];
-        if(f.origKey == key){
-          curField = f;
-          break;
-        }
-      }
-      if(curField==null){
-        return null;
-      }
-    }
-  }
-  return curField;
-}
-
-
-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;
-    case 'image':
-      var final = "";
-      for(var i=0; i<value.length; i++){
-        var f = value[i];
-        final = final + f.url + "\n";
-      }
-      return 's' + final;
-    default:
-      return "s"+value;
-  }
-}
-
-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 )
-    }
-  } );
-}
+main(@projectCodeService, spec);
 
-function getMainAndSubFields(exConfig){
-  var mainFields = [];
-  var subFields = [];
-  if (exConfig.fields == "*") {
-    tranverseFields(formSpecs,function(field,ctx){
-      if (ctx.parentField && ctx.parentField._ft == 'array') {
-        //nothing
-      }
-      else {
-        mainFields.push( field );
-      }
-    },{})
-  }
-  else{
-    for(var i=0; i<exConfig.fields.length; i++){
-      var fieldKey = exConfig.fields[i];
-      var field = getFieldByKey(fieldKey);
-      if(field){
-        mainFields.push(field);
-      }
-    }
-  }
-
-  if(exConfig && exConfig.items && exConfig.items.name){
-    if(exConfig.items.itemFields=='*'){
-      //找到items.name对应的field
-      var f = getFieldByKey(exConfig.items.name);
-      f.fields.forEach(function(spec){
-        if(spec._ft=='field'){
-          subFields.push(spec);
-        }
-      });
-    }
-    else{
-      for(var i=0; i<exConfig.items.itemFields.length; i++){
-        var itemField = exConfig.items.itemFields[i];
-        var fieldKey = "";
-        if(itemField.indexOf("$parent.")==0){
-          fieldKey = itemField.substring(8);
-          var field = getFieldByKey(fieldKey);
-          if(field){
-            field.isItemField = false;
-            subFields.push(field);
-          }
-          else{
-            $.log("panic!!!!-------------------------++++++++++++++" + fieldKey);
-          }
-
-        }
-        else{
-          fieldKey =  exConfig.items.name + "." + itemField;
-          var field = getFieldByKey(fieldKey);
-          if(field){
-            field.isItemField = true;
-            subFields.push(field);
-          }
-          else{
-            $.log("panic!!!!-------------------------++++++++++++++" + fieldKey);
-          }
-
-        }
-
-
-      }
-    }
-  }
-  return [mainFields,subFields];
-}
 
 
+function main(modelService,spec){
 
-(function(){
-    var spec = @spec;
-    var q = JSON.parse(query);
     var ctx = JSON.parse(env);
-    var exportKey = ctx.exportKey;
-
-    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 + "/is1erp/_doc/_search";
-
-    var sndTxt = JSON.stringify( q );
-    var s = HttpUtils.postRaw( searchUrl, sndTxt, headers );
-    var result = JSON.parse( s );
+    var params = ctx.params;
+    var key = params.key;
 
+    /******************************/
+    var ret = getRows(modelService, spec);
+    var taskInfo = modelService.getExportTaskInfo(taskInfoId);
+    taskInfo.processState = "processing";
+    taskInfo.percent = 20;
+    taskInfo.lastTime = new Date().getTime();
+    taskInfo.msg = "获取数据记录完成, 数据条数:" + ret.total;
+    modelService.updateExportTaskInfo(taskInfoId, taskInfo);
+    /*****************************/
 
-    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 exportConfig = getExportConfig(spec,key);
+    var titleList = exportConfig.cols;
+    if(!titleList){
+        return;
     }
-    var searchUrl = elasticSearchUrl + "/@projectCode/_search";
-
-    var sndTxt = JSON.stringify( q );
-    $.log("export.jsx")
-    $.log(sndTxt)
-
-    var s = HttpUtils.postRaw( searchUrl, sndTxt, headers );
-    $.log(s);
-    var result = JSON.parse( s );
-    var total = result.hits.total.value;
-
-    var taskInfo = @projectCodeService.getExportTaskInfo( taskInfoId );
-    taskInfo.total = total;
-    taskInfo.lastTime = new Date().getTime();
+    var recordList = ret.rows.map(function(row){
+        var record = {};
+        titleList.forEach(function(title){
+            var field = title.field;
+            var value = modelService.getValue(field,row);
+            record[field] = value;
+        });
+        return record;
+    });
+
+    var taskInfo = modelService.getExportTaskInfo(taskInfoId);
     taskInfo.processState = "processing";
-    taskInfo.msg = "获取导出总数成功......";
-    taskInfo.percent = "20";
+    taskInfo.percent = 40;
+    taskInfo.lastTime = new Date().getTime();
+    taskInfo.msg = "准备完数据,正在生成Excel文件......";
+    modelService.updateExportTaskInfo(taskInfoId, taskInfo);
+    /****************************************/
 
-  @projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
 
-    q.size = total;
+    /****************************************/
+    var export_fileName = DateUtil.getLongDate(new Date().getTime());
 
-    var sndTxt = JSON.stringify( q );
-    $.log('second times=============' + sndTxt);
-    var s = HttpUtils.postRaw( searchUrl, sndTxt, headers );
-    $.log('second times=============' + s);
-    var result = JSON.parse( s );
+    var fileUrl = Excel.createExcelList(export_fileName, titleList, recordList);
 
-    var hits = result.hits.hits;
-    var objs = hits.map( function (hit){
-      return hit._source
-    } );
+    var taskInfo = modelService.getExportTaskInfo(taskInfoId);
+    taskInfo.processState = "succeeded";
+    taskInfo.percent = 100;
+    taskInfo.lastTime = new Date().getTime();
+    taskInfo.msg = "导出文件成功，共导出" + ret.total + "条数据";
+    taskInfo.fileUrl = fileUrl;
+    modelService.updateExportTaskInfo(taskInfoId, taskInfo);
+    /********************************************/
+}
 
-    var meta = spec[ "#meta" ];
+function getExportConfig(spec, key) {
+    var meta = spec['#meta'];
+    var exportConfigs = meta.export;
+    var effectiveExportConfig = null;
+    exportConfigs.forEach(function(exportConfig){
+        if(exportConfig.key === key){
+            effectiveExportConfig = exportConfig;
+        }
+    });
+    return effectiveExportConfig;
+}
 
-    var rows = [];
-    var row = [];
+function getRows(modelService, spec) {
 
-    var groupings = [];
+    var meta = spec['#meta'];
+    var isPublic = meta && meta.isPublic;
+    var tableId = 'owl_' + spec._t;
+    var ctx = JSON.parse(env);
+    var params = ctx.params;
+
+    var loginId = ctx.loginId;
+    var roleId = params.rroleId || ctx.roleId;
+    var orgId = params.rorgId || ctx.orgId;
+
+    var searchArgs = params.searchArgs;
+    var templateId = params.templateId;
+
+    var sort = params.sort;
+    var exportRange = params.exportRange;
+    var outputTarget = params.outputTarget;
+    var ids = params.ids;
+    var key = params.key;
+
+    if (exportRange === "all") {
+        var keyword = searchArgs.keyword;
+        var mfilters = null;
+        delete searchArgs.keyword;
+        if (isPublic || orgId === '0') {
+            delete searchArgs["_orgIds"];
+        } else {
+            searchArgs["_orgIds"] = orgId;
+            var permissions = getPermissions(roleId,tableId);
+            mfilters = getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
+        }
 
-    var mainFields = [];
-    var subFields = [];
+        delete searchArgs.recycleBin;
 
-    var exConfig = null;
-    if (meta.export) {
-      meta.export.forEach(function(config){
-        if(config.key == exportKey){
-          exConfig = config;
-        }
-      });
-      if (exConfig && exConfig.fields) {
-        var fields = getMainAndSubFields(exConfig);
-        $.log("getMainAndSubFields=" + JSON.stringify(fields));
-        mainFields = fields[0];
-        subFields = fields[1];
-
-        if(mainFields.length>0){
-          row.push(exConfig.mainTitleFormat);
-          mainFields.forEach( function (f){
-            row.push( "s"+f.fieldLabel );
-          } );
-          rows.push(row);
-        }
-        else{
-          //写入子记录的title一次
-          row.push(exConfig.subTitleFormat);
-          subFields.forEach( function (spec){
-            row.push( "s" + spec.fieldLabel ); //子记录title
-          } );
-          rows.push(row);
+        var pageSize = 100000;
+        var from = 0;
+        var sort = {
+            owl_modifyTime: {order: "desc"}
         }
 
-        var subTitleInterval = exConfig.subTitleInterval || 9999999;
-        objs.forEach( function (obj,objIdx){
-          if(mainFields.length>0){
-            var row = [];
-            row.push(exConfig.mainRecordFormat);
-            mainFields.forEach( function (f){
-              if(!f.key){
-                row.push('null');
-              }
-              else{
-
-                var value = @projectCodeService.getValue( f.key, obj );
-                $.log("getValue:" + f.key+":" +value);
-                value = normalizeValue(value,f);
-                row.push( value );
-              }
-
-            } );
-            rows.push( row );
-          }
-          //写入子item的title
-          if (subFields.length>0) {
-            var row = [];
-            var grouping = [];
-            if(mainFields.length>0 && (objIdx % subTitleInterval)==0){
-              //当有主记录的时候才写入子记录的Title
-              row.push(exConfig.subTitleFormat);
-              subFields.forEach( function (spec){
-                row.push( "s" +spec.fieldLabel ); //子记录title
-              } );
-              rows.push( row );
-              grouping[ 0 ] = rows.length - 1;
-            }
-            var items = obj[exConfig.items.name];
-            items && items.forEach && items.forEach( function (item){
-              var row = [];
-              row.push(exConfig.subRecordFormat);
-              subFields.forEach( function (spec){
-                if(spec.isItemField){
-                  var value = item[ spec.origKey ];
-                  value = normalizeValue(value,spec);
-                  row.push( value );
-                }
-                else{
-                  if(spec.key){
-                    var value = @projectCodeService.getValue( spec.key, obj );
-                    value = normalizeValue(value,spec);
-                    row.push(value);
-                  }
-                  else{
-                    row.push("")
-                  }
-
-                }
-              } );
-              rows.push( row );
-            } );
-            if(mainFields.length>0){
-              grouping[ 1 ] = rows.length - 1;
-              groupings.push( grouping );
+        var sr = modelService.search(mfilters, searchArgs, keyword, from, pageSize, sort);
+        var count =  modelService.count(mfilters, searchArgs, keyword );
+        return {
+            rows: sr.list,
+            total: count
+        }
+    }
+    else if(exportRange=== "selected") {
+        var ids = params.ids;
+        var rows = [];
+        ids.forEach(function(id){
+            var row = modelService.get(id);
+            if(row){
+                rows.push(row);
             }
-          }
-        } );
-      }
-
-      var taskInfo = @projectCodeService.getExportTaskInfo( taskInfoId );
-      taskInfo.processState = "success";
-      taskInfo.percent = 70;
-      taskInfo.lastTime = new Date().getTime();
-      taskInfo.msg = "获取数据记录完成";
-      $.log("rows======" + JSON.stringify(rows));
-      var fileId = Excel.createExcel( rows, groupings, "export" );
-      var taskInfo = @projectCodeService.getExportTaskInfo( taskInfoId );
-      taskInfo.processState = "success";
-      taskInfo.percent = 100;
-      taskInfo.fileId = fileId;
-      taskInfo.lastTime = new Date().getTime();
-      taskInfo.msg = "生成Excel文件成功";
-    @projectCodeService.updateExportTaskInfo(taskInfoId, taskInfo );
+        });
+        return {
+            rows: rows,
+            total: rows.length
+        }
     }
-  }
-)();
+    return {
+        rows: [],
+        total: 0
+    };
+
+}
 
 
 

package/package.json

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