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

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

@@ -3,6 +3,12 @@ var objectql = require('@steedos/objectql');
 var clone = require('clone');
 var objectCore = require('./objects.core.js');
 
+const objectFieldsFind = function (filter) {
+    return objectql.wrapAsync(async function () {
+        return await objectql.getObject('object_fields').find(this.filter);
+    }, { filter: filter })
+}
+
 const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
 
 function canRemoveNameFileld(doc){
@@ -105,20 +111,18 @@ function _syncToObject(doc, event) {
 };
 
 function isRepeatedName(doc, name) {
-  var other;
-  other = Creator.getCollection("object_fields").find({
-    object: doc.object,
-    space: doc.space,
-    _id: {
-      $ne: doc._id
-    },
-    name: name || doc.name
-  }, {
-    fields: {
-      _id: 1
-    }
+  var other = objectFieldsFind({
+    filters: [[
+      'object', '=', doc.object
+    ], [
+      'space', '=', doc.space
+    ], [
+      '_id', '!=', doc._id
+    ], [
+      'name', '=', name || doc.name
+    ]]
   });
-  if (other.count() > 0) {
+  if (other.length > 0) {
     return true;
   }
   return false;
@@ -465,8 +469,9 @@ var triggers = {
       if(doc.name === 'name' || doc.is_name){
         checkNameField({type: doc.type})
       }
-
+      console.log('insert', doc)
       if (isRepeatedName(doc)) {
+        
         throw new Meteor.Error(doc.name, "字段名不能重复");
       }
 

package/main/default/objects/objects.core.js

@@ -216,6 +216,16 @@ function loadObject(doc, oldDoc) {
 
         originalObject.isMain = true;
 
+        const objConfig = register.getOriginalObjectConfig(doc.name);
+
+        if(objConfig){
+            _.each(objConfig.fields, (config, name)=>{
+                if(!config._id && !doc.fields[name]){
+                    doc.fields[name] = config;
+                }
+            })
+        }
+
         register.addObjectConfig(doc, datasourceName);
         register.loadObjectLazyListViews(doc.name);
         register.loadObjectLazyActions(doc.name);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.20-beta.8",
+    "version": "2.5.20-beta.9",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
+    "gitHead": "b04fd383c7f469ba970a52744a3778ae58ab4425"
 }