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

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

@@ -244,6 +244,10 @@ fields:
     label: Value
     help: 
     description: 
+  summary_depend_on:
+    label: Recalculate Summary Depend On
+    help: Which fields of the child table are dependent on when the summary is performed. When the values of these fields change, a recalculation of the summary field values of the primary table records is triggered.
+    description: 
   column_name:
     label: Database column name
     help: Only supports relational databases.
@@ -295,7 +299,11 @@ fields:
     description: 
   index:
     label: Is Index Field
-    help: 
+    help: The Creation Is Executed Once A Day By Default And The Existing Indexes Are Not Repeatedly Created.
+    description: 
+  unique:
+    label: Unique Index
+    help: The Creation Is Executed Once A Day By Default And The Existing Indexes Are Not Repeatedly Created.
     description: 
   sortable:
     label: Sortable
@@ -341,6 +349,10 @@ fields:
     label: Amis Attribute
     help: 
     description: 
+  enable_enhanced_lookup:
+    label: Enable Enhanced Lookup
+    help: 
+    description: 
 groups:
   external_data_source: External data source
   advanced: Advanced

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

@@ -6,6 +6,10 @@ fields:
     label: 所属对象
     help: 
     description: 
+  is_system:
+    label: 系统
+    help: 
+    description: 
   label:
     label: 显示名称
     help: 
@@ -224,6 +228,10 @@ fields:
     label: 值
     help: 
     description: 
+  summary_depend_on:
+    label: 汇总依赖的字段
+    help: 汇总时依赖了子表的哪些字段，当这些字段值变更时会触发重算主表记录的汇总字段值
+    description: 
   column_name:
     label: 数据库字段名
     help: 仅支持关系型数据库
@@ -275,7 +283,11 @@ fields:
     description: 
   index:
     label: 创建索引
-    help: 
+    help: 默认每天凌晨执行一次创建，已有的索引不重复创建。
+    description: 
+  unique:
+    label: 创建唯一索引
+    help: 默认每天凌晨执行一次创建，已有的索引不重复创建。
     description: 
   sortable:
     label: 可排序
@@ -313,6 +325,9 @@ fields:
   amis:
     label: Amis 属性
     help: <a href='https://docs.steedos.com/zh-CN/no-code/customize/fields/field-attributes/#amis-%E5%B1%9E%E6%80%A7' target='_blank'>查看帮助</a>
+  enable_enhanced_lookup:
+    label: 启用弹出窗口查找模式
+    help: 
     description: 
 groups:
   external_data_source: 外部数据源

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

@@ -576,6 +576,7 @@ fields:
       - summary_object
       - summary_type
     defaultIcon: service_contract
+    enable_enhanced_lookup: false
     amis:
       disabledOn: "${is_system == true}"
       "autoComplete": 
@@ -587,7 +588,7 @@ fields:
           "Authorization": "Bearer ${context.tenantId},${context.authToken}" 
         "sendOn": "!!this.summary_object && !!this.summary_type"
         "adaptor": "const summary_type = api.body.summary_type;\nconst term = api.query.term;\nlet fields = payload.fields;\nlet options = [];\nif (fields) {\n  if (summary_type && summary_type !== \"count\") {\n    if (summary_type === \"sum\" || summary_type === \"avg\") {\n      /*sum/avg类型可以汇总数值、金额、百分比字段*/\n      _.forEach(fields, (value, key) => {\n        let fieldType = value.type;\n        if ([\"formula\", \"summary\"].indexOf(fieldType) > -1) {\n          /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/\n          fieldType = value.data_type;\n        }\n        if ([\"number\", \"currency\", \"percent\"].indexOf(fieldType) > -1) {\n          options.push({ label: value.label, value: value.name });\n        }\n      })\n    }\n    else {\n      /*min、max类型可以汇总数值、金额、百分比、日期、日期时间字段*/\n      _.forEach(fields, (value, key) => {\n        let fieldType = value.type;\n        if ([\"formula\", \"summary\"].indexOf(fieldType) > -1) {\n          /*要聚合的字段为公式或汇总字段时，按其字段数据类型判断是否支持聚合*/\n          fieldType = value.data_type;\n        }\n        if ([\"number\", \"currency\", \"percent\", \"date\", \"datetime\"].indexOf(fieldType) > -1) {\n          options.push({ label: value.label, value: value.name });\n        }\n      })\n    }\n  }\n  if (term) {\n    options = _.filter(options, (item) => {\n      return item.label.toLowerCase().indexOf(term.toLowerCase()) > -1;\n    })\n  }\n}\npayload = {\n  data: { options: options },\n  msg: \"\",\n  status: 0\n}\nreturn payload;"
-    visible_on: "{{formData.type === 'summary' && formData.summary_type !== 'count' ? true: false}}"
+    visible_on: "{{formData.type === 'summary' && formData.summary_object && formData.summary_type && formData.summary_type !== 'count'}}"
     required: "{{formData.type === 'summary' && formData.summary_type !== 'count' ? true: false}}"
     sort_no: 320
   summary_filters:
@@ -750,6 +751,13 @@ fields:
     label: Is Index Field
     group: Advanced
     sort_no: 410
+    inlineHelpText: The Creation Is Executed Once A Day By Default And The Existing Indexes Are Not Repeatedly Created.
+  unique:
+    type: boolean
+    label: Unique Index
+    group: Advanced
+    sort_no: 411
+    inlineHelpText: The Creation Is Executed Once A Day By Default And The Existing Indexes Are Not Repeatedly Created.
   sortable:
     type: boolean
     label: Sortable
@@ -804,6 +812,10 @@ fields:
     type: boolean
     label: System
     visible_on: "{{false}}"
+  enable_enhanced_lookup:
+    type: boolean
+    label: Enable Enhanced Lookup
+    visible_on: "{{false}}"
 paging:
   enabled: false
 list_views:
@@ -816,6 +828,7 @@ list_views:
       - object
       - sort_no
       - modified
+      - is_system
     sort:
       - field_name: sort_no
         order: asc
@@ -830,6 +843,7 @@ list_views:
       - object
       - sort_no
       - modified
+      - is_system
     label: 自定义
     filters:
       - ["is_system","<>",true]

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

@@ -387,6 +387,7 @@ fields:
     blackbox: true
     is_wide: true
     hidden: false
+    visible_on: "${false}"
   field_groups.$.group_name:
     type: text
   field_groups.$.visible_on:

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

@@ -17,7 +17,7 @@
                 "items": [
                   {
                     "type": "tpl",
-                    "tpl": "设计字段布局 ${designObjectLabel}(${designObjectName})",
+                    "tpl": "<p><h4><strong>设计字段布局</strong></h4> ${designObjectLabel}<span style=\"color: rgb(149, 165, 166);\">  ${designObjectName}</span></p>",
                     "id": "u:4c7bef616400"
                   },
                   {
@@ -60,7 +60,7 @@
                               "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});"
+                                  "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 = _.cloneDeep(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});"
                                 }
                               ]
                             }
@@ -161,23 +161,28 @@
                       "columns": 2,
                       "name": "design_field",
                       "boardSource": "${groups}",
-                      "boardClassName": "bg-gray-50 p-2 border rounded shadow",
+                      "boardClassName": "bg-gray-50 p-2 ",
+                      "header": {
+                        "className": ""
+                      },
                       "boardHeader": {
                         "type": "tpl",
-                        "tpl": "字段分组：${group_name}",
+                        "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": [
+                        "body": [
+                          {
+                            "type": "tpl",
+                            "tpl": "<p><strong>${label}</strong> ${designObjectLabel}<span style=\"color: rgb(149, 165, 166);\">${_name}</span></p>",
+                            "className": "w-4/5",
+                            "inline": true
+                          },
                           {
                             "type": "steedos-dropdown-button",
-                            "label": "xxx",
+                            "label": "",
                             "buttons": [
                               {
                                 "type": "steedos-object-button",
@@ -198,9 +203,12 @@
                               "click"
                             ],
                             "id": "u:c2140a365019",
-                            "className": "mx-3 hidden"
+                            "mode": "edit",
+                            "className": "mr-7 w-fit h-fit opacity-0"
                           }
                         ],
+                        "bodyClassName": "h-7  flex justify-between items-center p-0 pl-10 my-2",
+                        "toolbar": [ ],
                         "className": "mb-0 border-0 bg-none card",
                         "id": "u:296298da1bef"
                       },
@@ -211,7 +219,7 @@
                           "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"
+                              "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        fieldForGroup: event.data.value, 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"
                             }
                           ]
                         }
@@ -243,7 +251,7 @@
                   "name": "form_design_form"
                 }
               ],
-              "className": "Panel--default max-w-xl m-auto",
+              "className": "Panel--default max-w-4xl m-auto",
               "id": "u:3a90104cb6b4"
             }
           ],
@@ -331,8 +339,11 @@
   },
   "id": "u:993ee4316643",
   "css": {
-    ".steedos-design-field .card:hover .slds-button": {
-      "display": "inline-block"
+    ".steedos-design-field li.p-1:hover .opacity-0": {
+      "opacity": "0.99"
+    },
+    ".antd-TplField p": {
+      "margin": "0.625rem 0.625rem"
     }
   },
   "className": "steedos-design-field"

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

@@ -10,6 +10,13 @@
             "enableTabs": true,
             "mode": "edit",
             "layout": "normal",
+            "fieldsExtend": {
+                "type": {
+                    "amis": {
+                        "searchable": true
+                    }
+                }
+            },
             "apiRequestAdaptor": "api.data.query = api.data.query.replace('object_fields__update', 'object_fields__upsert')",
             "submitSuccActions": [
                 {

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

@@ -222,7 +222,7 @@ module.exports = {
         if(!objectName && filters._id && filters._id.indexOf(".") > -1){
             objectName = filters._id.split('.')[0];
         }
-        if(objectName){
+        if(objectName){ 
             let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
             if(fields){
                 _.each(fields, (field)=>{
@@ -232,6 +232,20 @@ module.exports = {
                 this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, this.spaceId);
             }
         }
+
+        const dbSystemField = _.find(this.data.values, (field)=>{return field.is_system && field._id && field._id.indexOf('.') == -1})
+        if(dbSystemField){
+            const obj = await InternalData.getObject(dbSystemField.object, this.userId)
+            if(obj){
+                this.data.values = _.map(this.data.values, (item)=>{
+                    if(item.is_system){
+                        return Object.assign(item, _.find(obj.fields, (field)=>{return field.name === item.name}))
+                    }else{
+                        return item;
+                    }
+                })
+            }
+        }
     },
     beforeFind: async function(){
         const { query } = this;
@@ -327,7 +341,12 @@ module.exports = {
         }
         if(["parent","children"].indexOf(dbDoc._name) > -1){
             let isImportField = false;
-            if(doc._name !== dbDoc._name || doc.type !== dbDoc.type || doc.object !== dbDoc.object || doc.reference_to !== dbDoc.reference_to || !!doc.multiple !== !!dbDoc.multiple || ("children" === dbDoc._name && doc.omit !== true)){
+            if((doc._name != undefined && doc._name !== dbDoc._name) || 
+                (doc.type != undefined && doc.type !== dbDoc.type) || 
+                (doc.object != undefined && doc.object !== dbDoc.object) || 
+                (doc.reference_to != undefined && doc.reference_to !== dbDoc.reference_to) || 
+                (doc.multiple != undefined && !!doc.multiple !== !!dbDoc.multiple) || 
+                (doc.omit != undefined && ("children" === dbDoc._name && doc.omit !== true))){
                 isImportField = true;
             }
             if(isImportField){
@@ -362,7 +381,7 @@ module.exports = {
         // !!!暂不允许修改字段类型
         if (_.has(doc, 'type')) {
             const newFieldType = doc.type;
-            if (newFieldType &&  (latestDoc.type != newFieldType)) {
+            if (latestDoc.type && newFieldType &&  (latestDoc.type != newFieldType)) {
                 throw new Error('禁止修改字段类型。');
             }
         }

package/package.json

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

package/package.service.js

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-30 17:18:36
+ * @LastEditTime: 2023-10-31 10:25:17
  * @Description: 
  */
 "use strict";
@@ -57,6 +57,10 @@ module.exports = {
 				}
 
                 delete data.space;
+
+				if(data.is_system){
+					data = _.pick(data, ['label', 'icon', 'enable_files', 'enable_tasks', 'enable_notes', 'enable_events', 'enable_workflow', 'enable_instances', 'enable_inline_edit', 'enable_tree', 'enable_enhanced_lookup', 'description', 'is_deleted'])
+				}
 				
 				const object = await this.getObject('objects');
 				const dbRecord = await object.directFind({filters: ['_id','=',id]});
@@ -98,6 +102,10 @@ module.exports = {
                     data = JSON.parse(JSON.stringify(doc));
                 }
                 delete data.space;
+
+				if(data.is_system){
+					data = _.pick(data, ['label', 'defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis'])
+				}
 				
 				const object = await this.getObject('object_fields');
 				if(id.indexOf('.') > 0){
@@ -119,7 +127,8 @@ module.exports = {
 							created_by: userSession.userId,
 							modified_by: userSession.userId,
 							company_id: userSession.company_id,
-							company_ids: userSession.company_ids
+							company_ids: userSession.company_ids,
+							is_system: true
 						}));					
 						id = newId;
 					}