@steedos/service-core-objects 3.0.0-beta.137 → 3.0.0-beta.139

package/README.md

@@ -1,6 +1,6 @@
 # @steedos/standard-space
 
-### 服务名称 `~packages-@steedos/standard-space`
+### 服务名称 `@steedos/standard-space`
 
 ## actions
 
@@ -16,7 +16,7 @@
 
 示例
 ```
-this.broker.call('~packages-@steedos/standard-space.upsetOrganizations', {
+this.broker.call('@steedos/standard-space.upsetOrganizations', {
     organizations: [{
         qywx_id: "1",
         name: "组织1"
@@ -46,7 +46,7 @@ this.broker.call('~packages-@steedos/standard-space.upsetOrganizations', {
 
 示例
 ```
-this.broker.call('~packages-@steedos/standard-space.upsetSpaceUsers', {
+this.broker.call('@steedos/standard-space.upsetSpaceUsers', {
     spaceUsers: [{
         name: "user1",
         organizations: ['1']

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

@@ -9,7 +9,13 @@ fields:
   report_type:
     label: Report Type
     help: 
-    options: []
+    options: 
+      - label: Tabular
+        value: tabular
+      - label: Summary
+        value: summary
+      - label: Matrix
+        value: matrix
     description: 
   data_source:
     label: Data Source

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

@@ -9,7 +9,13 @@ fields:
   report_type:
     label: 报表类型
     help: 
-    options: []
+    options: 
+      - label: 表格
+        value: tabular
+      - label: 摘要
+        value: summary
+      - label: 矩阵
+        value: matrix
     description: 
   data_source:
     label: 报表数据来源

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/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/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/reports.object.yml

@@ -16,50 +16,26 @@ fields:
     label: Report Type
     type: select
     defaultValue: tabular
-    options: !<tag:yaml.org,2002:js/function> |-
-      function () {
-        var types = [
-          {
-            "label": t("reports_field_report_type_options_tabular"),
-            "value": "tabular"
-          },
-          {
-            "label": t("reports_field_report_type_options_summary"),
-            "value": "summary"
-          },
-          {
-            "label": t("reports_field_report_type_options_matrix"),
-            "value": "matrix"
-          }
-        ];
-        var plugins = Creator.Plugins;
-        if(plugins["@steedos/plugin-jsreport"]){
-          types.push({
-            "label": "JsReport",
-            "value": "jsreport"
-          });
-        }
-        if(plugins["@steedos/plugin-stimulsoft-report"]){
-          types.push({
-            "label": "StimulsoftReport",
-            "value": "stimulsoft-report"
-          });
-        }
-        return types;
-      }
+    options: 
+      - label: Tabular
+        value: tabular
+      - label: Summary
+        value: summary
+      - label: Matrix
+        value: matrix
     name: report_type
     filterable: true
-  data_source:
-    label: Data Source
-    type: select
-    defaultValue: odata
-    options:
-      - label: OData
-        value: odata
-      - label: Graphql
-        value: graphql
-    name: data_source
-    filterable: true
+  # data_source:
+  #   label: Data Source
+  #   type: select
+  #   defaultValue: odata
+  #   options:
+  #     - label: OData
+  #       value: odata
+  #     - label: Graphql
+  #       value: graphql
+  #   name: data_source
+  #   filterable: true
   object_name:
     label: Object
     type: lookup
@@ -68,52 +44,52 @@ fields:
     required: true
     name: object_name
     filterable: true
-  filter_scope:
-    label: Filter Scope
-    type: select
-    defaultValue: '"space"'
-    hidden: true
-    options:
-      - label: All
-        value: space
-      - label: Mine
-        value: mine
-    name: filter_scope
-    filterable: true
-  filters:
-    label: Filters
-    type: '[Object]'
-    omit: true
-    name: filters
-  filters.$:
-    label: Filter
-    blackbox: true
-    omit: true
-    hidden: true
-    name: filters.$
-  filters.$.field:
-    label: Field
-    type: text
-    name: filters.$.field
-  filters.$.operation:
-    label: Operator
-    type: select
-    defaultValue: =
-    options: !<tag:yaml.org,2002:js/function> |- 
-      function () {
-              return Creator.getFieldOperation();
-          }
-    name: filters.$.operation
-    filterable: true
-  filters.$.value:
-    label: Value
-    blackbox: true
-    name: filters.$.value
-  filter_logic:
-    label: Filter Logic
-    type: text
-    omit: true
-    name: filter_logic
+  # filter_scope:
+  #   label: Filter Scope
+  #   type: select
+  #   defaultValue: '"space"'
+  #   hidden: true
+  #   options:
+  #     - label: All
+  #       value: space
+  #     - label: Mine
+  #       value: mine
+  #   name: filter_scope
+  #   filterable: true
+  # filters:
+  #   label: Filters
+  #   type: '[Object]'
+  #   omit: true
+  #   name: filters
+  # filters.$:
+  #   label: Filter
+  #   blackbox: true
+  #   omit: true
+  #   hidden: true
+  #   name: filters.$
+  # filters.$.field:
+  #   label: Field
+  #   type: text
+  #   name: filters.$.field
+  # filters.$.operation:
+  #   label: Operator
+  #   type: select
+  #   defaultValue: =
+  #   options: !<tag:yaml.org,2002:js/function> |- 
+  #     function () {
+  #             return Creator.getFieldOperation();
+  #         }
+  #   name: filters.$.operation
+  #   filterable: true
+  # filters.$.value:
+  #   label: Value
+  #   blackbox: true
+  #   name: filters.$.value
+  # filter_logic:
+  #   label: Filter Logic
+  #   type: text
+  #   omit: true
+  #   name: filter_logic
   fields:
     label: Fields
     type: lookup
@@ -122,10 +98,14 @@ fields:
     depend_on:
       - object_name
     defaultIcon: service_contract
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-                return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
+    enable_enhanced_lookup: false
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function anonymous(filters,values
+      ) {
+        return ['object', '=', values.object_name]
+      }
     name: fields
     filterable: true
   rows:
@@ -136,10 +116,14 @@ fields:
     depend_on:
       - object_name
     defaultIcon: service_contract
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-                return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
+    enable_enhanced_lookup: false
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function anonymous(filters,values
+      ) {
+        return ['object', '=', values.object_name]
+      }
     name: rows
     filterable: true
   columns:
@@ -150,10 +134,14 @@ fields:
     depend_on:
       - object_name
     defaultIcon: service_contract
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-                return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
+    enable_enhanced_lookup: false
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function anonymous(filters,values
+      ) {
+        return ['object', '=', values.object_name]
+      }
     name: columns
     filterable: true
   values:
@@ -164,37 +152,41 @@ fields:
     depend_on:
       - object_name
     defaultIcon: service_contract
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-                return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
-            }
+    reference_to: object_fields
+    reference_to_field: name
+    enable_enhanced_lookup: false
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function anonymous(filters,values
+      ) {
+        return ['object', '=', values.object_name]
+      }
     name: values
     filterable: true
-  filter_fields:
-    label: Filter Fields
-    type: grid
-    is_wide: true
-    name: filter_fields
-    depend_on:
-      - object_name
-  filter_fields.$:
-    label: Filter Field
-    blackbox: true
-    type: object
-    name: filter_fields.$
-  filter_fields.$.field:
-    label: Field
-    type: lookup
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-                return Creator.getObjectFilterFieldOptions(values != null ? values.object_name : void 0);
-            }
-    name: filter_fields.$.field
-    filterable: true
-  filter_fields.$.required:
-    label: Required
-    type: boolean
-    name: filter_fields.$.required
+  # filter_fields:
+  #   label: Filter Fields
+  #   type: grid
+  #   is_wide: true
+  #   name: filter_fields
+  #   depend_on:
+  #     - object_name
+  # filter_fields.$:
+  #   label: Filter Field
+  #   blackbox: true
+  #   type: object
+  #   name: filter_fields.$
+  # filter_fields.$.field:
+  #   label: Field
+  #   type: lookup
+  #   optionsFunction: !<tag:yaml.org,2002:js/function> |- 
+  #     function (values) {
+  #               return Creator.getObjectFilterFieldOptions(values != null ? values.object_name : void 0);
+  #           }
+  #   name: filter_fields.$.field
+  #   filterable: true
+  # filter_fields.$.required:
+  #   label: Required
+  #   type: boolean
+  #   name: filter_fields.$.required
   options:
     label: Options
     omit: true
@@ -225,39 +217,6 @@ fields:
     type: boolean
     defaultValue: true
     name: counting
-  graphql:
-    label: Graphql
-    type: textarea
-    is_wide: true
-    hidden: false
-    group: JsReport
-    name: graphql
-  html:
-    label: Html
-    type: textarea
-    is_wide: true
-    hidden: false
-    group: JsReport
-    name: html
-  helper:
-    label: Helper
-    type: textarea
-    is_wide: true
-    hidden: false
-    group: JsReport
-    name: helper
-  script:
-    label: Script
-    type: textarea
-    is_wide: true
-    hidden: false
-    group: JsReport
-    name: script
-  mrt:
-    label: Mrt
-    type: textarea
-    is_wide: true
-    hidden: true
   is_system:
     type: boolean
     label: System
@@ -266,30 +225,29 @@ fields:
     visible_on: "{{global.mode ==='read' ? true : false}}"
     disabled: true
 list_views:
-  default:
-    columns:
-      - name
-      - report_type
-      - object_name
-      - is_system
   all:
     label: All Reports
     filter_scope: space
     filter_fields:
       - report_type
       - created
-  application:
-    label: Application Reports
-    filter_scope: space
-    filters: !<tag:yaml.org,2002:js/function> |- 
-      function () {
-              var object_names;
-              object_names = Creator.getAppObjectNames();
-              return [["object_name", "=", object_names]];
-            }
-    filter_fields:
+    columns:
+      - name
       - report_type
-      - created
+      - object_name
+      - is_system
+  # application:
+  #   label: Application Reports
+  #   filter_scope: space
+  #   filters: !<tag:yaml.org,2002:js/function> |- 
+  #     function () {
+  #             var object_names;
+  #             object_names = Creator.getAppObjectNames();
+  #             return [["object_name", "=", object_names]];
+  #           }
+  #   filter_fields:
+  #     - report_type
+  #     - created
   mine:
     label: My Reports
     filter_scope: mine
@@ -309,14 +267,15 @@ list_views:
 actions:
   standard_new_by_template:
     label: Pull from Library
-    visible: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              var permissions;
-              permissions = Creator.getPermissions();
-              if (Creator.getTemplateSpaceId() && permissions) {
-                return permissions["allowCreate"];
-              }
-            }
+    visible: false
+    # visible: !<tag:yaml.org,2002:js/function> |-
+    #   function () {
+    #           var permissions;
+    #           permissions = Creator.getPermissions();
+    #           if (Creator.getTemplateSpaceId() && permissions) {
+    #             return permissions["allowCreate"];
+    #           }
+    #         }
     'on': list
     todo: !<tag:yaml.org,2002:js/function> |-
       function (object_name, record_id, fields) {

package/main/default/objects/space_users/buttons/setPassword.button.js

@@ -70,18 +70,18 @@ module.exports = {
             autoComplete: "new-password",
             className: "ant-input",
             ref: inputRef,
-            onKeyDown: (event) => {
-                // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
-                if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {
-                    event.preventDefault();
-                    return false;
-                }
-            },
-            onContextMenu: (event) => {
-                // 禁用鼠标右键菜单
-                event.preventDefault();
-                return false;
-            }
+            // onKeyDown: (event) => {
+            //     // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
+            //     if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {
+            //         event.preventDefault();
+            //         return false;
+            //     }
+            // },
+            // onContextMenu: (event) => {
+            //     // 禁用鼠标右键菜单
+            //     event.preventDefault();
+            //     return false;
+            // }
         });
         let observered = false;
         const modalName = "modal-setPassword";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-core-objects",
-    "version": "3.0.0-beta.137",
+    "version": "3.0.0-beta.139",
     "main": "package.service.js",
     "publishConfig": {
         "access": "public"
@@ -9,12 +9,12 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/service-package-loader": "3.0.0-beta.137",
+        "@steedos/service-package-loader": "3.0.0-beta.139",
         "json2xls": "^0.1.2",
         "lodash": "^4.17.21"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "fc7817a9374cf0bb5472724bebfcdbaec81db098"
+    "gitHead": "8d6ec68f7c87be83db0a0eba893300457f71657f"
 }

package/main/default/objects/spaces/buttons/upgrade.button.js

@@ -1,12 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2022-12-12 11:32:14
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-12 13:44:53
- * @Description: 
- */
-module.exports = { 
-    upgrade: function () {
-        window.open(`https://www.steedos.com/pricing/platform`);
-    }
- }

package/main/default/objects/spaces/buttons/upgrade.button.yml

@@ -1,4 +0,0 @@
-name: upgrade
-label: Upgrade
-'on': record
-visible: true