@steedos/standard-object-database 2.7.0 → 2.7.1-beta.10

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

@@ -143,15 +143,18 @@
                 "amis": {
                     "onEvent": {
                         "change": {
-                            "actions": [{
-                                "actionType": "setValue",
-                                "args": {
-                                    "value": {
-                                        "defaultValue": null
-                                    }
-                                },
-                                "componentId": "steedos_object_fields_form"
-                            }]
+                            "actions": [
+                                {
+                                    "actionType": "setValue",
+                                    "args": {
+                                        "value": {
+                                            "defaultValue": null,
+                                            "sortable": "${ARRAYSOME(allowSort, item => item === event.data.value)}"
+                                        }
+                                    },
+                                    "componentId": "steedos_object_fields_form"
+                                }
+                            ]
                         }
                     },
                     "disabledOn": "${is_system == true}",
@@ -197,8 +200,33 @@
         "tabsMode": "line"
     }],
     "data": {
-        "context": {}
+        "context": {},
+        "allowSort": [
+            "text",
+            "select",
+            "date",
+            "datetime",
+            "time",
+            "number",
+            "currency",
+            "percent",
+            "autoumber",
+            "summary",
+            "formula"
+        ]
+    },
+    "onEvent": {
+        "init": {
+            "weight": 0,
+            "actions": [
+                {
+                    "actionType": "custom",
+                    "script": "//初始化时给外层dialog加上类名，使过滤组件popover正常显示\n$('.steedos-object-fields-form-page').closest('.amis-dialog-widget.antd-Modal').addClass('steedos-overflow-visible-dialog');"
+                }
+            ]
+        }
     },
     "name": "object_fields_form",
+    "className": "steedos-object-fields-form-page",
     "id": "steedos_object_fields_service"
 }

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

@@ -0,0 +1,51 @@
+{
+    "type": "service",
+    "body": [{
+        "type": "steedos-object-form",
+        "label": "Object Webhook",
+        "objectApiName": "object_webhooks",
+        "recordId": "${recordId}",
+        "mode": "edit",
+        "layout": "horizontal",
+    
+        "fieldsExtend": {
+            "condition": {
+                "amis": {
+                    "type": "service",
+                    "schemaApi": {
+                        "method": "get",
+                        "url": "/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                        "cache": 30000,
+                        "adaptor": "const field = context.uiSchema.fields.condition; const visibleOnVariables = SteedosUI.getFormulaVariables(payload.data.options);\n const defaultValueVariables = [visibleOnVariables[1]];\n const variables = [];\n const varItem = {\n     label: '对象字段',\n     children: _.map(payload.data.options, (item)=>{\n         return {\n             label: item.label,\n             value: item.value\n         }\n     })\n };\n variables.push(varItem);\n payload.data={label: field.label, type:'input-formula', name: 'condition', variables: variables, labelRemark: field.inlineHelpText, description: field.description } \n return payload;",
+                        "trackExpression": "${object_name}",
+                        "sendOn": "${object_name}"
+                    }
+                  }
+            },
+            "execute_when":{
+                "amis": {
+                    "type": "radios",
+                    "inline": false
+                }
+            },
+            "event": {
+                "amis":{
+                    "type": "radios",
+                    "inline": false
+                }
+            }
+        },
+        "form": {
+            "id": "steedos_object_webhooks_form"
+        },
+        "id": "u:e17c57cce896",
+        "tabsMode": "line"
+    }],
+    "data": {
+        "context": {},
+        "visibleOnVariables": "",
+        "defaultValueVariables": ""
+    },
+    "name": "object_webhooks_form",
+    "id": "steedos_object_webhooks_service"
+}

package/main/default/pages/object_webhooks_form.page.yml

@@ -0,0 +1,12 @@
+name: object_webhooks_form
+is_active: true
+label: 对象字段表单
+object_name: object_webhooks
+pageAssignments:
+  - type: orgDefault
+    page: object_webhooks_form
+    desktop: true
+    mobile: true
+render_engine: amis
+type: form
+widgets: []

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

@@ -299,8 +299,10 @@ function allowChangeObject(){
 }
 
 function checkNameField(nameField){
-  if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula"].indexOf(nameField.type) < 0){
-    throw new Error("只有文本、长文本、自动编号、日期、日期时间、时间、公式这些类型的字段可以被设置为名称字段");
+  if(["text", "textarea", "autonumber", "date", "datetime", "time", "formula", "lookup"].indexOf(nameField.type) < 0){
+    throw new Error("只有文本、长文本、自动编号、日期、日期时间、时间、公式、相关表这些类型的字段可以被设置为名称字段");
+  } else if(nameField.type == "lookup" && nameField.multiple) {
+    throw new Error("多选的相关表字段不可以被设置为名称字段");
   }
 }
 

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

@@ -0,0 +1,141 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2024-04-23 14:35:03
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-05-06 11:45:46
+ * @Description: 
+ */
+
+const BullMqMixin = require('moleculer-bullmq');
+const axios = require('axios');
+const { evaluate } = require("amis-formula")
+const serviceObjectMixin = require('@steedos/service-object-mixin');
+
+module.exports = {
+    name: "object_webhooks",
+    mixins: [serviceObjectMixin, BullMqMixin],
+    settings: {
+      bullmq: {
+        client: process.env.QUEUE_BACKEND,
+        worker: { concurrency: 50 }
+      }
+    },
+    events: {
+      "*.inserted": async function(ctx){
+        const { objectApiName, id, spaceId, userId  } = ctx.params;
+        if(ctx.eventName != `@${objectApiName}.inserted`){
+          return
+        }
+        if(objectApiName && id && spaceId){
+          await this.addQueue(ctx, objectApiName, "create", id, spaceId, userId)
+        }
+      },
+      "*.updated": async function(ctx){
+        const { objectApiName, id, spaceId, userId, previousDoc } = ctx.params;
+        if(ctx.eventName != `@${objectApiName}.updated`){
+          return
+        }
+        if(objectApiName && id && spaceId){
+          await this.addQueue(ctx, objectApiName, "update", id, spaceId, userId, previousDoc)
+        }
+      },
+      "*.deleted": async function(ctx){
+        const { objectApiName, id, spaceId, userId, previousDoc } = ctx.params;
+        if(ctx.eventName != `@${objectApiName}.deleted`){
+          return
+        }
+        if(objectApiName && id){
+          await this.addQueue(ctx, objectApiName, "delete", id, spaceId, userId, previousDoc)
+        }
+      }
+    },
+    actions: {
+      send: {
+        queue: true,
+        async handler(ctx) {
+          const { url, data } = ctx.params
+          const result = await axios.post(url, data);
+          ctx.locals.job.updateProgress(100)
+          return result.data;
+        }
+      }
+    },
+    methods: {
+
+      async addQueue(ctx, objectName, actionName, recordId, spaceId, userId, previousDoc){
+        const hooks = await this.getObjectWebhooks(objectName, spaceId)
+        if(hooks.length === 0) return
+
+        let newDoc;
+        if(recordId && (actionName === 'update' || actionName === 'create')){
+          newDoc = await this.getObject(objectName).findOne(recordId)
+        }
+        let sender;
+        let space;
+        if(userId && spaceId){
+          const userSession  = await ctx.call('@steedos/service-accounts.getUserSession', {userId, spaceId})
+          if(userSession){
+            sender = {
+              _id: userSession.userId,
+              username: userSession.username,
+              name: userSession.name,
+              email: userSession.email
+            }
+
+            space = {
+              _id: userSession.space._id,
+              name: userSession.space.name
+            }
+          }
+        }
+
+        for (const hook of hooks) {
+
+          if(hook.event != 'createAndUpdate' && hook.event != actionName){
+            continue;
+          }
+
+          if(hook.event == 'createAndUpdate' && actionName != 'create' && actionName != 'update'){
+            continue;
+          }
+
+          const { execute_when, condition } = hook;
+
+          if(hook.event == 'createAndUpdate' && actionName == 'create' && execute_when == 'trueOnChangeOnly'){
+            continue;
+          }
+
+          if(condition){
+
+            if(actionName == 'update' && execute_when === 'trueOnChangeOnly'){
+              const oldResult = evaluate(condition, previousDoc);
+              if(oldResult){
+                continue;
+              }
+            }
+
+            const result = evaluate(condition, newDoc);
+            if(!result){
+              continue;
+            }
+          }
+          let data  = newDoc || previousDoc;
+          if(hook.fields && hook.fields.length > 0){
+            data = _.map(data, hook.fields)
+          }
+          await this.queue(ctx, 'object_webhooks', 'send', { url: hook.payload_url, data: {
+            action: actionName,
+            object_name: objectName,
+            doc: data,
+            sender: sender,
+            space: space
+          }, space: spaceId, user: userId }, { priority: 10 })
+        }
+      },
+      async getObjectWebhooks(objectName, spaceId){
+        const SERVICE_NAME = 'metadata-cachers-service'
+        const hooks = await global.broker.call(`${SERVICE_NAME}.find`, {metadataName: 'object_webhooks', filters: ['object_name', '=', objectName], spaceId});
+        return hooks;
+      }
+    }
+}

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

@@ -7,6 +7,7 @@ const InternalData = require('@steedos/standard-objects').internalData;
 const objectql = require('@steedos/objectql');
 const auth = require('@steedos/auth');
 const _ = require('underscore');
+const clone = require('clone');
 //由于新版lookup 组件限制。需编写trigger处理在只读页面不显示已选中项的问题
 //由于lookup组件强依赖_id 字段，所以必须返回_id
 
@@ -35,14 +36,15 @@ module.exports = {
             dataList.push({_id: 'meteor', name: 'meteor', label: TAPi18n.__(`objects_field_datasource_meteor`, {}, lng), ...BASERECORD})
         }
         if (!_.isEmpty(dataList)) {
+            const cloneValues = clone(this.data.values, false);
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
                     return value.name === doc.name
                 })) {
-                    this.data.values.push(doc);
+                    cloneValues.push(doc);
                 }
             })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
             if (records.length > 0) {
                 this.data.values = records;
             } else {

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

@@ -1,13 +1,14 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-28 11:07:57
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-03-20 16:00:17
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2024-05-11 13:57:23
  * @Description: 
  */
 const InternalData = require('@steedos/standard-objects').internalData;
 const objectql = require('@steedos/objectql');
 const auth = require("@steedos/auth");
+const clone = require('clone');
 const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 module.exports = {
     beforeInsert: async function(){
@@ -35,14 +36,15 @@ module.exports = {
         if(objectName){
             let dataList = await InternalData.getObjectActions(objectName, this.userId);
             if (!_.isEmpty(dataList)) {
+                const cloneValues = clone(this.data.values, false);
                 dataList.forEach((doc) => {
                     if (!_.find(this.data.values, (value) => {
                         return value.name === doc.name
                     })) {
-                        this.data.values.push(Object.assign({_id: `${objectName}.${doc.name}`}, doc));
+                        cloneValues.push(Object.assign({_id: `${objectName}.${doc.name}`}, doc));
                     }
                 })
-                const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+                const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
                 if (records.length > 0) {
                     this.data.values = records;
                 } else {

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

@@ -231,15 +231,16 @@ module.exports = {
         if(objectName){ 
             let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
             if(fields){
+                const cloneValues = clone(this.data.values, false);
                 _.each(fields, (field)=>{
                     if(!_.find(this.data.values, (item)=>{
                         return item.object == field.object && item.name == field.name
                     })){
-                        this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
+                        cloneValues.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
                     }
                 })
                 // this.data.values = this.data.values.concat(fields)
-                this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, this.spaceId);
+                this.data.values = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, this.spaceId);
             }
         }
 
@@ -282,29 +283,6 @@ module.exports = {
         }
 
        
-    },
-    beforeAggregate: async function(){
-        const { query } = this;
-        if(query.fields && _.isArray(query.fields) && !_.include(query.fields, 'object')){
-            query.fields.push('object')
-        }
-    },
-    afterAggregate: async function(){
-        let filters = InternalData.parserFilters(this.query.filters);
-        let objectName = filters.object;
-        if(!objectName && filters._id && filters._id.indexOf(".") > -1){
-            objectName = filters._id.split('.')[0];
-        }
-        if(objectName){
-            let fields = await InternalData.getObjectFields(objectName, this.userId, true);
-            if(fields){
-                _.each(fields, (field)=>{
-                    this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
-                })
-                // this.data.values = this.data.values.concat(fields)
-                this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, this.spaceId);
-            }
-        }
     },
     afterCount: async function(){
         let result = await objectql.getObject('object_fields').find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))

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

@@ -8,26 +8,25 @@ const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
 const register = require('@steedos/metadata-registrar')
 const auth = require('@steedos/auth');
+const clone = require('clone');
 
 module.exports = {
     beforeFind: async function(){
         delete this.query.fields;
     },
-    beforeAggregate: async function(){
-        delete this.query.fields;
-    },
     afterFind: async function(){
         const { spaceId } = this;
         let dataList = await register.getAllObjectValidationRules();
         if (!_.isEmpty(dataList)) {
+            const cloneValues = clone(this.data.values, false);
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
                     return value.name === doc.name
                 })) {
-                    this.data.values.push(doc);
+                    cloneValues.push(doc);
                 }
             })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
             if (records.length > 0) {
                 this.data.values = records;
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.0",
+    "version": "2.7.1-beta.10",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,10 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.0",
-        "@steedos/standard-objects": "2.7.0"
+        "@steedos/metadata-core": "2.7.1-beta.10",
+        "@steedos/service-object-mixin": "2.7.1-beta.10",
+        "@steedos/standard-objects": "2.7.1-beta.10",
+        "amis-formula": "~6.3.0",
+        "clone": "^2.1.2",
+        "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "2f1586ea4f8af5b93753878e96f1f48adbef31a7"
+    "gitHead": "ebcec3b98499655769a965cf548456f280f0df18"
 }

package/package.service.js

@@ -166,8 +166,9 @@ module.exports = {
 				const dbRecord = await object.directFind({filters: ['_id','=',id]});
 				if(dbRecord.length === 0){
 					// const newId = await object._makeNewID();
-					const objectConfig = await object.toConfig();
-					let field_groups = objectConfig.field_groups || null;
+					const curentObject = await this.getObject(name);
+					const curentObjectConfig = await curentObject.toConfig();
+					let field_groups = curentObjectConfig.field_groups || null;
 					
 					const now = new Date();
 					await object.directInsert(Object.assign({}, data, {