owl-cli 5.42.0 → 6.0.0

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

@@ -14,6 +14,11 @@
   var shopId = env.shopId;
   var warehouseId = env.warehouseId;
   var m = shopId;
+  var roleId = env.roleId
+
+  var spec = @spec;
+  var tableId = 'owl_' + spec._t;
+  var permissions = getPermissions(roleId,tableId);
 
 
 

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

@@ -12,16 +12,23 @@
     var shopId = env.shopId;
     var warehouseId = env.warehouseId;
     var m = shopId;
+    var roleId = env.roleId;
+
+
+
     ///////////////////////////////
 
     var flattenedSpecs = @flattenedSpecs;
     var spec = @spec;
+    var tableId = 'owl_' + spec._t;
+    var permissions = getPermissions(roleId,tableId);
     var formSpecs = @formSpecs;
 
     var ret = {
         state:'ok',
         flattenedSpecs:flattenedSpecs,
         spec:spec,
+        permissions:permissions,
         formSpecs:formSpecs
     }
     out.print(JSON.stringify(ret));

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

@@ -76,45 +76,18 @@ function checklogin(){
     }
 }
 
-function getTablePermission(table, loginUserId,roleId){
-
-    if(typeof PermissionService  != 'undefined' && PermissionService.getTablePermissions){
-        var tablePermission = PermissionService.getTablePermissions(table,loginUserId,roleId);
-        return tablePermission;
+function getPermissions(roleId,tableId){
+    var searchArgs = {
+        roleId:roleId,
+        tableId:tableId
     }
-    return null;
-
-    /*var searchArgs = {table:table, roleId:roleId};
-    //m, searchArgs, keyword,from, pageSize, sort, dataSource
-    var ret = owl_table_permissionService.search("0",searchArgs,0,1000,null);
-    if(ret.state==='ok'){
-        if(ret.total===0){
-            return null;
-        }
-        else{
-            var filters = [];
-            var list = ret.list;
-            list.forEach(function(obj){
-                var linkField = obj.linkField;
-                if(obj.searchArgs){
-                    var expanded = obj.searchArgs;
-                    if(loginUserId){
-                        expanded = obj.searchArgs.replaceAll("@loginUserId", loginUserId);
-                    }
-                    var linkSearchArgs =  JSON.parse(expanded);
-                    var linkRet = owl_table_permissionService.search("0",linkSearchArgs,0,1000,null,obj.linkDataSource);
-                    if(linkRet.state==='ok'){
-                        if(linkRet.total>0){
-                            var linkIds = linkRet.list.map(function(o,index){return o[linkField]});
-                            var filter = {terms:{}};
-                            filter.terms[obj.filterField] = linkIds;
-                            filters.push(filter);
-                        }
-                    }
-                }
-            });
-            return filters;
-        }
+    var sr = owl_permissionService.search("0",searchArgs,null,0,10000,null);
+    if(sr.state==='ok'){
+        return sr.list;
     }
-    return null;*/
+    return [];
 }
+
+
+
+

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

@@ -45,17 +45,13 @@
       //adding
       if(!modelObject._orgId){
         modelObject._orgId = orgId;
-        modelObject._orgIds = orgIds;
       }
-      else{
-        modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
-      }
-
-
+      modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
       modelObject.m = env.m;
       var newdata = @projectCodeService.add( modelObject,env );
     }
     else {
+      modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
       var newdata = @projectCodeService.update( modelObject,env);
     }
 

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

@@ -591,10 +591,11 @@ var @projectCodeService = (function (pigeon) {
 
         del: function (id) {
             //只做软删除
-            var data = f.get(id)
+            var data = f.get(id,true)
             if (!data) {
                 throw '对象不存在!id=' + id
             }
+            data.id = id;
             var key = pigeon.getRKey(data['owl_createTime'], 13)
             pigeon.deleteFromList(f.getAllListName(), key, id)
             if (data['subplatformId']) {

package/package.json

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