@steedos/standard-permission 2.4.0-beta.24 → 2.4.0-beta.26

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

@@ -43,24 +43,6 @@ 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(_.include(['admin','user','supplier','customer'], 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(_.include(['admin','user','supplier','customer'], permissionSetId)){
+            if(_.includes(['admin','user','supplier','customer'], permissionSetId)){
                 return toastr.error("请先自定义权限集")
             }
         }
@@ -32,7 +32,8 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function(object_name, record_id, record_permissions, record){
+    customizeVisible: function(object_name, record_id, record_permissions, data){
+        var record = data && data.record;
         if(!record){
             record = {}
         }
@@ -48,10 +49,12 @@ module.exports = {
             FlowRouter.reload();
         }
     },
-    resetFieldPermissionsVisible: function (object_name, record_id, record_permissions, record) {
+    resetFieldPermissionsVisible: function (object_name, record_id, record_permissions, data) {
+        var record = data && data.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,24 +29,6 @@ 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,7 +8,8 @@ module.exports = {
         });
             
     },
-    customizeVisible: function(object_name, record_id, record_permissions, record){
+    customizeVisible: function(object_name, record_id, record_permissions, data){
+        var record = data && data.record;
         if(!record){
             record = {}
         }

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

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

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

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

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

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

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

@@ -15,10 +15,6 @@ 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,7 +16,8 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function (object_name, record_id, record_permissions, record) {
+    customizeVisible: function (object_name, record_id, record_permissions, data) {
+        var record = data && data.record;
         if (!record) {
             record = {}
         }

package/package.json

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