@steedos/standard-permission 2.3.6 → 2.3.7

package/main/default/objectTranslations/permission_set.en/permission_set.en.objectTranslation.yml

@@ -1,5 +1,5 @@
 name: permission_set
-label: Profile & Permission Set
+label: Permission Set
 description: 
 fields:
   name:

package/main/default/objectTranslations/permission_set.zh-CN/permission_set.zh-CN.objectTranslation.yml

@@ -1,5 +1,5 @@
 name: permission_set
-label: 简档 & 权限集
+label: 权限集
 description: 
 fields:
   name:

package/main/default/objects/permission_fields.object.yml

@@ -43,6 +43,24 @@ fields:
     required: true
     create: false
     sort_no: 130
+    optionsFunction: !<tag:yaml.org,2002:js/function> |-
+      function () {
+              var _options;
+
+              _options = [];
+
+              _.forEach(Creator.objectsByName, function (o, k) {
+                if (!o.hidden) {
+                  return _options.push({
+                    label: o.label,
+                    value: k,
+                    icon: o.icon
+                  });
+                }
+              });
+
+              return _options;
+            }
     name: object_name
     filterable: true
   field:

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

@@ -11,13 +11,13 @@ module.exports = {
         delete newDoc.is_system;
 
         let permissionSetId = doc.permission_set_id
-        if(_.includes(['admin','user','supplier','customer'], doc.permission_set_id)){
+        if(_.include(['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)){
+            if(_.include(['admin','user','supplier','customer'], permissionSetId)){
                 return toastr.error("请先自定义权限集")
             }
         }
@@ -32,8 +32,7 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function(object_name, record_id, record_permissions, data){
-        var record = data && data.record;
+    customizeVisible: function(object_name, record_id, record_permissions, record){
         if(!record){
             record = {}
         }
@@ -49,12 +48,10 @@ module.exports = {
             FlowRouter.reload();
         }
     },
-    resetFieldPermissionsVisible: function (object_name, record_id, record_permissions, data) {
-        var record = data && data.record;
+    resetFieldPermissionsVisible: function (object_name, record_id, record_permissions, record) {
         if (!record) {
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && !record.is_system;
-        // return !(Creator.baseObject.actions.standard_new.visible() && record.is_system);
+        return !(Creator.baseObject.actions.standard_new.visible() && record.is_system);
     }
 }

package/main/default/objects/permission_objects.object.yml

@@ -29,6 +29,24 @@ fields:
     index: true
     required: true
     create: false
+    optionsFunction: !<tag:yaml.org,2002:js/function> |-
+      function () {
+              var _options;
+
+              _options = [];
+
+              _.forEach(Creator.objectsByName, function (o, k) {
+                if (!o.hidden) {
+                  return _options.push({
+                    label: o.label,
+                    value: k,
+                    icon: o.icon
+                  });
+                }
+              });
+
+              return _options;
+            }
     name: object_name
     filterable: true
   allowRead:

package/main/default/objects/permission_set/buttons/permission_set.action.js

@@ -8,8 +8,7 @@ module.exports = {
         });
             
     },
-    customizeVisible: function(object_name, record_id, record_permissions, data){
-        var record = data && data.record;
+    customizeVisible: function(object_name, record_id, record_permissions, record){
         if(!record){
             record = {}
         }

package/main/default/objects/permission_set/permission_set.object.yml

@@ -1,5 +1,5 @@
 name: permission_set
-label: Profile & Permission Set
+label: Permission Set
 icon: groups
 hidden: false
 enable_inline_edit: false
@@ -39,8 +39,22 @@ fields:
     label: Assigned Apps
     type: lookup
     multiple: true
-    reference_to: apps
-    reference_to_field: code
+    optionsFunction: !<tag:yaml.org,2002:js/function> |-
+      function () {
+              var _options;
+
+              _options = [];
+
+              _.forEach(Creator.Apps, function (o, k) {
+                return _options.push({
+                  label: o.label || o.name,
+                  value: k,
+                  icon: o.icon_slds
+                });
+              });
+
+              return _options;
+            }
     name: assigned_apps
     filterable: true
   users:

package/main/default/objects/permission_shares.object.yml

@@ -13,9 +13,12 @@ fields:
     label: Object
     type: lookup
     multiple: true
-    reference_to: objects
-    reference_to_field: name
-    filters: ["enable_share", "=", true]
+    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
+      function () {
+        return Steedos.getObjectsOptions(function(o){
+          return o.enable_share
+        })
+      }
     required: true
     filterable: true
   filters:

package/main/default/objects/permission_tabs/buttons/customize.button.js

@@ -24,8 +24,7 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function (object_name, record_id, record_permissions, data) {
-        var record = data && data.record;
+    customizeVisible: function (object_name, record_id, record_permissions, record) {
         return record && Creator.baseObject.actions.standard_new.visible() && record.is_system;
     }
 }

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

@@ -16,8 +16,7 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function (object_name, record_id, record_permissions, data) {
-        var record = data && data.record;
+    customizeVisible: function (object_name, record_id, record_permissions, record) {
         if (!record) {
             record = {}
         }

package/main/default/objects/restriction_rules.object.yml

@@ -15,6 +15,10 @@ fields:
     write_requires_master_read: true
     reference_to_field: name
     required: true
+    optionsFunction: !<tag:yaml.org,2002:js/function> |-
+      function () {
+        return Steedos.getObjectsOptions();
+      }
     sort_no: 120
   active:
     label: 启用

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

@@ -16,8 +16,7 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function (object_name, record_id, record_permissions, data) {
-        var record = data && data.record;
+    customizeVisible: function (object_name, record_id, record_permissions, record) {
         if (!record) {
             record = {}
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "2.3.6",
+    "version": "2.3.7",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "3ef6bf3744c616d6a961b3264e5f204b9697ef6a"
+    "gitHead": "e81279db5d8aab35332334cf3eeecf5fd8ead99f"
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-07-29 09:40:31
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-09 13:41:11
+ * @LastEditTime: 2022-07-29 14:37:14
  * @Description: 
  */
 "use strict";
@@ -22,8 +22,7 @@ module.exports = {
 	settings: {
 		packageInfo: {
 			path: __dirname,
-			name: packageName,
-			isPackage: false
+			name: packageName
 		}
 	},