owl-cli 6.102.0 → 6.104.0

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

@@ -1,63 +1,63 @@
-//#import Util.js
-//#import session.js
-//#import HttpUtil.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 spec = @spec;
-
-    var id = $.params.id;
-    if (id) {
-        var obj = @projectCodeService.get(id);
-    @projectCodeService.index(obj);
-        out.print(id + ":重建索引成功");
-    } else {
-        var start = $.params.start;
-        var limit = $.params.limit;
-        if (start != null && limit != null) {
-            var listName = @projectCodeService.getAllListName();
-            var list = @projectCodeService.getList(listName, start, limit);
-            for (var i = 0; i < list.length; i++) {
-                try {
-                @projectCodeService.index(list[i]);
-                } catch (e) {
-                    try {
-                        out.print(list[i].id + ",重建索引失败，异常信息:" + JSON.stringify(e) + "<br>");
-                    } catch (e1) {
-                        out.print(list[i].id + ",重建索引失败，异常信息:" + e1 + "<br>");
-                    }
-                }
-            }
-            out.print(spec["_t"] + "重建索引成功:"+list.length);
-        }else{
-            try {
-            @projectCodeService.reindexAll();
-            } catch (e) {
-                out.print("重建索引失败，异常信息:" + e + "<br>");
-            }
-            /*var list = @projectCodeService.getList(@projectCodeService.getAllListName(), 0, -1);
-            list.forEach(function (value) {
-                try{
-                    @projectCodeService.index(value);
-                }catch(e){
-                    try {
-                        out.print(value.id + ",重建索引失败，异常信息:" + JSON.stringify(e)+"<br>");
-                    } catch (e1) {
-                        out.print(value.id + ",重建索引失败，异常信息:" + e1+"<br>");
-                    }
-                }
-            });*/
-            out.print(spec["_t"] + "重建索引成功:");
-        }
-    }
-})();
+//#import Util.js
+//#import session.js
+//#import HttpUtil.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 spec = @spec;
+
+    var id = $.params.id;
+    if (id) {
+        var obj = @projectCodeService.get(id);
+    @projectCodeService.index(obj);
+        out.print(id + ":重建索引成功");
+    } else {
+        var start = $.params.start;
+        var limit = $.params.limit;
+        if (start != null && limit != null) {
+            var listName = @projectCodeService.getAllListName();
+            var list = @projectCodeService.getList(listName, start, limit);
+            for (var i = 0; i < list.length; i++) {
+                try {
+                @projectCodeService.index(list[i]);
+                } catch (e) {
+                    try {
+                        out.print(list[i].id + ",重建索引失败，异常信息:" + JSON.stringify(e) + "<br>");
+                    } catch (e1) {
+                        out.print(list[i].id + ",重建索引失败，异常信息:" + e1 + "<br>");
+                    }
+                }
+            }
+            out.print(spec["_t"] + "重建索引成功:"+list.length);
+        }else{
+            try {
+            @projectCodeService.reindexAll();
+            } catch (e) {
+                out.print("重建索引失败，异常信息:" + e + "<br>");
+            }
+            /*var list = @projectCodeService.getList(@projectCodeService.getAllListName(), 0, -1);
+            list.forEach(function (value) {
+                try{
+                    @projectCodeService.index(value);
+                }catch(e){
+                    try {
+                        out.print(value.id + ",重建索引失败，异常信息:" + JSON.stringify(e)+"<br>");
+                    } catch (e1) {
+                        out.print(value.id + ",重建索引失败，异常信息:" + e1+"<br>");
+                    }
+                }
+            });*/
+            out.print(spec["_t"] + "重建索引成功:");
+        }
+    }
+})();

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

@@ -1,54 +1,54 @@
-//#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 doRecovery(){
-    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 obj = @projectCodeService.get(id,true);
-    if(obj){
-        obj.del = 'F';
-        var newdata = @projectCodeService.update( obj,env );
-        var ret = {
-            state: 'ok',
-            object: newdata
-        }
-        out.print(JSON.stringify(ret));
-    }
-    else{
-        var ret = {
-            state: 'err',
-            msg: "wrong id:"+id
-        }
-        out.print(JSON.stringify(ret));
-        return;
-    }
-}
-function main(){
-    try{
-        doRecovery();
-    }
-    catch(e){
-        var ret = {
-            state: 'err',
-            msg: e
-        }
-        out.print(JSON.stringify(ret));
-        return;
-    }
-}
+//#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 doRecovery(){
+    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 obj = @projectCodeService.get(id,true);
+    if(obj){
+        obj.del = 'F';
+        var newdata = @projectCodeService.update( obj,env );
+        var ret = {
+            state: 'ok',
+            object: newdata
+        }
+        out.print(JSON.stringify(ret));
+    }
+    else{
+        var ret = {
+            state: 'err',
+            msg: "wrong id:"+id
+        }
+        out.print(JSON.stringify(ret));
+        return;
+    }
+}
+function main(){
+    try{
+        doRecovery();
+    }
+    catch(e){
+        var ret = {
+            state: 'err',
+            msg: e
+        }
+        out.print(JSON.stringify(ret));
+        return;
+    }
+}
 main();

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

@@ -1,110 +1,125 @@
-//#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
-//#import @handlers/include/diff.jsx
-(function(){
-  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 orgIds = env.orgIds;
-
-
-  ///////////////////////////////
-
-  try {
-    var modelObject = JSON.parse( $body );
-
-    //判断是add还是update
-    var id = modelObject.id;
-    var action = $.params.action;
-    var oldObj = @projectCodeService.get(id);
-    var roleId = env.roleId
-    if(orgId && oldObj && oldObj._orgIds){
-      //检查是否有权限修改
-      if(roleId!=='internal' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
-        var ret = {
-          state:'err',
-          code: 'no permission',
-          msg: '没有权限'
-        }
-        out.print(JSON.stringify(ret));
-        return;
-      }
-    }
-    var diffResult =[];
-    var tableId = 'owl_' + spec._t;
-    var permissions = getPermissions(roleId,tableId);
-    if (!id || action==='add') {
-      //adding
-      if(!modelObject._orgId){
-        modelObject._orgId = orgId;
-      }
-      modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
-      modelObject.m = env.m;
-
-      //如果检查不通过，则会抛出异常
-      if(roleId!=='internal'){
-        checkPermission(modelObject,permissions,orgId,"add");
-      }
-
-      var newdata = @projectCodeService.add( modelObject,env );
-    }
-    else {
-
-      modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
-      //修复_orgIds
-      var _orgIds = [];
-      if(modelObject._orgIds){
-        modelObject._orgIds.forEach(function(orgId){
-          if(typeof orgId === 'string'){
-            _orgIds.push(orgId);
-            if(_orgIds.indexOf(orgId)===-1){
-              _orgIds.push(orgId);
-            }
-          }
-          else{
-            if(_orgIds.indexOf('0')===-1) {
-              _orgIds.push('0');
-            }
-          }
-        });
-      }
-      modelObject._orgIds = _orgIds;
-      diffResult = diff(oldObj,modelObject,"");
-      if(roleId!=='internal') {
-        checkUpdatePermission(modelObject, diffResult, permissions, orgId);
-      }
-      var merged = merge(oldObj,modelObject,permissions,orgId);
-      var newdata = @projectCodeService.update( merged,env);
-    }
-
-    var ret = {
-      state: 'ok',
-      object: newdata,
-      diffResult:diffResult
-    };
-    out.print( JSON.stringify( ret ) );
-  } catch ( e ) {
-    var ret = {
-      state: 'err',
-      msg: (e.msg || e) + ""
-    };
-    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
+//#import @handlers/include/diff.jsx
+(function(){
+  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 orgIds = env.orgIds;
+
+
+  ///////////////////////////////
+
+  try {
+    var modelObject = JSON.parse( $body );
+
+    //判断是add还是update
+    var id = modelObject.id;
+    var action = $.params.action;
+    var oldObj = @projectCodeService.get(id);
+    var roleId = env.roleId
+    if(orgId && oldObj && oldObj._orgIds){
+      //检查是否有权限修改
+      if(roleId!=='internal' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
+        var ret = {
+          state:'err',
+          code: 'no permission',
+          msg: '没有权限'
+        }
+        out.print(JSON.stringify(ret));
+        return;
+      }
+    }
+    var diffResult =[];
+    var tableId = 'owl_' + spec._t;
+    var permissions = getPermissions(roleId,tableId);
+    if (!id || action==='add') {
+      //adding
+      if(!modelObject._orgId){
+        modelObject._orgId = orgId;
+      }
+      modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
+      modelObject.m = env.m;
+
+      //如果检查不通过，则会抛出异常
+      if(roleId!=='internal'){
+        checkPermission(modelObject,permissions,orgId,"add");
+      }
+      modelObject.owl_createUserId = env.loginUserId;
+      var newdata = @projectCodeService.add( modelObject,env );
+    }
+    else {
+      modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
+      //修复_orgIds
+      var _orgIds = [];
+      if(modelObject._orgIds){
+        modelObject._orgIds.forEach(function(orgId){
+          if(typeof orgId === 'string'){
+            _orgIds.push(orgId);
+            if(_orgIds.indexOf(orgId)===-1){
+              _orgIds.push(orgId);
+            }
+          }
+          else{
+            if(_orgIds.indexOf('0')===-1) {
+              _orgIds.push('0');
+            }
+          }
+        });
+      }
+      modelObject._orgIds = _orgIds;
+      diffResult = diff(oldObj,modelObject,"");
+      if(roleId!=='internal') {
+        checkUpdatePermission(modelObject, diffResult, permissions, orgId);
+      }
+      var merged = merge(oldObj,modelObject,permissions,orgId);
+      merged.owl_lastModifiedUserId = env.loginUserId;
+      var newdata = @projectCodeService.update( merged,env);
+    }
+
+    var ret = {
+      state: 'ok',
+      object: newdata,
+      diffResult:diffResult
+    };
+    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/upload.jsx

@@ -1,72 +1,72 @@
-//#import Util.js
-//#import file.js
-//#import session.js
-//#import @handlers/include/checklogin.jsx
-
-;(function(){
-    var env = checklogin();
-    if(!env){
-        return;
-    }
-    var shopId = env.shopId;
-    var warehouseId = env.warehouseId;
-    m = shopId;
-    ///////////////////////////////
-
-    var flattenedSpecs = @flattenedSpecs
-
-    var fullkey = $.params.fullkey;
-    var fields = flattenedSpecs.mainFields;
-    var maxBytes = 1024*1024*1024;
-    var exts;
-    var spec;
-    var size = 1;
-    var unit = "G";
-
-    for(var i=0; i<fields.length; i++){
-        var field = fields[i];
-        if(field.key == fullkey){
-            // $.log("field=" + JSON.stringify(field));
-            size = field.size;
-            if(size){
-                unit = size.substring(size.length-1,size.length);
-                var sizeNum = size.substring(0,size.length-1);
-
-                if(unit == 'm' || unit=='M'){
-                    maxBytes = parseFloat(sizeNum) * 1024 * 1024;
-                }
-                else if(unit == 'k' || unit == 'K'){
-                    maxBytes = 1024 * parseFloat(sizeNum);
-                }
-
-            }
-            exts = field.exts;
-            spec = field.spec;
-        }
-
-    }
-    try{
-        var fileInfo = $.uploadEx(exts,maxBytes);
-        var url = FileService.getRelatedUrl(fileInfo.fileId,"300x300");
-        var fullUrl = FileService.getRelatedUrl(fileInfo.fileId,null);
-        var ret = {
-            state:"ok",
-            thumbUrl:"" + url,
-            url:"" +fullUrl,
-            fileId:"" +fileInfo.fileId,
-            name: "" +fileInfo.fileName,
-            size:fileInfo.size
-
-        }
-        out.print(JSON.stringify(ret));
-    }
-    catch(e){
-        var ret = {
-            state:"err",
-            msg:"文件大小不能超过"+size + unit
-        }
-        out.print(JSON.stringify(ret));
-    }
-
-})();
-
+//#import Util.js
+//#import file.js
+//#import session.js
+//#import @handlers/include/checklogin.jsx
+
+;(function(){
+    var env = checklogin();
+    if(!env){
+        return;
+    }
+    var shopId = env.shopId;
+    var warehouseId = env.warehouseId;
+    m = shopId;
+    ///////////////////////////////
+
+    var flattenedSpecs = @flattenedSpecs
+
+    var fullkey = $.params.fullkey;
+    var fields = flattenedSpecs.mainFields;
+    var maxBytes = 1024*1024*1024;
+    var exts;
+    var spec;
+    var size = 1;
+    var unit = "G";
+
+    for(var i=0; i<fields.length; i++){
+        var field = fields[i];
+        if(field.key == fullkey){
+            // $.log("field=" + JSON.stringify(field));
+            size = field.size;
+            if(size){
+                unit = size.substring(size.length-1,size.length);
+                var sizeNum = size.substring(0,size.length-1);
+
+                if(unit == 'm' || unit=='M'){
+                    maxBytes = parseFloat(sizeNum) * 1024 * 1024;
+                }
+                else if(unit == 'k' || unit == 'K'){
+                    maxBytes = 1024 * parseFloat(sizeNum);
+                }
+
+            }
+            exts = field.exts;
+            spec = field.spec;
+        }
+
+    }
+    try{
+        var fileInfo = $.uploadEx(exts,maxBytes);
+        var url = FileService.getRelatedUrl(fileInfo.fileId,"300x300");
+        var fullUrl = FileService.getRelatedUrl(fileInfo.fileId,null);
+        var ret = {
+            state:"ok",
+            thumbUrl:"" + url,
+            url:"" +fullUrl,
+            fileId:"" +fileInfo.fileId,
+            name: "" +fileInfo.fileName,
+            size:fileInfo.size
+
+        }
+        out.print(JSON.stringify(ret));
+    }
+    catch(e){
+        var ret = {
+            state:"err",
+            msg:"文件大小不能超过"+size + unit
+        }
+        out.print(JSON.stringify(ret));
+    }
+
+})();
+

package/defaultTemplate/api/src/init/indexConfigs/changeMapping.json

@@ -1,14 +1,14 @@
-//curl -XPUT -u elastic 'localhost:9200/is1erp/_mapping/_doc?pretty' -H 'Content-Type: application/json' -d '
-{
-  "dynamic_templates": [
-    {
-      "integers": {
-        "match_mapping_type": "long",
-        "mapping": {
-          "type": "double"
-        }
-      }
-    }
-  ]
-}
-'
+//curl -XPUT -u elastic 'localhost:9200/is1erp/_mapping/_doc?pretty' -H 'Content-Type: application/json' -d '
+{
+  "dynamic_templates": [
+    {
+      "integers": {
+        "match_mapping_type": "long",
+        "mapping": {
+          "type": "double"
+        }
+      }
+    }
+  ]
+}
+'

package/defaultTemplate/api/src/init/indexConfigs/createAliase.json

@@ -1,11 +1,11 @@
-//curl -XPOST -u elastic 'localhost:9200/_aliases' -H 'Content-Type: application/json' -d '
-{
-  "actions": [
-    {
-      "add": {
-        "index": "owl_@projectCode_v0",
-        "alias": "owl_@projectCode"
-      }
-    }
-  ]
+//curl -XPOST -u elastic 'localhost:9200/_aliases' -H 'Content-Type: application/json' -d '
+{
+  "actions": [
+    {
+      "add": {
+        "index": "owl_@projectCode_v0",
+        "alias": "owl_@projectCode"
+      }
+    }
+  ]
 }