@steedos/standard-object-database 2.5.2 → 2.5.3-beta.10

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

@@ -216,7 +216,7 @@ fields:
           return ['_id', '=', 'no']
         }
       }
-    sort_no: 450
+    sort_no: 445
   reference_to_field:
     type: lookup
     group: Advanced
@@ -615,13 +615,13 @@ fields:
   required:
     type: boolean
     label: Required
-    group: Advanced
+    # group: Advanced
     visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
     sort_no: 390
   is_wide:
     type: boolean
     label: Is Wide
-    group: Advanced
+    # group: Advanced
   # readonly:
   #   type: boolean
   #   label: Readonly
@@ -657,7 +657,7 @@ fields:
   show_as_qr:
     type: boolean
     label: Show_as_qr
-    group: Advanced
+    # group: Advanced
     visible_on: "{{formData.type === 'url' ? true: false}}"
     sort_no: 440
   visible_on:
@@ -670,13 +670,13 @@ fields:
     label: Prompt text
     type: textarea
     is_wide: true
-    group: Advanced
+    # group: Advanced
     sort_no: 460
   description:
     label: Description
     type: textarea
     is_wide: true
-    group: Advanced
+    # group: Advanced
     sort_no: 470
   amis:
     label: Amis 属性

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

@@ -1,4 +1,5 @@
 var objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
 const clone = require('clone');
 const defaultDatasourceName = 'default';
 const defaultDatasourcesName = ['default','meteor'];
@@ -135,7 +136,7 @@ function loadDBObject(object){
     objectql.extend(object, {fields: fields}, {actions: actions}, {relatedList: relatedList});
     _.each(actions, function(action){
         action._visible = action.visible;
-        objectql.addLazyLoadButtons(action.object, action);
+        register.addLazyLoadButtons(action.object, action);
     })
 }
 
@@ -189,17 +190,17 @@ function loadObject(doc, oldDoc) {
 
         originalObject.isMain = true;
 
-        objectql.addObjectConfig(doc, datasourceName);
-        objectql.loadObjectLazyListViews(doc.name);
-        objectql.loadObjectLazyActions(doc.name);
-        objectql.loadActionScripts(doc.name);
-        objectql.loadObjectLazyMethods(doc.name);
-        objectql.loadObjectLazyListenners(doc.name);
-        objectql.loadObjectLazyButtons(doc.name);
+        register.addObjectConfig(doc, datasourceName);
+        register.loadObjectLazyListViews(doc.name);
+        register.loadObjectLazyActions(doc.name);
+        register.loadActionScripts(doc.name);
+        register.loadObjectLazyMethods(doc.name);
+        register.loadObjectLazyListenners(doc.name);
+        register.loadObjectLazyButtons(doc.name);
         //获取到继承后的对象
         // const _doc = objectql.getObjectConfig(doc.name);
         // console.log(`loadObject===>`, doc.name)
-        objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){            
+        register.MetadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){            
             if(res){
                 // datasource.setObject(doc.name, _doc);
                 // try {
@@ -215,7 +216,7 @@ function loadObject(doc, oldDoc) {
                 //     loadObjectPermission(doc);
                 // }
                 
-                objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
+                broker.broadcast("$packages.statisticsActivatedPackages", {});
             }
         })
         
@@ -273,33 +274,33 @@ function reloadObject(changeLog){
             case 'field':
                 if(data.event === 'remove'){
                     deleted.fields.push(data.value.name);
-                    objectql.removeObjectFieldConfig(objectName, data.value);
+                    register.removeObjectFieldConfig(objectName, data.value);
                 }else{
                     if(data.event === 'update'){
                         if(data.value._previousName != data.value.name){
                             deleted.fields.push(data.value._previousName);
-                            objectql.removeObjectFieldConfig(objectName, {name: data.value._previousName});
+                            register.removeObjectFieldConfig(objectName, {name: data.value._previousName});
                         }
                     }
-                    objectql.addObjectFieldConfig(objectName, data.value);
+                    register.addObjectFieldConfig(objectName, data.value);
                 }
                 break;
             case 'action':
                 if(data.event === 'remove'){
                     deleted.actions.push(data.value.name);
-                    objectql.removeObjectButtonsConfig(objectName, data.value);
+                    register.removeObjectButtonsConfig(objectName, data.value);
                 }else{
                     if(data.event === 'update'){
                         if(data.value._previousName != data.value.name){
                             deleted.actions.push(data.value._previousName);
-                            objectql.removeObjectButtonsConfig(objectName, {name: data.value._previousName});
+                            register.removeObjectButtonsConfig(objectName, {name: data.value._previousName});
                         }
                     }
                     if(data.value.is_enable){
-                        objectql.addObjectButtonsConfig(objectName, data.value);
+                        register.addObjectButtonsConfig(objectName, data.value);
                     }else{
                         deleted.actions.push(data.value.name);
-                        objectql.removeObjectButtonsConfig(objectName, data.value);
+                        register.removeObjectButtonsConfig(objectName, data.value);
                     }
                 }
                 break;
@@ -316,7 +317,7 @@ function reloadObject(changeLog){
             return 
         }
         //获取到最新的对象
-        const object = objectql.getOriginalObjectConfig(objectName);
+        const object = register.getOriginalObjectConfig(objectName);
 
         let _mf =  _.max(_.values(object.fields), function (field) { return field.sort_no; });
         if(_mf && object.name){
@@ -341,7 +342,7 @@ function reloadObject(changeLog){
                 // } catch (error) {
                 //     console.log('error', error);
                 // }
-                objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
+                broker.broadcast("$packages.statisticsActivatedPackages", {});
             }
         })
     }

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

@@ -4,6 +4,7 @@ const odataMongodb = require("@steedos/odata-v4-mongodb");
 const clone = require('clone');
 var objectCore = require('../objects/objects.core.js');
 const objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
 const auth = require('@steedos/auth');
 const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
 const validateOptionValue = (value)=>{
@@ -198,7 +199,7 @@ const initSummaryDoc = async (doc) => {
     if (!doc.summary_object) {
         throw new Error("object_fields_error_summary_object_required");
     }
-    let summaryObject = objectql.getObjectConfig(doc.summary_object);
+    let summaryObject = register.getObjectConfig(doc.summary_object);
     let summaryConfig = {
         summary_object: doc.summary_object,
         summary_type: doc.summary_type,

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

@@ -6,6 +6,7 @@
 const _ = require("underscore");
 const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
+const register = require('@steedos/metadata-registrar')
 const auth = require('@steedos/auth');
 
 module.exports = {
@@ -17,7 +18,7 @@ module.exports = {
     },
     afterFind: async function(){
         const { spaceId } = this;
-        let dataList = objectql.getAllObjectValidationRules();
+        let dataList = register.getAllObjectValidationRules();
         if (!_.isEmpty(dataList)) {
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
@@ -37,7 +38,7 @@ module.exports = {
     },
     afterAggregate: async function(){
         const { spaceId } = this;
-        let dataList = objectql.getAllObjectValidationRules();
+        let dataList = register.getAllObjectValidationRules();
         if (!_.isEmpty(dataList)) {
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
@@ -61,7 +62,7 @@ module.exports = {
     },
     afterFindOne: async function(){
         if (_.isEmpty(this.data.values)) {
-            const all = objectql.getAllObjectValidationRules();
+            const all = register.getAllObjectValidationRules();
             const id = this.id;
             this.data.values = _.find(all, function (item) {
                 return item._id === id

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.2",
+    "version": "2.5.3-beta.10",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "cdf76ccec2a8c9acb954f15e07a1c7ca0e62077e"
+    "gitHead": "f84a751c28a45aeffd00f4cb2ec1a72cf72658c9"
 }