@steedos/standard-object-database 2.5.0-beta.3 → 2.5.0-beta.30

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

@@ -53,9 +53,9 @@ fields:
         value: percent
       - label: Password
         value: password
-      - label: Lookup
+      - label: Lookup Relationship
         value: lookup
-      - label: Master Detail
+      - label: Master-Detail Relationship
         value: master_detail
       - label: Autonumber
         value: autonumber

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

@@ -50,9 +50,9 @@ fields:
         value: percent
       - label: 密码
         value: password
-      - label: 相关表
+      - label: 查找关系
         value: lookup
-      - label: 主表/子表
+      - label: 主-详细信息关系
         value: master_detail
       - label: 自动编号
         value: autonumber

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

@@ -14,14 +14,12 @@ fields:
     label: 运行时
     help: 
     description: 
-  is_enable:
+  isEnabled:
     label: 已启用
     help: 
     description: 
-  todo:
-    label: >-
-      执行的脚本 <a target="_blank"
-      href="https://developer.steedos.com/developer/object_trigger">查看帮助</a>
+  handler:
+    label: 内容
     help: 
     description: 
 listviews:

package/main/default/objects/13.permission_fields.observe.object.js

@@ -19,6 +19,9 @@ Meteor.startup(function () {
         }
     }).observe({
         added: function (newDocument) {
+            if (newDocument.copy_from) { // 通过复制简档创建的字段权限，使用批量注册
+                return;
+            }
             if (inited) {
                 return _change(newDocument);
             }

package/main/default/objects/14.object_fields.observe.object.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-05 14:17:44
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-22 10:23:14
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-05-12 09:33:27
  * @Description: 
  */
 const objectql = require("@steedos/objectql");
@@ -13,7 +13,7 @@ Meteor.startup(function () {
         // 重置字段权限延迟10秒,防止对象服务未上线
         setTimeout(()=>{
             try {
-                console.log("====resetAllPermissionSetFieldPermissions====")
+                // console.log("====resetAllPermissionSetFieldPermissions====")
                 objectql.getSteedosSchema().broker.call(`permission_fields.resetAllPermissionSetFieldPermissions`, {
                     objectName: document.object
                 }, {

package/main/default/objects/15.permission_objects.observe.object.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-05 14:17:44
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-22 10:32:01
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-05-13 17:09:31
  * @Description: 
  */
 const objectql = require("@steedos/objectql");
@@ -38,6 +38,9 @@ Meteor.startup(function () {
         }
     }).observe({
         added: function (newDocument) {
+            if (newDocument.copy_from) { // 通过复制简档创建的对象权限，不需要重置字段权限
+                return;
+            }
             if (inited) {
                 return _change(newDocument);
             }

package/main/default/objects/2.object_triggers.observe.object.js

@@ -1,35 +1,43 @@
-var objectql = require('@steedos/objectql');
-var triggerCore = require('./object_triggers.core.js');
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-21 17:06:15
+ * @Description: 
+ */
+// var objectql = require('@steedos/objectql');
+// var triggerCore = require('./object_triggers.core.js');
 
-Meteor.startup(function () {
-    var _change, _remove;
-    _change = function (document) {
-        triggerCore.loadObjectTrigger(document)
-    };
-    _remove = function (document) {
-        triggerCore.removeObjectTrigger(document);
-    };
-    var config = objectql.getSteedosConfig();
-    if(config.tenant && config.tenant.saas){
-        return ;
-    }else{
-        Creator.getCollection("object_triggers").find({is_enable: true}, {
-            fields: {
-                created: 0,
-                created_by: 0,
-                modified: 0,
-                modified_by: 0
-            }
-        }).observe({
-            added: function (newDocument) {
-                return _change(newDocument);
-            },
-            changed: function (newDocument, oldDocument) {
-                return _change(newDocument);
-            },
-            removed: function (oldDocument) {
-                return _remove(oldDocument);
-            }
-        });
-    }
-});
+// Meteor.startup(function () {
+//     var _change, _remove;
+//     _change = function (document) {
+//         console.log("object_triggers===> _change");
+//         triggerCore.loadObjectTrigger(document)
+//     };
+//     _remove = function (document) {
+//         triggerCore.removeObjectTrigger(document);
+//     };
+//     var config = objectql.getSteedosConfig();
+//     if(config.tenant && config.tenant.saas){
+//         return ;
+//     }else{
+//         Creator.getCollection("object_triggers").find({is_enable: true}, {
+//             fields: {
+//                 created: 0,
+//                 created_by: 0,
+//                 modified: 0,
+//                 modified_by: 0
+//             }
+//         }).observe({
+//             added: function (newDocument) {
+//                 return _change(newDocument);
+//             },
+//             changed: function (newDocument, oldDocument) {
+//                 return _change(newDocument);
+//             },
+//             removed: function (oldDocument) {
+//                 return _remove(oldDocument);
+//             }
+//         });
+//     }
+// });

package/main/default/objects/3.permission_objects.observe.object.js

@@ -1,13 +1,46 @@
-var permissionCore = require('./permission_objects.core.js');
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-06 18:58:32
+ * @Description: 
+ */
 
+const cachers = require('@steedos/cachers');
+const objectql = require("@steedos/objectql");
+const _ = require('lodash');
+let permissionObjectsLoadSetTimeoutId = null;
 Meteor.startup(function () {
     var _change, _remove;
     _change = function (document) {
-        permissionCore.loadObjectPermission(document)
-    };
-    _remove = function (document) {
-        permissionCore.removeObjectPermission(document);
+        if(permissionObjectsLoadSetTimeoutId){
+            clearTimeout(permissionObjectsLoadSetTimeoutId);
+            permissionObjectsLoadSetTimeoutId = null;
+        }
+        permissionObjectsLoadSetTimeoutId = setTimeout(()=>{
+            objectql.getObject("permission_set").find({}).then((permissionSets)=>{
+                objectql.getObject("permission_objects").directFind({}).then((records)=>{
+                    records = _.map(records, (doc)=>{
+                        if(_.includes(['admin', 'user', 'customer', 'supplier'], doc.permission_set_id)){
+                            doc.name = doc.permission_set_id
+                        }else{
+                            const record = _.find(permissionSets, (item)=>{
+                                return doc.permission_set_id == item._id
+                            })
+                            if(record){
+                                doc.name = record.name;
+                            }else{
+                                doc.name = _.last(doc.name.split('.')) || doc.permission_set_id;
+                            }
+                        }
+                        return doc;
+                    })
+                    cachers.getCacher('permission_objects').set('permission_objects', _.groupBy(records, 'space'));
+                })
+            })
+        }, 1000 * 3)
     };
+   
     Creator.getCollection("permission_objects").find({}, {
         fields: {
             created: 0,
@@ -23,7 +56,7 @@ Meteor.startup(function () {
             return _change(newDocument);
         },
         removed: function (oldDocument) {
-            return _remove(oldDocument);
+            return _change(oldDocument);
         }
     });
 });

package/main/default/objects/datasources.object.js

@@ -1,4 +1,5 @@
 const _ = require("underscore");
+const lodash = require("lodash");
 var objectql = require('@steedos/objectql');
 var schema = objectql.getSteedosSchema();
 const datasourceCore = require('./datasources.core');
@@ -20,6 +21,9 @@ Creator.Objects['datasources'].methods = {
     testConnection: async function (req, res) {
         var userSession = req.user
             var recordId = req.params._id;
+            if(lodash.includes(defaultDatasourceName, recordId)){
+                return res.send({ok: 1});
+            }
             var spaceId = userSession.spaceId
             let doc = await objectql.getObject('datasources').findOne(recordId, {filters: `(space eq \'${spaceId}\')`});
             if(doc){

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

@@ -82,6 +82,15 @@ fields:
   is_enable:
     type: boolean
     label: Enable
+  record_permissions: 
+    type: object
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+  is_system:
+    type: boolean
+    label: System
+    readonly: true
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+    disabled: true
 list_views:
   all:
     columns:
@@ -89,6 +98,7 @@ list_views:
       - name
       - is_enable
       - driver
+      - is_system
     label: All
     filter_scope: space
 actions:

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

@@ -76,6 +76,7 @@ fields:
   type: 
     type: select
     sort_no: 170
+    hidden: true
     options:
       - label: Custom JavaScript
         value: script
@@ -89,16 +90,16 @@ fields:
   #   reference_to: word_templates
   #   visible_on: "{{formData.type === 'word-print' ? true: false}}"
   #   create: false
-  todo:
-    label: Execute Script
-    sort_no: 180
-    type: code
-    language: javascript
-    required: "{{formData.type != 'amis_button' ? true: false}}"
-    # omit: true
-    # hidden: true
-    is_wide: true
-    visible_on: "{{formData.type != 'amis_button' ? true: false}}"
+  # todo:
+  #   label: Execute Script
+  #   sort_no: 180
+  #   type: code
+  #   language: javascript
+  #   required: "{{formData.type != 'amis_button' ? true: false}}"
+  #   # omit: true
+  #   # hidden: true
+  #   is_wide: true
+  #   visible_on: "{{formData.type != 'amis_button' ? true: false}}"
   amis_schema: 
     label: Amis Schema
     sort_no: 180
@@ -108,6 +109,11 @@ fields:
     is_wide: true
     hidden: true
     visible_on: "{{formData.type == 'amis_button' ? true: false}}"
+form:
+  initialValues: !!js/function |
+    function(){
+      return {type: 'amis_button'}
+    }
 paging:
   enabled: false
 actions: 

package/main/default/objects/object_fields.object.js

@@ -268,7 +268,7 @@ function checkName(name){
   var reg = new RegExp('^[a-z]([a-z0-9]|_(?!_))*[a-z0-9]$'); //支持表格类型的验证表达式(待优化.$.限制只能出现一次): new RegExp('^[a-z]([a-z0-9]|_(?!_))*(\\.\\$\\.\\w+)*[a-z0-9]$')
   //TODO 撤销注释
   if(!reg.test(name)){
-    throw new Error("名称只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
+    throw new Error("'字段名'只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符");
   }
   if(name.length > 50){
     throw new Error("名称长度不能大于50个字符");

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

@@ -110,23 +110,46 @@ fields:
     visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     required: "{{['master_detail'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 180
-  # reference_to_field:
-  #   type: lookup
-  #   label: Reference to field
-  #   reference_to: object_fields
-  #   reference_to_field: name
-  #   visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
-  #   depend_on:
-  #     - reference_to
-  #   filtersFunction: !<tag:yaml.org,2002:js/function> |-
-  #     function (filters, values) {
-  #       if(values && values.reference_to){
-  #         return ['object', '=', values.reference_to]
-  #       }else{
-  #         return ['_id', '=', 'no']
-  #       }
-  #     }
-  #   sort_no: 182
+    amis:
+      menuTpl: "<div>${label}(${value})</div>"
+  depend_on:
+    type: lookup
+    group: Advanced
+    label: 依赖的字段
+    reference_to: object_fields
+    reference_to_field: name
+    multiple: true
+    visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
+    depend_on:
+      - object
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        if(values && values.object){
+          return ['object', '=', values.object]
+        }else{
+          return ['_id', '=', 'no']
+        }
+      }
+    sort_no: 450
+  reference_to_field:
+    type: lookup
+    group: Advanced
+    label: 关联的字段
+    description: '默认为主键'
+    reference_to: object_fields
+    reference_to_field: name
+    visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
+    depend_on:
+      - reference_to
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        if(values && values.reference_to){
+          return ['object', '=', values.reference_to]
+        }else{
+          return ['_id', '=', 'no']
+        }
+      }
+    sort_no: 450
   multiple:
     type: boolean
     label: Multiple
@@ -163,16 +186,23 @@ fields:
     sort_no: 220
   filtersFunction:
     label: filters Function
-    type: textarea
-    is_wide: true
-    visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
-    sort_no: 230
-  optionsFunction:
-    label: options Function
-    type: textarea
+    type: code
+    language: javascript
     is_wide: true
     visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
-    sort_no: 240
+    sort_no: 448
+    group: Advanced
+    amis:
+      placeholder: |-
+        function(filters, values){
+        
+        }
+  # optionsFunction:
+  #   label: options Function
+  #   type: textarea
+  #   is_wide: true
+  #   visible_on: "{{['lookup', 'master_detail'].indexOf(formData.type) > -1 ? true: false}}"
+  #   sort_no: 240
   precision:
     type: currency
     label: Precision
@@ -381,48 +411,23 @@ fields:
   summary_field:
     type: lookup
     label: Field to Aggregate
+    reference_to: object_fields
+    reference_to_field: name
     inlineHelpText: If the field type is a 'Roll-Up Summary' and the 'Roll-Up Type' is not COUNT, this field must be filled in, Only fields that aggregate number, currency, date, and datetime types are supported.
     depend_on:
       - summary_object
       - summary_type
     defaultIcon: service_contract
-    optionsFunction: !<tag:yaml.org,2002:js/function> |- 
-      function (values) {
-        if(!values.summary_object){
-          return [];
-        }
-        if(values.summary_type && values.summary_type !== "count"){
-          var options = Creator.getObjectLookupFieldOptions(values.summary_object, false, true);
-          var object = Creator.getObject(values.summary_object);
-          var fields = object ? object.fields : null;
-          if(!fields){
-            return [];
-          }
-          if(values.summary_type === "sum" || values.summary_type === "avg"){
-            /*sum/avg类型可以汇总数值、金额、百分比字段*/
-            options = options.filter(function(option){
-              var optionFieldType = fields[option.value] && fields[option.value].type;
-              if(["formula", "summary"].indexOf(optionFieldType) > -1){
-                /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/
-                optionFieldType = fields[option.value].data_type;
-              }
-              return ["number", "currency", "percent"].indexOf(optionFieldType) > -1
-            });
-          }
-          else{
-            /*min、max类型可以汇总数值、金额、百分比、日期、日期时间字段*/
-            options = options.filter(function(option){
-              var optionFieldType = fields[option.value] && fields[option.value].type;
-              if(["formula", "summary"].indexOf(optionFieldType) > -1){
-                /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/
-                optionFieldType = fields[option.value].data_type;
-              }
-              return ["number", "currency", "percent", "date", "datetime"].indexOf(optionFieldType) > -1
-            });
-          }
-          return options;
-        }
-      }
+    amis:
+      "autoComplete": 
+        "method": "get"
+        "url": "${context.rootUrl}/service/api/@${summary_object}/uiSchema?summary_object=${summary_object}&summary_type=${summary_type}&term=${term}"
+        "data": 
+          "summary_type": "${summary_type}"
+        "headers": 
+          "Authorization": "Bearer ${context.tenantId},${context.authToken}" 
+        "sendOn": "!!this.summary_object && !!this.summary_type"
+        "adaptor": "const summary_type = api.body.summary_type;\nconst term = api.query.term;\nlet fields = payload.fields;\nlet options = [];\nif (fields) {\n  if (summary_type && summary_type !== \"count\") {\n    if (summary_type === \"sum\" || summary_type === \"avg\") {\n      /*sum/avg类型可以汇总数值、金额、百分比字段*/\n      _.forEach(fields, (value, key) => {\n        let fieldType = value.type;\n        if ([\"formula\", \"summary\"].indexOf(fieldType) > -1) {\n          /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/\n          fieldType = value.data_type;\n        }\n        if ([\"number\", \"currency\", \"percent\"].indexOf(fieldType) > -1) {\n          options.push({ label: value.label, value: value.name });\n        }\n      })\n    }\n    else {\n      /*min、max类型可以汇总数值、金额、百分比、日期、日期时间字段*/\n      _.forEach(fields, (value, key) => {\n        let fieldType = value.type;\n        if ([\"formula\", \"summary\"].indexOf(fieldType) > -1) {\n          /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/\n          fieldType = value.data_type;\n        }\n        if ([\"number\", \"currency\", \"percent\", \"date\", \"datetime\"].indexOf(fieldType) > -1) {\n          options.push({ label: value.label, value: value.name });\n        }\n      })\n    }\n  }\n  if (term) {\n    options = _.filter(options, (item) => {\n      return item.label.toLowerCase().indexOf(term.toLowerCase()) > -1;\n    })\n  }\n}\npayload = {\n  data: { options: options },\n  msg: \"\",\n  status: 0\n}\nreturn payload;"
     visible_on: "{{formData.type === 'summary' && formData.summary_type !== 'count' ? true: false}}"
     required: "{{formData.type === 'summary' && formData.summary_type !== 'count' ? true: false}}"
     sort_no: 320

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

@@ -1,94 +1,93 @@
 name: object_triggers
 icon: apex
 label: Object Triggers
+version: 2.0
 hidden: true
 fields:
-  name:
+  _name:
     type: text
-    label: Name
+    label: Api Name
     searchable: true
     index: true
     required: true
-  # label:
-  #   label: 显示名称
-  #   type: text
-  object:
+  name: 
+    data_type: text
+    type: text
+    visible_on: "{{false}}"
+  listenTo:
     label: Object
     type: master_detail
     reference_to: objects
     reference_to_field: name
     required: true
-  # on:
-  #   label: 运行于
-  #   type: lookup
-  #   required: true
-  #   optionsFunction: !<tag:yaml.org,2002:js/function> |-
-  #     function () {
-  #             return [{
-  #               label: "客户端",
-  #               value: "client",
-  #               icon: "address"
-  #             }, {
-  #               label: "服务端",
-  #               value: "server",
-  #               icon: "address"
-  #             }];
-  #           }
   when:
     label: Execution Time Option
-    type: lookup
+    type: select
     required: true
-    optionsFunction: !<tag:yaml.org,2002:js/function> |-
-      function () {
-              return [{
+    multiple: true
+    is_wide: true
+    options: [{
                 label: "新增记录之前",
-                value: "beforeInsert",
-                icon: "asset_relationship"
+                value: "beforeInsert"
               }, {
                 label: "新增记录之后",
-                value: "afterInsert",
-                icon: "asset_relationship"
+                value: "afterInsert"
               }, {
                 label: "修改记录之前",
-                value: "beforeUpdate",
-                icon: "asset_relationship"
+                value: "beforeUpdate"
               }, {
                 label: "修改记录之后",
-                value: "afterUpdate",
-                icon: "asset_relationship"
+                value: "afterUpdate"
               }, {
                 label: "删除记录之前",
-                value: "beforeDelete",
-                icon: "asset_relationship"
+                value: "beforeDelete"
               }, {
                 label: "删除记录之后",
-                value: "afterDelete",
-                icon: "asset_relationship"
+                value: "afterDelete"
               }, {
                 label: "查下记录之前",
-                value: "beforeFind",
-                icon: "asset_relationship"
-              }];
-            }
-  is_enable:
-    label: Enable
+                value: "beforeFind"
+              }]
+  isEnabled:
+    label: Enabled
     type: boolean
-  todo:
-    label: Execute Script  <a target="_blank" href="https://developer.steedos.com/developer/object_trigger">View Help</a>
-    type: textarea
-    required: true
+    defaultValue: true
+  handler:
+    label: Handler
+    type: code
+    language: javascript
     is_wide: true
+    required: true
+    defaultValue: |-
+      const { params, getObject, getUser, call } = ctx;
+    editorDidMount: |-
+      if(window._registerCompletionItemProviderTrigger){
+        return ;
+      }
+      window._registerCompletionItemProviderTrigger = true;
+      const result = Steedos.authRequest("/service/api/suggestions/trigger.d.ts", {async: false});
+      monaco.languages.typescript.javascriptDefaults.addExtraLib(
+        result
+      );
+  record_permissions: 
+    type: object
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+  is_system:
+    type: boolean
+    label: System
+    readonly: true
+    visible_on: "{{global.mode ==='read' ? true : false}}"
+    disabled: true
 paging:
   enabled: false
 list_views:
   all:
     columns:
       - name
-      # - label
-      - object
-      # - 'on'
+      - listenTo
       - when
-      - is_enable
+      - isEnabled
+      - is_system
     label: All
     filter_scope: space
 permission_set: