@steedos/standard-permission 2.7.0-beta.6 → 2.7.0-beta.7

package/main/default/objects/permission_objects.action.js

@@ -11,16 +11,16 @@ module.exports = {
         delete newDoc.is_system;
 
         let permissionSetId = doc.permission_set_id
-        if(_.includes(['admin','user','supplier','customer'], doc.permission_set_id)){
-            let dbPst = Creator.odata.query('permission_set', {$select: "_id", $filter: "(name eq '"+doc.permission_set_id+"') and (space eq '"+Steedos.getSpaceId()+"')"}, true)
-            if(dbPst && dbPst.length > 0){
-                permissionSetId = dbPst[0]._id;
-            }
+        // if(_.includes(['admin','user','supplier','customer'], doc.permission_set_id)){
+        //     let dbPst = Creator.odata.query('permission_set', {$select: "_id", $filter: "(name eq '"+doc.permission_set_id+"') and (space eq '"+Steedos.getSpaceId()+"')"}, true)
+        //     if(dbPst && dbPst.length > 0){
+        //         permissionSetId = dbPst[0]._id;
+        //     }
             
-            if(_.includes(['admin','user','supplier','customer'], permissionSetId)){
-                return toastr.error("请先自定义权限集")
-            }
-        }
+        //     if(_.includes(['admin','user','supplier','customer'], permissionSetId)){
+        //         return toastr.error("请先自定义权限集")
+        //     }
+        // }
         Creator.odata.insert(object_name, Object.assign(newDoc, {permission_set_id: permissionSetId}), function(result, error){
             if (result) {
                 if(Session.get("object_name") === 'permission_objects'){

package/main/default/triggers/permission_objects.trigger.js

@@ -146,6 +146,29 @@ module.exports = {
     },
     beforeInsert: async function(){
         let doc = this.doc;
+
+        let permissionSetId = doc.permission_set_id
+        if(_.includes(['admin','user','supplier','customer'], doc.permission_set_id)){
+            let dbPst = Creator.getCollection("permission_set").direct.find({name: doc.permission_set_id});
+            if(dbPst && dbPst.length > 0){
+                permissionSetId = dbPst[0]._id;
+                const dbDoc = dbPst[0]
+                if(_.includes(['admin','user','supplier','customer'], permissionSetId)){
+                    permissionSetId =  Creator.getCollection("permission_set")._makeNewID()
+                    Creator.getCollection("permission_set").insert({
+                        _id: permissionSetId,
+                        name: dbDoc.name, label: dbDoc.label, type: dbDoc.type, 
+                        license: dbDoc.license, lockout_interval: dbDoc.lockout_interval, 
+                        max_login_attempts: dbDoc.max_login_attempts, 
+                        password_history: dbDoc.password_history, 
+                        default_standard_buttons: dbDoc.default_standard_buttons
+                    });
+                }
+            }
+        }
+
+        doc.permission_set_id = permissionSetId;
+
         let existedCount = Creator.getCollection("permission_objects").direct.find({permission_set_id: doc.permission_set_id, object_name: doc.object_name, space: doc.space}).count()
         if(existedCount > 0){
             throw new Error("此对象已有权限对象记录")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "2.7.0-beta.6",
+    "version": "2.7.0-beta.7",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "375ec701f921e76a94071d0c4004727d8dc6a8a4"
+    "gitHead": "6b88f14e441193de85363a8c187318ad5f33d2ab"
 }