@steedos/service-core-objects 3.0.0-beta.98 → 3.0.0

package/main/default/objects/_base/base.trigger.js

@@ -1,142 +1,6 @@
 const objectql = require('@steedos/objectql');
-const auth = require('@steedos/auth');
 const _ = require('underscore');
 
-/**
- * 校验记录的 company 是否在指定授权范围内
- * @param {*} object_name
- * @param {*} userId 
- * @param {*} doc 
- */
-const checkCompany = async (object_name, userId, doc) => {
-    const userSession = await auth.getSessionByUserId(userId, doc.space);
-
-    if (!userSession || userSession.is_space_admin) {
-        return;
-    }
-
-    let userObjectPermission = null;
-
-    try {
-        userObjectPermission = await objectql.getObject(object_name).getUserObjectPermission(userSession);
-    } catch (error) {
-        return;
-    }
-
-    if (userObjectPermission.modifyAllRecords) {
-        return true;
-    }
-
-    let allowCompanyIds = [];
-
-    //与client端保持一致，始终授权用户所属分部
-    if (!_.isEmpty(userSession.company_ids)) {
-        allowCompanyIds.push(...userSession.company_ids);
-    }
-    if (!_.isEmpty(userObjectPermission.modifyAssignCompanysRecords)) {
-        allowCompanyIds.push(...userObjectPermission.modifyAssignCompanysRecords);
-    }
-
-    if (_.has(doc, "company_id")) {
-        if (!_.include(allowCompanyIds, doc.company_id)) {
-            throw new Error(`未获得分部授权`);
-        }
-    }
-
-    if (_.has(doc, "company_ids")) {
-        if (_.difference(doc.company_ids, allowCompanyIds).length > 0) {
-            throw new Error(`未获得分部授权`);
-        }
-    }
-}
-
-const beforeInsertBase = async function () {
-    const { doc, userId } = this;
-    // 迁移到insert函数中提前执行了
-    // doc.created = new Date();
-    // doc.modified = new Date();
-    // if (userId) {
-    //     if (!doc.owner) {
-    //         doc.owner = userId;
-    //     }
-    //     if (doc.owner === '{userId}') {
-    //         doc.owner = userId;
-    //     }
-    //     doc.created_by = userId;
-    //     doc.modified_by = userId;
-    // }
-    var extras = ["spaces", "company", "organizations", "users", "space_users"];
-    if (extras.indexOf(this.object_name) < 0 && doc.space) {
-        /* company_ids/company_id默认值逻辑*/
-        if (!doc.company_id || !doc.company_ids) {
-            var su;
-            if (userId) {
-                const spaceUsers = await objectql.getObject("space_users").find({ filters: [['space', '=', doc.space], ['user', '=', userId]], fields: ['company_id'] });
-                su = spaceUsers.length > 0 ? spaceUsers[0] : null
-            }
-            if (!doc.company_id) {
-                if (doc.company_ids && doc.company_ids.length) {
-                    /* 如果用户在界面上指定了company_ids，则取第一个值 */
-                    doc.company_id = doc.company_ids[0];
-                }
-                else if (su && su.company_id) {
-                    doc.company_id = su.company_id;
-                }
-            }
-            if (!doc.company_ids) {
-                if (doc.company_id) {
-                    /* 如果用户在界面上指定了company_id，则取其值输入 */
-                    doc.company_ids = [doc.company_id];
-                }
-                else if (su && su.company_id) {
-                    doc.company_ids = [su.company_id];
-                }
-            }
-        }
-        await checkCompany(this.object_name, userId, doc);
-    }
-}
-const beforeUpdateBase = async function () {
-    const { doc, userId } = this;
-    if (!doc) {
-        return;
-    }
-    // 迁移到update函数中提前执行了
-    // doc.modified = new Date();
-    // if (userId) {
-    //     doc.modified_by = userId;
-    // }
-    var extras = ["spaces", "company", "organizations", "users", "space_users"];
-    if (extras.indexOf(this.object_name) < 0) {
-        /* company_ids/company_id级联修改逻辑*/
-        if (_.has(doc, "company_ids")) {
-            /*
-                原则上应该将 company_ids 设置为可编辑，company_id 设置为只读。
-                当 company_ids 可编辑时，修改 company_ids 同时更新 company_id = company_ids[0]
-            */
-            var firstCompanyId = doc.company_ids ? doc.company_ids[0] : null;
-            if (firstCompanyId) {
-                doc.company_id = firstCompanyId;
-            }
-            else {
-                doc.company_id = null;
-            }
-        }
-        else if (_.has(doc, "company_id")) {
-            /*
-                考虑到兼容老项目，允许将 company_id 设置为可编辑，此时 company_ids 必须只读。
-                当 company_id 可编辑时，修改 company_id 同时更新 company_ids = [company_id]
-            */
-            if (doc.company_id) {
-                doc.company_ids = [doc.company_id];
-            }
-            else {
-                doc.company_ids = null;
-            }
-        }
-        await checkCompany(this.object_name, userId, doc);
-    }
-}
 const afterDeleteBase = async function () {
     const { object_name, previousDoc } = this;
     if (!previousDoc) {
@@ -148,22 +12,21 @@ const afterDeleteBase = async function () {
     const fields = objectConfig.fields;
     const fieldsName = _.keys(previousDoc);
 
-    _.each(fieldsName, function (fieldName) {
+    for (const fieldName of fieldsName) {
         const fieldProps = fields[fieldName];
         const indexOfType = fieldProps && ['file', 'image'].indexOf(fieldProps.type);
         if (indexOfType > -1 && previousDoc[fieldName] && previousDoc[fieldName].length) {
-            const collection = [cfs.files, cfs.images][indexOfType];
+            const collection = ['cfs_files_filerecord', 'cfs_images_filerecord'][indexOfType];
             let ids = previousDoc[fieldName]
             if (typeof ids === 'string') {
                 ids = [ids]
             }
-            _.each(ids, function (id) {
-                collection.remove({
-                    "_id": id
-                });
-            })
+            for (const id of ids) {
+                await objectql.getObject(collection).delete(id)
+            }
         }
-    });
+    }
+
     if ("cms_files" != object_name) {
         // 删除附件
         const cmsFilesObj = objectql.getObject('cms_files')

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

@@ -1,5 +1,5 @@
 name: audit_records
-label: Audit Record
+label: Audit Records
 icon: medication
 hidden: true
 version: 2

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

@@ -183,7 +183,7 @@ actions:
                                 "method": "post",
                                 "messages": {},
                                 "dataType": "form-data",
-                                "requestAdaptor": "debugger; const superData = (typeof context != 'undefined') ? context : api.body; api.data.append('record_id', superData._master.record._id);api.data.append('parent', superData._master.record._id);api.data.append('object_name', superData._master.objectName); api.data.append('space', superData.global.spaceId);api.data.append('owner', superData.global.userId);api.data.append('owner_name', superData.context.user.user.name);return api;",
+                                "requestAdaptor": "const superData = (typeof context != 'undefined') ? context : api.body; api.data.append('record_id', superData._master.record._id);api.data.append('parent', superData._master.record._id);api.data.append('object_name', superData._master.objectName); api.data.append('space', superData.global.spaceId);api.data.append('owner', superData.global.userId);api.data.append('owner_name', superData.context.user.user.name);return api;",
                                 "adaptor": "if(payload.errors && payload.errors.length > 0){payload = {status: 500,msg: payload.errors[0].errorMessage}};return payload;"
                             },
                             "onEvent": {

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

@@ -1,5 +1,5 @@
 name: company
-label: Division
+label: Divisions
 icon: account
 enable_api: true
 hidden: false

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

@@ -4,16 +4,6 @@ icon: webcart
 hidden: true
 enable_audit: false
 fields:
-  edition:
-    type: text
-    label: Edition
-    hidden: true
-  edition_label:
-    type: text
-    label: Edition
-    is_name: true
-    filterable: true
-    searchable: true
   license:
     type: textarea
     rows: 8
@@ -26,13 +16,22 @@ fields:
     hidden: true
   product:
     type: text
-    label: Product
-    hidden: true
+    label: Product ID
   product_label:
     type: text
     label: Product
     filterable: true
     searchable: true
+  edition:
+    type: text
+    label: Edition
+    hidden: true
+  edition_label:
+    type: text
+    label: Edition
+    is_name: true
+    filterable: true
+    searchable: true
   is_trial:
     type: boolean
     label: Trial
@@ -75,34 +74,15 @@ fields:
   is_local:
     type: boolean
     hidden: true
-actions:
-  apply:
-    label: Apply
-    on: list
-    visible: false
-  changeSpaceLicense:
-    label: 更新许可证
-    on: list
-    visible: true
-  copySpaceId:
-    label: Copy space id
-    on: list
-    visible: false
-  upgrade:
-    label: Upgrade
-    on: list
-    visible: true
 list_views:
   all:
-    label: Al
+    label: All
     columns:
-      - edition_label
       - product_label
+      - product
       - user_number
       - verify_status
       - end_date
-    filters:
-      - [['lid', '<>', 'None'], ['invalid','!=',true]]
 permission_set:
   user:
     allowCreate: false

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

@@ -1,4 +1,4 @@
 name: logs
-label: Log
+label: System Logs
 hidden: true
 icon: job_profile

package/main/default/objects/notifications/fields/related_to.field.yml

@@ -6,11 +6,19 @@ reference_to: !<tag:yaml.org,2002:js/function> |-
   function anonymous(
   ) {
 
-          var o = [];
-          _.each(Creator.Objects, function (object, object_name) {
-            return o.push(object.name);
+        try{
+          let objects = [];
+          var queryResult = Steedos.authRequest(`/graphql`, {
+              type: 'POST', async: false, 
+              data: JSON.stringify({
+                query: `{ objects{ name } }`
+              })
           });
-          return o;
+          objects = queryResult && queryResult.data && queryResult.data.objects;
+          return _.map(objects, 'name') ;
+        }catch(e){
+          return []
+        }
         
   }
 filterable: true

package/main/default/objects/object_fields/fields/description.field.yml

@@ -2,6 +2,15 @@ name: description
 hidden: false
 is_wide: true
 label: Description
-sort_no: 340
+sort_no: 380
 type: textarea
-inlineHelpText: 在字段下方增加解释说明
+inlineHelpText: 在字段下方增加解释说明
+amis: 
+    type: input-rich-text
+    name: rich
+    options:
+      menubar: false
+      height: 200
+      plugins: 
+        - lists
+      toolbar: undo redo | formatselect | bold italic forecolor backcolor  | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat

package/main/default/objects/object_fields/fields/required.field.yml

@@ -1,7 +1,7 @@
 name: required
 hidden: false
 label: Required
-sort_no: 380
+sort_no: 340
 type: boolean
 visible_on: >-
   {{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false:

package/main/default/objects/object_fields/listviews/all.listview.yml

@@ -4,8 +4,8 @@ columns:
   - field: name
     amis:
       copyable: true
-  - group
   - type
+  - group
   - object
   - sort_no
   - modified

package/main/default/objects/object_functions/buttons/open_api.button.yml

@@ -6,9 +6,7 @@ amis_schema: >-
   objectApiName__expand{\n      name\n    }\n  }\n}\n 
   `\n}","adaptor":"","messages":{}}},{"ignoreError":false,"actionType":"custom","script":"const
   record =
-  event.data.object_function;\nwindow.open(`/api/v1/${record.object.name}/functions/${record.name}`)\n"}]}},"hidden":false,"visibleOn":"${is_rest
-  ==
-  true}"}],"data":{"context":{},"dataComponentId":"","record_id":"","record":{},"permissions":{}},"bodyClassName":"p-0","id":"u:05f888280584","dsType":"api"}
+  event.data.object_function;\nwindow.open(`/api/v6/functions/${record.object.name}/${record.name}`)\n"}]}},"hidden":false,"visibleOn":"${true}"}],"data":{"context":{},"dataComponentId":"","record_id":"","record":{},"permissions":{}},"bodyClassName":"p-0","id":"u:05f888280584","dsType":"api"}
 is_enable: true
 label: 请求API
 locked: false

package/main/default/objects/object_functions/fields/script.field.yml

@@ -5,9 +5,10 @@ language: javascript
 is_wide: true
 required: true
 defaultValue: |-
-  // global: {_:lodash, moment, validator, filters, axios, formData, mongodb, sequelize}
-  // objects
   // ctx: {input, params, broker, getObject, getUser}
+  // objects: all steedos objects
+  // db: mongodb client instance
+  // npm: {_, moment, validator, filters, axios, formData, mongodb, sequelize}
 editorDidMount: >-
   if(window._registerCompletionItemProviderFunction){
     return ;

package/main/default/objects/object_functions/listviews/all.listview.yml

@@ -3,7 +3,6 @@ columns:
   - name
   - objectApiName
   - isEnabled
-  - is_rest
   - is_system
 label: All
 filter_scope: space

package/main/default/objects/object_functions/listviews/customize.listview.yml

@@ -3,7 +3,6 @@ columns:
   - name
   - objectApiName
   - isEnabled
-  - is_rest
   - is_system
 label: 自定义
 filters:

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

@@ -1,5 +1,5 @@
 name: object_functions
-icon: code_playground
+icon: formula
 label: Object Functions
 version: 2
 hidden: true

package/main/default/objects/object_listviews/fields/extra_columns.field.yml

@@ -3,7 +3,7 @@ label: Extra Columns
 type: lookup
 multiple: true
 is_wide: false
-required: true
+required: false
 depend_on:
   - object_name
 reference_to: object_fields

package/main/default/objects/object_triggers/fields/handler.field.yml

@@ -5,10 +5,11 @@ language: javascript
 is_wide: true
 required: true
 defaultValue: |-
-  // global: {_:lodash, moment, validator, filters, axios, formData, mongodb, sequelize}
   // ctx
-  // objects
+  // objects: all steedos objects
+  // db: mongodb client instance
   // services
+  // npm: {_, moment, validator, filters, axios, formData, mongodb, sequelize}
 editorDidMount: >-
   if(window._registerCompletionItemProviderTrigger){
     return ;

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

@@ -1,5 +1,5 @@
 name: object_webhooks
-label: Object Webhook
+label: Object Webhooks
 icon: output
 hidden: true
 isMetadata: true

package/main/default/objects/objects/buttons/show_object.button.js

@@ -13,7 +13,7 @@ module.exports = {
             return toastr.warning("请先启动对象");
         }
 
-        window.open(Steedos.getRelativeUrl("/app/__preview/" + (record.name || this.record.name)));
+        window.open(Steedos.getRelativeUrl("/app/-/" + (record.name || this.record.name)));
     },
     show_objectVisible: function(object_name, record_id, record_permissions, data) {
         var record = data && data.record;

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

@@ -0,0 +1,114 @@
+name: copy
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "${'permission_set.copy.copy' | t}",
+              "id": "u:copy",
+              "onEvent": {
+                  "click": {
+                      "weight": 0,
+                      "actions": [
+                          {
+                              "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'permission_set.copy.copy_record' | t}",
+                                  "body": [
+                                      {
+                                          "type": "form",
+                                          "title": "表单",
+                                          "body": [
+                                              {
+                                                  "label": "${'permission_set.copy.display_name' | t}",
+                                                  "type": "input-text",
+                                                  "value": "${'permission_set.copy.copy_of_record' | t:${record.label}}",
+                                                  "name": "label_input",
+                                                  "id": "u:24e89a11d437",
+                                                  "required": true
+                                              },
+                                              {
+                                                  "type": "input-text",
+                                                  "name": "name_input",
+                                                  "value": "${record.name}_copy",
+                                                  "label": "${'permission_set.copy.api_name' | t}",
+                                                  "id": "u:27bd7cfe3e12",
+                                                  "required": true
+                                              }
+                                          ],
+                                          "api": {
+                                              "url": "${context.rootUrl}/api/permission/permission_set/copy",
+                                              "method": "post",
+                                              "messages": {
+                                                "success": "复制成功"
+                                              },
+                                              "requestAdaptor": "delete api.body.label_input;\ndelete api.body.name_input;",
+                                              "data": {
+                                                  "&": "$$",
+                                                  "label": "${label_input}",
+                                                  "name": "${name_input}",
+                                                  "originalPermissionSetId": "${record._id}"
+                                              },
+                                              "headers": {
+                                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                              }
+                                          },
+                                          "onEvent": {
+                                            "submitSucc": {
+                                            "weight": 0,
+                                            "actions": [
+                                                {
+                                                "args": {
+                                                    "url": "${context.rootUrl}/app/${appId}/${objectName}/view/${result.data.recordId}",
+                                                    "blank": false
+                                                },
+                                                "actionType": "url"
+                                                }
+                                            ]
+                                            }
+                                        },
+                                          "id": "u:818f7b68417b",
+                                          "mode": "normal"
+                                      }
+                                  ],
+                                  "showCloseButton": true,
+                                  "showErrorMsg": true,
+                                  "showLoading": true,
+                                  "id": "u:9f9b042404a1",
+                                  "closeOnEsc": false,
+                                  "dataMapSwitch": false,
+                                  "size": "md"
+                              },
+                              "actionType": "dialog"
+                          }
+                      ]
+                  }
+              }
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+          "context": {},
+          "app_id": "",
+          "tab_id": "",
+          "object_name": "",
+          "dataComponentId": "",
+          "record_id": "",
+          "record": {},
+          "permissions": {}
+      },
+      "bodyClassName": "p-0",
+      "id": "u:4b81eda72f12"
+  }
+is_enable: true
+label: 复制
+'on': record_only
+type: amis_button
+visible: !!js/function |
+    function (object_name, record_id, record_permissions, record) {
+
+        return record.record.type == 'profile';
+    }