@steedos/standard-permission 2.6.1-beta.7 → 2.6.2-beta.3

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

@@ -35,3 +35,5 @@ fields:
     label: System
     help: 
     description: 
+  allowExport:
+    label: Allow Export Excel

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

@@ -102,6 +102,8 @@ fields:
     label: System
     help: 
     description: 
+  allowCreateListViews:
+    label: Allow Create ListViews
 groups:
   files_permissions: Files permissions
 listviews:

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

@@ -94,6 +94,10 @@ fields:
     label: 系统
     help: 
     description: 
+  allowCreateListViews:
+    label: 允许创建视图
+  allowExport:
+    label: 允许导出Excel
 groups:
   files_permissions: 附件权限
 listviews:

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

@@ -33,3 +33,8 @@ fields:
 actions:
   customize:
     label: Customize
+listviews:
+  all:
+    label: All Roles
+  customize:
+    label: Customize

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

@@ -33,3 +33,8 @@ fields:
 actions:
   customize:
     label: Customize
+listviews:
+  all:
+    label: All Share Rules
+  customize:
+    label: Customize

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

@@ -98,6 +98,10 @@ fields:
     type: boolean
     label: Modify All Files
     group: Files permissions
+  allowCreateListViews:
+    type: boolean
+    label: Allow Create ListViews
+    defaultValue: true
   disabled_list_views:
     type: lookup
     reference_to: object_listviews
@@ -131,6 +135,10 @@ fields:
             }
     name: disabled_list_views
     filterable: true
+  allowExport:
+    type: boolean
+    label: Allow Export Excel
+    defaultValue: true
   disabled_actions:
     type: lookup
     label: Disabled Actions

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

@@ -161,6 +161,6 @@ label: 设置选项卡权限
 'on': record_only
 type: amis_button
 visible: !!js/function |
-    function (object_name, record_id, record_permissions, record) {
-        return true;
+    function (object_name, record_id, record_permissions, data) {
+        return data.record.type === 'profile';
     }

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

@@ -1,7 +1,7 @@
 name: permission_set
 label: Profile & Permission Set
 icon: groups
-hidden: false
+hidden: true
 enable_inline_edit: false
 version: 2
 enable_dataloader: false
@@ -25,8 +25,10 @@ fields:
     label: Type
     type: select
     firstOption: false
-    options: Permission set:permission_set
+    options: Profile:profile,Permission set:permission_set
     defaultValue: permission_set
+    amis:
+      "disabledOn": "${global.mode !='read'}"
   assigned_apps:
     label: Assigned Apps
     type: lookup

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

@@ -2,7 +2,7 @@ name: permission_tabs
 label: 选项卡权限
 icon: apps
 version: 2
-hidden: false
+hidden: true
 enable_dataloader: false
 paging:
   enabled: false

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

@@ -3,6 +3,7 @@ label: 限制规则
 icon: filter_criteria
 version: 2
 enable_dataloader: false
+hidden: true
 fields:
   name:
     label: Api 名称
@@ -52,7 +53,20 @@ actions:
     on: record
 list_views:
   all:
-    label: All Roles
+    label: 所有
+    filter_scope: space
+    columns:
+      - name
+      - object_name
+      - active
+      - entry_criteria
+      - record_filter
+      - description
+      - is_system
+  customize:
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
     filter_scope: space
     columns:
       - name

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

@@ -3,6 +3,7 @@ label: 共享规则
 icon: assigned_resource
 version: 2
 enable_dataloader: false
+hidden: true
 fields:
   name:
     label: Api 名称
@@ -56,7 +57,20 @@ actions:
     on: record
 list_views:
   all:
-    label: All Roles
+    label: 所有
+    filter_scope: space
+    columns:
+      - name
+      - object_name
+      - active
+      - entry_criteria
+      - record_filter
+      - description
+      - is_system
+  customize:
+    label: 自定义
+    filters:
+      - ["is_system","<>",true]
     filter_scope: space
     columns:
       - name

package/main/default/server/permission_set.object.js

@@ -28,17 +28,17 @@ Creator.Objects['permission_set'].triggers = Object.assign({}, Creator.Objects['
                 if(!doc.license){
                     // throw new Meteor.Error(500, "请指定许可证");
                 }else{
-                    if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), doc.license) < 0){
-                        throw new Meteor.Error(500, "无效的许可证");
-                    }
+                    // if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), doc.license) < 0){
+                    //     throw new Meteor.Error(500, "无效的许可证");
+                    // }
                 }
             }
 
-            if(doc.license){
-                if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), doc.license) < 0){
-                    throw new Meteor.Error(500, "无效的许可证");
-                }
-            }
+            // if(doc.license){
+            //     if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), doc.license) < 0){
+            //         throw new Meteor.Error(500, "无效的许可证");
+            //     }
+            // }
 
             if(doc.type === 'profile'){
                 delete doc.users

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

@@ -27,7 +27,13 @@ const getInternalPermissionObjects = async function(){
           if(!objectJSON._id && !objectJSON.hidden && !_.include(InternalData.hiddenObjects, objectName)){
             let permission_set = objectJSON.permission_set
             _.each(permission_set, function(v, code){
-                objectsPermissions.push(Object.assign({}, v, {_id: `${code}_${objectName}`, name: `${code}_${objectName}`, permission_set_id: code, object_name: objectName}, baseRecord))
+                objectsPermissions.push(Object.assign({}, v, {
+                    _id: `${code}_${objectName}`, 
+                    name: `${code}_${objectName}`, 
+                    permission_set_id: code, 
+                    object_name: objectName,
+                    allowCreateListViews: v.allowCreateListViews == false ? false : true
+                }, baseRecord))
             })
           }
         });
@@ -76,11 +82,6 @@ module.exports = {
     beforeFind: async function () {
         delete this.query.fields;
     },
-
-    beforeAggregate: async function () {
-        delete this.query.fields;
-    },
-
     afterFind: async function(){
         const { spaceId } = this;
         let dataList = await getInternalPermissionObjects();
@@ -121,25 +122,10 @@ module.exports = {
             }
         }
 
-    },
-    afterAggregate: async function(){
-        const { spaceId } = this;
-        let dataList = await getInternalPermissionObjects();
-        if (!_.isEmpty(dataList)) {
-            dataList.forEach((doc) => {
-                if (!_.find(this.data.values, (value) => {
-                    return value.name === doc.name
-                })) {
-                    this.data.values.push(doc);
-                }
-            })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-            if (records.length > 0) {
-                this.data.values = records;
-            } else {
-                this.data.values.length = 0;
-            }
-        }
+        _.each(this.data.values, (value)=>{
+            value.allowCreateListViews = value.allowCreateListViews == false ? false : true
+        })
+
     },
     afterCount: async function(){
         delete this.query.fields;
@@ -153,6 +139,9 @@ module.exports = {
             this.data.values = _.find(all, function(item){
                 return item._id === id
             });
+        }else{
+            const { allowCreateListViews } = this.data.values;
+            this.data.values.allowCreateListViews =  allowCreateListViews == false ? false : true
         }
     },
     beforeInsert: async function(){

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

@@ -35,7 +35,7 @@ module.exports = {
     afterFind: async function(){
         let { spaceId } = this;
         if(!spaceId){
-            spaceId = process.env.STEEDOS_CLOUD_SPACE_ID;
+            spaceId = process.env.STEEDOS_TENANT_ID;
         }
         if(!spaceId){
             const spaces = await objectql.getObject('spaces').find({});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "2.6.1-beta.7",
+    "version": "2.6.2-beta.3",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+    "gitHead": "7842aa5d3023622c0e140009cfdd081180563bdd"
 }