@steedos/standard-object-database 2.5.5-beta.1 → 2.5.6-beta.1

package/main/default/objects/7.object_actions.observe.object.js

@@ -1,8 +1,15 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-06-27 09:32:45
+ * @Description: 
+ */
 var objectql = require('@steedos/objectql');
 var objectCore = require('./objects.core.js');
 var lodash = require('lodash');
 Meteor.startup(function () {
-    var _change, _remove;
+    var _change, _remove, inited = false;
     _change = function (document) {
         // 防止visible默认值丢失
         if(!document.visible && !lodash.isBoolean(document.visible)){
@@ -30,14 +37,21 @@ Meteor.startup(function () {
             }
         }).observe({
             added: function (newDocument) {
-                return _change(Object.assign(newDocument, {_previousName: newDocument.name}));
+                if(inited){
+                    return _change(Object.assign(newDocument, {_previousName: newDocument.name}));
+                }
             },
             changed: function (newDocument, oldDocument) {
-                return _change(Object.assign(newDocument, {_previousName: oldDocument.name}));
+                if(inited){
+                    return _change(Object.assign(newDocument, {_previousName: oldDocument.name}));
+                }
             },
             removed: function (oldDocument) {
-                return _remove(oldDocument);
+                if(inited){
+                    return _remove(oldDocument);
+                }
             }
         });
+        inited=true;
     }
 });

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

@@ -639,7 +639,7 @@ fields:
     label: Required
     # group: Advanced
     visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
-    sort_no: 390
+    sort_no: 272
     amis:
       onEvent:
         change:
@@ -661,7 +661,7 @@ fields:
         value: clear
       - label: 不允许删除＂作为相关表关系的一部分的相关表记录＂。
         value: retain
-    sort_no: 395
+    sort_no: 276
     is_wide: true
     defaultValue: clear
     amis:
@@ -683,7 +683,7 @@ fields:
   #   type: boolean
   #   label: Omit
   #   group: Advanced
-    sort_no: 400
+    sort_no: 274
   index:
     type: boolean
     label: Is Index Field

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

@@ -141,13 +141,39 @@ function loadDBObject(object){
 }
 
 
+let _objectConfigs = [];
+let _setTimeoutId = null;
+function _sendObjectMeta(objectConfig){
+
+    if(_setTimeoutId){
+        clearTimeout(_setTimeoutId);
+    }
+
+    _objectConfigs.push(objectConfig);
+
+    _setTimeoutId = setTimeout(function(){
+        var length = _objectConfigs.length
+        register.MetadataRegister.addObjectConfigs(DB_OBJECT_SERVICE_NAME, _objectConfigs).then(function(res){         
+            if(res){
+                // console.log('send object meta success', length);
+                broker.broadcast("$packages.statisticsActivatedPackages", {});
+            }
+        })
+        _objectConfigs = [];
+        _setTimeoutId = null;
+    }, 300)
+
+    
+}
+
+
 function loadObject(doc, oldDoc) {
     try {
         if (!canLoadObject(doc.name, doc.datasource)) {
             console.warn('warn: Not loaded. Invalid custom object -> ', doc.name);
             return;
         }
-    
+        
         var datasourceDoc = getDataSource(doc);
         if (doc.datasource && !_.include(defaultDatasourcesName, doc.datasource) && (!datasourceDoc || !datasourceDoc.is_enable)) {
             console.warn('warn: Not loaded. Invalid custom object -> ', doc.name, doc.datasource);
@@ -200,25 +226,7 @@ function loadObject(doc, oldDoc) {
         //获取到继承后的对象
         // const _doc = objectql.getObjectConfig(doc.name);
         // console.log(`loadObject===>`, doc.name)
-        register.MetadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){            
-            if(res){
-                // datasource.setObject(doc.name, _doc);
-                // try {
-                //     if (!datasourceName || datasourceName == defaultDatasourceName) {
-                //         Creator.Objects[doc.name] = _doc;
-                //         Creator.loadObjects(_doc, _doc.name);
-                //     }
-                // } catch (error) {
-                //     console.log('error', error);
-                // }
-                // if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
-                //     loadObjectTriggers(doc);
-                //     loadObjectPermission(doc);
-                // }
-                
-                broker.broadcast("$packages.statisticsActivatedPackages", {});
-            }
-        })
+        _sendObjectMeta(originalObject);
         
         
     } catch (error) {
@@ -355,6 +363,7 @@ function triggerReloadObject(objectName, type, value, event){
       })
     if(objectRecord){
         //TODO 待支持动态加载related_list后， 删除此行代码
+        // console.log(`triggerReloadObject===>`, objectName)
         Creator.getCollection("objects").update({name: objectName}, {$set: {reload_time: new Date()}})
     }else{
         Creator.getCollection("_object_reload_logs").insert({

package/package.json

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