@steedos/standard-object-database 2.7.8-beta.1 → 2.7.8-beta.21

package/LICENSE.txt

@@ -1,22 +1,21 @@
-Steedos Licensing
+# Open Source License
 
-SOFTWARE LICENSING
+Steedos is licensed under a modified version of the Apache License 2.0, with the following additional conditions:
 
-To determine under which license you may use a file from the Steedos source code,
-please resort to the header of that file.
+1. Steedos may be utilized commercially, including as a backend service for other applications or as an application development platform for enterprises. Should the conditions below be met, a commercial license must be obtained from the producer:
 
-If the file has no header, the following rules apply
-1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
+a. Multi-tenant service: Unless explicitly authorized by Steedos in writing, you may not use the Steedos source code to operate a multi-tenant environment.
+    - Tenant Definition: Within the context of Steedos, one tenant corresponds to one space. The space provides a separated area for each tenant's data and configurations.
 
-On request, licenses under different terms are available.
+b. LOGO and copyright information: In the process of using Steedos's frontend, you may not remove or modify the LOGO or copyright information in the Steedos console or applications. This restriction is inapplicable to uses of Steedos that do not involve its frontend.
 
-Source code of enterprise features are files that
-* are in folders named "ee" or start with "ee_", or in subfolders of such folders.
-* contain the strings "ee_" in its filename name.
-The files can be found by running the command `find . -iname ee -or -iname "*_ee*" -or -iname "*ee_*"`
+2. As a contributor, you should agree that:
 
-STEEDOS TRADEMARK GUIDELINES
+a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
+b. Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations.
 
-Your use of the mark Steedos is subject to Steedos, Inc's prior written approval. For trademark approval or any questions
-you have about using these trademarks, please email zhuangjianguo@steedos.com
+Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.
+
+The interactive design of this product is protected by appearance patent.
+
+© 2025 Steedos, Inc.

package/main/default/client/object_fields.client.js

@@ -239,12 +239,6 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
         display: none;
       }
       
-      .defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden .antd-Form-label {
-        /*html字段类型默认值，显示为静态值编辑器时，因为移除了flex样式类，不再把amis公式配置按钮显示在右侧，而是换行显示，此时label不可以display: none，否则缩进不对*/
-        display: block;
-        visibility: hidden;
-      }
-      
       .defaultValue_field .defaultValue_field_formula_hidden {
         flex-grow: 0;
       }
@@ -256,14 +250,6 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
       .defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden {
         margin-left: 0px;
       }
-      
-      .defaultValue_field .defaultValue_field_formula_hidden .antd-Form-label {
-        display: none;
-      }
-      
-      .defaultValue_field .defaultValue_field_formula_hidden .antd-FormulaPicker-input {
-        display: none;
-      }
       </style>`);
     $("head").append(styleCss);
   } catch (error) {

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

@@ -78,8 +78,12 @@ fields:
     label: Enable Instances
     help: 
     description: 
+  enable_audit:
+    label: Enable Audit
+    help:
+    description:
   enable_chatter:
-    label: Enable Chatter
+    label: Enable Comments
     help: 
     description: 
   enable_inline_edit:

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

@@ -75,8 +75,12 @@ fields:
     label: 显示审批单子表
     help: 
     description: 
+  enable_audit:
+    label: 记录字段历史
+    help: 
+    description:
   enable_chatter:
-    label: 允许添加留言
+    label: 允许添加评论
     help: 
     description: 
   enable_inline_edit:

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

@@ -0,0 +1,10 @@
+name: authentication_header_key
+type: text
+label: Header Name
+group: 认证
+sort_no: 180
+visible_on: ${type === 'url' && authentication_type === 'header'}
+amis: 
+  - options:
+      - label: authorization
+        value: authorization

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

@@ -0,0 +1,6 @@
+name: authentication_header_value
+type: text
+label: Header Value
+group: 认证
+sort_no: 190
+visible_on: ${type === 'url' && authentication_type === 'header'}

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

@@ -0,0 +1,12 @@
+name: authentication_type
+label: 认证类型
+type: select
+group: 认证
+options:
+  - label: 不认证
+    value: none
+  - label: Header Auth
+    value: header
+defaultValue: none
+sort_no: 170
+visible_on: ${type === 'url'}

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

@@ -23,3 +23,4 @@ editorDidMount: >-
     result
   );
 sort_no: 150
+visible_on: ${type != 'url'}

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

@@ -0,0 +1,10 @@
+name: type
+label: 类型
+type: select
+options: 
+  - label: 代码
+    value: code
+  - label: 接口
+    value: url
+defaultValue: code
+sort_no: 132

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

@@ -0,0 +1,6 @@
+name: url
+type: url
+label: URL
+sort_no: 160
+is_wide: true
+visible_on: ${type === 'url'}

package/main/default/objects/objects/buttons/design_field_layout.button.yml

@@ -1,4 +1,5 @@
 name: design_field_layout
 is_enable: true
 label: 设计字段布局
-'on': record_only
+'on': record_more
+sort: 80

package/main/default/objects/objects/buttons/design_fields_layout.button.yml

@@ -1,5 +1,4 @@
 name: design_fields_layout
 is_enable: true
-label: 设计字段布局
-'on': record_more
-sort: 80
+label: 设计对象
+'on': record_only

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

@@ -0,0 +1,6 @@
+name: enable_audit
+type: boolean
+label: Enable Audit
+group: Switch
+sort_no: 305
+visible_on: '{{ Meteor.settings.public.platform && ["platform-standard", "platform-enterprise", "platform-professional"].includes(Meteor.settings.public.platform.product)  }}'

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

@@ -1,6 +1,7 @@
 name: enable_chatter
-hidden: true
-label: Enable Chatter
+group: switch
+hidden: false
+label: Enable Comments
 sort_no: 300
 type: boolean
-visible_on: '{{false}}'
+visible_on: '{{ Meteor.settings.public.platform && ["platform-standard", "platform-enterprise", "platform-professional"].includes(Meteor.settings.public.platform.product)  }}'

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

@@ -184,13 +184,22 @@
             "visible_on": {
                 "amis": {
                     "type": "input-formula",
-                    "name": "formula",
                     "evalMode": false,
                     "variableMode": "tabs",
                     "variables": "${visibleOnVariables}",
                     "visibleOn": "${visibleOnVariables}",
                     "id": "u:618105d5bfad"
                 }
+            },
+            "formula": {
+                "amis": {
+                    "type": "input-formula",
+                    "evalMode": false,
+                    "variableMode": "tabs",
+                    "variables": "${visibleOnVariables}",
+                    "visibleOn": "${visibleOnVariables && (type == 'formula' || type == 'autonumber') }",
+                    "id": "u:618105d5bfad"
+                }
             }
         },
         "form": {

package/main/default/routes/object_fields_design.ejs

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-02 17:45:15
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-09-04 18:09:08
+ * @LastEditTime: 2024-10-17 12:02:21
  * @Description: 
 -->
 <html>
@@ -11,6 +11,15 @@
     <script src="/unpkg.com/axios@0.26.1/dist/axios.min.js"></script>
     <script src="https://unpkg.steedos.cn/flowbite@2.3.0/dist/flowbite.min.js"></script>
     <script src="https://cdn.tailwindcss.com"></script>
+    <link href="/toast/toastr.min.css" rel="stylesheet" />
+    <script src="/jquery.min.js" ></script>
+    <script src="/toast/toastr.min.js"></script>
+    <style>
+      #toast-container.toast-bottom-center>div, #toast-container.toast-top-center>div {
+        width: 450px;
+        opacity: 1;
+      }
+    </style>
   </head>
 
   <body>
@@ -185,7 +194,7 @@
           
         }
 
-        return await axios.post(
+        const result =  await axios.post(
             `${rootUrl}/service/api/object_fields/amis/design/schema?oid=${oid}`,
             {
               withCredentials: true,
@@ -199,16 +208,130 @@
             // handle error
             console.log(error);
           });
+        const actionNames = ['insert', 'update', 'delete'];
+
+        toastr.options = {
+          "closeButton": true,
+          "debug": false,
+          "newestOnTop": false,
+          "progressBar": false,
+          "positionClass": "toast-top-center",
+          "preventDuplicates": false,
+          "onclick": null,
+          "showDuration": "300",
+          "hideDuration": "1000",
+          "timeOut": "5000",
+          "extendedTimeOut": "1000",
+          "showEasing": "swing",
+          "hideEasing": "linear",
+          "showMethod": "fadeIn",
+          "hideMethod": "fadeOut"
+        }
+
+        actionNames.forEach(function(actionName){
+          const actionData = result.data.data[actionName];
+          let actionLabel = '';
+          if(actionName === 'insert'){
+            actionLabel = '新增';
+          }else if(actionName === 'update'){
+            actionLabel = '更新';
+          }else if(actionName === 'delete'){
+            actionLabel = '删除';
+          }
+          if(actionData.error && actionData.error.length > 0){
+          actionData.error.forEach((error)=>{
+            toastr.warning(error.message, `${actionLabel}字段「${error.fieldLabel}(${error.fieldName})」失败:`);
+            })
+          }
+        })
+        return result;
       };
       window.addEventListener('message', function (event) {
         const { data } = event;
         if (data) {
           if(data.type === 'builder.loaded'){
             comp.messageFrame('builder.EditorPropsChanged', { editorProps :  JSON.stringify({
+                onChange: function(value){
+                  const fields = [];
+                  _.each(value.body, (bodyItem)=>{
+                      if(bodyItem.type === 'steedos-field-group'){
+                          let groupName = bodyItem.title;
+                          _.each(bodyItem.body, (field)=>{
+                              if(_.startsWith(field.type, 'sfield-')){
+
+                                  if(field.config && field.config.amis){
+                                      delete field.config.amis.name
+                                      delete field.config.amis.mode
+                                  }
+
+                                  fields.push(Object.assign({}, field.config, {group: groupName}));
+                              }
+                          })
+                      }else if(_.startsWith(bodyItem.type, 'sfield-')){
+                          if(bodyItem.config && bodyItem.config.amis){
+                              delete bodyItem.config.amis.name
+                              delete bodyItem.config.amis.mode
+                          }
+                          fields.push(Object.assign({}, bodyItem.config, {group: '通用'}));
+                      }
+                  })
+
+
+                  const variables = [];
+
+                  _.each(_.groupBy(fields, 'group'), (v, k)=>{
+                      if(k=== '通用'){
+                          _.each(v, (field)=>{
+                              variables.push({
+                                  label: field.label,
+                                  value: field.name
+                              })
+                          })
+                      }else{
+                          variables.push({
+                              label: k,
+                              children: _.map(v, (field)=>{
+                                  return {
+                                      label: field.label,
+                                      value: field.name
+                                  }
+                              })
+                          })
+                      }
+                  })
+                  window._objectFieldsVariables = variables;
+                },
                 onDndAccept: function(event){
-                  console.log(`onDndAccept===>`, event);
                   return true;
                 },
+                beforeDelete: function(event){
+                    const toastConfig = {
+                        "closeButton": true,
+                        "debug": false,
+                        "newestOnTop": false,
+                        "progressBar": false,
+                        "positionClass": "toast-top-center",
+                        "preventDuplicates": false,
+                        "onclick": null,
+                        "showDuration": "300",
+                        "hideDuration": "1000",
+                        "timeOut": "5000",
+                        "extendedTimeOut": "1000",
+                        "showEasing": "swing",
+                        "hideEasing": "linear",
+                        "showMethod": "fadeIn",
+                        "hideMethod": "fadeOut"
+                      }
+                    if(event.context.schema.type.startsWith('sfield') && event.context.schema.config.is_system){
+                      parent.toastr.warning('禁止删除系统字段', '', toastConfig)
+                      return event.preventDefault();
+                    };
+
+                    if(event.context.schema.type.startsWith('sfield') && event.context.schema.config.name === 'name'){
+                      parent.toastr.warning('禁止删除名称字段', '', toastConfig)
+                      return event.preventDefault();
+                    }
+                },
                 onInit: function(){
                   // 创建一个新的 style 元素
                   var style = document.createElement('style');
@@ -225,6 +348,9 @@
                   .ae-RendererList-tabs-header .antd-Tabs-link:nth-child(n+2) {
                       display: none !important;
                   }
+                  .ae-RendererList-groupWrap .ae-RendererList-group.collapse-content .ae-RendererList-item:hover .ae-RendererIcon{
+                    display: none !important;
+                  }
                   `;
 
                   // 将 style 元素插入到 head 中

package/main/default/routes/object_fields_design.router.js

@@ -42,7 +42,7 @@ router.get('/api/amisObjectFieldsDesign', core.requireAuthentication, async func
         } else if (req.query.locale == "zh-cn") {
             locale = "zh-CN";
         }
-        const retUrl = __meteor_runtime_config__.ROOT_URL + '/app/admin/objects/view/' + req.query.oid
+        const retUrl = req.query.retUrl || __meteor_runtime_config__.ROOT_URL + '/app/admin/objects/view/' + req.query.oid
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
         const builderHost = `${steedosBuilderUrl}/object?${assetUrl}retUrl=${retUrl}&locale=${locale}&isObjectDesign=1&pType=objectDesign`;
 

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

@@ -2,10 +2,11 @@ var _ = require("underscore");
 var objectql = require('@steedos/objectql');
 var clone = require('clone');
 var objectCore = require('./objects.core.js');
+var lodash = require('lodash');
 
 const objectFieldsFind = function (filter) {
     return objectql.wrapAsync(async function () {
-        return await objectql.getObject('object_fields').find(this.filter);
+        return await objectql.getObject('object_fields').directFind(this.filter);
     }, { filter: filter })
 }
 
@@ -31,7 +32,7 @@ function getFieldName(objectName, fieldName, spaceId, oldFieldName){
   if(object && object.datasource && object.datasource != 'default'){
     return fieldName;
   }else{
-    if(fieldName != 'name' && fieldName != 'owner'){
+    if(!lodash.includes(['name', 'owner', 'created', 'created_by', 'modified', 'modified_by'], fieldName)  ){
       return objectql._makeNewFieldName(fieldName, spaceId, oldFieldName);
     }else{
       return fieldName
@@ -470,7 +471,7 @@ var triggers = {
       }
 
       checkName(doc._name);
-      if(['name','owner','parent','children'].indexOf(doc._name)>-1){
+      if(['name','owner','parent','children'].indexOf(doc._name)>-1 || doc._name && doc.is_system){
         doc.name = doc._name;
       }else{
         doc.name = getFieldName(doc.object,doc._name,doc.space);

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

@@ -169,6 +169,7 @@ function _sendObjectMeta(objectConfig){
             if(res){
                 // console.log('send object meta success', length);
                 broker.broadcast("$packages.statisticsActivatedPackages", {});
+                broker.emit(`translations.object.change`, {});
             }
         })
         _objectConfigs = [];

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

@@ -318,6 +318,62 @@ let objectTriggers = {
                 filterable: true,
                 sort_no: 10
             });
+            Creator.getCollection("object_fields").insert({
+                object: doc.name,
+                owner: userId,
+                _name: "created",
+                name: "created",
+                label: "创建时间",
+                space: doc.space,
+                type: "datetime",
+                group: '',
+                sort_no: 9999,
+                readonly: true,
+                disabled: true,
+                sortable: true
+            });
+            Creator.getCollection("object_fields").insert({
+                object: doc.name,
+                owner: userId,
+                _name: "created_by",
+                name: "created_by",
+                label: "创建人",
+                space: doc.space,
+                type: "lookup",
+                reference_to: 'users',
+                group: '',
+                sort_no: 9999,
+                readonly: true,
+                disabled: true,
+            });
+            Creator.getCollection("object_fields").insert({
+                object: doc.name,
+                owner: userId,
+                _name: "modified",
+                name: "modified",
+                label: "修改时间",
+                space: doc.space,
+                type: "datetime",
+                group: '',
+                sort_no: 9999,
+                readonly: true,
+                disabled: true,
+                sortable: true
+            });
+            Creator.getCollection("object_fields").insert({
+                object: doc.name,
+                owner: userId,
+                _name: "modified_by",
+                name: "modified_by",
+                label: "修改人",
+                space: doc.space,
+                type: "lookup",
+                reference_to: 'users',
+                group: '',
+                sort_no: 9999,
+                readonly: true,
+                disabled: true,
+            });
             // Creator.getCollection("object_fields").insert({
             //     object: doc.name,
             //     owner: userId,

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

@@ -7,7 +7,30 @@ const steedosI18n = require("@steedos/i18n");
 const _ = require("lodash");
 const clone = require("clone");
 const serviceObjectMixin = require('@steedos/service-object-mixin');
+const objectql = require('@steedos/objectql');
 // 默认值字段代码：services/standard-object-database/main/default/services/object_fields.service.js
+
+const initSummaryDoc = async (doc) => {
+    if (!doc.summary_object) {
+        throw new Error("object_fields_error_summary_object_required");
+    }
+    let summaryObject = register.getObjectConfig(doc.summary_object);
+    let summaryConfig = {
+        summary_object: doc.summary_object,
+        summary_type: doc.summary_type,
+        summary_field: doc.summary_field,
+        field_name: doc.name,
+        object_name: doc.object
+    };
+    const dataType = await objectql.getSummaryDataType(summaryConfig, summaryObject);
+    if (!dataType) {
+        throw new Error("object_fields_error_summary_data_type_not_found");
+    }
+    doc.data_type = dataType;
+    // objectql.validateFilters(doc.summary_filters, summaryObject.fields);
+}
+
+
 module.exports = {
     name: "object_fields",
     mixins: [serviceObjectMixin],
@@ -278,9 +301,12 @@ module.exports = {
                     const groups = object.field_groups;
 
                     const getGroup = (groupName)=>{
+                        if(groupName == 'undefined' || groupName == 'null'){
+                            groupName = '';
+                        }
                         return _.find(groups, (group)=>{
                             return group.group_name === groupName;
-                        })
+                        }) || {group_name: groupName}
                     }
 
                     const objectName = object.name;
@@ -288,8 +314,16 @@ module.exports = {
 
                     _.map(objectFields, (objectField)=>{
                         if(!objectField.group){
-                            objectField.group = '基本信息'
-                        }
+                            objectField.group = '通用'
+                        };
+                        delete objectField.owner;
+                        delete objectField.space;
+                        delete objectField.created;
+                        delete objectField.modified;
+                        delete objectField.created_by;
+                        delete objectField.modified_by;
+                        delete objectField.company_id;
+                        delete objectField.company_ids;
                     })
 
                     return {
@@ -300,18 +334,20 @@ module.exports = {
                         data: {
                             objectName
                         },
-                        className: "steedos-amis-form steedos-field-layout-page m-4",
+                        className: "steedos-amis-form steedos-field-layout-page",
                         body: _.map(_.groupBy(_.orderBy(objectFields, function(o) { return o.sort_no || 100 }), 'group'), (items, groupName)=>{
                             const group = getGroup(groupName)
                             return {
                                 type: 'steedos-field-group',
                                 title: group.group_name,
+                                collapsable: true,
                                 collapsed: group.collapsed,
                                 visible_on: group.visible_on,
                                 body: _.map(items, (field)=>{
                                     return {
-                                        type: `sfield-${field.type}`,
-                                        config: Object.assign({amis: {name: field.name}}, field)
+                                        type: `sfield-${_.camelCase(field.type).toLowerCase()}`,
+                                        config: Object.assign({amis: {name: field.name}}, field),
+                                        visibleOn: field.visible_on
                                     }
                                 })
                             }
@@ -350,22 +386,39 @@ module.exports = {
                     return {}
                 }
                 let sort_no = 50;
-                _.each(schema.body, (group)=>{
-                    if(group.type === 'steedos-field-group'){
-                        const groupName = group.title;
-                        _.each(group.body, (field)=>{
+                _.each(schema.body, (bodyItem)=>{
+                    if(bodyItem.type === 'steedos-field-group'){
+                        const groupName = bodyItem.title;
+                        _.each(bodyItem.body, (field)=>{
                             if(_.startsWith(field.type, 'sfield-')){
-                                fields.push(Object.assign({}, field.config, {group: groupName, sort_no}));
+
+                                if(field.config){
+                                    field.config.object = object.name
+                                }
+
+                                if(field.config && field.config.amis){
+                                    delete field.config.amis.name
+                                    delete field.config.amis.mode
+                                }
+
+                                fields.push(Object.assign({}, field.config, {group: groupName, sort_no, _name: field.config.name}));
                                 sort_no += 50;
                             }
                         })
                         groups.push({
-                            group_name: group.title,
-                            collapsed: group.collapsed,
-                            visible_on: group.visible_on
+                            group_name: bodyItem.title,
+                            collapsed: bodyItem.collapsed,
+                            visible_on: bodyItem.visible_on
                         })
-                    }else if(_.startsWith(field.type, 'sfield-')){
-                        fields.push(Object.assign({}, field.config, {sort_no}));
+                    }else if(_.startsWith(bodyItem.type, 'sfield-')){
+                        if(bodyItem.config){
+                            bodyItem.config.object = object.name
+                        }
+                        if(bodyItem.config && bodyItem.config.amis){
+                            delete bodyItem.config.amis.name
+                            delete bodyItem.config.amis.mode
+                        }
+                        fields.push(Object.assign({}, bodyItem.config, {sort_no, _name: bodyItem.config.name}));
                         sort_no += 50;
                     }
                 })
@@ -397,11 +450,12 @@ module.exports = {
                 
                 // 循环需要增加的字段
                 for (const fieldName of insertFields) {
+                    const newId = await object_fields._makeNewID();
+                    const now = new Date();
+                    const field = _.find(fields, { name: fieldName });
                     try {
-                        const newId = await object_fields._makeNewID();
-                        const now = new Date();
-                        const field = _.find(fields, { name: fieldName });
-                        await object_fields.directInsert(Object.assign({}, field, {
+                        
+                        const doc = Object.assign({}, field, {
                             _id: newId,
                             owner: userSession.userId,
                             space: userSession.spaceId,
@@ -412,10 +466,18 @@ module.exports = {
                             modified_by: userSession.userId,
                             company_id: userSession.company_id,
                             company_ids: userSession.company_ids
-                        }));
+                        });
+                        if(doc.type === "summary"){
+                            await initSummaryDoc(doc);
+                        }
+                        await object_fields.directInsert(doc);
                         log.insert.success.push(fieldName);
                     } catch (e) {
-                        log.insert.error.push(fieldName);
+                        log.insert.error.push({
+                            fieldName: fieldName,
+                            fieldLabel: field.label,
+                            message: steedosI18n.t(e.message, null, 'zh-CN')
+                        });
                         console.error(`新增字段 ${fieldName} 时出错：`, e);
                     }
                 }
@@ -423,28 +485,45 @@ module.exports = {
                 // 循环需要修改的字段
                 const now = new Date();
                 for (const fieldName of updateFields) {
+                    const field = _.find(fields, { name: fieldName });
                     try {
-                        const field = _.find(fields, { name: fieldName });
                         const id = _.find(dbFields, { name: fieldName })._id;
                         const submitField = _.omit(field, ['name', '_name']);
+
+                        if(submitField.type === "summary"){
+                            await initSummaryDoc(submitField);
+                        }
+                        if(submitField){
+                            delete submitField._id;
+                        }
                         await object_fields.directUpdate(id, Object.assign({}, submitField, {
                             modified: now,
                             modified_by: userSession.userId
                         }));
                         log.update.success.push(fieldName);
                     } catch (e) {
-                        log.update.error.push(fieldName);
+                        log.update.error.push({
+                            fieldName: fieldName,
+                            fieldLabel: field.label,
+                            message: steedosI18n.t(e.message, null, 'zh-CN')
+                        });
                         console.log(`dbFields`, fieldName, dbFields)
                         console.error(`更新字段 ${fieldName} 时出错：`, e);
                     }
                 }
                 // 循环需要删除的字段
                 for (const fieldName of deleteFields) {
-                    try {
-                        const id = _.find(dbFields, { name: fieldName })._id;
+                    const field = _.find(dbFields, { name: fieldName });
+                 try {
+                        const id = field._id;
                         await object_fields.directDelete(id);
                         log.delete.success.push(fieldName);
                     } catch (e) {
+                        log.delete.error.push({
+                            fieldName: fieldName,
+                            fieldLabel: field.label,
+                            message: steedosI18n.t(e.message, null, 'zh-CN')
+                        });
                         log.delete.error.push(fieldName);
                         console.error(`删除字段 ${fieldName} 时出错：`, e);
                     }

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

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2024-04-23 14:35:03
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-05-06 11:45:46
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2024-09-14 11:24:08
  * @Description: 
  */
 
@@ -10,6 +10,7 @@ const BullMqMixin = require('moleculer-bullmq');
 const axios = require('axios');
 const { evaluate } = require("amis-formula")
 const serviceObjectMixin = require('@steedos/service-object-mixin');
+const _ = require("lodash");
 
 module.exports = {
     name: "object_webhooks",

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

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-28 11:07:57
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2024-05-11 13:57:23
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-10-31 17:36:24
  * @Description: 
  */
 const InternalData = require('@steedos/standard-objects').internalData;
@@ -17,7 +17,22 @@ module.exports = {
         doc.visible;
     },
     beforeUpdate: async function(){
-        const { doc } = this;
+        const { doc, id } = this;
+        if(doc.label){
+            const dbRecord = await this.getObject('object_actions').findOne(id);
+
+            const amis_schema = doc.amis_schema || dbRecord.amis_schema;
+    
+            if(dbRecord && dbRecord.label != doc.label && amis_schema && _.isString(amis_schema) ){
+                try {
+                    const json = JSON.parse(amis_schema);
+                    json.body[0].label = doc.label
+                    doc.amis_schema = JSON.stringify(json)
+                } catch (error) {
+                    console.log(error)
+                }
+            }
+        }
         delete doc.visible_type
         doc.visible;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.8-beta.1",
+    "version": "2.7.8-beta.21",
     "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.8-beta.1",
-        "@steedos/service-object-mixin": "2.7.8-beta.1",
-        "@steedos/standard-objects": "2.7.8-beta.1",
+        "@steedos/metadata-core": "2.7.8-beta.21",
+        "@steedos/service-object-mixin": "2.7.8-beta.21",
+        "@steedos/standard-objects": "2.7.8-beta.21",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "8d913c6e5741fc022c36b86db513753f975294a4"
+    "gitHead": "bde64f8e1f880f54583600a8bb0a6018f36061b7"
 }

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-03-20 14:30:13
+ * @LastEditTime: 2024-10-10 15:58:37
  * @Description: 
  */
 "use strict";
@@ -14,6 +14,10 @@ const validator = require('validator');
 const triggers = require('./src/triggers');
 const { checkAPIName } = require('@steedos/standard-objects').util
 
+const { customAlphabet } = require('nanoid');
+const { group } = require('console');
+const nanoid = customAlphabet('1234567890abcdef', 10)
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -133,6 +137,475 @@ module.exports = {
 				await checkAPIName(objectName, fieldName, fieldValue, recordId, filters)
 			}
 		},
+		create_object: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/objects/create_by_design"
+			},
+			async handler(ctx) {
+				const { appId, groupId, name, label, icon } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+
+				// 1 创建对象
+				const obj = await this.getObject('objects').insert({
+					name: name || `o_${nanoid(5)}`,
+					label: label || '未命名对象',
+					datasource: 'default',
+					icon: icon || 'account'
+				}, userSession);
+				
+				
+				const tab_items = app.tab_items || {};
+				tab_items[`object_${obj.name.replace(/__c$/, "")}`] = {
+					group: groupId
+				}
+
+				await this.getObject('apps').update(app._id, {
+					tab_items
+				}, userSession);
+				
+				return obj;
+			}
+		},
+		create_app_group: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/create_app_group_by_design"
+			},
+			async handler(ctx) {
+				const { appId, name, defaultOpen, oldName } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return {};
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return {};
+				}
+
+				await this.getObject('apps').update(app._id, {
+					$push: {
+						tab_groups: {
+							group_name: name,
+							default_open: defaultOpen
+						}
+					}
+				}, userSession);
+				
+				return {};
+			}
+		},
+		update_app_group: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/update_app_group_by_design"
+			},
+			async handler(ctx) {
+				const { appId, name, defaultOpen, oldName } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!oldName){
+					return {}
+				}
+
+				if(!appId){
+					return {};
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return {};
+				};
+
+				const tab_groups = app.tab_groups;
+
+				const tab_items = app.tab_items;
+
+				_.each(tab_groups, (tGroup)=>{
+					if(tGroup.group_name == oldName){
+						tGroup.group_name = name;
+						tGroup.default_open = defaultOpen
+					}
+				});
+
+
+				_.each(tab_items, (tItem, key)=>{
+					if(tItem.group === oldName){
+						tab_items[key] = {
+							group: name
+						}
+					}
+				})
+
+				await this.getObject('apps').update(app._id, {
+					tab_groups, tab_items
+				}, userSession);
+				
+				return {};
+			}
+		},
+		create_by_design: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/create_by_design"
+			},
+			async handler(ctx) {
+				const { code, name, icon } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!code || !name){
+					return {};
+				}
+
+				return await this.getObject('apps').insert({
+					name: name,
+					code: code,
+					sort : 9100,
+					is_creator : true,
+					mobile : true,
+					visible : true,
+					showSidebar : true,
+					icon_slds : icon || "account",
+				}, userSession);
+			}
+		},
+		update_app_by_design: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/update_app_by_design"
+			},
+			async handler(ctx) {
+				const { appId, tab_groups, tab_items } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return {};
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return {};
+				}
+
+				await this.getObject('apps').update(app._id, {
+					tab_groups: tab_groups,
+					tab_items: tab_items
+				}, userSession);
+				
+			}
+		},
+		update_app_tabs_by_design: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/update_app_tabs_by_design"
+			},
+			async handler(ctx) {
+				const { appId, addTabNames, groupId } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return {};
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return {};
+				}
+
+				const tab_items = app.tab_items || {};
+
+				_.each(addTabNames, (tabName)=>{
+					if(tabName){
+						tab_items[tabName] = {
+							group: groupId
+						}
+					}
+				})
+
+				await this.getObject('apps').update(app._id, {
+					tab_items
+				}, userSession);
+				
+			}
+		},
+		create_link_tab_by_design: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/tabs/create_link_tab_by_design"
+			},
+			async handler(ctx) {
+				const { appId, groupId, name, label, icon, url } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+
+				const tab = await this.getObject('tabs').insert({
+					name: name || `t_${nanoid(5)}`,
+					label: label || '未命名选项卡',
+					icon: icon || 'account',
+					mobile : true,
+					desktop : true,
+					is_new_window : false,
+					is_use_iframe : true,
+					type : "url",
+					url : url,
+				}, userSession);
+				
+				
+				const tab_items = app.tab_items || {};
+				tab_items[tab.name] = {
+					group: groupId
+				}
+				await this.getObject('apps').update(app._id, {
+					tab_items
+				}, userSession);
+				
+				return tab;
+			}
+		},
+		update_link_tab_by_design: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/tabs/update_link_tab_by_design"
+			},
+			async handler(ctx) {
+				const { appId, groupId, name, label, icon, url } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+
+				const dbTab = await this.getObject('tabs').find({
+					filters: ['name', '=', name]
+				}, userSession);
+
+				if(dbTab.length > 0){
+					const tab = await this.getObject('tabs').update(dbTab[0]._id, {
+						name: name,
+						label: label,
+						icon: icon,
+						url : url,
+					}, userSession);
+					return tab;
+				}
+				return dbTab;
+			}
+		},
+		create_page_by_design: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/pages/create_page_by_design"
+			},
+			async handler(ctx) {
+				const { appId, groupId, name, label, icon } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+
+				const page = await this.getObject('pages').insert({
+					name: name || `t_${nanoid(5)}`,
+					label : label,
+					is_active : true,
+					render_engine : "amis",
+					type : "app"
+				}, userSession);
+				
+				const tab = await this.getObject('tabs').insert({
+					name: `page_${page.name}`,
+					mobile : true,
+					desktop : true,
+					is_new_window : false,
+					is_use_iframe : false,
+					icon : icon,
+					type : "page",
+					label : label,
+					page : page.name,
+				}, userSession);
+				
+				
+				const tab_items = app.tab_items || {};
+				tab_items[tab.name] = {
+					group: groupId
+				}
+				await this.getObject('apps').update(app._id, {
+					tab_items
+				}, userSession);
+				
+				return page;
+			}
+		},
+		delete_app_tab: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/delete_app_tab"
+			},
+			async handler(ctx) {
+				const { appId, tabName } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+				
+				
+				const tab_items = app.tab_items || {};
+
+				delete tab_items[tabName]
+
+				await this.getObject('apps').update(app._id, {
+					tab_items
+				}, userSession);
+				
+				return app;
+			}
+		},
+		delete_app_group: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/delete_app_group"
+			},
+			async handler(ctx) {
+				const { appId, groupName } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+				
+				const tab_groups = app.tab_groups || [];
+				const newTabGroups = [];
+				
+				_.each(tab_groups, (tGroup)=>{
+					if(tGroup.group_name != groupName){
+						newTabGroups.push(tGroup);
+					}
+				});
+				await this.getObject('apps').update(app._id, {
+					tab_groups: newTabGroups
+				}, userSession);
+				
+				return app;
+			}
+		},
+		move_app_tab: {
+			rest: {
+				method: "POST",
+                fullPath: "/service/api/apps/move_app_tab"
+			},
+			async handler(ctx) {
+				const { appId, tabName, groupName, oldGroupName } = ctx.params;
+				const userSession = ctx.meta.user;
+
+				if(!appId){
+					return;
+				}
+
+				const records = await this.getObject('apps').find({
+					filters: ['code', '=', appId]
+				});
+				const app = records.length > 0 ? records[0] : null;
+
+				if(!app){
+					return ;
+				}
+				
+				
+				const tab_items = app.tab_items || {};
+
+				_.each(tab_items, (item, k)=>{
+					if(k === tabName){
+						tab_items[k].group = groupName == 0 ? '' : groupName
+					}
+				})
+
+				await this.getObject('apps').update(app._id, {
+					tab_items
+				}, userSession);
+				
+				return app;
+			}
+		},
 	},
 
 	/**