@steedos/standard-permission 2.5.3-beta.2 → 2.5.3-beta.21

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

@@ -19,14 +19,37 @@ fields:
       - label: Permission set
         value: permission_set
     description: 
-  license:
-    label: License
-    help: 
-    description: 
   assigned_apps:
     label: Assigned Apps
     help: 
     description: 
+  default_standard_buttons:
+    label: Default Standard Buttons
+    help:
+    description:
+    options:
+      - label: Query
+        value: standard_query
+      - label: New
+        value: standard_new
+      - label: View
+        value: standard_open_view
+      - label: Edit
+        value: standard_edit
+      - label: Delete
+        value: standard_delete
+      - label: Delete many
+        value: standard_delete_many
+      - label: Approve
+        value: standard_approve
+      - label: View instance
+        value: standard_view_instance
+      - label: Follow
+        value: standard_follow
+      - label: Submit for approval
+        value: standard_submit_for_approval
+      - label: Import data
+        value: standard_import_data
   users:
     label: Users
     help: 'When the type is a profile, no user needs to be selected'
@@ -85,9 +108,9 @@ listviews:
   all:
     label: All
   permission_set:
-    label: Permission Set
+    label: Permission Sets
   profile:
-    label: Profile
+    label: Profiles
 actions:
   customize:
     label: Customize

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

@@ -19,14 +19,37 @@ fields:
       - label: 权限集
         value: permission_set
     description: 
-  license:
-    label: 许可证
-    help: 
-    description: 
   assigned_apps:
     label: 授权应用
     help: 
     description: 
+  default_standard_buttons:
+    label: 默认标准按钮
+    help:
+    description:
+    options:
+      - label: 查找
+        value: standard_query
+      - label: 新建
+        value: standard_new
+      - label: 查看
+        value: standard_open_view
+      - label: 编辑
+        value: standard_edit
+      - label: 删除
+        value: standard_delete
+      - label: 批量删除
+        value: standard_delete_many
+      - label: 发起审批
+        value: standard_approve
+      - label: 查看审批单
+        value: standard_view_instance
+      - label: 关注
+        value: standard_follow
+      - label: 提请批准
+        value: standard_submit_for_approval
+      - label: 导入数据
+        value: standard_import_data
   users:
     label: 成员
     help: 类别为简档时，不需要选择成员

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

@@ -1,7 +1,9 @@
 module.exports = {
     customize: function (object_name, record_id, fields) {
         var doc = Creator.odata.get(object_name, record_id)
-        Creator.odata.insert(object_name, {name: doc.name, label: doc.label, type: doc.type, license: doc.license, lockout_interval: doc.lockout_interval, max_login_attempts: doc.max_login_attempts, password_history: doc.password_history}, function(result, error){
+        Creator.odata.insert(object_name, {name: doc.name, label: doc.label, type: doc.type, license: doc.license, lockout_interval: doc.lockout_interval, max_login_attempts: doc.max_login_attempts, password_history: doc.password_history, 
+            default_standard_buttons: doc.default_standard_buttons
+        }, function(result, error){
             if(result){
                 FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
             }

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

@@ -26,15 +26,6 @@ fields:
     firstOption: false
     options: Profile:profile,Permission set:permission_set
     defaultValue: permission_set
-  license:
-    label: License
-    type: lookup
-    optionsFunction: !!js/function 
-      function(){
-        return Steedos.getLicenseOptions();
-      }
-    showIcon: false
-    # required: "{{ 'profile' === formData.type }}"
   assigned_apps:
     label: Assigned Apps
     type: lookup
@@ -43,6 +34,34 @@ fields:
     reference_to_field: code
     name: assigned_apps
     filterable: true
+  default_standard_buttons:
+    label: Default Standard Buttons
+    type: select
+    multiple: true
+    options:
+      - label: 查找
+        value: standard_query
+      - label: 新建
+        value: standard_new
+      - label: 查看
+        value: standard_open_view
+      - label: 编辑
+        value: standard_edit
+      - label: 删除
+        value: standard_delete
+      - label: 删除
+        value: standard_delete_many
+      - label: 发起审批
+        value: standard_approve
+      - label: 查看审批单
+        value: standard_view_instance
+      - label: 关注
+        value: standard_follow
+      - label: 提请批准
+        value: standard_submit_for_approval
+      - label: 导入数据
+        value: standard_import_data
+    visible_on: "{{'profile' === formData.type ? true: false}}"
   users:
     label: Users
     type: lookup

package/main/default/objects/permission_tabs/permissions/customer.permission.yml

@@ -9,6 +9,6 @@ allowRead: true
 allowReadFiles: true
 modifyAllRecords: false
 permission_set_id: customer
-viewAllFiles: false
-viewAllRecords: false
-viewCompanyRecords: false
+viewAllFiles: true
+viewAllRecords: true
+viewCompanyRecords: true

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-05-13 17:00:38
+ * @LastEditTime: 2023-06-14 10:49:23
  * @Description: 复制已有简档来创建新简档
  * 使用mongodb的事务处理，保证数据的一致性
  * 复制对象包括：简档、对象权限、字段权限、选项卡权限
@@ -228,7 +228,7 @@ async function getInternalPermissionObjects(permissionSetId) {
         filters: [
             ['_id', '=', permissionSetId],
         ]
-    })[0]);
+    }))[0];
     // 如果库中有记录则使用库中的name作为判断条件，否则使用permissionSetId
     const permissionSetName = permissionSetDoc ? permissionSetDoc.name : permissionSetId;
 

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

@@ -1,12 +1,19 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 17:08:43
+ * @Description: 
+ */
 const objectql = require('@steedos/objectql');
 const auth = require('@steedos/auth');
 const clone = require('clone');
 const _ = require('underscore');
 const readonlyFields = ['created', 'created_by', 'modified', 'modified_by'];
-
+const register = require('@steedos/metadata-registrar');
 async function getAll() {
     const schema = objectql.getSteedosSchema();
-    const configs = await objectql.registerPermissionFields.getAll(schema.broker)
+    const configs = await register.registerPermissionFields.getAll(schema.broker)
     const dataList = _.pluck(configs, 'metadata');
 
     _.each(dataList, function (item) {
@@ -19,7 +26,7 @@ async function getAll() {
 
 async function get(apiName) {
     const schema = objectql.getSteedosSchema();
-    const config = await objectql.registerPermissionFields.get(schema.broker, apiName)
+    const config = await register.registerPermissionFields.get(schema.broker, apiName)
     return config ? config.metadata : null;
 }
 

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

@@ -3,6 +3,7 @@ const objectql = require("@steedos/objectql");
 const InternalData = require('@steedos/standard-objects').internalData;
 const auth = require("@steedos/auth");
 
+
 const permissions = {
     allowEdit: false,
     allowDelete: false,
@@ -104,7 +105,7 @@ module.exports = {
                         filters: [
                             ['_id', '=', permissionSetId],
                         ]
-                    })[0]);
+                    }))[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/main/default/triggers/permission_set.trigger.js

@@ -1,16 +1,24 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 15:10:02
+ * @Description: 
+ */
 const _ = require('underscore');
 const objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
 const auth = require("@steedos/auth");
 
 
 const getSourcePermissionSets = async function(type){
     switch (type) {
         case 'permission_set':
-            return await objectql.getSourcePermissionsets();
+            return await register.getSourcePermissionsets();
         case 'profile':
-            return await objectql.getSourceProfiles();
+            return await register.getSourceProfiles();
         default:
-            return (await objectql.getSourceProfiles()).concat((await objectql.getSourcePermissionsets()));
+            return (await register.getSourceProfiles()).concat((await register.getSourcePermissionsets()));
     }
     
 }

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

@@ -1,16 +1,17 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-10-26 14:14:51
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-10-27 17:42:29
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 15:09:54
  * @Description: 
  */
 const objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
 const auth = require('@steedos/auth');
 const _ = require('underscore');
 async function getAll() {
     const schema = objectql.getSteedosSchema();
-    const configs = await objectql.registerTab.getAll(schema.broker)
+    const configs = await register.registerTab.getAll(schema.broker)
     const dataList = _.pluck(configs, 'metadata');
     let permissionTabs = [];
     for (const item of dataList) {

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

@@ -1,10 +1,18 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 17:06:59
+ * @Description: 
+ */
 const objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
 const auth = require('@steedos/auth');
 const _ = require('underscore');
 const clone = require('clone');
 async function getAll() {
     const schema = objectql.getSteedosSchema();
-    const configs = await objectql.registerRestrictionRules.getAll(schema.broker)
+    const configs = await register.registerRestrictionRules.getAll(schema.broker)
     const dataList = _.pluck(configs, 'metadata');
 
     _.each(dataList, function (item) {
@@ -17,7 +25,7 @@ async function getAll() {
 
 async function get(apiName) {
     const schema = objectql.getSteedosSchema();
-    const config = await objectql.registerRestrictionRules.get(schema.broker, apiName)
+    const config = await register.registerRestrictionRules.get(schema.broker, apiName)
     return config ? Object.assign(config.metadata, { _id: config.metadata._id || `${config.metadata.object_name}.${config.metadata.name}` }) : null;
 }
 

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

@@ -1,10 +1,18 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 17:07:49
+ * @Description: 
+ */
 const objectql = require('@steedos/objectql');
 const auth = require('@steedos/auth');
+const register = require('@steedos/metadata-registrar');
 const _ = require('underscore');
 const clone = require('clone');
 async function getAll() {
     const schema = objectql.getSteedosSchema();
-    const configs = await objectql.registerShareRules.getAll(schema.broker)
+    const configs = await register.registerShareRules.getAll(schema.broker)
     const dataList = _.pluck(configs, 'metadata');
 
     _.each(dataList, function (item) {
@@ -17,7 +25,7 @@ async function getAll() {
 
 async function get(apiName) {
     const schema = objectql.getSteedosSchema();
-    const config = await objectql.registerShareRules.get(schema.broker, apiName)
+    const config = await register.registerShareRules.get(schema.broker, apiName)
     return config ? Object.assign(config.metadata, { _id: config.metadata._id || `${config.metadata.object_name}.${config.metadata.name}` }) : null;
 }
 

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

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2021-12-27 10:49:33
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-07-30 13:22:15
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 17:07:59
  * @Description: 
  */
 const util = require('@steedos/standard-objects').util;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "2.5.3-beta.2",
+    "version": "2.5.3-beta.21",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
+    "gitHead": "b4313a2ef5d18ef1cf9271bd3c89b2d6fe52d65b"
 }