@steedos/standard-permission 2.5.0-beta.22 → 2.5.0-beta.24

package/main/default/objects/permission_set/buttons/copy.button.yml

@@ -107,6 +107,6 @@ label: 复制
 type: amis_button
 visible: !!js/function |
     function (object_name, record_id, record_permissions, record) {
-        return false;
+
         return record.record.type == 'profile';
     }

package/main/default/routes/copyProfile.router.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-26 16:56:54
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-04-28 14:59:28
+ * @LastEditTime: 2023-05-13 17:00:38
  * @Description: 复制已有简档来创建新简档
  * 使用mongodb的事务处理，保证数据的一致性
  * 复制对象包括：简档、对象权限、字段权限、选项卡权限
@@ -52,6 +52,9 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
         if (originalPermissionSet.type !== 'profile') {
             throw new Error("permission_set is not profile type");
         }
+
+        const { name:originalPermissionSetName } = originalPermissionSet;
+
         // API名称不能重复
         const existPermissionSetCount = await psObj.count({
             filters: [
@@ -112,7 +115,7 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
             delete newPermissionSetData.record_permissions;
             const insertPermissionSetResult = await permissionSetColl.insertOne(newPermissionSetData);
             newPermissionSet = insertPermissionSetResult.ops[0];
-            console.log('newPermissionSet', newPermissionSet)
+            // console.log('newPermissionSet', newPermissionSet)
 
             // 创建对象权限和选项卡权限
             if (newPermissionSet) {
@@ -152,6 +155,7 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
                             editable: fieldPermission ? fieldPermission.editable : getFieldDefaultEditable(field),
                             readable: fieldPermission ? fieldPermission.readable : getFieldDefaultReadable(field),
                             _id: driver._makeNewID(),
+                            copy_from: fieldPermission ? fieldPermission._id : `${originalPermissionSetName}.${newPermissionObject.object_name}.${field.name}`
                         })
                     }
                 }
@@ -181,6 +185,12 @@ router.post('/api/permission/permission_set/copy', core.requireAuthentication, a
 
                 // 批量创建选项卡权限
                 await permissionTabsColl.insertMany(newPermissionTabs, { session });
+
+                // 批量注册字段权限
+                const schema = objectql.getSteedosSchema();
+                const objectName = "permission_fields";
+                const SERVICE_NAME = `~database-${objectName}`;
+                await objectql.registerPermissionFields.mregister(schema.broker, SERVICE_NAME, newPermissionFields)
             }
 
         } catch (error) {

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

@@ -93,20 +93,22 @@ module.exports = {
             })
             
             // 为了解决默认简档自定义后生成新的_id，导致无法查询到数据的问题
-            const filtersStr = this.query.filters;
-            const regex = /(?<=permission_set_id eq ')\w+(?=')/g;
-            const matches = filtersStr.match(regex);
-            if (matches) {
-                const permissionSetId = matches[0];
-                // 查找permissionSetId对应的permissionSet
-                const permissionSetDoc = (await objectql.getObject('permission_set').directFind({
-                    filters: [
-                        ['_id', '=', permissionSetId],
-                    ]
-                })[0]);
-                if (permissionSetDoc) {
-                    // 替换this.query.filters中全部的的permission_set_id为permissionSetDoc.name
-                    this.query.filters = this.query.filters.replace(regex, permissionSetDoc.name).replace(`permission_set_id eq '${permissionSetDoc.name}'`, `(permission_set_id eq '${permissionSetDoc.name}') or (permission_set_id eq '${permissionSetId}')`);
+            if (_.isString(this.query.filters)) {
+                const filtersStr = this.query.filters;
+                const regex = /(?<=permission_set_id eq ')\w+(?=')/g;
+                const matches = filtersStr.match(regex);
+                if (matches) {
+                    const permissionSetId = matches[0];
+                    // 查找permissionSetId对应的permissionSet
+                    const permissionSetDoc = (await objectql.getObject('permission_set').directFind({
+                        filters: [
+                            ['_id', '=', permissionSetId],
+                        ]
+                    })[0]);
+                    if (permissionSetDoc) {
+                        // 替换this.query.filters中全部的的permission_set_id为permissionSetDoc.name
+                        this.query.filters = this.query.filters.replace(regex, permissionSetDoc.name).replace(`permission_set_id eq '${permissionSetDoc.name}'`, `(permission_set_id eq '${permissionSetDoc.name}') or (permission_set_id eq '${permissionSetId}')`);
+                    }
                 }
             }
             

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "2.5.0-beta.22",
+    "version": "2.5.0-beta.24",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "5a309a822879b8eaa81fb847326765f48e8e84a9"
+    "gitHead": "a12153914810e9e5967827ab0ec01b58a2b3b0cb"
 }