@steedos/standard-object-database 2.7.3 → 2.7.4-beta.10

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

@@ -303,13 +303,13 @@ fields:
     help: 
     description:
   deleted_lookup_record_behavior:
-    label: What to do if the lookup record is deleted?
+    label: The rule for deleting related table records
     help: 
-    description: 
+    description: If the field is mandatory, then by default, deletion is not allowed and modification is prohibited.
     options:
-      - label: Clear the value of this field. You can't choose this option if you make this field required.
+      - label: When deleting related table records, also delete the value of this field.
         value: clear
-      - label: Don't allow deletion of the lookup record that's part of a lookup relationship.
+      - label: Do not allow deletion.
         value: retain
   is_wide:
     label: Is Wide

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

@@ -65,13 +65,13 @@ fields:
     help: 
     description: 
   deleted_lookup_record_behavior:
-    label: 如果相关表记录被删除怎么办？
+    label: 相关表记录删除规则
     help: 
-    description: 
+    description: 如果该字段是必填项，则默认不允许删除且禁止修改。
     options:
-      - label: 清除此字段的值。 如果您将此字段设为必填，您不能选择此选项。
+      - label: 相关表记录删除时，同时删除该字段值
         value: clear
-      - label: 不允许删除＂作为相关表关系的一部分的相关表记录＂。
+      - label: 不允许删除
         value: retain
   depend_on:
     label: 依赖字段

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

@@ -52,7 +52,7 @@ fields:
     help: 
     description: 
   enable_form_tabs:
-    label: 是否显示为选项卡模式
+    label: 启用选项卡
     help: 在表单中以选项卡模式显示分组，只在编辑模式时识别该属性
     description: 
   enable_events:

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

@@ -6,13 +6,14 @@ amis:
     !deleted_lookup_record_behavior, "clear", deleted_lookup_record_behavior)}
 hidden: false
 is_wide: true
-label: 如果相关表记录被删除怎么办？
+label: 相关表记录删除规则
 options:
-  - label: 清除此字段的值。 如果您将此字段设为必填，您不能选择此选项。
+  - label: 相关表记录删除时，同时删除该字段值
     value: clear
-  - label: 不允许删除＂作为相关表关系的一部分的相关表记录＂。
+  - label: 不允许删除
     value: retain
 required: true
 sort_no: 100
 type: select
 visible_on: '{{ ''lookup'' === formData.type ? true: false }}'
+description: 如果该字段是必填项，则默认不允许删除且禁止修改。

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

@@ -4,3 +4,4 @@ is_wide: true
 label: Description
 sort_no: 340
 type: textarea
+inlineHelpText: 在字段下方增加解释说明

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

@@ -5,3 +5,4 @@ is_wide: true
 label: Prompt text
 sort_no: 420
 type: textarea
+inlineHelpText: 在字段名称的右侧增加一个叹号提示，可查看对该字段的解释说明

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

@@ -1,5 +1,4 @@
 name: required
-group: ui
 hidden: false
 label: Required
 sort_no: 380

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

@@ -3,7 +3,7 @@ defaultValue: 100
 group: ui
 hidden: false
 label: Sort Number
-readonly: true
+# readonly: true
 scale: 0
 sort_no: 490
 sortable: true

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

@@ -11,18 +11,14 @@ options:
     value: textarea
   - label: Html
     value: html
-  - label: Code
-    value: code
-  - label: Markdown
-    value: markdown
+  - label: Lookup
+    value: lookup
+  - label: Master Detail
+    value: master_detail
   - label: Select
     value: select
-  - label: Color
-    value: color
   - label: Boolean
     value: boolean
-  - label: Toggle
-    value: toggle
   - label: Date
     value: date
   - label: Datetime
@@ -35,12 +31,20 @@ options:
     value: currency
   - label: Percent
     value: percent
+  - label: Image
+    value: image
+  - label: File
+    value: file
+  - label: Code
+    value: code
+  - label: Markdown
+    value: markdown
+  - label: Color
+    value: color
+  - label: Toggle
+    value: toggle
   - label: Password
     value: password
-  - label: Lookup
-    value: lookup
-  - label: Master Detail
-    value: master_detail
   - label: Autonumber
     value: autonumber
   - label: Url
@@ -49,10 +53,6 @@ options:
     value: email
   - label: Location
     value: location
-  - label: Image
-    value: image
-  - label: File
-    value: file
   - label: Formula
     value: formula
   - label: 累计汇总

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

@@ -4,8 +4,12 @@ columns:
   - name
   - shared_to
   - owner
+  - sort_no
   - modified
   - is_enable
   - is_system
 label: All List Views
 filter_scope: space
+sort:
+  - field_name: sort_no
+    order: asc

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

@@ -22,6 +22,7 @@
                             "objectApiName": "${objectName}",
                             "labelAlign": "left",
                             "id": "u:4eb5fa6f6fad",
+                            "tabsMode": "line",
                             "recordId": "${recordId}"
                         }
                     ],

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

@@ -341,7 +341,7 @@ let objectTriggers = {
                 shared_to: "space",
                 filter_scope: "space",
                 crud_mode: 'table',
-                columns: [{field: 'name'}],
+                columns: [{field: 'name'}, {field: 'created_by'}, {field: 'created'}],
                 "sort" : [
                     {
                         "field_name" : "created",

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

@@ -129,15 +129,11 @@ module.exports = {
                     if(_.isString(value) && regDoubleQuote.test(value)){
                         // 只读时值是公式就显示公式
                         steedos_field = {
-                            "type": "control",
+                            "type": "static",
                             "label": translatedLabel,
-                            "body": {
-                                "name": "defaultValue",
-                                "label": translatedLabel,
-                                "labelClassName": "text-left",
-                                "type": "tpl",
-                                "tpl": value.replace(regDoubleQuote, '\\${$1}')
-                            }
+                            "tpl": value.replace(regDoubleQuote, '\\${$1}'),
+                            "labelClassName": "text-left",
+                            "name": "defaultValue"
                         }
                     }else if(['number','currency','percent'].includes(type)){
                         steedos_field = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.3",
+    "version": "2.7.4-beta.10",
     "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.3",
-        "@steedos/service-object-mixin": "2.7.3",
-        "@steedos/standard-objects": "2.7.3",
+        "@steedos/metadata-core": "2.7.4-beta.10",
+        "@steedos/service-object-mixin": "2.7.4-beta.10",
+        "@steedos/standard-objects": "2.7.4-beta.10",
         "amis-formula": "~6.3.0",
         "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "8033b8a6229e061c919923b9b499af32c78ca821"
+    "gitHead": "0ed0582d10ad5c2b2b8fa73a3317587f639b8320"
 }