@steedos/standard-object-database 2.5.3-beta.2 → 2.5.3-beta.21

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/objectTranslations/datasources.en/datasources.en.objectTranslation.yml

@@ -93,7 +93,7 @@ groups:
   advanced: Advanced
 listviews:
   all:
-    label: All
+    label: All Data Source
 actions:
   testConnection:
     label: Test connection

package/main/default/objectTranslations/object_triggers.en/object_triggers.en.objectTranslation.yml

@@ -27,4 +27,4 @@ fields:
     description: 
 listviews:
   all:
-    label: All
+    label: All Triggers

package/main/default/objectTranslations/object_validation_rules.en/object_validation_rules.en.objectTranslation.yml

@@ -34,7 +34,7 @@ fields:
     description: 
 listviews:
   all:
-    label: All
+    label: All Object Validation Rules
 CustomLabels:
   object_validation_rules_field_error_display_field: 
   object_validation_rules_field_error_display_field_inlineHelpText: 

package/main/default/objectTranslations/objects.en/objects.en.objectTranslation.yml

@@ -127,7 +127,7 @@ fields:
     help: 
     description: 
   owner:
-    label: 
+    label: Owner
     help: 
     description: 
   app_unique_id:
@@ -147,7 +147,7 @@ fields:
     help: 
     description: 
   is_deleted:
-    label: 
+    label: Deleted
     help: 
     description: 
   reload_time:
@@ -198,7 +198,7 @@ groups:
   script: Script
 listviews:
   all:
-    label: All
+    label: All Objects
   customize:
     label: Customize
   system:
@@ -215,7 +215,7 @@ actions:
 CustomLabels:
   objects_field_datasource_defaultValue: Default data source
   objects_field_datasource_meteor: Meteor
-  objects_field_enable_approvals: 
-  objects_field_enable_space_global: 
-  objects_field_enable_web_forms: 
-  object_object__error_name_invalid_format: 
+  objects_field_enable_approvals: Display Request History Steps
+  objects_field_enable_space_global: Accessing Data Across Workspaces
+  objects_field_enable_web_forms: Allow Online Forms
+  object_object__error_name_invalid_format: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters

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/object_listviews.object.yml

@@ -266,7 +266,7 @@ list_views:
       - owner
       - modified
       - is_system
-    label: All List View
+    label: All List Views
     filter_scope: space
 actions:
   customize:

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

@@ -172,7 +172,7 @@ list_views:
       - object_name
       - objectName
       - sort_no
-    label: All List View
+    label: All List Views
     filter_scope: space
     sort: [["sort_no", "desc"]]
 permission_set:

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/objects/objects.object.yml

@@ -28,10 +28,12 @@ fields:
     required: true
     is_name: true
     searchable: true
+    filterable: true
   name:
     type: text
     label: API Name
     searchable: true
+    filterable: true
     index: true
     required: true
     inlineHelpText: Can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore character or contain two consecutive underscore characters
@@ -131,6 +133,11 @@ fields:
     inlineHelpText: When enabled, the lookup field associated with this object displays its options as a pop-up window.
     group: Switch
     defaultValue: false
+  # enable_audit:
+  #   type: boolean
+  #   label: Enable Audit
+  #   group: Switch
+  #   hidden: true
   # enable_trash:
   #   type: boolean
   # enable_space_global:

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.3-beta.2",
+    "version": "2.5.3-beta.21",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
+    "gitHead": "b4313a2ef5d18ef1cf9271bd3c89b2d6fe52d65b"
 }