@steedos/standard-object-database 2.5.19-beta.2 → 2.5.19-beta.4

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

@@ -17,6 +17,8 @@ fields:
     write_requires_master_read: true
     filters: ['name', 'notcontains', ['base','core','space_users_invite','_object_reload_logs']]
     sort_no: 110
+    amis:
+      disabledOn: "true"
   label:
     type: text
     required: true
@@ -103,6 +105,7 @@ fields:
     sort_no: 150
     amis:
       disabledOn: "${is_system == true}"
+      searchable: true
       onEvent:
         change:
           weight: 0

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

@@ -19,7 +19,7 @@ module.exports = {
             record = Creator.odata.get("objects", record_id, "is_deleted");
         }
 
-        if (record && !record.is_deleted && record.name != 'users' && !record.is_system) {
+        if (record && !record.is_deleted && record.name != 'users') {
             return true;
         }
     },

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

@@ -195,7 +195,8 @@
                                 "type": "steedos-object-button",
                                 "name": "standard_delete",
                                 "objectName": "object_fields",
-                                "className": "antd-Button--default"
+                                "className": "antd-Button--default",
+                                "visibleOn": "false"
                               }
                             ],
                             "placement": "bottomRight",
@@ -273,7 +274,7 @@
             "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};",
+            "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  obj.originId = obj._id;\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.originId,\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": {
@@ -283,7 +284,7 @@
               "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",
+                  "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}\n// doAction({\n//   actionType: 'setValue',\n//   componentId: \"service_field_design\",\n//   args: {\n//     value: { fieldForGroup }\n//   }\n// });\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}"
                 }
               ]

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

@@ -10,13 +10,6 @@
             "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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.19-beta.2",
+    "version": "2.5.19-beta.4",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "fc946a6dd1aa34db1809edf505ddd1edce91fe1c"
+    "gitHead": "1dba5cd1c2522748e824b724d323f55412a3ade5"
 }

package/package.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 1985-10-26 16:15:00
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-31 10:25:17
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-04 16:05:25
  * @Description: 
  */
 "use strict";
@@ -10,6 +10,9 @@ const project = require('./package.json');
 const packageName = project.name;
 const packageLoader = require('@steedos/service-meteor-package-loader');
 const serviceObjectMixin = require('@steedos/service-object-mixin');
+
+const triggers = require('./src/triggers');
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -37,6 +40,8 @@ module.exports = {
 	 * Actions
 	 */
 	actions: {
+		...triggers,
+
 		objects__upsert: {
 			graphql: {
 				mutation:

package/src/triggers/index.js

@@ -0,0 +1,11 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-11-01 10:47:02
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-04 16:05:05
+ * @FilePath: /steedos-platform-2.3/services/standard-object-database/src/triggers/index.js
+ * @Description: 
+ */
+module.exports = {
+    object_fields_trigger_create_index: require('./object_fields_trigger_create_index'),
+} 

package/src/triggers/object_fields_trigger_create_index.js

@@ -0,0 +1,58 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2023-11-01 10:47:47
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-11-08 16:08:35
+ * @FilePath: /steedos-platform-2.3/services/standard-object-database/src/triggers/object_fields_trigger_create_index.js
+ * @Description: 当管理员新建/编辑字段时勾选了创建索引/创建唯一索引，保存后立即创建索引 https://github.com/steedos/steedos-platform/issues/5650
+ */
+module.exports = {
+    trigger: {
+        listenTo: 'object_fields',
+        when: [
+            'afterInsert',
+            'afterUpdate',
+        ],
+    },
+    async handler(ctx) {
+        const { isInsert, isUpdate, isDelete, isFind, isBefore, isAfter, id, doc, previousDoc, size, userId, spaceId, objectName, query, data } = ctx.params;
+
+        if (isAfter) {
+            if (isInsert) {
+                const { index, unique, object, name } = doc
+                if (object && (index || unique)) {
+                    const obj = this.getObject(object)
+                    setTimeout(async function () {
+                        await obj.createIndex(name)
+                    }, 6000) // 等待对象重新加载
+                }
+            }
+            if (isUpdate) {
+                const fieldObj = this.getObject(objectName)
+                const newDoc = await fieldObj.findOne(id)
+                const { index, unique, object, name } = newDoc
+                const { index: preIndex, unique: preUnique } = previousDoc
+                // 判断是否修改了索引
+                if (object) {
+                    const obj = this.getObject(object)
+                    if ((index || unique) && ((preIndex != index && !unique) || preUnique != unique)) {
+                        setTimeout(async function () {
+                            if ((preIndex || preUnique) && ((preIndex != index && !unique) || preUnique != unique)) { // 之前勾选过，现在调整了
+                                await obj.dropIndex(name)
+                            }
+                            await obj.createIndex(name)
+                        }, 6000)
+                    }
+                    // 取消勾选，删除索引
+                    if ((!index && !unique) && (preIndex || preUnique)) {
+                        setTimeout(async function () {
+                            await obj.dropIndex(name)
+                        }, 6000)
+                    }
+                }
+
+
+            }
+        }
+    }
+}