owl-cli 6.130.0 → 6.132.0

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

@@ -5,58 +5,85 @@
 //#import @handlers/include/checklogin.jsx
 
 ;(function(){
-    var spec = @spec;
+    try{
+        var spec = @spec;
 
-    var env = checklogin();
-    if(!env){
-        return;
-    }
-    var shopId = env.shopId;
-    var warehouseId = env.warehouseId;
-    var m = shopId;
+        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 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 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);
 
-    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
+        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");
             }
-            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];
+        for(var i=0;i<ids.length; i++) {
+            var id = ids[i];
         @projectCodeService.del(id);
-    }
+        }
 
 
-    var ret = {
-        state: 'ok'
+        var ret = {
+            state: 'ok'
+        }
+        out.print(JSON.stringify(ret));
     }
-    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/include/checklogin.jsx

@@ -714,7 +714,7 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
         return null;
     }
 
-    $.log("getListPermissionFilter tableId="+tableId+",roleId="+roleId+",orgId="+orgId+",userId="+userId+", permissions="+JSON.stringify(permissions));
+    // $.log("getListPermissionFilter tableId="+tableId+",roleId="+roleId+",orgId="+orgId+",userId="+userId+", permissions="+JSON.stringify(permissions));
     //获得有权限的对象的filter
     var tp = expandTablePermission(permissions);
 

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

@@ -70,16 +70,16 @@ function buildSort(sort){
     var meta = spec['#meta'];
     var isPublic = meta && meta.isPublic;
 
+    var mfilters = null;
     if(isPublic || orgId=='0'){
         delete searchArgs["_orgIds"];
     }
     else{
         searchArgs["_orgIds"] = orgId;
+        mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
     }
 
-
    var dataSource = null;
-   var mfilters =  getListPermissionFilter(tableId, roleId, orgId, loginId, permissions);
 
     var isRecycleBin = false;
     if(recycleBin){

package/package.json

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