@steedos/standard-object-database 2.7.1-beta.9 → 2.7.2-beta.1

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

@@ -0,0 +1,47 @@
+name: object_functions
+label: Object Functions
+description:
+fields:
+  _name:
+    label: API Name
+    help: >-
+      Can only contain lowercase letters and numbers, must start with a letter,
+      cannot end with an underscore character or contain two consecutive
+      underscore characters
+    description:
+  is_rest:
+    label: Enable API
+    help:
+    description: allow the use of api interface access：{POST/GET} /api/v1/:objectName/functions/:functionApiName
+  is_system:
+    label: System
+    help:
+    description:
+  isEnabled:
+    label: Enable
+    help:
+    description:
+  name:
+    label: Name
+    help:
+    description:
+  objectApiName:
+    label: Object
+    help:
+    description:
+  script:
+    label: Script
+    help:
+    description: |
+      async function run(ctx) {
+          // ...
+      }
+  description:
+    label: Description
+    help:
+    description:
+listviews:
+  all:
+    label: All
+  customize:
+    label: Customize

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

@@ -0,0 +1,44 @@
+name: object_functions
+label: 对象函数
+description:
+fields:
+  _name:
+    label: API 名称
+    help: API 名称只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符
+    description:
+  is_rest:
+    label: 启用API
+    help:
+    description: 允许使用API接口访问：{POST/GET} /api/v1/:objectName/functions/:functionApiName
+  is_system:
+    label: 系统
+    help:
+    description:
+  isEnabled:
+    label: 已启用
+    help:
+    description:
+  name:
+    label: 名称
+    help:
+    description:
+  objectApiName:
+    label: 所属对象
+    help:
+    description:
+  script:
+    label: 代码
+    help:
+    description: |
+      async function run(ctx) {
+          // ...
+      }
+  description:
+    label: 备注
+    help:
+    description:
+listviews:
+  all:
+    label: 所有
+  customize:
+    label: 自定义

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

@@ -56,7 +56,7 @@ fields:
     description: 
   enable_form_tabs:
     label: Enable Form Tabs
-    help: This feature exclusively affects the editable pages, with precedence given to configurations specified on the components.
+    help: Displays groups in tabbed mode in the form, recognizing this property only when editing mode.
     description: 
   enable_events:
     label: Enable Events

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

@@ -52,8 +52,8 @@ fields:
     help: 
     description: 
   enable_form_tabs:
-    label: 表单启用选项卡模式
-    help: 该功能只影响编辑页面，但会优先识别组件上的配置
+    label: 是否显示为选项卡模式
+    help: 在表单中以选项卡模式显示分组，只在编辑模式时识别该属性
     description: 
   enable_events:
     label: 允许添加日程

package/main/default/objects/datasources/fields/driver.field.yml

@@ -6,3 +6,4 @@ options: >-
   Server:sqlserver,PostgreSQL:postgres,Oracle:oracle,MySQL:mysql,Sqlite:sqlite
 required: true
 sort_no: 100
+filterable: true

package/main/default/objects/datasources/fields/is_enable.field.yml

@@ -2,3 +2,4 @@ name: is_enable
 type: boolean
 label: Enable
 sort_no: 250
+filterable: true

package/main/default/objects/datasources/fields/label.field.yml

@@ -4,3 +4,5 @@ label: Label
 required: true
 is_name: true
 sort_no: 110
+filterable: true
+searchable: true

package/main/default/objects/datasources/fields/name.field.yml

@@ -9,3 +9,4 @@ inlineHelpText: >-
   cannot end with an underscore character or contain two consecutive underscore
   characters
 sort_no: 120
+filterable: true

package/main/default/objects/object_fields/fields/auto_fill_mapping.$.to.field.yml

@@ -73,3 +73,5 @@ reference_to_field: name
 required: true
 sort_no: 530
 type: lookup
+amis: 
+  disabledOn: ${!from}

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

@@ -6,4 +6,4 @@ hidden: false
 label: Is Name
 sort_no: 650
 type: boolean
-visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup'], item => item === type) && !multiple}
+visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup', 'master_detail'], item => item === type) && !multiple}

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

@@ -4,3 +4,4 @@ hidden: false
 label: Sortable
 sort_no: 580
 type: boolean
+visible_on: '{{ ["image","file","lookup","master_detail","select"].indexOf(formData.type)<0 }}'

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

@@ -13,4 +13,4 @@ is_wide: true
 label: Filter Criteria
 sort_no: 280
 type: table
-visible_on: '{{formData.type === ''summary'' && global.mode !=''read'' ? true: false}}'
+visible_on: '{{formData.type === ''summary''}}'

package/main/default/objects/object_functions/buttons/standard_new.button.js

@@ -0,0 +1,16 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2024-05-14 17:04:31
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2024-05-14 17:04:36
+ * @FilePath: /steedos-platform-2.3/services/standard-object-database/main/default/objects/object_functions/buttons/standard_new.button.js
+ * @Description: 
+ */
+module.exports = {
+    standard_newVisible: function (object_name, record_id, record_permissions, data) {
+        if(Meteor.settings.public.enable_saas){
+            return false;
+        }
+        return Creator.baseObject.actions.standard_new.visible.apply(this, arguments);
+    },
+}

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

@@ -0,0 +1,7 @@
+name: _name
+type: text
+label: Api Name
+searchable: true
+index: true
+required: true
+sort_no: 100

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

@@ -0,0 +1,5 @@
+name: description
+label: Description
+type: textarea
+sort_no: 200
+is_wide: true

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

@@ -0,0 +1,5 @@
+name: isEnabled
+label: Enabled
+type: boolean
+defaultValue: true
+sort_no: 140

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

@@ -0,0 +1,5 @@
+name: is_rest
+type: boolean
+label: Rest
+sort_no: 170
+defaultValue: true

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

@@ -0,0 +1,7 @@
+name: is_system
+type: boolean
+label: System
+readonly: true
+visible_on: '{{global.mode ===''read'' ? true : false}}'
+disabled: true
+sort_no: 180

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

@@ -0,0 +1,8 @@
+name: name
+hidden: false
+label: Name
+required: false
+sort_no: 90
+type: text
+visible_on: '{{false}}'
+readonly: true

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

@@ -0,0 +1,7 @@
+name: objectApiName
+label: Object
+type: master_detail
+reference_to: objects
+reference_to_field: name
+required: true
+sort_no: 120

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

@@ -0,0 +1,4 @@
+name: record_permissions
+type: object
+visible_on: '{{global.mode ===''read'' ? true : false}}'
+sort_no: 160

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

@@ -0,0 +1,24 @@
+name: script
+label: Script
+type: code
+language: javascript
+is_wide: true
+required: true
+defaultValue: |-
+  // global: {_:lodash, moment, validator, filters}
+  // objects
+  // ctx: {input, params, broker, getObject, getUser}
+editorDidMount: >-
+  if(window._registerCompletionItemProviderFunction){
+    return ;
+  }
+
+  window._registerCompletionItemProviderFunction = true;
+
+  const result = Steedos.authRequest("/service/api/suggestions/function.d.ts",
+  {async: false});
+
+  monaco.languages.typescript.javascriptDefaults.addExtraLib(
+    result
+  );
+sort_no: 150

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

@@ -0,0 +1,9 @@
+name: all
+columns:
+  - name
+  - objectApiName
+  - isEnabled
+  - is_rest
+  - is_system
+label: All
+filter_scope: space

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

@@ -0,0 +1,13 @@
+name: customize
+columns:
+  - name
+  - objectApiName
+  - isEnabled
+  - is_rest
+  - is_system
+label: 自定义
+filters:
+  - - is_system
+    - <>
+    - true
+filter_scope: space

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

@@ -0,0 +1,8 @@
+name: object_functions
+icon: code_playground
+label: Object Functions
+version: 2
+hidden: true
+enable_dataloader: false
+paging:
+  enabled: false

package/main/default/objects/object_functions/permissions/admin.permission.yml

@@ -0,0 +1,7 @@
+permission_set_id: admin
+allowCreate: true
+allowDelete: true
+allowEdit: true
+allowRead: true
+modifyAllRecords: true
+viewAllRecords: true

package/main/default/objects/object_functions/permissions/user.permission.yml

@@ -0,0 +1,7 @@
+permission_set_id: user
+allowCreate: false
+allowDelete: false
+allowEdit: false
+allowRead: false
+modifyAllRecords: false
+viewAllRecords: false

package/main/default/objects/object_listviews/buttons/customize.button.js

@@ -26,6 +26,6 @@ customize:function (object_name, record_id, fields) {
   },
 customizeVisible:function(object_name, record_id, record_permissions, data){
     var record = data && data.record;
-    return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+    return Creator.baseObject.actions.standard_new.visible(object_name) && record.is_system;
   }
  }

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

@@ -5,3 +5,4 @@ searchable: true
 index: true
 required: true
 sort_no: 100
+filterable: true

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

@@ -3,3 +3,4 @@ label: Enabled
 type: boolean
 defaultValue: true
 sort_no: 140
+filterable: true

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

@@ -5,3 +5,4 @@ reference_to: objects
 reference_to_field: name
 required: true
 sort_no: 120
+filterable: true

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

@@ -3,3 +3,4 @@ data_type: text
 type: text
 visible_on: '{{false}}'
 sort_no: 110
+filterable: true

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

@@ -20,3 +20,4 @@ options:
   - label: 查询记录之前
     value: beforeFind
 sort_no: 130
+filterable: true

package/main/default/objects/object_validation_rules/fields/active.field.yml

@@ -5,3 +5,4 @@ inlineHelpText: >-
   Indicates whether this validation rule is active, (true), or not active
   (false).
 sort_no: 120
+filterable: true

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

@@ -3,3 +3,4 @@ type: textarea
 is_wide: true
 label: description
 sort_no: 130
+filterable: true

package/main/default/objects/object_validation_rules/fields/name.field.yml

@@ -3,3 +3,5 @@ type: text
 label: Name
 required: true
 sort_no: 100
+filterable: true
+searchable: true

package/main/default/objects/object_validation_rules/fields/object_name.field.yml

@@ -6,3 +6,4 @@ write_requires_master_read: true
 reference_to_field: name
 required: true
 sort_no: 110
+filterable: true

package/main/default/objects/object_webhooks/fields/event.field.yml

@@ -12,4 +12,5 @@ options:
   - label: 记录已创建或已更新
     value: createAndUpdate
   - label: 记录已删除
-    value: delete
+    value: delete
+filterable: true

package/main/default/objects/object_webhooks/fields/execute_when.field.yml

@@ -9,4 +9,5 @@ options:
   - label: 每次更新记录并满足条件要求
     value: trueEveryTime
   - label: 仅在更新记录以满足条件要求时
-    value: trueOnChangeOnly
+    value: trueOnChangeOnly
+filterable: true

package/main/default/objects/object_webhooks/fields/name.field.yml

@@ -2,4 +2,6 @@ name: name
 type: text
 label: Name
 required: true
-sort_no: 10
+sort_no: 10
+filterable: true
+searchable: true

package/main/default/objects/object_webhooks/fields/object_name.field.yml

@@ -5,4 +5,6 @@ reference_to_field: name
 label: Object
 required: true
 index: true
-sort_no: 20
+sort_no: 20
+searchable: true
+filterable: true

package/main/default/objects/object_webhooks/fields/payload_url.field.yml

@@ -4,4 +4,6 @@ type: text
 is_wide: true
 # regEx: /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i
 required: true
-sort_no: 70
+sort_no: 70
+filterable: true
+searchable: true

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

@@ -4,3 +4,4 @@ is_wide: true
 label: Description
 sort_no: 50
 type: textarea
+filterable: true

package/main/default/objects/objects/fields/enable_form_tabs.field.yml

@@ -1,5 +1,6 @@
 # 只影响编辑页面
 name: enable_form_tabs
+group: switch
 label: Enable Form Tabs
 sort_no: 461
 type: boolean

package/main/default/objects/objects/fields/in_development.field.yml

@@ -13,3 +13,5 @@ options:
 required: true
 sort_no: 40
 type: select
+filterable: true
+

package/main/default/objects/objects/fields/is_customize.field.yml

@@ -4,3 +4,4 @@ label: 是否自定义
 readonly: true
 sort_no: 100
 type: boolean
+filterable: true

package/main/default/objects/objects/fields/is_system.field.yml

@@ -6,3 +6,4 @@ readonly: true
 sort_no: 110
 type: boolean
 visible_on: '{{global.mode ===''read'' ? true : false}}'
+filterable: true

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

@@ -12,7 +12,7 @@ extra_columns:
 filter_scope: space
 filters:
   - - is_customize
-    - <>
+    - =
     - true
 label: Customize
 shared: true

package/main/default/pages/design_field_layout.page.amis.json

@@ -162,7 +162,7 @@
                                       "actions": [
                                         {
                                           "actionType": "custom",
-                                          "script": "///整理分组数据\nconst defaultGroupName = \"未分组\";\nconst hiddenGroupName = \"隐藏\";\nlet setting_groups = _.cloneDeep(event.data.groups);\nif (!_.find(setting_groups, { is_default: true })) {\n  setting_groups.unshift({\n    \"id\": \"default-group\",\n    \"group_name\": defaultGroupName,\n    \"visible_on\": \"\",\n    \"is_default\": true\n  })\n}\nif (!_.find(setting_groups, { is_hidden: true })) {\n  setting_groups.push({\n    id: \"hidden-group\",\n    group_name: hiddenGroupName,\n    visible_on: \"\",\n    is_hidden: true\n  });\n}\nsetting_groups.forEach(function (group) {\n  if (!group.id) {\n    group.id = window.crypto.randomUUID();\n  }\n  if (/\\$\\{.+\\}/.test(group.visible_on)) {\n    group.visible_on = group.visible_on.replaceAll('${', '\\\\${');\n  }\n})\n\n//整理字段与分组关系的数据\nlet design_field = {};\nlet oldGroup = _.cloneDeep(event.data.design_field);\nsetting_groups.forEach(function (group) {\n  if (_.has(oldGroup, group.id)) {\n    design_field[group.id] = oldGroup[group.id];\n    oldGroup = _.omit(oldGroup, group.id);\n  } else {\n    design_field[group.id] = [];\n  }\n})\n//当有分组被删除时，会进入以下if，将该分组下所有字段放入未分组中\nif (oldGroup && !_.isEmpty(oldGroup)) {\n  _.forEach(oldGroup, function (value, key) {\n    design_field[\"default-group\"] = _.unionBy(design_field[\"default-group\"], value);\n  });\n}\n\n//未分组 放在所有分组开头，隐藏 放在所有分组最后\nconst defaultGroup = design_field['default-group'];\nconst hiddenGroup = design_field['hidden-group'];\ndelete design_field['default-group'];\ndelete design_field['hidden-group'];\ndesign_field = _.merge({ 'default-group': defaultGroup }, design_field, { 'hidden-group': hiddenGroup });\n\n//根据design_field调整groups顺序，设置分组与保存时需要groups按照顺序\nconst keys = _.keys(design_field);\nsetting_groups = _.sortBy(setting_groups, function (group) { return _.findIndex(keys, function (key) { return key == group.id }) });\n\ndoAction({\n  actionType: 'setValue',\n  componentId: 'form_field_design',\n  args: {\n    value: {\n      groups: setting_groups,\n      design_field\n    }\n  }\n});"
+                                          "script": "///整理分组数据\nconst defaultGroupName = \"未分组\";\nconst hiddenGroupName = \"隐藏\";\nlet setting_groups = _.cloneDeep(event.data.groups);\nif (!_.find(setting_groups, { is_default: true })) {\n  setting_groups.unshift({\n    \"id\": \"default-group\",\n    \"group_name\": defaultGroupName,\n    \"visible_on\": \"\",\n    \"is_default\": true\n  })\n}\nif (!_.find(setting_groups, { is_hidden: true })) {\n  setting_groups.push({\n    id: \"hidden-group\",\n    group_name: hiddenGroupName,\n    visible_on: \"\",\n    is_hidden: true\n  });\n}\nsetting_groups.forEach(function (group) {\n  if (!group.id) {\n    group.id = window.BuilderAmisObject.AmisLib.uuidv4();\n  }\n  if (/\\$\\{.+\\}/.test(group.visible_on)) {\n    group.visible_on = group.visible_on.replaceAll('${', '\\\\${');\n  }\n})\n\n//整理字段与分组关系的数据\nlet design_field = {};\nlet oldGroup = _.cloneDeep(event.data.design_field);\nsetting_groups.forEach(function (group) {\n  if (_.has(oldGroup, group.id)) {\n    design_field[group.id] = oldGroup[group.id];\n    oldGroup = _.omit(oldGroup, group.id);\n  } else {\n    design_field[group.id] = [];\n  }\n})\n//当有分组被删除时，会进入以下if，将该分组下所有字段放入未分组中\nif (oldGroup && !_.isEmpty(oldGroup)) {\n  _.forEach(oldGroup, function (value, key) {\n    design_field[\"default-group\"] = _.unionBy(design_field[\"default-group\"], value);\n  });\n}\n\n//未分组 放在所有分组开头，隐藏 放在所有分组最后\nconst defaultGroup = design_field['default-group'];\nconst hiddenGroup = design_field['hidden-group'];\ndelete design_field['default-group'];\ndelete design_field['hidden-group'];\ndesign_field = _.merge({ 'default-group': defaultGroup }, design_field, { 'hidden-group': hiddenGroup });\n\n//根据design_field调整groups顺序，设置分组与保存时需要groups按照顺序\nconst keys = _.keys(design_field);\nsetting_groups = _.sortBy(setting_groups, function (group) { return _.findIndex(keys, function (key) { return key == group.id }) });\n\ndoAction({\n  actionType: 'setValue',\n  componentId: 'form_field_design',\n  args: {\n    value: {\n      groups: setting_groups,\n      design_field\n    }\n  }\n});"
                                         },
                                         {
                                           "actionType": "closeDialog"
@@ -476,7 +476,7 @@
             },
             "messages": {},
             "requestAdaptor": "",
-            "adaptor": "//筛选出可编辑的字段\nvar oldFields = _.filter(payload.data.fields, function (obj) { return obj.recordPermissions.allowEdit; });\n//将group为空的字段分为未分组的组中,将系统字段的_id改为对象名.字段名\noldFields = _.map(oldFields, function (obj) {\n  obj.originId = obj._id;\n  if (obj.hidden || obj.visible_on == \"{{false}}\") {\n    obj.group = \"隐藏\";\n  }else if (obj.group === null) {\n    obj.group = \"未分组\";\n  }\n  if (obj.is_system) {\n    obj._id = api.data.designObjectName + \".\" + obj._name;\n  }\n  return obj;\n});\n\n//整合出字段的属性集合\nconst fields = oldFields.map((field) => {\n  return {\n    \"id\": field._id,//用与steedos-board组件的关系分辨\n    \"_name\": field._name,\n    \"label\": field.label,\n    \"_id\": field.originId,//用于打开steedos-object-form\n    \"columnSpan\": field.is_wide ? 2 : 1,\n    \"is_system\": field.is_system,\n    \"type\": field.type,\n    \"attr_visible_on\": field.visible_on\n  }\n})\n\n//去重并去除隐藏和未分组\nlet newArray = _.reject(_.uniqBy(oldFields, \"group\"), function(obj) {\n  return obj.group == \"隐藏\" || obj.group == \"未分组\";\n});\n//从字段的group属性中，整合出字段分组的属性集合\nlet field_groups = _.map(newArray, function (obj) {\n  return {\n    \"id\": window.crypto.randomUUID(), \n    \"group_name\": obj.group,\n    \"visible_on\": \"\"\n  };\n});\n\n//合并对象上的field_groups与字段上的group\nlet groups = _.unionBy(api.data.field_groups, field_groups, 'group_name');\n\n//判断是否第一次调用接口，不是的话（说明是触发了datachange事件），返回fields与fieldUpdateData；目前新增与删除都不支持\nif (api.data.dataInitialed) {\n  const eventData = api.data.eventData;\n  let fieldUpdateData = \"\";\n  const fieldForGroup = api.data.fieldForGroup;\n  let fieldForGroupLength = 0;\n  _.forIn(fieldForGroup, function (value, key) {\n    fieldForGroupLength += value.length;\n  });\n  if (fieldForGroupLength < fields.length) {\n    fieldUpdateData = {\n      type: \"insert\",\n      id: eventData.result.data.recordId\n    }\n  } else if (fieldForGroupLength > fields.length) {\n    fieldUpdateData = {\n      type: \"delete\",\n      id: eventData._id\n    }\n  }\n  return payload = {\n    data: {\n      fields,\n      fieldUpdateData\n    }\n  }\n}\n\n//整合字段与分组的关系\nconst oldFieldsInGroups = _.groupBy(oldFields, \"group\");\nlet fieldForGroup = _.mapValues(_.groupBy(groups, \"id\"), function (group,key) {\n  if (oldFieldsInGroups[group[0].group_name]) {\n    return _.map(oldFieldsInGroups[group[0].group_name], function (obj) {\n      return obj._id;\n    });\n  } else {\n    return [];\n  }\n});\n\n//未分组 放在所有分组开头，隐藏 放在所有分组最后\nconst defaultGroupId = _.find(groups, { 'is_default': true }).id;\nconst hiddenGroupId = _.find(groups, { 'is_hidden': true }).id;\nconst defaultGroup = fieldForGroup[defaultGroupId];\nconst hiddenGroup = fieldForGroup[hiddenGroupId];\ndelete fieldForGroup[defaultGroupId];\ndelete fieldForGroup[hiddenGroupId];\nfieldForGroup = _.merge({ [defaultGroupId]: defaultGroup }, fieldForGroup, { [hiddenGroupId]: hiddenGroup });\n\n//根据fieldForGroup调整groups顺序，设置分组与保存时需要groups按照顺序\nconst keys = _.keys(fieldForGroup);\ngroups = _.sortBy(groups, function (group) { return _.findIndex(keys, function (key) { return key == group.id }) });\n\nreturn payload = {\n  data: {\n    fields,\n    groups,\n    fieldForGroup,\n    dataInitialed: true\n  }\n};",
+            "adaptor": "//筛选出可编辑的字段\nvar oldFields = _.filter(payload.data.fields, function (obj) { return obj.recordPermissions.allowEdit; });\n//将group为空的字段分为未分组的组中,将系统字段的_id改为对象名.字段名\noldFields = _.map(oldFields, function (obj) {\n  obj.originId = obj._id;\n  if (obj.hidden || obj.visible_on == \"{{false}}\") {\n    obj.group = \"隐藏\";\n  }else if (obj.group === null) {\n    obj.group = \"未分组\";\n  }\n  if (obj.is_system) {\n    obj._id = api.data.designObjectName + \".\" + obj._name;\n  }\n  return obj;\n});\n\n//整合出字段的属性集合\nconst fields = oldFields.map((field) => {\n  return {\n    \"id\": field._id,//用与steedos-board组件的关系分辨\n    \"_name\": field._name,\n    \"label\": field.label,\n    \"_id\": field.originId,//用于打开steedos-object-form\n    \"columnSpan\": field.is_wide ? 2 : 1,\n    \"is_system\": field.is_system,\n    \"type\": field.type,\n    \"attr_visible_on\": field.visible_on\n  }\n})\n\n//去重并去除隐藏和未分组\nlet newArray = _.reject(_.uniqBy(oldFields, \"group\"), function(obj) {\n  return obj.group == \"隐藏\" || obj.group == \"未分组\";\n});\n//从字段的group属性中，整合出字段分组的属性集合\nlet field_groups = _.map(newArray, function (obj) {\n  return {\n    \"id\": window.BuilderAmisObject.AmisLib.uuidv4(), \n    \"group_name\": obj.group,\n    \"visible_on\": \"\"\n  };\n});\n\n//合并对象上的field_groups与字段上的group\nlet groups = _.unionBy(api.data.field_groups, field_groups, 'group_name');\n\n//判断是否第一次调用接口，不是的话（说明是触发了datachange事件），返回fields与fieldUpdateData；目前新增与删除都不支持\nif (api.data.dataInitialed) {\n  const eventData = api.data.eventData;\n  let fieldUpdateData = \"\";\n  const fieldForGroup = api.data.fieldForGroup;\n  let fieldForGroupLength = 0;\n  _.forIn(fieldForGroup, function (value, key) {\n    fieldForGroupLength += value.length;\n  });\n  if (fieldForGroupLength < fields.length) {\n    fieldUpdateData = {\n      type: \"insert\",\n      id: eventData.result.data.recordId\n    }\n  } else if (fieldForGroupLength > fields.length) {\n    fieldUpdateData = {\n      type: \"delete\",\n      id: eventData._id\n    }\n  }\n  return payload = {\n    data: {\n      fields,\n      fieldUpdateData\n    }\n  }\n}\n\n//整合字段与分组的关系\nconst oldFieldsInGroups = _.groupBy(oldFields, \"group\");\nlet fieldForGroup = _.mapValues(_.groupBy(groups, \"id\"), function (group,key) {\n  if (oldFieldsInGroups[group[0].group_name]) {\n    return _.map(oldFieldsInGroups[group[0].group_name], function (obj) {\n      return obj._id;\n    });\n  } else {\n    return [];\n  }\n});\n\n//未分组 放在所有分组开头，隐藏 放在所有分组最后\nconst defaultGroupId = _.find(groups, { 'is_default': true }).id;\nconst hiddenGroupId = _.find(groups, { 'is_hidden': true }).id;\nconst defaultGroup = fieldForGroup[defaultGroupId];\nconst hiddenGroup = fieldForGroup[hiddenGroupId];\ndelete fieldForGroup[defaultGroupId];\ndelete fieldForGroup[hiddenGroupId];\nfieldForGroup = _.merge({ [defaultGroupId]: defaultGroup }, fieldForGroup, { [hiddenGroupId]: hiddenGroup });\n\n//根据fieldForGroup调整groups顺序，设置分组与保存时需要groups按照顺序\nconst keys = _.keys(fieldForGroup);\ngroups = _.sortBy(groups, function (group) { return _.findIndex(keys, function (key) { return key == group.id }) });\n\nreturn payload = {\n  data: {\n    fields,\n    groups,\n    fieldForGroup,\n    dataInitialed: true\n  }\n};",
             "sendOn": "!!this.designObjectId"
           },
           "messages": {},
@@ -510,7 +510,7 @@
         },
         "messages": {},
         "requestAdaptor": "",
-        "adaptor": "const field_groups = payload.data.objects[0] && _.map(payload.data.objects[0].field_groups, function (obj) {\n  return {\n    \"id\": window.crypto.randomUUID(), //唯一性id\n    \"group_name\": obj.group_name,\n    \"visible_on\": obj.visible_on,\n    \"collapsed\": obj.collapsed\n  }\n});\nfield_groups.unshift({\n  id: \"hidden-group\",\n  group_name: \"隐藏\",\n  visible_on: \"\",\n  is_hidden: true\n});\nfield_groups.unshift({\n  id: \"default-group\",\n  group_name: \"未分组\",\n  visible_on: \"\",\n  is_default: true\n});\n\n\n\nconst designObjectId = payload.data.objects[0] && payload.data.objects[0]._id;\nreturn payload = {\n  data: {\n    field_groups,\n    designObjectId,\n designObjectLabel: payload.data.objects[0] && payload.data.objects[0].label,\n   _master: {\n      recordId: designObjectId\n    }\n  }\n}"
+        "adaptor": "const field_groups = payload.data.objects[0] && _.map(payload.data.objects[0].field_groups, function (obj) {\n  return {\n    \"id\": window.BuilderAmisObject.AmisLib.uuidv4(), //唯一性id\n    \"group_name\": obj.group_name,\n    \"visible_on\": obj.visible_on,\n    \"collapsed\": obj.collapsed\n  }\n});\nfield_groups.unshift({\n  id: \"hidden-group\",\n  group_name: \"隐藏\",\n  visible_on: \"\",\n  is_hidden: true\n});\nfield_groups.unshift({\n  id: \"default-group\",\n  group_name: \"未分组\",\n  visible_on: \"\",\n  is_default: true\n});\n\n\n\nconst designObjectId = payload.data.objects[0] && payload.data.objects[0]._id;\nreturn payload = {\n  data: {\n    field_groups,\n    designObjectId,\n designObjectLabel: payload.data.objects[0] && payload.data.objects[0].label,\n   _master: {\n      recordId: designObjectId\n    }\n  }\n}"
       },
       "messages": {},
       "onEvent": {

package/main/default/pages/object_detail.page.amis.json

@@ -176,6 +176,19 @@
                             "perPage": 20
                         }
                     ]
+                },
+                {
+                    "title": "${'objects_amis_functions' | t}",
+                    "body": [
+                        {
+                            "type": "steedos-object-related-listview",
+                            "objectApiName": "objects",
+                            "recordId": "${recordId}",
+                            "relatedObjectApiName": "object_functions",
+                            "relatedKey": "objectApiName",
+                            "perPage": 20
+                        }
+                    ]
                 }
             ],
             "id": "u:6a3b45d7adcf",

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

@@ -299,7 +299,7 @@ function allowChangeObject(){
 }
 
 function checkNameField(nameField){
-  if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup"].indexOf(nameField.type) < 0){
+  if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup", "master_detail"].indexOf(nameField.type) < 0){
     throw new Error("只有文本、长文本、自动编号、日期、日期时间、时间、公式、相关表这些类型的字段可以被设置为名称字段");
   } else if(nameField.type == "lookup" && nameField.multiple) {
     throw new Error("多选的相关表字段不可以被设置为名称字段");

package/main/default/server/objects.core.js

@@ -349,6 +349,10 @@ function reloadObject(changeLog){
         //获取到最新的对象
         const object = register.getOriginalObjectConfig(objectName);
 
+        if (object.name) {
+            delete object.extend; // 因为objects.addConfig中会将extend赋值给name导致metadataApiName错误，故这里提前删除。
+        }
+
         let _mf =  _.max(_.values(object.fields), function (field) { return field.sort_no; });
         if(_mf && object.name){
             object.fields_serial_number = _mf.sort_no + 10;

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

@@ -315,7 +315,8 @@ let objectTriggers = {
                 required: true,
                 index: true,
                 searchable: true,
-                filterable: true
+                filterable: true,
+                sort_no: 10
             });
             // Creator.getCollection("object_fields").insert({
             //     object: doc.name,

package/main/default/services/suggestions.service.js

@@ -129,6 +129,98 @@ module.exports = {
                     ${servicesTypes}
                 `
             }
+        },
+        functionTSExtraLib: {
+            rest: {
+                method: "GET",
+                path: "/function.d.ts",
+            },
+            async handler(ctx) {
+                let objectsTypes = 'declare const objects: {';
+                _.each(global.objects, (v, k)=>{
+                    objectsTypes = `${objectsTypes} ${k}: SteedosObjectType;`
+                });
+
+                objectsTypes = objectsTypes + '}'
+
+                return `
+                    
+                    declare var global = {_: any, moment: any, validator: any, filters: any};
+
+                    declare type Params = {
+                        userId: SteedosIDType;
+                        spaceId?: SteedosIDType;
+                    }
+
+                    declare type CTXType = {
+                        input: any;
+                        params: Params;
+                        broker: {
+                            meta: any;
+                            call: any;
+                            mcall: any;
+                            emit: any;
+                            broadcast: any;
+                            broadcastLocal: any;
+                            namespace: string;
+                            nodeID: string;
+                            instanceID: string;
+                            logger: any;
+                            metadata: any;
+                        },
+                        getObject(objectName: string): SteedosObjectType;
+                        getUser(userId: string, spaceId: string): Promise<SteedosUserSession>;
+                    };
+
+                    declare var ctx: CTXType;
+
+                    declare type SteedosQueryFilters = any;
+                    declare type SteedosIDType = number | string;
+                    declare type SteedosQueryOptions = {
+                        fields?: Array<string> | string;
+                        readonly filters?: SteedosQueryFilters;
+                        readonly top?: number;
+                        readonly skip?: number;
+                        readonly sort?: string;
+                    };
+                    declare type SteedosUserSession = {
+                        userId: SteedosIDType;
+                        spaceId?: string;
+                        name: string;
+                        username?: string;
+                        mobile?: string;
+                        email?: string;
+                        utcOffset?: number;
+                        locale?: string;
+                        roles?: string[];
+                        space?: any;
+                        spaces?: any;
+                        company?: any;
+                        companies?: any;
+                        organization?: any;
+                        organizations?: any;
+                        permission_shares?: any;
+                        company_id?: string;
+                        company_ids?: string[];
+                        is_space_admin?: boolean;
+                        steedos_id?: string;
+                    };
+                    declare class SteedosObjectType {
+                        find(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        findOne(id: SteedosIDType, query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        insert(doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        update(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        delete(id: SteedosIDType, userSession?: SteedosUserSession): Promise<any>;
+                        directFind(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        directInsert(doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        directUpdate(id: SteedosIDType, doc: Dictionary<any>, userSession?: SteedosUserSession): Promise<any>;
+                        directDelete(id: SteedosIDType, userSession?: SteedosUserSession): Promise<any>;
+                        count(query: SteedosQueryOptions, userSession?: SteedosUserSession): Promise<any>;
+                        _makeNewID(): Promise<any>;
+                    }
+                    ${objectsTypes}
+                `
+            }
         }
 	},
 

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

@@ -77,6 +77,11 @@ module.exports = {
                 }
             }
             
+            if(_.isEmpty(this.data.values)){
+                const records = await objectql.getObject('datasources').find({filters: ['name', '=', this.id]})
+                this.data.values = records.length > 0 ? records[0]: null
+            }
+            
         }
     }
 }

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

@@ -0,0 +1,104 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2024-05-13 14:20:37
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2024-05-18 14:12:38
+ * @FilePath: /steedos-platform-2.3/services/standard-object-database/main/default/triggers/object_functions.trigger.js
+ * @Description: 
+ */
+const _ = require('lodash');
+const objectql = require('@steedos/objectql');
+const auth = require('@steedos/auth');
+const validator = require('validator');
+const PERMISSIONS = {
+    allowEdit: false,
+    allowDelete: false,
+    allowRead: true,
+};
+
+const BASERECORD = {
+    is_system: true,
+    record_permissions: PERMISSIONS
+};
+
+const APINAMEM_MULTI_MSG = '函数Api Name不能重复';
+const METADATA_CACHER_SERVICE_NAME = 'metadata-cachers-service'
+
+const getSourceFunctions = async () => {
+    const fDocs = await broker.call(`${METADATA_CACHER_SERVICE_NAME}.find`, { metadataName: 'object_functions' });
+    const data = _.map(_.filter(fDocs, (item)=>{
+        return !item._id || item._id == item.name
+    }), (item) => {
+        return {
+            ...item,
+            _id: item.name,
+            ...BASERECORD
+        };
+    });
+    return data;
+}
+
+function checkVariableName(variableName) {
+    if (variableName.length > 50) {
+        throw new Error("名称长度不能大于50个字符");
+    }
+    var reg = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+    if (reg.test(variableName)) {
+        var keywords = ['break', 'case', 'catch', 'continue', 'debugger', 'default', 'delete', 'do', 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof', 'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while', 'with', 'true', 'false', 'null', 'undefined', 'NaN', 'Infinity'];
+        if (keywords.indexOf(variableName) === -1) {
+            return true;
+        } else {
+            throw new Error("名称不能包含关键字");
+        }
+    } else {
+        throw new Error("名称只能包含字母、数字，必须以字母开头");
+    }
+}
+
+module.exports = {
+    beforeFind: async function () {
+        delete this.query.fields;
+    },
+    afterFind: async function () {
+        let spaceId = this.spaceId;
+        let sourceData = await getSourceFunctions();
+        this.data.values = this.data.values.concat(sourceData);
+        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+    },
+    afterCount: async function () {
+        let spaceId = this.spaceId;
+        this.data.values = this.data.values + objectql.getSteedosSchema().metadataDriver.count(await getSourceFunctions(), this.query, spaceId);
+    },
+    afterFindOne: async function () {
+        let spaceId = this.spaceId;
+        if (_.isEmpty(this.data.values)) {
+            const records = objectql.getSteedosSchema().metadataDriver.find(await getSourceFunctions(), { filters: ['_id', '=', this.id] }, spaceId);
+            if (records.length > 0) {
+                this.data.values = records[0]
+            }
+        }
+    },
+    beforeInsert: async function () {
+        if (validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true) == true) {
+            throw new Error('No permission')
+        }
+        const doc = this.doc;
+        checkVariableName(doc._name)
+        const count = await objectql.getObject(this.object_name).count({ filters: [['_name', '=', doc._name], ['objectApiName', '=', doc.objectApiName]] })
+        if (count > 0) {
+            throw new Error(APINAMEM_MULTI_MSG)
+        }
+        doc.name = `${doc.objectApiName}_${doc._name}`
+    },
+    beforeUpdate: async function () {
+        const doc = this.doc;
+        if (doc._name) {
+            checkVariableName(doc._name)
+        }
+        const count = await objectql.getObject(this.object_name).count({ filters: [['_name', '=', doc._name], ['objectApiName', '=', doc.objectApiName], ['_id', '!=', this.id]] })
+        if (count > 0) {
+            throw new Error(APINAMEM_MULTI_MSG)
+        }
+        doc.name = `${doc.objectApiName}_${doc._name}`
+    }
+}

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

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2021-06-03 15:11:52
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-15 09:26:19
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2024-05-18 14:06:18
  * @Description: 
  */
 const Cache = require('@steedos/cachers');

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

@@ -2,7 +2,7 @@ const InternalData = require('@steedos/standard-objects').internalData;
 const _ = require('underscore');
 const objectql = require('@steedos/objectql');
 const objectTree = require('../server/objects.tree.js');
-
+const clone = require('clone');
 const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
 module.exports = {
@@ -18,13 +18,25 @@ module.exports = {
         let userId = this.userId
         let spaceId = this.spaceId;
 
+        let filters = InternalData.parserFilters(this.query.filters);
+
         _.each(this.data.values, (item)=>{
             item.is_customize = true
         })
 
-        this.data.values = this.data.values.concat(await InternalData.getObjects(userId));
+        let cloneValues = clone(this.data.values, false);
+
+        if(filters.is_customize){
+            const dbObjects = await objectql.getObject('objects').directFind({space: spaceId});
+            _.each(dbObjects, (item)=>{
+                item.is_customize = true
+            })
+            cloneValues = cloneValues.concat(dbObjects);
+        }
+
+        cloneValues = cloneValues.concat(await InternalData.getObjects(userId));
 
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+        this.data.values = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
 
         _.each(this.data.values, function(value){
             if(value){
@@ -39,6 +51,11 @@ module.exports = {
     afterCount: async function(){
         let userId = this.userId
         let spaceId = this.spaceId;
+        let filters = InternalData.parserFilters(this.query.filters);
+        if(filters.is_customize){
+            const dbObjects = await objectql.getObject('objects').directFind({space: spaceId});
+            return this.data.values = dbObjects.length;
+        }
         this.data.values = this.data.values + objectql.getSteedosSchema().metadataDriver.count(await InternalData.getObjects(userId), this.query, spaceId);
     },
     afterFindOne: async function(){

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.1-beta.9",
+    "version": "2.7.2-beta.1",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,14 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.1-beta.9",
-        "@steedos/service-object-mixin": "2.7.1-beta.9",
-        "@steedos/standard-objects": "2.7.1-beta.9",
+        "@steedos/metadata-core": "2.7.2-beta.1",
+        "@steedos/service-object-mixin": "2.7.2-beta.1",
+        "@steedos/standard-objects": "2.7.2-beta.1",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "63b5ff5367f88ad33c4de6e04a1f432a1e2f5e8e"
+    "gitHead": "666aa721be857f2a029c35cc03fbb94910367b24"
 }