@steedos/standard-object-database 2.5.20-beta.16 → 2.5.20-beta.18

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

@@ -9,6 +9,13 @@ const objectFieldsFind = function (filter) {
     }, { filter: filter })
 }
 
+
+const getRecords = function (objectName) {
+  return objectql.wrapAsync(async function () {
+      return await objectql.getObject(this.objectName).directFind({fields:["_id"], top: 1});
+  }, { objectName: objectName })
+}
+
 const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
 
 function canRemoveNameFileld(doc){
@@ -432,11 +439,11 @@ var triggers = {
         }
       });
       if (object) {
-        object_documents = Creator.getCollection(object.name).find();
-        if ((modifier != null ? (ref6 = modifier.$set) != null ? ref6.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.count() > 0) {
+        object_documents = getRecords(object.name);
+        if ((modifier != null ? (ref6 = modifier.$set) != null ? ref6.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.length > 0) {
           throw new Meteor.Error(500, `对象${object.label}中已经有记录，不能修改reference_to字段`);
         }
-        if ((modifier != null ? (ref7 = modifier.$unset) != null ? ref7.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.count() > 0) {
+        if ((modifier != null ? (ref7 = modifier.$unset) != null ? ref7.reference_to : void 0 : void 0) && doc.reference_to !== _reference_to && object_documents.length > 0) {
           throw new Meteor.Error(500, `对象${object.label}中已经有记录，不能修改reference_to字段`);
         }
       }

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

@@ -125,18 +125,18 @@
                     ]
                 },
                 {
-                    "title": "${'objects_amis_process_mapping' | t}",
+                    "title": "${'objects_amis_object_workflows' | t}",
+                    "hiddenOn": "${_master.record.enable_workflow != true}",
                     "body": [
                         {
                             "type": "steedos-object-related-listview",
                             "objectApiName": "objects",
                             "recordId": "${recordId}",
                             "relatedObjectApiName": "object_workflows",
-                            "perPage": 20,
-                            "id": "u:e14df76cfa51"
+                            "relatedKey": "object_name",
+                            "perPage": 20
                         }
-                    ],
-                    "id": "u:cbc13e1a7033"
+                    ]
                 },
                 {
                     "title": "${'objects_amis_validation_rule' | t}",
@@ -175,20 +175,6 @@
                             "perPage": 20
                         }
                     ]
-                },
-                {
-                    "title": "${'objects_amis_object_workflows' | t}",
-					"hiddenOn": "${_master.record.enable_workflow != true}",
-                    "body": [
-                        {
-                            "type": "steedos-object-related-listview",
-                            "objectApiName": "objects",
-                            "recordId": "${recordId}",
-                            "relatedObjectApiName": "object_workflows",
-                            "relatedKey": "object_name",
-                            "perPage": 20
-                        }
-                    ]
                 }
             ],
             "id": "u:6a3b45d7adcf",

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

@@ -226,7 +226,11 @@ module.exports = {
             let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
             if(fields){
                 _.each(fields, (field)=>{
-                    this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, 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))
+                    }
                 })
                 // this.data.values = this.data.values.concat(fields)
                 this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, this.spaceId);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.20-beta.16",
+    "version": "2.5.20-beta.18",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "73d7de52edd72e6fc42bfa118224387b187a95cf"
+    "gitHead": "5bc21369ead7ec6b57f3739298bfbe66b36d8878"
 }