owl-cli 6.159.0 → 6.161.0

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

@@ -1,79 +1,79 @@
-//#import Util.js
-//#import login.js
-//#import user.js
-//#import base64.js
-//#import HttpUtil.js
-//#import session.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-
-(function() {
-
-    var env = checklogin();
-    if (!env) {
-        return;
-    }
-
-    var nAdded = 0;
-    var nUpdated = 0;
-    var nExists = 0;
-    var nError = 0;
-
-    try {
-        var params = JSON.parse( $body );
-
-        //判断是add还是update
-        var objs = params.objs;
-        var action = params.action;
-        var errs = [];
-        for(var i=0; i<objs.length; i++){
-            try{
-                var modelObject = objs[i];
-                var id = modelObject.id;
-                var oldObj = @projectCodeService.get(id);
-                if(action=='add'){
-                    if(!oldObj){
-                        modelObject.m = env.m;
-                        var newdata = @projectCodeService.add( modelObject,env );
-                        nAdded = nAdded + 1;
-                    }
-                    else{
-                        nExists = nExists + 1;
-                    }
-                }
-                else if(action==='force'){
-                    if(!oldObj){
-                        modelObject.m = env.m;
-                        var newdata = @projectCodeService.add( modelObject,env );
-                        nAdded = nAdded + 1;
-                    }
-                    else{
-                        modelObject._v = oldObj._v;
-                        var newdata = @projectCodeService.update( modelObject,env);
-                        nUpdated = nUpdated + 1;
-                    }
-                }
-            }
-            catch(e){
-              errs.push("id=" + id + " " + e.toString() + "");
-              nError++;
-            }
-
-        }
-        var ret = {
-            state:'ok',
-            added:nAdded,
-            updated:nUpdated,
-            errored:nError,
-            exists:nExists,
-            errs:errs
-        }
-        out.print( JSON.stringify( ret ) );
-    } catch ( e ) {
-        var ret = {
-            state: 'err',
-            msg: e.toString() + ""
-        };
-        out.print( JSON.stringify( ret ) );
-    }
+//#import Util.js
+//#import login.js
+//#import user.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+
+(function() {
+
+    var env = checklogin();
+    if (!env) {
+        return;
+    }
+
+    var nAdded = 0;
+    var nUpdated = 0;
+    var nExists = 0;
+    var nError = 0;
+
+    try {
+        var params = JSON.parse( $body );
+
+        //判断是add还是update
+        var objs = params.objs;
+        var action = params.action;
+        var errs = [];
+        for(var i=0; i<objs.length; i++){
+            try{
+                var modelObject = objs[i];
+                var id = modelObject.id;
+                var oldObj = @projectCodeService.get(id);
+                if(action=='add'){
+                    if(!oldObj){
+                        modelObject.m = env.m;
+                        var newdata = @projectCodeService.add( modelObject,env );
+                        nAdded = nAdded + 1;
+                    }
+                    else{
+                        nExists = nExists + 1;
+                    }
+                }
+                else if(action==='force'){
+                    if(!oldObj){
+                        modelObject.m = env.m;
+                        var newdata = @projectCodeService.add( modelObject,env );
+                        nAdded = nAdded + 1;
+                    }
+                    else{
+                        modelObject._v = oldObj._v;
+                        var newdata = @projectCodeService.update( modelObject,env);
+                        nUpdated = nUpdated + 1;
+                    }
+                }
+            }
+            catch(e){
+              errs.push("id=" + id + " " + e.toString() + "");
+              nError++;
+            }
+
+        }
+        var ret = {
+            state:'ok',
+            added:nAdded,
+            updated:nUpdated,
+            errored:nError,
+            exists:nExists,
+            errs:errs
+        }
+        out.print( JSON.stringify( ret ) );
+    } catch ( e ) {
+        var ret = {
+            state: 'err',
+            msg: e.toString() + ""
+        };
+        out.print( JSON.stringify( ret ) );
+    }
 })();

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

@@ -1,89 +1,89 @@
-//#import Util.js
-//#import session.js
-//#import HttpUtil.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-
-;(function(){
-    try{
-        var spec = @spec;
-
-        var env = checklogin();
-        if(!env){
-            return;
-        }
-        var shopId = env.shopId;
-        var warehouseId = env.warehouseId;
-        var m = shopId;
-
-
-        var orgId = env.orgId;
-        var roleId = env.roleId;
-        var orgIds = env.orgIds;
-
-        var params = JSON.parse($body);
-        var id = params.id;
-        var ids = params.ids;
-        if(!ids){
-            ids = [id];
-        }
-
-        var tableId = 'owl_' + spec._t;
-        var permissions = getPermissions(roleId,tableId);
-
-        for(var i=0;i<ids.length; i++){
-            var id = ids[i];
-            var oldObj = @projectCodeService.get(id,true);
-            if(!oldObj){
-                $.log("object not found:" + id);
-                var ret = {
-                    state: 'err',
-                    msg:'object not found, id=' + id
-                }
-                out.print(JSON.stringify(ret));
-                return;
-            }
-            if(roleId!=='internal'  && roleId!='0'){
-                //检查是否有权限修改
-                checkPermission(oldObj,permissions,orgId,"del");
-            }
-        }
-
-
-        for(var i=0;i<ids.length; i++) {
-            var id = ids[i];
-        @projectCodeService.del(id);
-        }
-
-
-        var ret = {
-            state: 'ok'
-        }
-        out.print(JSON.stringify(ret));
-    }
-    catch(e){
-        var ret = {
-            state:'err',
-            msg:getErrorMsg(e)
-        }
-        out.print(JSON.stringify(ret));
-    }
-
-})();
-
-function getErrorMsg(e){
-    if(typeof e === 'string'){
-        return e;
-    }
-    var msg = e.msg || e.message || e.toString();
-    var beginIdx = msg.indexOf(':');
-    if(beginIdx===-1){
-        return msg;
-    }
-    var endIdx = msg.indexOf('(',beginIdx);
-    if(endIdx===-1){
-        return msg;
-    }
-    return msg.substring(beginIdx+1,endIdx);
-
+//#import Util.js
+//#import session.js
+//#import HttpUtil.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+
+;(function(){
+    try{
+        var spec = @spec;
+
+        var env = checklogin();
+        if(!env){
+            return;
+        }
+        var shopId = env.shopId;
+        var warehouseId = env.warehouseId;
+        var m = shopId;
+
+
+        var orgId = env.orgId;
+        var roleId = env.roleId;
+        var orgIds = env.orgIds;
+
+        var params = JSON.parse($body);
+        var id = params.id;
+        var ids = params.ids;
+        if(!ids){
+            ids = [id];
+        }
+
+        var tableId = 'owl_' + spec._t;
+        var permissions = getPermissions(roleId,tableId);
+
+        for(var i=0;i<ids.length; i++){
+            var id = ids[i];
+            var oldObj = @projectCodeService.get(id,true);
+            if(!oldObj){
+                $.log("object not found:" + id);
+                var ret = {
+                    state: 'err',
+                    msg:'object not found, id=' + id
+                }
+                out.print(JSON.stringify(ret));
+                return;
+            }
+            if(roleId!=='internal'  && roleId!='0'){
+                //检查是否有权限修改
+                checkPermission(oldObj,permissions,orgId,"del");
+            }
+        }
+
+
+        for(var i=0;i<ids.length; i++) {
+            var id = ids[i];
+        @projectCodeService.del(id);
+        }
+
+
+        var ret = {
+            state: 'ok'
+        }
+        out.print(JSON.stringify(ret));
+    }
+    catch(e){
+        var ret = {
+            state:'err',
+            msg:getErrorMsg(e)
+        }
+        out.print(JSON.stringify(ret));
+    }
+
+})();
+
+function getErrorMsg(e){
+    if(typeof e === 'string'){
+        return e;
+    }
+    var msg = e.msg || e.message || e.toString();
+    var beginIdx = msg.indexOf(':');
+    if(beginIdx===-1){
+        return msg;
+    }
+    var endIdx = msg.indexOf('(',beginIdx);
+    if(endIdx===-1){
+        return msg;
+    }
+    return msg.substring(beginIdx+1,endIdx);
+
 }

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

@@ -1,117 +1,117 @@
-//#import Util.js
-//#import base64.js
-//#import HttpUtil.js
-//#import session.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-function trim(s){
-  if(s){
-    return s.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
-  }
-  return ""
-}
-
-
-var spec = @spec;
-(function(){
-
-  var env = checklogin();
-  if(!env){
-    return;
-  }
-  var shopId = env.shopId;
-  var warehouseId = env.warehouseId;
-  var m = shopId;
-
-
-//判断是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 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 ret = {
-    state:'ok',
-    taskInfoId : taskInfoId
-  }
-
-  out.print(JSON.stringify(ret));
-
-})();
-
-
-
-
-
+//#import Util.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+function trim(s){
+  if(s){
+    return s.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+  }
+  return ""
+}
+
+
+var spec = @spec;
+(function(){
+
+  var env = checklogin();
+  if(!env){
+    return;
+  }
+  var shopId = env.shopId;
+  var warehouseId = env.warehouseId;
+  var m = shopId;
+
+
+//判断是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 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 ret = {
+    state:'ok',
+    taskInfoId : taskInfoId
+  }
+
+  out.print(JSON.stringify(ret));
+
+})();
+
+
+
+
+

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

@@ -1,27 +1,27 @@
-//#import Util.js
-//#import session.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-
-;(function(){
-
-  var env = checklogin();
-  if(!env){
-    return;
-  }
-  var shopId = env.shopId;
-  var warehouseId = env.warehouseId;
-  var m = shopId;
-
-  var params = JSON.parse($body);
-  var id = params.id;
-  var taskInfoId = @projectCodeService.addDocExportTask(id,env);
-
-  var ret = {
-    state:'ok',
-    taskInfoId : taskInfoId
-  }
-
-  out.print(JSON.stringify(ret));
-})();
-
+//#import Util.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+
+;(function(){
+
+  var env = checklogin();
+  if(!env){
+    return;
+  }
+  var shopId = env.shopId;
+  var warehouseId = env.warehouseId;
+  var m = shopId;
+
+  var params = JSON.parse($body);
+  var id = params.id;
+  var taskInfoId = @projectCodeService.addDocExportTask(id,env);
+
+  var ret = {
+    state:'ok',
+    taskInfoId : taskInfoId
+  }
+
+  out.print(JSON.stringify(ret));
+})();
+