@steedos/standard-object-database 2.7.1-beta.8 → 2.7.1-beta.9

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

@@ -6,3 +6,4 @@ hidden: false
 label: Is Name
 sort_no: 650
 type: boolean
+visible_on: ${ARRAYSOME(['text', 'textarea', 'autonumber', 'date', 'datetime', 'time', 'formula', 'lookup'], item => item === type) && !multiple}

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/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.1-beta.8",
+    "version": "2.7.1-beta.9",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,13 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.1-beta.8",
-        "@steedos/service-object-mixin": "2.7.1-beta.8",
-        "@steedos/standard-objects": "2.7.1-beta.8",
+        "@steedos/metadata-core": "2.7.1-beta.9",
+        "@steedos/service-object-mixin": "2.7.1-beta.9",
+        "@steedos/standard-objects": "2.7.1-beta.9",
         "amis-formula": "~6.3.0",
+        "clone": "^2.1.2",
         "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "6c6d45b547b6f1f511f1d3f8a4bd5b06caf0b113"
+    "gitHead": "63b5ff5367f88ad33c4de6e04a1f432a1e2f5e8e"
 }