@steedos/standard-object-database 2.5.5 → 2.6.1-beta.2

package/main/default/client/object_fields.client.js

@@ -1,154 +1,12 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-05 14:17:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-06-09 14:42:12
+ * @Description: 
+ */
 Steedos.ObjectFieldManager = {};
 
-// Steedos.ObjectFieldManager.__lastDoc = null;
-
-// const baseFieldsName = [{ "name": "object", "required": true }, { "name": "label", "required": true }, {name: '_name', required: true}, { "name": "type", "required": true }, { "name": "defaultValue" }, { "name": "group" }, { "name": "sort_no" }, { "name": "is_name" }, { "name": "required" }, { "name": "is_wide" }, { "name": "readonly" }, { "name": "hidden" }, { "name": "omit" }, { "name": "index" }, { "name": "sortable" }, { "name": "searchable" }, { "name": "filterable" }, {"name":"inlineHelpText"},{"name":"description"}];
-
-// function getFieldsByType(doc, type, dataType) {
-//   let fields = [];
-//   if(dataType){
-//     fields = fields.concat(getFieldsByType(doc, dataType))
-//   }
-//   switch (type) {
-//     case 'textarea':{
-//       fields.push({ name: 'rows', required: true });
-//       break;
-//     }
-//     case 'select':{
-//       fields.push({ name: 'options', required: true });
-//       fields.push({ name: 'options.$', required: true });
-//       fields.push({ name: 'options.$.label', required: true });
-//       fields.push({ name: 'options.$.value', required: true });
-//       fields.push({ name: 'options.$.color', required: false });
-//       fields.push({ name: 'options.$.description', required: false });
-//       fields.push({ name: 'multiple'});
-//       break;
-//     }
-//     case 'number':{
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       break;
-//     }
-//     case 'currency':{
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       break;
-//     }
-//     case 'percent':{
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       break;
-//     }
-//     case 'lookup': {
-//       fields.push({ name: 'reference_to'});
-//       fields.push({ name: 'filtersFunction'});
-//       fields.push({ name: 'optionsFunction'});
-//       fields.push({ name: 'multiple'});
-//       break;
-//     }
-//     case 'master_detail': {
-//       fields.push({ name: 'reference_to'});
-//       fields.push({ name: 'filtersFunction'});
-//       fields.push({ name: 'optionsFunction'});
-//       fields.push({ name: 'write_requires_master_read'});
-//       break;
-//     }
-//     case 'autonumber': {
-//       fields.push({ name: 'formula', required: true });
-//       break;
-//     }
-//     case 'formula': {
-//       fields.push({ name: 'formula', required: true });
-//       fields.push({ name: 'data_type', required: true });
-//       fields.push({ name: 'formula_blank_value', required: true });
-//       break;
-//     }
-//     case 'summary': {
-//       fields.push({ name: 'summary_object', required: true });
-//       fields.push({ name: 'summary_type', required: true });
-//       if(doc.summary_type != 'count'){
-//         fields.push({ name: 'summary_field', required: true });
-//       }
-//       // fields.push({ name: 'data_type', required: true });
-//       fields.push({ name: 'precision', required: true });
-//       fields.push({ name: 'scale', required: true });
-//       fields.push({ name: 'summary_filters' });
-//       fields.push({ name: 'summary_filters.$' });
-//       fields.push({ name: 'summary_filters.$.field' });
-//       fields.push({ name: 'summary_filters.$.operation' });
-//       fields.push({ name: 'summary_filters.$.value' });
-//       break;
-//     }
-//     case 'image': {
-//       // fields.push({ name: 'multiple'}); image多选时，单个字段编辑窗口样式异常,暂时不支持
-//       break;
-//     }
-//     case 'url': {
-//       fields.push({ name: 'show_as_qr'});
-//       break;
-//     }
-//     default:
-//       break;
-//   }
-//   return fields;
-// }
-// Meteor.startup(function(){
-//   $('body').on('hidden.bs.modal', '#afModal', function(){
-//     Steedos.ObjectFieldManager.__lastDoc = null;
-//   });
-// });
-
-// Steedos.ObjectFieldManager.changeSchema = function (doc, schema, when) {
-//   var __lastDoc = Steedos.ObjectFieldManager.__lastDoc;
-//   var noChange = doc.type && __lastDoc && __lastDoc._id == doc._id && __lastDoc.type == doc.type && __lastDoc.data_type == doc.data_type;
-//   if(noChange && doc.type == "summary" && __lastDoc.summary_type != doc.summary_type){
-//     // 当字段类型为汇总时，汇总类型如果有变更，有可能“要聚合的字段”属性不一定必填，所以这里强制重新计算Schema
-//     noChange = false;
-//   }
-//   if(noChange){
-//     return false;
-//   }else{
-//     Steedos.ObjectFieldManager.__lastDoc = doc;
-//   }
-
-//   var clone = require('clone');
-//   var fields = clone(Creator.getObject("object_fields").fields);
-//   var showFields = baseFieldsName.concat(getFieldsByType(doc, doc.type, doc.data_type));
-//   if(when === 'view'){
-//     showFields.push({ "name": "name" })
-//   }else if(when === 'edit' && false){
-//     showFields.push({name: '_name', required: true})
-//   }
-//   var objectName = doc.object;
-//   if(_.isObject(objectName)){
-//     objectName = objectName.name
-//   }
-//   var _object = Creator.getObject(objectName); 
-//   if(!_object){
-//     var _objects = Steedos.authRequest(`/api/v4/objects`, { type: 'get', async: false, data: { $filter: "name eq '"+objectName+"'" } });
-//     _object = _objects && _objects.value && _objects.value.length > 0 ? _objects.value[0] : null;
-//   }
-//   // 外部数据源对象必须启用后，才可正常显示对象字段属性
-//   if(_object && (_object.database_name || _object.datasource)){
-//     showFields.push({"name":"column_name"})
-//     showFields.push({"name":"primary"})
-//     showFields.push({"name":"generated"})
-//   }
-//   _.map(fields, function(field, fname){
-//     var showField = _.find(showFields, function(item){
-//       return item && item.name === fname;
-//     })
-//     if(showField){
-//       Object.assign(field, showField)
-//     }else{
-//       Object.assign(field, {omit: true, hidden: true})
-//     }
-//   })
-
-//   var objectSchema = Creator.getObjectSchema({fields: fields});
-//   Object.assign(schema, new SimpleSchema(objectSchema)) 
-// }
-
 Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
   var operations, optionals;
   optionals = {

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/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",
+    "version": "2.6.1-beta.2",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "f1e15b667da1e140e3003bf836d56cd6e36c79e3"
+    "gitHead": "9051772a001ba99aeaf026680ef171d508e92b8f"
 }