@steedos/standard-object-database 2.5.17 → 2.5.18-beta.1

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

@@ -162,6 +162,8 @@ fields:
     label: Field
     help: 
     description: 
+  is_enable:
+    label: Enable
 groups:
   advanced: Advanced
 listviews:

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

@@ -146,6 +146,8 @@ fields:
     description: 
   sort_no:
     label: 排序号
+  is_enable:
+    label: 启用
   crud_mode:
     label: 显示模式
     help: 

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

@@ -131,7 +131,7 @@ fields:
     visible_on: "{{formData.type == 'amis_button' ? true: false}}"
   is_system:
     type: boolean
-    label: System
+    label: 系统
     # omit: true
     readonly: true
     visible_on: "{{global.mode ==='read' ? true : false}}"

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

@@ -238,7 +238,7 @@ function checkMasterDetailTypeField(doc, oldReferenceTo) {
 
 function onChangeName(oldName, newDoc){
   var newName = newDoc.name
-  Creator.getCollection("object_listviews").direct.find({space: newDoc.space, object_name: newDoc.object}, {fields: {_id:1, columns: 1}}).forEach(function(view){
+  Creator.getCollection("object_listviews").direct.find({space: newDoc.space, object_name: newDoc.object}, {fields: {_id:1, columns: 1, name: 1}}).forEach(function(view){
     if(_.isArray(view.columns)){
       var columns = [];
       _.each(view.columns, function(column){
@@ -258,7 +258,8 @@ function onChangeName(oldName, newDoc){
           columns.push(column)
         }
       });
-      Creator.getCollection("object_listviews").update({_id: view._id}, {$set: {columns: columns}});
+      // 由于 https://github.com/steedos/steedos-platform/issues/4655 改动, 修改列表视图的时候, 必须要传入name, 否则会报错
+      Creator.getCollection("object_listviews").update({_id: view._id}, {$set: {name: view.name, columns: columns}});
     }
   })
 }

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

@@ -31,6 +31,8 @@ fields:
     required: true
     visible_on: "{{global.mode !='read' ? true : false}}"
     sort_no: 130
+    amis:
+      disabledOn: "${is_system == true}"
   name:
     type: text
     label: API Name
@@ -41,6 +43,8 @@ fields:
     readonly: true
     visible_on: "{{global.mode !='read' ? false : true}}"
     sort_no: 140
+    amis:
+      disabledOn: "${is_system == true}"
   type:
     type: select
     label: Type
@@ -98,6 +102,7 @@ fields:
         value: summary
     sort_no: 150
     amis:
+      disabledOn: "${is_system == true}"
       onEvent:
         change:
           weight: 0
@@ -204,6 +209,8 @@ fields:
         value: yaml
     sort_no: 155
     visible_on: "{{['code'].indexOf(formData.type) > -1 ? true: false}}"
+    amis:
+      disabledOn: "${is_system == true}"
   defaultValue:
     type: text
     label: Default Value
@@ -218,6 +225,8 @@ fields:
     sort_no: 175
     defaultValue: bd09
     visible_on: "{{['location'].indexOf(formData.type) > -1 ? true: false}}"
+    amis:
+      disabledOn: "${is_system == true}"
   reference_to:
     type: lookup
     label: Reference to
@@ -228,6 +237,7 @@ fields:
     sort_no: 180
     amis:
       menuTpl: "<div>${label}(${value})</div>"
+      disabledOn: "${is_system == true}"
   depend_on:
     type: lookup
     group: Advanced
@@ -248,12 +258,16 @@ fields:
         }
       }
     sort_no: 445
+    amis:
+      disabledOn: "${is_system == true}"
   create:
     type: boolean
     label: 是否显示新建按钮
     defaultValue: true
     visible_on: "{{['lookup'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 185
+    amis:
+      disabledOn: "${is_system == true}"
   reference_to_field:
     type: lookup
     group: Advanced
@@ -274,18 +288,24 @@ fields:
         }
       }
     sort_no: 440
+    amis:
+      disabledOn: "${is_system == true}"
   multiple:
     type: boolean
     label: Multiple
     inlineHelpText: Single choice and multiple choice switch to each other. Please resubmit the existing records or modify the saving format of this field in the database.
     visible_on: "{{['select', 'lookup', 'image','file'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 190
+    amis:
+      disabledOn: "${is_system == true}"
   write_requires_master_read:
     label: Write requires master read
     type: boolean
     inlineHelpText: Sets the minimum sharing access level required on the master record to create, edit, or delete child records. This field applies only to master-detail or junction object custom field types. true—Allows users with “Read” access to the master record permission to create, edit, or delete child records. This setting makes sharing less restrictive. false—Allows users with “Read/Write” access to the master record permission to create, edit, or delete child records. This setting is more restrictive than true, and is the default value.
     visible_on: "{{formData.type === 'master_detail' ? true: false}}"
     sort_no: 200
+    amis:
+      disabledOn: "${is_system == true}"
   formula:
     label: Formula
     type: textarea
@@ -294,6 +314,8 @@ fields:
     visible_on: "{{['autonumber', 'formula'].indexOf(formData.type) > -1 ? true: false}}"
     required: "{{['autonumber', 'formula'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 210
+    amis:
+      disabledOn: "${is_system == true}"
   data_type:
     type: lookup
     label: Data Type
@@ -308,6 +330,8 @@ fields:
     visible_on: "{{['formula','select'].indexOf(formData.type) > -1 ? true: false}}"
     required: "{{['formula'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 220
+    amis:
+      disabledOn: "${is_system == true}"
   filtersFunction:
     label: filters Function
     type: code
@@ -317,6 +341,7 @@ fields:
     sort_no: 448
     group: Advanced
     amis:
+      disabledOn: "${is_system == true}"
       placeholder: |-
         function(filters, values){
         
@@ -333,6 +358,7 @@ fields:
     scale: 0
     amis: 
       value: 18
+      disabledOn: "${is_system == true}"
     # defaultValue: 18
     visible_on: "{{
       (function(){
@@ -372,6 +398,7 @@ fields:
     # defaultValue: 2
     amis:
       value: 2
+      disabledOn: "${is_system == true}"
     min: 0
     inlineHelpText: If the field type is a Percent, this indicates the number of decimal places the field will display, for example, two decimal places will display as 10.20%.
     visible_on: "{{
@@ -426,6 +453,8 @@ fields:
     visible_on: "{{formData.type === 'select' ? true: false}}"
     required: "{{formData.type === 'select' ? true: false}}"
     sort_no: 280
+    amis:
+      disabledOn: "${is_system == true}"
   options.$:
     label: Options
     blackbox: true
@@ -459,6 +488,8 @@ fields:
     visible_on: "{{['formula'].indexOf(formData.type) > -1 ? true: false}}"
     required: "{{['formula'].indexOf(formData.type) > -1 ? true: false}}"
     sort_no: 290
+    amis:
+      disabledOn: "${is_system == true}"
   summary_object:
     type: lookup
     label: Object to Summarize
@@ -468,6 +499,7 @@ fields:
     depend_on:
       - object
     amis:
+      disabledOn: "${is_system == true}"
       "source": 
         "method": "get"
         "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object}/detailLists/options?depend_on_object=${object}"
@@ -532,6 +564,8 @@ fields:
     visible_on: "{{formData.type === 'summary' ? true: false}}"
     required: "{{formData.type === 'summary' ? true: false}}"
     sort_no: 310
+    amis:
+      disabledOn: "${is_system == true}"
   summary_field:
     type: lookup
     label: Field to Aggregate
@@ -543,6 +577,7 @@ fields:
       - summary_type
     defaultIcon: service_contract
     amis:
+      disabledOn: "${is_system == true}"
       "autoComplete": 
         "method": "get"
         "url": "${context.rootUrl}/service/api/@${summary_object}/uiSchema?summary_object=${summary_object}&summary_type=${summary_type}&term=${term}"
@@ -564,6 +599,8 @@ fields:
       - summary_object
     visible_on: "{{formData.type === 'summary' && global.mode !='read' ? true: false}}"
     sort_no: 330
+    amis:
+      disabledOn: "${is_system == true}"
   summary_filters.$:
     label: Filter Criteria
     blackbox: true
@@ -624,18 +661,24 @@ fields:
     group: External data source
     # visible_on: "{{true}}"
     sort_no: 340
+    amis:
+      disabledOn: "${is_system == true}"
   primary:
     type: boolean
     label: Primary Key
     group: External data source
     # visible_on: "{{true}}"
     sort_no: 350
+    amis:
+      disabledOn: "${is_system == true}"
   generated:
     type: boolean
     label: Generated
     group: External data source
     # visible_on: "{{formData.database_name || formData.datasource ? true: false}}"
     sort_no: 360
+    amis:
+      disabledOn: "${is_system == true}"
   sort_no:
     label: Sort Number
     type: number
@@ -649,6 +692,8 @@ fields:
     label: Is Name
     group: Advanced
     sort_no: 380
+    amis:
+      disabledOn: "${is_system == true}"
   required:
     type: boolean
     label: Required
@@ -656,6 +701,7 @@ fields:
     visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
     sort_no: 272
     amis:
+      disabledOn: "${is_system == true}"
       onEvent:
         change:
           weight: 0
@@ -681,7 +727,7 @@ fields:
     defaultValue: clear
     amis:
       "id": "u:6a556d8a8514"
-      "disabledOn": "${required==true}"
+      "disabledOn": "${required==true || is_system == true}"
   is_wide:
     type: boolean
     label: Is Wide
@@ -725,6 +771,8 @@ fields:
     # group: Advanced
     visible_on: "{{formData.type === 'url' ? true: false}}"
     sort_no: 440
+    amis:
+      disabledOn: "${is_system == true}"
   visible_on:
     type: textarea
     label: Visible On
@@ -752,6 +800,10 @@ fields:
     group: Advanced
     sort_no: 455
     inlineHelpText: <a href='https://docs.steedos.com/zh-CN/no-code/customize/fields/field-attributes/#amis-%E5%B1%9E%E6%80%A7' target='_blank'>查看帮助</a>
+  is_system:
+    type: boolean
+    label: System
+    visible_on: "{{false}}"
 paging:
   enabled: false
 list_views:
@@ -809,7 +861,8 @@ relatedList:
 form:
   initialValues: !!js/function |
     function(){
-      var object = Creator.odata.get('objects', Session.get("record_id"), "fields_serial_number");
+      //应用程序微页面内Session.get("record_id")获取不到值（比如设计字段布局微页面）
+      var object = Creator.odata.get('objects', Session.get("record_id") || (this.master && this.master.recordId), "fields_serial_number");
       if(object){
         let fields_serial_number = object.fields_serial_number
         if(!fields_serial_number || fields_serial_number < 100){

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

@@ -225,6 +225,10 @@ fields:
     type: number
     scale: 0
     defaultValue: 100
+  is_enable:
+    type: boolean
+    label: Enable
+    defaultValue: true
   crud_mode:
     label: 显示模式
     type: select
@@ -277,6 +281,7 @@ list_views:
       - shared
       - owner
       - modified
+      - is_enable
       - is_system
     label: All List Views
     filter_scope: space

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

@@ -1,4 +1,28 @@
 module.exports = {
+    design_field_layout: function (object_name, record_id, item_element) {
+        var record = this.record || Creator.getObjectById(record_id);
+        if (record && record.record) {
+            record = record.record;
+        }
+        if (!record) {
+            return toastr.error("未找到记录");
+        }
+
+        window.open(Creator.getRelativeUrl("/api/page/view/design_field_layout?designObjectName=" + record.name));
+    },
+    design_field_layoutVisible: function (object_name, record_id, record_permissions, data) {
+        var record = data && data.record;
+        if (!Creator.isSpaceAdmin()) {
+            return false
+        }
+        if (!record) {
+            record = Creator.odata.get("objects", record_id, "is_deleted");
+        }
+
+        if (record && !record.is_deleted && record.name != 'users' && !record.is_system) {
+            return true;
+        }
+    },
   show_object: function (object_name, record_id, item_element) {
     var record = this.record || Creator.getObjectById(record_id);
     if(record && record.record){
@@ -21,8 +45,7 @@ module.exports = {
             return toastr.warning("请先启动数据源");
         }
     }
-
-    window.open(Creator.getRelativeUrl("/app/admin/" + record.name));
+    window.open(Creator.getRelativeUrl("/app/admin/" + (record.name || this.record.name)));
     // SteedosUI.Object.getUISchema(record.name).then((res)=>{
     //     if(res.idFieldName){
     //         window.open(Creator.getRelativeUrl("/app/-/" + record.name));

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

@@ -233,7 +233,7 @@ function onChangeObjectName(oldName, newDoc){
         multi: true
     });
     //修改trigger
-    Creator.getCollection("object_triggers").direct.update({space: newDoc.space, object: oldName}, {$set: {object: newDoc.name}}, {
+    Creator.getCollection("object_triggers").direct.update({space: newDoc.space, listenTo: oldName}, {$set: {listenTo: newDoc.name}}, {
         multi: true
     });
     //字段表中的reference_to

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

@@ -23,6 +23,8 @@ fields:
     #     return options;
     #   }
     defaultValue: 'default'
+    amis:
+      disabledOn: "${is_system == true}"
   label:
     type: text
     label: Label
@@ -38,6 +40,8 @@ fields:
     index: true
     required: true
     inlineHelpText: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters
+    amis:
+      disabledOn: "${is_system == true}"
   icon:
     type: lookup
     label: Icon
@@ -60,6 +64,8 @@ fields:
     label: Enable
     type: boolean
     defaultValue: true
+    amis:
+      disabledOn: "${is_system == true}"
   in_development:
     type: select
     label: Development State
@@ -71,6 +77,8 @@ fields:
         value: "0" 
     defaultValue: "1"
     required: true
+    amis:
+      disabledOn: "${is_system == true}"
   enable_search:
     type: boolean
     label: Enable Search
@@ -171,6 +179,8 @@ fields:
     searchable: true
     inlineHelpText: The default data source does not support this property
     group: External data source
+    amis:
+      disabledOn: "${is_system == true}"
   version:
     readonly: true
     label: Version
@@ -372,6 +382,18 @@ fields:
     rows: 3
     is_wide: true
     hidden: true
+  field_groups:
+    type: grid
+    blackbox: true
+    is_wide: true
+    hidden: false
+  field_groups.$.group_name:
+    type: text
+  field_groups.$.visible_on:
+    type: text
+  extend:
+    type: text
+    hidden: true
 paging:
   enabled: false
 relatedList:
@@ -493,6 +515,9 @@ actions:
   delete_object:
     on: record_more
     label: 删除
+  design_field_layout:
+    on: record_only
+    label: 设计字段布局
   # export:
   #   label: Export
   #   visible: true

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

@@ -0,0 +1,339 @@
+{
+  "type": "page",
+  "title": "Welcome to Steedos",
+  "body": [
+    {
+      "type": "service",
+      "body": [
+        {
+          "type": "service",
+          "id": "service_field_design",
+          "body": [
+            {
+              "type": "panel",
+              "header": {
+                "type": "flex",
+                "id": "u:b2c8374e93fe",
+                "items": [
+                  {
+                    "type": "tpl",
+                    "tpl": "设计字段布局 ${designObjectLabel}(${designObjectName})",
+                    "id": "u:4c7bef616400"
+                  },
+                  {
+                    "type": "flex",
+                    "id": "u:1bfde03380f8",
+                    "items": [
+                      {
+                        "type": "button",
+                        "id": "u:ec9931ea883c",
+                        "actionType": "dialog",
+                        "dialog": {
+                          "type": "dialog",
+                          "title": "设置分组",
+                          "size": "lg",
+                          "body": [
+                            {
+                              "type": "input-table",
+                              "columns": [
+                                {
+                                  "name": "group_name",
+                                  "label": "名称",
+                                  "id": "u:ee2fb813a3e7"
+                                },
+                                {
+                                  "name": "visible_on",
+                                  "label": "显示条件",
+                                  "id": "u:ed37c3ff9dcb"
+                                }
+                              ],
+                              "value": "${groups}",
+                              "name": "setting_groups",
+                              "addable": true,
+                              "editable": true,
+                              "removable": true,
+                              "id": "u:483827aac3e8"
+                            }
+                          ],
+                          "onEvent": {
+                            "confirm": {
+                              "actions": [
+                                {
+                                  "actionType": "custom",
+                                  "script": "//整理分组数据\nlet setting_groups = event.data.setting_groups;\nif (!_.find(setting_groups, { is_default: true })) {\n  setting_groups.unshift({\n    \"id\": \"未分组\",\n    \"group_name\": \"未分组\",\n    \"visible_on\": \"\",\n    \"is_default\": true\n  })\n}\nsetting_groups.forEach(function (group) {\n  if (group.is_default) {\n    group.group_name = \"未分组\";\n    group.visible_on = \"\";\n  }\n  if (!group.id) {\n    group.id = group.group_name;\n  }\n})\n\n//整理字段与分组关系的数据\nconst fieldForGroup = {};\nlet oldGroup = event.data.fieldForGroup;\nsetting_groups.forEach(function (group) {\n  if (_.has(oldGroup, group.id)) {\n    fieldForGroup[group.id] = oldGroup[group.id];\n    oldGroup = _.omit(oldGroup, group.id);\n  } else {\n    fieldForGroup[group.id] = [];\n  }\n})\nif (oldGroup && !_.isEmpty(oldGroup)) {\n  _.forEach(oldGroup, function (value, key) {\n    fieldForGroup[\"未分组\"] = _.unionBy(fieldForGroup[\"未分组\"], value);\n  });\n}\nconsole.log(\"setting_groups,fieldForGroup===>\", setting_groups, fieldForGroup);\n\ndoAction({\n  actionType: 'setValue',\n  componentId: 'service_field_design',\n  args: {\n    value: {\n      groups: setting_groups,\n      fieldForGroup\n    }\n  }\n});"
+                                }
+                              ]
+                            }
+                          },
+                          "id": "u:e02c8f59216e",
+                          "closeOnEsc": false,
+                          "closeOnOutside": false,
+                          "showCloseButton": true,
+                          "showErrorMsg": true,
+                          "showLoading": true
+                        },
+                        "label": "设置分组",
+                        "className": ""
+                      },
+                      {
+                        "type": "button",
+                        "label": "新增字段",
+                        "actionType": "dialog",
+                        "id": "u:5857ae729799",
+                        "dialog": {
+                          "type": "dialog",
+                          "title": "新增字段",
+                          "data": {
+                            "appId": "${appId}",
+                            "global": "${global}",
+                            "context": "${context}",
+                            "designObjectName": "${designObjectName}",
+                            "_master": "${_master}"
+                          },
+                          "body": [
+                            {
+                              "type": "steedos-object-form",
+                              "label": "对象表单",
+                              "objectApiName": "object_fields",
+                              "recordId": "",
+                              "mode": "edit",
+                              "defaultData": {
+                                "name": "",
+                                "shared": false,
+                                "object": "${designObjectName}"
+                              },
+                              "fieldsExtend": {
+                                "object": {
+                                  "amis": {
+                                    "disabledOn": "true"
+                                  }
+                                },
+                                "group": {
+                                  "amis": {
+                                    "hidden": true
+                                  }
+                                }
+                              },
+                              "fields": "",
+                              "id": "u:b71796d3cb8c",
+                              "className": "mb-4",
+                              "enableTabs": true,
+                              "tabsMode": "line"
+                            }
+                          ],
+                          "showCloseButton": true,
+                          "showErrorMsg": true,
+                          "showLoading": true,
+                          "closeOnEsc": false,
+                          "dataMapSwitch": false,
+                          "size": "lg",
+                          "id": "u:066b3884bdd8"
+                        }
+                      },
+                      {
+                        "type": "button",
+                        "label": "保存",
+                        "actionType": "submit",
+                        "id": "u:d9039421ea6b",
+                        "target": "form_design_form",
+                        "level": "primary"
+                      }
+                    ]
+                  }
+                ],
+                "style": {
+                  "position": "static",
+                  "flexWrap": "nowrap",
+                  "justifyContent": "space-between",
+                  "alignItems": "baseline"
+                },
+                "isFixedHeight": false,
+                "isFixedWidth": false
+              },
+              "body": [
+                {
+                  "type": "form",
+                  "title": "",
+                  "body": [
+                    {
+                      "type": "steedos-board",
+                      "id": "steedos_field_deign",
+                      "columns": 2,
+                      "name": "design_field",
+                      "boardSource": "${groups}",
+                      "boardClassName": "bg-gray-50 p-2 border rounded shadow",
+                      "boardHeader": {
+                        "type": "tpl",
+                        "tpl": "字段分组：${group_name}",
+                        "id": "u:76d9a6c7d401"
+                      },
+                      "cardClassName": "p-1 bg-white border w-full rounded shadow",
+                      "cardSchema": {
+                        "type": "card",
+                        "header": {
+                          "className": "items-center py-0 border-0",
+                          "title": "${label}(${_name})"
+                        },
+                        "toolbar": [
+                          {
+                            "type": "steedos-dropdown-button",
+                            "label": "xxx",
+                            "buttons": [
+                              {
+                                "type": "steedos-object-button",
+                                "name": "standard_edit",
+                                "objectName": "object_fields",
+                                "className": "antd-Button--default"
+                              },
+                              {
+                                "type": "steedos-object-button",
+                                "name": "standard_delete",
+                                "objectName": "object_fields",
+                                "className": "antd-Button--default"
+                              }
+                            ],
+                            "placement": "bottomRight",
+                            "overlayClassName": "shadow !min-w-[160px]",
+                            "trigger": [
+                              "click"
+                            ],
+                            "id": "u:c2140a365019",
+                            "className": "mx-3 hidden"
+                          }
+                        ],
+                        "className": "mb-0 border-0 bg-none card",
+                        "id": "u:296298da1bef"
+                      },
+                      "cardSource": "${fields}",
+                      "vertical": true,
+                      "onEvent": {
+                        "change": {
+                          "actions": [
+                            {
+                              "actionType": "custom",
+                              "script": "const newGroups = _.keys(event.data.value);\nconst lastGroups = _.map(context.props.data.groups, 'group_name');\nif (newGroups != lastGroups) {\n  doAction({\n    actionType: 'setValue',\n    componentId: 'service_field_design',\n    args: {\n      value: {\n        groups: field_groups = _.sortBy(context.props.data.groups, function (group) { return _.findIndex(newGroups, function (group_name) { return group.group_name === group_name; }); })\n      }\n    }\n  });\n}\n"
+                            }
+                          ]
+                        }
+                      },
+                      "value": "${fieldForGroup}"
+                    }
+                  ],
+                  "id": "form_field_design",
+                  "api": {
+                    "url": "${context.rootUrl}/graphql",
+                    "method": "post",
+                    "dataType": "json",
+                    "headers": {
+                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                    },
+                    "requestAdaptor": "var graphqlOrder = \"\";\n//根据groups，修改对象的字段分组field_groups\nvar field_groups = _.cloneDeep(api.data.groups);\n_.remove(field_groups, { is_default: true });\nfield_groups = field_groups.map(function (group) {\n  return _.omit(group, 'id');\n})\nconst groupOrder = 'upsert0:objects__upsert(id:\"' + api.data.$self.designObjectId + '\" , doc:' + JSON.stringify(JSON.stringify({ field_groups })) + ') {_id}';\ngraphqlOrder += groupOrder;\n\n//根据design_field,修改对象字段的sort_no与groups\nvar index = 1;\n_.forEach(api.data.design_field, function (items, key) {\n  _.forEach(items, function (item) {\n    const field = _.find(api.data.fields, { 'id': item });\n    const itemOrder = 'upsert' + index + ':object_fields__upsert(id:\"' + item + '\" , doc:' + JSON.stringify(JSON.stringify({ object: api.data.$self.designObjectName, _name: field._name, label: field.label, sort_no: index * 10, group: key == \"未分组\" ? null : key })) + '){_id}\\n';\n    graphqlOrder += itemOrder;\n    index++;\n  })\n})\n\ngraphqlOrder = 'mutation {' + graphqlOrder + '}';\nreturn {\n  ...api,\n  data: {\n    query: graphqlOrder\n  }\n}",
+                    "adaptor": "if (payload.errors) {\n  payload.status = 2;\n  payload.msg = window.t ? window.t(payload.errors[\n    0\n  ].message) : payload.errors[\n    0\n  ].message;\n}\nreturn payload;",
+                    "messages": {
+                    },
+                    "data": {
+                      "design_field": "${design_field}",
+                      "groups": "${groups}",
+                      "fields": "${fields}",
+                      "$self": "$$"
+                    }
+                  },
+                  "visibleOn": "${dataInitialed}",
+                  "wrapWithPanel": false,
+                  "name": "form_design_form"
+                }
+              ],
+              "className": "Panel--default max-w-xl m-auto",
+              "id": "u:3a90104cb6b4"
+            }
+          ],
+          "api": {
+            "method": "post",
+            "url": "${context.rootUrl}/graphql?designObjectId=${designObjectId}",
+            "data": {
+              "query": "{fields:object_fields(filters: [[\"object\",\"=\",\"${designObjectName}\"]],sort: \"sort_no asc\"){_id,label,_name,group,type,sort_no,modified,is_wide,is_system,recordPermissions: _permissions{allowEdit}}}",
+              "field_groups": "${field_groups}",
+              "dataInitialed": "${dataInitialed}",
+              "designObjectName": "${designObjectName}",
+              "eventData": "${eventData}",
+              "fieldForGroup": "${fieldForGroup}"
+            },
+            "headers": {
+              "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+            },
+            "messages": {
+            },
+            "requestAdaptor": "",
+            "adaptor": "//筛选出可编辑的字段\r\n\r\nvar oldFields = _.filter(payload.data.fields, function (obj) { return obj.recordPermissions.allowEdit; });\r\n//将group为空的字段分为未分组的组中\r\noldFields = _.map(oldFields, function (obj) {\r\n  if (obj.group === null) {\r\n    obj.group = \"未分组\";\r\n  }\r\n  if (obj.is_system) {\r\n    obj._id = api.data.designObjectName + \".\" + obj._name;\r\n  }\r\n  return obj;\r\n});\r\n\r\n//整合出字段的属性集合\r\nconst fields = oldFields.map((field) => {\r\n  return {\r\n    \"id\": field._id,\r\n    \"_name\": field._name,\r\n    \"label\": field.label,\r\n    \"_id\": field._id,\r\n    \"columnSpan\": field.is_wide ? 2 : 1\r\n  }\r\n})\r\n\r\n//从字段的group属性中，整合出字段分组的属性集合\r\nlet field_groups = _.map(_.uniqBy(oldFields, \"group\"), function (obj) {\r\n  return {\r\n    \"id\": obj.group,\r\n    \"group_name\": obj.group,\r\n    \"visible_on\": \"\"\r\n  };\r\n});\r\n\r\n//合并对象上的field_groups与字段上的group\r\nconst groups = _.unionBy(api.data.field_groups, field_groups, 'id');\r\n\r\n//判断是否第一次调用接口，不是的话（说明是触发了datachange事件），返回fields与fieldUpdateData\r\nif (api.data.dataInitialed) {\r\n  const eventData = api.data.eventData;\r\n  let fieldUpdateData = \"\";\r\n  const fieldForGroup = api.data.fieldForGroup;\r\n  let fieldForGroupLength = 0;\r\n  _.forIn(fieldForGroup, function (value, key) {\r\n    fieldForGroupLength += value.length;\r\n  });\r\n  if (fieldForGroupLength < fields.length) {\r\n    fieldUpdateData = {\r\n      type: \"insert\",\r\n      id: eventData.result.data.recordId\r\n    }\r\n  } else if (fieldForGroupLength > fields.length) {\r\n    fieldUpdateData = {\r\n      type: \"delete\",\r\n      id: eventData._id\r\n    }\r\n  }\r\n  return payload = {\r\n    data: {\r\n      fields,\r\n      fieldUpdateData\r\n    }\r\n  }\r\n}\r\n\r\n//整合字段与分组的关系\r\nconst oldFieldsInGroups = _.groupBy(oldFields, \"group\");\r\nconst fieldForGroup = _.mapValues(_.groupBy(groups, \"id\"), function (group,key) {\r\n  if (oldFieldsInGroups[key]) {\r\n    return _.map(oldFieldsInGroups[key], function (obj) {\r\n      return obj._id;\r\n    });\r\n  } else {\r\n    return [];\r\n  }\r\n});\r\n\r\nreturn payload = {\r\n  data: {\r\n    fields,\r\n    groups,\r\n    fieldForGroup,\r\n    dataInitialed: true\r\n  }\r\n};",
+            "sendOn": "!!this.designObjectId"
+          },
+          "messages": {
+          },
+          "onEvent": {
+            "fetchInited": {
+              "actions": [
+                {
+                  "actionType": "custom",
+                  "script": "const fieldForGroup = context.props.data.fieldForGroup;\nconst fieldUpdateData = event.data.fieldUpdateData;\nif (fieldUpdateData && fieldUpdateData.type == \"delete\") {\n  _.forIn(fieldForGroup, function (group, group_name) {\n    _.remove(group, function (field) {\n      return field === fieldUpdateData.id;\n    })\n  });\n} else if (fieldUpdateData && fieldUpdateData.type == \"insert\") {\n  fieldForGroup[\"未分组\"].push(fieldUpdateData.id);\n}\ndoAction({\n  actionType: 'setValue',\n  componentId: \"form_field_design\",\n  args: {\n    value: { design_field: fieldForGroup }\n  }\n});\n\n",
+                  "expression": "${event.data.fieldUpdateData}"
+                }
+              ]
+            }
+          },
+          "initFetch": false,
+          "data": {
+            "eventData": ""
+          }
+        }
+      ],
+      "id": "u:02f594329e1e",
+      "api": {
+        "method": "post",
+        "url": "${context.rootUrl}/graphql",
+        "data": {
+          "query": "{objects(filters: [[\"name\",\"=\",\"${designObjectName}\"]]){_id,name,label,field_groups}}"
+        },
+        "headers": {
+          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+        },
+        "messages": {
+        },
+        "requestAdaptor": "",
+        "adaptor": "const field_groups = payload.data.objects[0] && _.map(payload.data.objects[0].field_groups, function (obj) {\r\n  return {\r\n    \"id\": obj.group_name,\r\n    \"group_name\": obj.group_name,\r\n    \"visible_on\": obj.visible_on\r\n  }\r\n});\r\nfield_groups.unshift({\r\n  id: \"未分组\",\r\n  group_name: \"未分组\",\r\n  visible_on: \"\",\r\n  is_default: true\r\n});\r\nconst designObjectId = payload.data.objects[0] && payload.data.objects[0]._id;\r\nreturn payload = {\r\n  data: {\r\n    field_groups,\r\n    designObjectId,\r\n designObjectLabel: payload.data.objects[0] && payload.data.objects[0].label,\r\n   _master: {\r\n      recordId: designObjectId\r\n    }\r\n  }\r\n}"
+      },
+      "messages": {
+      },
+      "onEvent": {
+        "@data.changed.object_fields": {
+          "actions": [
+            {
+              "actionType": "reload",
+              "data": {
+                "eventData": "${event.data}"
+              },
+              "componentId": "service_field_design"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "regions": [
+    "body"
+  ],
+  "data": {
+    "initialValues": {
+    },
+    "appId": "builder",
+    "title": "",
+    "context": "${context}",
+    "dataInitialed": false
+  },
+  "id": "u:993ee4316643",
+  "css": {
+    ".steedos-design-field .card:hover .slds-button": {
+      "display": "inline-block"
+    }
+  },
+  "className": "steedos-design-field"
+}

package/main/default/pages/design_field_layout.page.yml

@@ -0,0 +1,7 @@
+name: design_field_layout
+is_active: true
+label: 设计字段布局
+pageAssignments: []
+render_engine: amis
+type: app
+widgets: []

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

@@ -10,10 +10,19 @@
             "enableTabs": true,
             "mode": "edit",
             "layout": "normal",
+            "apiRequestAdaptor": "api.data.query = api.data.query.replace('object_fields__update', 'object_fields__upsert')",
             "submitSuccActions": [
                 {
                     "actionType": "custom",
                     "script": "setTimeout(function(){doAction({'actionType': 'setValue','componentId': 'form_object_fields','args': {'value': {'sort_no': event.data.sort_no + 10}}})}, 300)"
+                },
+                {
+                    "actionType": "toast",
+                    "args": {
+                      "msgType": "success",
+                      "msg": "操作成功, 请刷新浏览器后查看效果",
+                      "position": "top-right"
+                    }
                 }
             ]
         }

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

@@ -0,0 +1,31 @@
+{
+    "type": "service",
+    "body": [
+        {
+            "type": "steedos-object-form",
+            "label": "对象表单",
+            "objectApiName": "objects",
+            "recordId": "${recordId}",
+            "className": "",
+            "enableTabs": true,
+            "mode": "edit",
+            "layout": "normal",
+            "apiRequestAdaptor": "console.log('api.data.query===', api.data.query);api.data.query = api.data.query.replace('objects__update', 'objects__upsert')",
+            "submitSuccActions": [
+                {
+                    "actionType": "toast",
+                    "args": {
+                      "msgType": "success",
+                      "msg": "操作成功, 请刷新浏览器后查看效果",
+                      "position": "top-right"
+                    }
+                }
+            ]
+        }
+    ],
+    "data": {
+        "context": {}
+    },
+    "name": "object_fields_form",
+    "id": "u:bb11df394baf"
+}

package/main/default/pages/object_form.page.yml

@@ -0,0 +1,12 @@
+name: object_form
+is_active: true
+label: 对象字段表单
+object_name: objects
+pageAssignments:
+  - type: orgDefault
+    page: object_form
+    desktop: true
+    mobile: true
+render_engine: amis
+type: form
+widgets: []

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

@@ -353,12 +353,12 @@ module.exports = {
         const obj = this.getObject(object_name);
         const latestDoc = await obj.findOne(id);
         // !!!暂不允许修改name
-        if (_.has(doc, '_name')) {
-            const newFieldName = doc._name;
-            if (newFieldName &&  (latestDoc._name != newFieldName)) {
-                throw new Error('禁止修改字段名。');
-            }
-        }
+        // if (_.has(doc, '_name')) {
+        //     const newFieldName = doc._name;
+        //     if (newFieldName &&  (latestDoc._name != newFieldName)) {
+        //         throw new Error('禁止修改字段名。');
+        //     }
+        // }
         // !!!暂不允许修改字段类型
         if (_.has(doc, 'type')) {
             const newFieldType = doc.type;

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

@@ -36,28 +36,6 @@ module.exports = {
             }
         })
     },
-    afterAggregate: async function(){
-        let userId = this.userId
-        let spaceId = this.spaceId;
-        for (const doc of this.data.values) {
-            doc.fields =  Object.assign({}, doc.fields, await InternalData.getDefaultSysFields(doc.name, userId)) ;
-        }
-        // this.data.values = this.data.values.concat(await InternalData.findObjects(userId, this.query.filters));
-
-        this.data.values = this.data.values.concat(await InternalData.getObjects(userId));
-
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-        
-        _.each(this.data.values, function(value){
-            if(value){
-                delete value.actions;
-                delete value.fields;
-                delete value.list_views;
-                delete value.permission_set;
-                delete value.triggers;
-            }
-        })
-    },
     afterCount: async function(){
         let userId = this.userId
         let spaceId = this.spaceId;
@@ -134,9 +112,9 @@ module.exports = {
             const latestDoc = await obj.findOne(id);
             const newObjName = doc.name;
             // !!!暂不允许修改name
-            if (newObjName &&  (latestDoc.name != newObjName)) {
-                throw new Error('禁止修改API 名称。');
-            }
+            // if (newObjName &&  (latestDoc.name != newObjName)) {
+            //     throw new Error('禁止修改API 名称。');
+            // }
             /*
             if (newObjName &&  (latestDoc.name != newObjName) && latestDoc.datasource === 'default') {
                 const datasource = objectql.getDataSource(latestDoc.datasource);
@@ -169,7 +147,7 @@ module.exports = {
         }
         */
 
-        await sleep(1000 * 2)
+        // await sleep(1000 * 2)
     },
     afterDelete: async function(){
         const { previousDoc: object, spaceId } = this;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.17",
+    "version": "2.5.18-beta.1",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "c1e5161c0f7357c2daf621a09818f675fa76861e"
+    "gitHead": "c4ba4e73e2182af6a1b825988b5d325c4af918ff"
 }

package/package.service.js

@@ -1,21 +1,22 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-09 13:41:16
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-10-30 17:18:36
  * @Description: 
  */
 "use strict";
 const project = require('./package.json');
 const packageName = project.name;
 const packageLoader = require('@steedos/service-meteor-package-loader');
+const serviceObjectMixin = require('@steedos/service-object-mixin');
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
 module.exports = {
 	name: packageName,
 	namespace: "steedos",
-	mixins: [packageLoader],
+	mixins: [packageLoader, serviceObjectMixin],
 	/**
 	 * Settings
 	 */
@@ -36,7 +37,96 @@ module.exports = {
 	 * Actions
 	 */
 	actions: {
+		objects__upsert: {
+			graphql: {
+				mutation:
+				"objects__upsert(id: String, doc: JSON): objects"
+			},
+			async handler(ctx) {
+				const userSession = ctx.meta.user;
+                let { id, doc } = ctx.params;
+                let data = '';
+                if (_.isString(doc)) {
+                    data = JSON.parse(doc);
+                } else {
+                    data = JSON.parse(JSON.stringify(doc));
+                }
 
+				if(data.form && _.isString(data.form)){
+					data.form = JSON.parse(data.form)
+				}
+
+                delete data.space;
+				
+				const object = await this.getObject('objects');
+				const dbRecord = await object.directFind({filters: ['_id','=',id]});
+				if(dbRecord.length === 0){
+					// const newId = await object._makeNewID();
+					const now = new Date();
+					await object.directInsert(Object.assign({}, data, {
+						// _id: newId,
+						_id: id, // saas模式不支持修改对象
+						owner: userSession.userId,
+						space: userSession.spaceId,
+						created: now,
+						modified: now,
+						created_by: userSession.userId,
+						modified_by: userSession.userId,
+						company_id: userSession.company_id,
+						company_ids: userSession.company_ids,
+						extend: data.name,
+						custom: false,
+						is_system: true
+					}));					
+					// id = newId;
+				}
+                return object.update(id, data, userSession)
+			},
+		},
+		object_fields__upsert: {
+			graphql: {
+				mutation:
+				"object_fields__upsert(id: String, doc: JSON): object_fields"
+			},
+			async handler(ctx) {
+				const userSession = ctx.meta.user;
+                let { id, doc } = ctx.params;
+                let data = '';
+                if (_.isString(doc)) {
+                    data = JSON.parse(doc);
+                } else {
+                    data = JSON.parse(JSON.stringify(doc));
+                }
+                delete data.space;
+				
+				const object = await this.getObject('object_fields');
+				if(id.indexOf('.') > 0){
+					const [objectName, fieldName] = id.split('.');
+					const dbRecord = await object.directFind({filters: [['object','=',objectName], ['name','=',fieldName]]});
+					if(dbRecord.length > 0){
+						id = dbRecord[0]._id;
+					}else{
+						const newId = await object._makeNewID();
+						const now = new Date();
+						await object.directInsert(Object.assign({}, data, {
+							_id: newId,
+							name: data._name || fieldName,
+							owner: userSession.userId,
+							space: userSession.spaceId,
+							object: objectName,
+							created: now,
+							modified: now,
+							created_by: userSession.userId,
+							modified_by: userSession.userId,
+							company_id: userSession.company_id,
+							company_ids: userSession.company_ids
+						}));					
+						id = newId;
+					}
+				}
+                return object.update(id, data, userSession)
+			},
+		},
 	},
 
 	/**