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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/main/default/objects/objects.core.js +19 -20
  2. package/main/default/triggers/object_fields.trigger.js +1 -2
  3. package/main/default/triggers/object_validation_rules.trigger.js +3 -4
  4. package/package.json +2 -2
package/main/default/objects/objects.core.js CHANGED
@@ -1,5 +1,4 @@
1
1
  var objectql = require('@steedos/objectql');
2
- const register = require('@steedos/metadata-registrar');
3
2
  const clone = require('clone');
4
3
  const defaultDatasourceName = 'default';
5
4
  const defaultDatasourcesName = ['default','meteor'];
@@ -136,7 +135,7 @@ function loadDBObject(object){
136
135
  objectql.extend(object, {fields: fields}, {actions: actions}, {relatedList: relatedList});
137
136
  _.each(actions, function(action){
138
137
  action._visible = action.visible;
139
- register.addLazyLoadButtons(action.object, action);
138
+ objectql.addLazyLoadButtons(action.object, action);
140
139
  })
141
140
  }
142
141
 
@@ -190,17 +189,17 @@ function loadObject(doc, oldDoc) {
190
189
 
191
190
  originalObject.isMain = true;
192
191
 
193
- register.addObjectConfig(doc, datasourceName);
194
- register.loadObjectLazyListViews(doc.name);
195
- register.loadObjectLazyActions(doc.name);
196
- register.loadActionScripts(doc.name);
197
- register.loadObjectLazyMethods(doc.name);
198
- register.loadObjectLazyListenners(doc.name);
199
- register.loadObjectLazyButtons(doc.name);
192
+ objectql.addObjectConfig(doc, datasourceName);
193
+ objectql.loadObjectLazyListViews(doc.name);
194
+ objectql.loadObjectLazyActions(doc.name);
195
+ objectql.loadActionScripts(doc.name);
196
+ objectql.loadObjectLazyMethods(doc.name);
197
+ objectql.loadObjectLazyListenners(doc.name);
198
+ objectql.loadObjectLazyButtons(doc.name);
200
199
  //获取到继承后的对象
201
200
  // const _doc = objectql.getObjectConfig(doc.name);
202
201
  // console.log(`loadObject===>`, doc.name)
203
- register.MetadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){
202
+ objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){
204
203
  if(res){
205
204
  // datasource.setObject(doc.name, _doc);
206
205
  // try {
@@ -216,7 +215,7 @@ function loadObject(doc, oldDoc) {
216
215
  // loadObjectPermission(doc);
217
216
  // }
218
217
 
219
- broker.broadcast("$packages.statisticsActivatedPackages", {});
218
+ objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
220
219
  }
221
220
  })
222
221
 
@@ -274,33 +273,33 @@ function reloadObject(changeLog){
274
273
  case 'field':
275
274
  if(data.event === 'remove'){
276
275
  deleted.fields.push(data.value.name);
277
- register.removeObjectFieldConfig(objectName, data.value);
276
+ objectql.removeObjectFieldConfig(objectName, data.value);
278
277
  }else{
279
278
  if(data.event === 'update'){
280
279
  if(data.value._previousName != data.value.name){
281
280
  deleted.fields.push(data.value._previousName);
282
- register.removeObjectFieldConfig(objectName, {name: data.value._previousName});
281
+ objectql.removeObjectFieldConfig(objectName, {name: data.value._previousName});
283
282
  }
284
283
  }
285
- register.addObjectFieldConfig(objectName, data.value);
284
+ objectql.addObjectFieldConfig(objectName, data.value);
286
285
  }
287
286
  break;
288
287
  case 'action':
289
288
  if(data.event === 'remove'){
290
289
  deleted.actions.push(data.value.name);
291
- register.removeObjectButtonsConfig(objectName, data.value);
290
+ objectql.removeObjectButtonsConfig(objectName, data.value);
292
291
  }else{
293
292
  if(data.event === 'update'){
294
293
  if(data.value._previousName != data.value.name){
295
294
  deleted.actions.push(data.value._previousName);
296
- register.removeObjectButtonsConfig(objectName, {name: data.value._previousName});
295
+ objectql.removeObjectButtonsConfig(objectName, {name: data.value._previousName});
297
296
  }
298
297
  }
299
298
  if(data.value.is_enable){
300
- register.addObjectButtonsConfig(objectName, data.value);
299
+ objectql.addObjectButtonsConfig(objectName, data.value);
301
300
  }else{
302
301
  deleted.actions.push(data.value.name);
303
- register.removeObjectButtonsConfig(objectName, data.value);
302
+ objectql.removeObjectButtonsConfig(objectName, data.value);
304
303
  }
305
304
  }
306
305
  break;
@@ -317,7 +316,7 @@ function reloadObject(changeLog){
317
316
  return
318
317
  }
319
318
  //获取到最新的对象
320
- const object = register.getOriginalObjectConfig(objectName);
319
+ const object = objectql.getOriginalObjectConfig(objectName);
321
320
 
322
321
  let _mf = _.max(_.values(object.fields), function (field) { return field.sort_no; });
323
322
  if(_mf && object.name){
@@ -342,7 +341,7 @@ function reloadObject(changeLog){
342
341
  // } catch (error) {
343
342
  // console.log('error', error);
344
343
  // }
345
- broker.broadcast("$packages.statisticsActivatedPackages", {});
344
+ objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
346
345
  }
347
346
  })
348
347
  }
package/main/default/triggers/object_fields.trigger.js CHANGED
@@ -4,7 +4,6 @@ const odataMongodb = require("@steedos/odata-v4-mongodb");
4
4
  const clone = require('clone');
5
5
  var objectCore = require('../objects/objects.core.js');
6
6
  const objectql = require('@steedos/objectql');
7
- const register = require('@steedos/metadata-registrar');
8
7
  const auth = require('@steedos/auth');
9
8
  const MAX_MASTER_DETAIL_LEAVE = objectql.MAX_MASTER_DETAIL_LEAVE;
10
9
  const validateOptionValue = (value)=>{
@@ -199,7 +198,7 @@ const initSummaryDoc = async (doc) => {
199
198
  if (!doc.summary_object) {
200
199
  throw new Error("object_fields_error_summary_object_required");
201
200
  }
202
- let summaryObject = register.getObjectConfig(doc.summary_object);
201
+ let summaryObject = objectql.getObjectConfig(doc.summary_object);
203
202
  let summaryConfig = {
204
203
  summary_object: doc.summary_object,
205
204
  summary_type: doc.summary_type,
package/main/default/triggers/object_validation_rules.trigger.js CHANGED
@@ -6,7 +6,6 @@
6
6
  const _ = require("underscore");
7
7
  const util = require('@steedos/standard-objects').util;
8
8
  const objectql = require("@steedos/objectql");
9
- const register = require('@steedos/metadata-registrar')
10
9
  const auth = require('@steedos/auth');
11
10
 
12
11
  module.exports = {
@@ -18,7 +17,7 @@ module.exports = {
18
17
  },
19
18
  afterFind: async function(){
20
19
  const { spaceId } = this;
21
- let dataList = register.getAllObjectValidationRules();
20
+ let dataList = objectql.getAllObjectValidationRules();
22
21
  if (!_.isEmpty(dataList)) {
23
22
  dataList.forEach((doc) => {
24
23
  if (!_.find(this.data.values, (value) => {
@@ -38,7 +37,7 @@ module.exports = {
38
37
  },
39
38
  afterAggregate: async function(){
40
39
  const { spaceId } = this;
41
- let dataList = register.getAllObjectValidationRules();
40
+ let dataList = objectql.getAllObjectValidationRules();
42
41
  if (!_.isEmpty(dataList)) {
43
42
  dataList.forEach((doc) => {
44
43
  if (!_.find(this.data.values, (value) => {
@@ -62,7 +61,7 @@ module.exports = {
62
61
  },
63
62
  afterFindOne: async function(){
64
63
  if (_.isEmpty(this.data.values)) {
65
- const all = register.getAllObjectValidationRules();
64
+ const all = objectql.getAllObjectValidationRules();
66
65
  const id = this.id;
67
66
  this.data.values = _.find(all, function (item) {
68
67
  return item._id === id
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/standard-object-database",
3
- "version": "2.5.3-beta.1",
3
+ "version": "2.5.3-beta.2",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -15,5 +15,5 @@
15
15
  },
16
16
  "repository": {},
17
17
  "license": "MIT",
18
- "gitHead": "a2e723ed4256279e8e6fa9f67d7f607c83f8638f"
18
+ "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
19
19
  }