@steedos/standard-object-database 2.6.2-beta.13 → 2.6.2-beta.15

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

@@ -37,6 +37,8 @@ fields:
         value: markdown
       - label: Select
         value: select
+      - label: Color
+        value: color
       - label: Checkbox
         value: boolean
       - label: Toggle

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

@@ -38,6 +38,8 @@ fields:
         value: markdown
       - label: 选择框
         value: select
+      - label: 颜色
+        value: color
       - label: 复选框
         value: boolean
       - label: 开关

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

@@ -66,6 +66,8 @@ fields:
         value: markdown
       - label: Select
         value: select
+      - label: Color
+        value: color
       - label: Boolean
         value: boolean
       - label: Toggle
@@ -431,7 +433,7 @@ fields:
   #   group: Advanced
     sort_no: 270
   options:
-    type: grid
+    type: table
     label: Options
     is_wide: true
     inlineHelpText: The label and value of each option cannot be empty. Set the background color to FFFFFF in hexadecimal format.
@@ -454,7 +456,7 @@ fields:
     required: true
   options.$.color:
     label: Color
-    type: text
+    type: color
     required: false
   options.$.description:
     label: Description

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

@@ -220,7 +220,7 @@ fields:
     visible_on: "{{global.mode ==='read' ? true : false}}"
   mobile_columns:
     label: Mobile Columns
-    type: grid
+    type: table
     is_wide: true
     depend_on:
       - object_name
@@ -234,8 +234,16 @@ fields:
     type: lookup
     multiple: false
     is_wide: false
+    required: true
+    depend_on:
+      - object_name
     reference_to: object_fields
     reference_to_field: name
+    enable_enhanced_lookup: false
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function(filters, values){
+        return ['object', '=', values.object_name]
+      }
   searchable_fields:
     label: Searchable Fields
     type: grid

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

@@ -34,29 +34,36 @@
                           "size": "lg",
                           "body": [
                             {
-                              "type": "steedos-input-table",
-                              "fields": [
-                                {
-                                  "name": "group_name",
-                                  "label": "名称",
-                                  "type": "text",
-                                  "id": "u:31952daa443c"
-                                },
+                              "type": "form",
+                              "mode": "normal",
+                              "body": [
                                 {
-                                  "name": "visible_on",
-                                  "label": "显示条件",
-                                  "type": "text",
-                                  "id": "u:8d7551abcd28",
-                                  "value": null
+                                  "type": "steedos-input-table",
+                                  "fields": [
+                                    {
+                                      "name": "group_name",
+                                      "label": "名称",
+                                      "type": "text",
+                                      "id": "u:31952daa443c"
+                                    },
+                                    {
+                                      "name": "visible_on",
+                                      "label": "显示条件",
+                                      "type": "text",
+                                      "id": "u:8d7551abcd28",
+                                      "value": null
+                                    }
+                                  ],
+                                  "name": "groups",
+                                  "addable": true,
+                                  "editable": true,
+                                  "removable": true,
+                                  "draggable": false,
+                                  "showIndex": false,
+                                  "id": "u:776ec89804c0",
+                                  "label": ""
                                 }
-                              ],
-                              "name": "groups",
-                              "addable": true,
-                              "editable": true,
-                              "removable": true,
-                              "draggable": false,
-                              "showIndex": false,
-                              "id": "u:776ec89804c0"
+                              ]
                             }
                           ],
                           "onEvent": {
@@ -261,8 +268,7 @@
                           }
                         ],
                         "bodyClassName": "h-7  flex justify-between items-center p-0 pl-10 my-2",
-                        "toolbar": [
-                        ],
+                        "toolbar": [],
                         "className": "mb-0 border-0 bg-none card",
                         "id": "u:296298da1bef"
                       },
@@ -291,8 +297,7 @@
                     },
                     "requestAdaptor": "var graphqlOrder = \"\";\n//先修改字段，使系统对象自行自定义\n//根据design_field,修改对象字段的sort_no与groups\nvar index = 1;\n_.forEach(api.data.design_field, function (items, key) {\n  let group = key;\n  if (key == \"未分组\" || key == \"隐藏\") {\n    group = null;\n  }\n  _.forEach(items, function (item) {\n    const field = _.find(api.data.fields, { 'id': item });\n    //如果是在隐藏分组里的字段，就给visible_on属性赋予{{false}};如果不在隐藏分组里，就判断来自数据库内的visible_on属性是不是{{false}},是就清除，不是就保持不变\n    const visible_on = key == \"隐藏\" ? \"{{false}}\" : (field.attr_visible_on == \"{{false}}\" ? \"{{true}}\" : field.attr_visible_on);\n    let docJson = {\n      sort_no: index * 10,\n      group, visible_on\n    }\n    if (field.id == field._id && field.is_system) {\n      docJson = {\n        object: api.data.$self.designObjectName,\n        type: field.type,\n        _name: field._name,\n        label: field.label,\n        sort_no: index * 10,\n        group,\n        visible_on,\n        is_system: field.is_system\n      }\n    }\n    if (key != \"隐藏\") {\n      docJson.hidden = false;\n    }\n    let itemOrder = 'upsert' + index + ':object_fields__upsert(id:\"' + item + '\" , doc:' + JSON.stringify(JSON.stringify(docJson)) + '){_id}\\n';\n    graphqlOrder += itemOrder;\n    index++;\n  })\n})\n\n//根据groups，修改对象的字段分组field_groups\nvar field_groups = _.cloneDeep(api.data.groups);\n_.remove(field_groups, { is_default: true });\n_.remove(field_groups, { is_hidden: true });\nfield_groups = field_groups.map(function (group) {\n  return _.omit(group, 'id');\n})\nconst keys = _.keys(api.data.design_field);\nfield_groups = _.sortBy(field_groups, function (group) { return _.findIndex(keys, function (key) { return key == group.group_name }) });\nconst groupOrder = 'upsert0:objects__upsert(id:\"' + api.data.$self.designObjectId + '\" , doc:' + JSON.stringify(JSON.stringify({ field_groups, name: api.data.$self.designObjectName })) + ') {_id}';\ngraphqlOrder += groupOrder;\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": {
-                    },
+                    "messages": {},
                     "data": {
                       "design_field": "${design_field}",
                       "groups": "${groups}",
@@ -334,14 +339,12 @@
             "headers": {
               "Authorization": "Bearer ${context.tenantId},${context.authToken}"
             },
-            "messages": {
-            },
+            "messages": {},
             "requestAdaptor": "",
             "adaptor": "//筛选出可编辑的字段\r\nvar oldFields = _.filter(payload.data.fields, function (obj) { return obj.recordPermissions.allowEdit; });\r\n//将group为空的字段分为未分组的组中,将系统字段的_id改为对象名.字段名\r\noldFields = _.map(oldFields, function (obj) {\r\n  obj.originId = obj._id;\r\n  if (obj.hidden || obj.visible_on == \"{{false}}\") {\r\n    obj.group = \"隐藏\";\r\n  }else 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,//用与steedos-board组件的关系分辨\r\n    \"_name\": field._name,\r\n    \"label\": field.label,\r\n    \"_id\": field.originId,//用于打开steedos-objectform\r\n    \"columnSpan\": field.is_wide ? 2 : 1,\r\n    \"is_system\": field.is_system,\r\n    \"type\": field.type,\r\n    \"attr_visible_on\": field.visible_on\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\nlet 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\nlet 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\n//未分组 放在所有分组开头，隐藏 放在所有分组最后\r\nconst defaultGroup = fieldForGroup[\"未分组\"];\r\nconst hiddenGroup = fieldForGroup[\"隐藏\"];\r\ndelete fieldForGroup[\"未分组\"];\r\ndelete fieldForGroup[\"隐藏\"];\r\nfieldForGroup = _.merge({ \"未分组\": defaultGroup }, fieldForGroup, { \"隐藏\": hiddenGroup });\r\n\r\n//根据fieldForGroup调整groups顺序，设置分组与保存时需要groups按照顺序\r\nconst keys = _.keys(fieldForGroup);\r\ngroups = _.sortBy(groups, function (group) { return _.findIndex(keys, function (key) { return key == group.group_name }) });\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": {
-          },
+          "messages": {},
           "onEvent": {
             "fetchInited": {
               "actions": [
@@ -369,13 +372,11 @@
         "headers": {
           "Authorization": "Bearer ${context.tenantId},${context.authToken}"
         },
-        "messages": {
-        },
+        "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_hidden: true\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\n\r\n\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": {
-      },
+      "messages": {},
       "onEvent": {
         "@data.changed.object_fields": {
           "actions": [
@@ -395,8 +396,7 @@
     "body"
   ],
   "data": {
-    "initialValues": {
-    },
+    "initialValues": {},
     "appId": "builder",
     "title": "",
     "context": "${context}",

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

@@ -35,7 +35,7 @@ const validateOptionsValue = (value)=>{
 
 const validateOptionColorValue = (value)=>{
     if(value){
-        const reg = /^[\da-f]{6}$/i;
+        const reg = /^(#)?[\da-f]{6}$/i;
         if(!reg.test(value)){
             throw new Error("object_fields_error_option_color_not_valid");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.2-beta.13",
+    "version": "2.6.2-beta.15",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,9 +12,9 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/standard-objects": "2.6.2-beta.13"
+        "@steedos/standard-objects": "2.6.2-beta.15"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "8b4dd42561a6499bdeb04a44fa628d78671405d6"
+    "gitHead": "848eb6cdf895971f0ea6638795e8be4e0b7d2b3b"
 }