@steedos/service-metadata-objects 2.1.46 → 2.1.50

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 (15) hide show
  1. package/lib/master-detail/masterDetailActionHandler.d.ts +10 -2
  2. package/lib/master-detail/masterDetailActionHandler.js +78 -25
  3. package/lib/master-detail/masterDetailActionHandler.js.map +1 -1
  4. package/lib/objects/fields/index.d.ts +1 -0
  5. package/lib/objects/fields/index.js +143 -3
  6. package/lib/objects/fields/index.js.map +1 -1
  7. package/lib/objects/index.js +49 -20
  8. package/lib/objects/index.js.map +1 -1
  9. package/lib/objects.service.js +1 -0
  10. package/lib/objects.service.js.map +1 -1
  11. package/package.json +2 -2
  12. package/src/master-detail/masterDetailActionHandler.ts +51 -12
  13. package/src/objects/fields/index.ts +145 -3
  14. package/src/objects/index.ts +114 -67
  15. package/src/objects.service.ts +1 -0
package/lib/master-detail/masterDetailActionHandler.d.ts CHANGED
@@ -17,18 +17,26 @@ export declare class MasterDetailActionHandler {
17
17
  constructor(broker: any);
18
18
  getObjectConfig(objectApiName: string): Promise<any>;
19
19
  add(objectConfig: any): Promise<boolean>;
20
+ remove(objectConfig: any): Promise<boolean>;
21
+ /**
22
+ * 删除 主表子表类型字段 时，清理关联对象上masters 、details属性。
23
+ * TODO: 解决的问题： master_detail字段删除后重建一个同名同类型字段不报错。
24
+ * 测试过程中发现的问题： 在graphql查询数据时，如果删除一个相关的主表子表字段， 此时还能查询到相关表信息， 重启服务和刷新页面后才查询不到。
25
+ * @param objectConfig
26
+ */
27
+ removeObjectMasterDetails(objectConfig: any): Promise<void>;
20
28
  checkMasterDetails(objectApiName: string): Promise<void>;
21
29
  addObjectMasterDetails(objectConfig: any): Promise<void>;
22
30
  getMasterKey(objectApiName: any): string;
23
31
  getMasters(objectApiName: string): Promise<any[]>;
24
32
  getMastersInfo(objectApiName: string): Promise<any>;
25
33
  addMaster(objectApiName: any, masterObjectApiName: string, field: any): Promise<boolean>;
26
- removeMaster(objectApiName: any, masterObjectApiName: string): Promise<void>;
34
+ removeMaster(objectApiName: any, masterObjectApiName: string, masterFieldName: any): Promise<boolean>;
27
35
  getDetailKey(objectApiName: any): string;
28
36
  getDetails(objectApiName: string): Promise<any[]>;
29
37
  getDetailsInfo(objectApiName: string): Promise<any>;
30
38
  addDetail(objectApiName: any, detailObjectApiName: string, detailField: any): Promise<boolean>;
31
- removeDetail(objectApiName: any, detailObjectApiName: string): Promise<void>;
39
+ removeDetail(objectApiName: any, detailObjectApiName: string, detailFieldName: any): Promise<boolean>;
32
40
  getDetailPaths(objectApiName: string): Promise<any[]>;
33
41
  getMasterPaths(objectApiName: string): Promise<any[]>;
34
42
  getMaxDetailsLeave(objectApiName: string, paths?: string[]): Promise<number>;
package/lib/master-detail/masterDetailActionHandler.js CHANGED
@@ -81,6 +81,53 @@ class MasterDetailActionHandler {
81
81
  return false;
82
82
  });
83
83
  }
84
+ remove(objectConfig) {
85
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
86
+ try {
87
+ yield this.removeObjectMasterDetails(objectConfig);
88
+ return true;
89
+ }
90
+ catch (error) {
91
+ this.broker.logger.error(error);
92
+ }
93
+ return false;
94
+ });
95
+ }
96
+ /**
97
+ * 删除 主表子表类型字段 时，清理关联对象上masters 、details属性。
98
+ * TODO: 解决的问题： master_detail字段删除后重建一个同名同类型字段不报错。
99
+ * 测试过程中发现的问题： 在graphql查询数据时，如果删除一个相关的主表子表字段， 此时还能查询到相关表信息， 重启服务和刷新页面后才查询不到。
100
+ * @param objectConfig
101
+ */
102
+ removeObjectMasterDetails(objectConfig) {
103
+ var e_1, _a;
104
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
105
+ const { name: objectApiName } = objectConfig;
106
+ let masters = yield this.getMastersInfo(objectApiName);
107
+ if (masters.length) {
108
+ try {
109
+ for (var masters_1 = tslib_1.__asyncValues(masters), masters_1_1; masters_1_1 = yield masters_1.next(), !masters_1_1.done;) {
110
+ const item = masters_1_1.value;
111
+ const fieldNameReferenceTo = item.split('.')[0];
112
+ const fieldName = item.split('.')[1];
113
+ const field = objectConfig.fields[fieldName];
114
+ // 考虑以下情况： (字段删除 | 字段名改变） 、 字段类型改变、 字段引用对象改变
115
+ if (!field || field.type !== 'master_detail' || field.reference_to !== fieldNameReferenceTo) {
116
+ yield this.removeMaster(objectApiName, fieldNameReferenceTo, fieldName);
117
+ yield this.removeDetail(fieldNameReferenceTo, objectApiName, fieldName);
118
+ }
119
+ }
120
+ }
121
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
122
+ finally {
123
+ try {
124
+ if (masters_1_1 && !masters_1_1.done && (_a = masters_1.return)) yield _a.call(masters_1);
125
+ }
126
+ finally { if (e_1) throw e_1.error; }
127
+ }
128
+ }
129
+ });
130
+ }
84
131
  checkMasterDetails(objectApiName) {
85
132
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
86
133
  const mastersCount = (yield this.getMasters(objectApiName)).length;
@@ -111,7 +158,7 @@ class MasterDetailActionHandler {
111
158
  });
112
159
  }
113
160
  addObjectMasterDetails(objectConfig) {
114
- var e_1, _a;
161
+ var e_2, _a;
115
162
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
116
163
  const { name: objectApiName } = objectConfig;
117
164
  try {
@@ -150,12 +197,12 @@ class MasterDetailActionHandler {
150
197
  }
151
198
  }
152
199
  }
153
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
200
+ catch (e_2_1) { e_2 = { error: e_2_1 }; }
154
201
  finally {
155
202
  try {
156
203
  if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
157
204
  }
158
- finally { if (e_1) throw e_1.error; }
205
+ finally { if (e_2) throw e_2.error; }
159
206
  }
160
207
  yield this.checkMasterDetails(objectApiName);
161
208
  });
@@ -203,14 +250,17 @@ class MasterDetailActionHandler {
203
250
  return false;
204
251
  });
205
252
  }
206
- removeMaster(objectApiName, masterObjectApiName) {
253
+ removeMaster(objectApiName, masterObjectApiName, masterFieldName) {
207
254
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
208
- let master = yield this.getMasters(objectApiName);
209
- let index = master.indexOf(masterObjectApiName);
210
- if (index >= 0) {
211
- master.splice(index, 1);
255
+ let master = yield this.getMastersInfo(objectApiName);
256
+ let maps = [];
257
+ if (master) {
258
+ maps = master;
212
259
  }
213
- yield this.broker.call('metadata.add', { key: this.getMasterKey(objectApiName), data: master }, { meta: {} });
260
+ const masterFullName = `${masterObjectApiName}.${masterFieldName}`;
261
+ maps = _.difference(maps, [masterFullName]);
262
+ yield this.broker.call('metadata.add', { key: this.getMasterKey(objectApiName), data: maps }, { meta: {} });
263
+ return true;
214
264
  });
215
265
  }
216
266
  getDetailKey(objectApiName) {
@@ -256,14 +306,17 @@ class MasterDetailActionHandler {
256
306
  return false;
257
307
  });
258
308
  }
259
- removeDetail(objectApiName, detailObjectApiName) {
309
+ removeDetail(objectApiName, detailObjectApiName, detailFieldName) {
260
310
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
261
- let detail = yield this.getDetails(objectApiName);
262
- let index = detail.indexOf(detailObjectApiName);
263
- if (index >= 0) {
264
- detail.splice(index, 1);
311
+ let detail = yield this.getDetailsInfo(objectApiName);
312
+ let maps = [];
313
+ if (detail) {
314
+ maps = detail;
265
315
  }
266
- yield this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: detail }, { meta: {} });
316
+ const detailFullName = `${detailObjectApiName}.${detailFieldName}`;
317
+ maps = _.difference(maps, [detailFullName]);
318
+ yield this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} });
319
+ return true;
267
320
  });
268
321
  }
269
322
  getDetailPaths(objectApiName) {
@@ -271,7 +324,7 @@ class MasterDetailActionHandler {
271
324
  let results = [];
272
325
  let objectDetails = yield this.getDetails(objectApiName);
273
326
  let loop = (master, details, paths, leave) => { var details_1, details_1_1; return tslib_1.__awaiter(this, void 0, void 0, function* () {
274
- var e_2, _a;
327
+ var e_3, _a;
275
328
  paths.push(master);
276
329
  if (!details.length) {
277
330
  results.push(paths);
@@ -290,12 +343,12 @@ class MasterDetailActionHandler {
290
343
  yield loop(n, objectDetail, _.clone(paths), leave);
291
344
  }
292
345
  }
293
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
346
+ catch (e_3_1) { e_3 = { error: e_3_1 }; }
294
347
  finally {
295
348
  try {
296
349
  if (details_1_1 && !details_1_1.done && (_a = details_1.return)) yield _a.call(details_1);
297
350
  }
298
- finally { if (e_2) throw e_2.error; }
351
+ finally { if (e_3) throw e_3.error; }
299
352
  }
300
353
  }); };
301
354
  // console.log("==getDetailPaths======", objectApiName);
@@ -308,8 +361,8 @@ class MasterDetailActionHandler {
308
361
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
309
362
  let results = [];
310
363
  let objectMasters = yield this.getMasters(objectApiName);
311
- let loop = (detail, masters, paths, leave) => { var masters_1, masters_1_1; return tslib_1.__awaiter(this, void 0, void 0, function* () {
312
- var e_3, _a;
364
+ let loop = (detail, masters, paths, leave) => { var masters_2, masters_2_1; return tslib_1.__awaiter(this, void 0, void 0, function* () {
365
+ var e_4, _a;
313
366
  paths.push(detail);
314
367
  if (!masters.length) {
315
368
  results.push(paths);
@@ -322,18 +375,18 @@ class MasterDetailActionHandler {
322
375
  return;
323
376
  }
324
377
  try {
325
- for (masters_1 = tslib_1.__asyncValues(masters); masters_1_1 = yield masters_1.next(), !masters_1_1.done;) {
326
- const n = masters_1_1.value;
378
+ for (masters_2 = tslib_1.__asyncValues(masters); masters_2_1 = yield masters_2.next(), !masters_2_1.done;) {
379
+ const n = masters_2_1.value;
327
380
  const objectMaster = yield this.getMasters(n);
328
381
  yield loop(n, objectMaster, _.clone(paths), leave);
329
382
  }
330
383
  }
331
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
384
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
332
385
  finally {
333
386
  try {
334
- if (masters_1_1 && !masters_1_1.done && (_a = masters_1.return)) yield _a.call(masters_1);
387
+ if (masters_2_1 && !masters_2_1.done && (_a = masters_2.return)) yield _a.call(masters_2);
335
388
  }
336
- finally { if (e_3) throw e_3.error; }
389
+ finally { if (e_4) throw e_4.error; }
337
390
  }
338
391
  }); };
339
392
  yield loop(objectApiName, objectMasters, [], 0);
package/lib/master-detail/masterDetailActionHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"masterDetailActionHandler.js","sourceRoot":"","sources":["../../src/master-detail/masterDetailActionHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"masterDetailActionHandler.js","sourceRoot":"","sources":["../../src/master-detail/masterDetailActionHandler.ts"],"names":[],"mappings":"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"}
package/lib/objects/fields/index.d.ts CHANGED
@@ -1 +1,2 @@
1
1
  export declare function addObjectField(): Promise<void>;
2
+ export declare function getDBType(objectName: any, field: any): any;
package/lib/objects/fields/index.js CHANGED
@@ -1,10 +1,150 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.addObjectField = void 0;
3
+ exports.getDBType = exports.addObjectField = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  function addObjectField() {
6
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
7
- });
6
+ return tslib_1.__awaiter(this, void 0, void 0, function* () { });
8
7
  }
9
8
  exports.addObjectField = addObjectField;
9
+ var SteedosFieldDBType;
10
+ (function (SteedosFieldDBType) {
11
+ SteedosFieldDBType["varchar"] = "varchar";
12
+ SteedosFieldDBType["text"] = "text";
13
+ SteedosFieldDBType["number"] = "number";
14
+ SteedosFieldDBType["boolean"] = "boolean";
15
+ SteedosFieldDBType["date"] = "date";
16
+ SteedosFieldDBType["dateTime"] = "dateTime";
17
+ SteedosFieldDBType["json"] = "json";
18
+ SteedosFieldDBType["array"] = "array";
19
+ // oneToOne,
20
+ // oneToMany,
21
+ // manyToOne,
22
+ // manyToMany
23
+ })(SteedosFieldDBType || (SteedosFieldDBType = {}));
24
+ function getDBType(objectName, field) {
25
+ switch (field.type) {
26
+ case "text":
27
+ return SteedosFieldDBType.varchar;
28
+ case "textarea":
29
+ return SteedosFieldDBType.text;
30
+ case "html":
31
+ return SteedosFieldDBType.text;
32
+ case "select":
33
+ if (this.multiple) {
34
+ return SteedosFieldDBType.array;
35
+ }
36
+ else {
37
+ return SteedosFieldDBType.varchar;
38
+ }
39
+ case "boolean":
40
+ return SteedosFieldDBType.boolean;
41
+ case "toggle":
42
+ return SteedosFieldDBType.boolean;
43
+ case "date":
44
+ return SteedosFieldDBType.date;
45
+ case "datetime":
46
+ return SteedosFieldDBType.dateTime;
47
+ case "number":
48
+ return SteedosFieldDBType.number;
49
+ case "currency":
50
+ if (!this.scale && this.scale != 0) {
51
+ this.scale = 2;
52
+ }
53
+ return SteedosFieldDBType.number;
54
+ case "password":
55
+ return SteedosFieldDBType.varchar;
56
+ case "lookup":
57
+ // let reference_to = this.reference_to
58
+ // if(_.isFunction(this.reference_to)){
59
+ // reference_to = this.reference_to()
60
+ // }
61
+ // if(_.isArray(reference_to)){
62
+ // this._columnType = SteedosColumnType.manyToMany
63
+ // }else{
64
+ // if(this.multiple){
65
+ // this._columnType = SteedosColumnType.oneToMany
66
+ // }else{
67
+ // this._columnType = SteedosColumnType.oneToOne
68
+ // }
69
+ // }
70
+ return SteedosFieldDBType.varchar;
71
+ case "master_detail":
72
+ // let reference_to2 = this.reference_to
73
+ // if(_.isFunction(this.reference_to)){
74
+ // reference_to2 = this.reference_to()
75
+ // }
76
+ // if(_.isArray(reference_to2)){
77
+ // this._columnType = SteedosColumnType.manyToMany
78
+ // }else{
79
+ // if(this.multiple){
80
+ // this._columnType = SteedosColumnType.manyToOne //TODO
81
+ // }else{
82
+ // this._columnType = SteedosColumnType.oneToOne
83
+ // }
84
+ // }
85
+ return SteedosFieldDBType.varchar;
86
+ case "grid":
87
+ return SteedosFieldDBType.array;
88
+ case "url":
89
+ return SteedosFieldDBType.varchar;
90
+ case "email":
91
+ return SteedosFieldDBType.varchar;
92
+ case "avatar":
93
+ return SteedosFieldDBType.varchar;
94
+ case "location":
95
+ return SteedosFieldDBType.json;
96
+ case "image":
97
+ return SteedosFieldDBType.varchar;
98
+ case "object":
99
+ return SteedosFieldDBType.json;
100
+ case "url":
101
+ return SteedosFieldDBType.varchar;
102
+ case "[object]":
103
+ return SteedosFieldDBType.array;
104
+ case "[Object]":
105
+ return SteedosFieldDBType.array;
106
+ case "[grid]":
107
+ return SteedosFieldDBType.array;
108
+ case "[text]":
109
+ return SteedosFieldDBType.array;
110
+ case "selectCity":
111
+ return SteedosFieldDBType.json;
112
+ case "audio":
113
+ return SteedosFieldDBType.varchar;
114
+ case "filesize":
115
+ return SteedosFieldDBType.number;
116
+ case "file":
117
+ return SteedosFieldDBType.varchar;
118
+ case "string":
119
+ return SteedosFieldDBType.varchar;
120
+ case "code":
121
+ return SteedosFieldDBType.varchar;
122
+ case "function Object() { [native code] }":
123
+ return SteedosFieldDBType.json;
124
+ case Object:
125
+ return SteedosFieldDBType.json;
126
+ case "function String() { [native code] }":
127
+ return SteedosFieldDBType.varchar;
128
+ case String:
129
+ return SteedosFieldDBType.varchar;
130
+ case "Object":
131
+ return SteedosFieldDBType.json;
132
+ case "autonumber":
133
+ return SteedosFieldDBType.varchar;
134
+ case "markdown":
135
+ return SteedosFieldDBType.varchar;
136
+ case "formula":
137
+ return this.getDBType(this.data_type);
138
+ case "summary":
139
+ //汇总不需要check类型
140
+ return SteedosFieldDBType.varchar;
141
+ case "percent":
142
+ //百分比字段按数值类型处理
143
+ return this.getDBType("number");
144
+ default:
145
+ console.log(`field`, field);
146
+ throw new Error(`${objectName}.${field.name} invalid field type ${field.type}`);
147
+ }
148
+ }
149
+ exports.getDBType = getDBType;
10
150
  //# sourceMappingURL=index.js.map
package/lib/objects/fields/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/objects/fields/index.ts"],"names":[],"mappings":";;;;AAAA,SAAsB,cAAc;;IAEpC,CAAC;CAAA;AAFD,wCAEC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/objects/fields/index.ts"],"names":[],"mappings":"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"}
package/lib/objects/index.js CHANGED
@@ -4,10 +4,11 @@ exports.refreshObject = exports.getOriginalObject = exports.getObjectServiceName
4
4
  const tslib_1 = require("tslib");
5
5
  const _ = require("lodash");
6
6
  const __1 = require("..");
7
- const clone = require('clone');
8
- exports.SYSTEM_DATASOURCE = '__SYSTEM_DATASOURCE';
9
- exports.MONGO_BASE_OBJECT = '__MONGO_BASE_OBJECT';
10
- exports.SQL_BASE_OBJECT = '__SQL_BASE_OBJECT';
7
+ const fields_1 = require("./fields");
8
+ const clone = require("clone");
9
+ exports.SYSTEM_DATASOURCE = "__SYSTEM_DATASOURCE";
10
+ exports.MONGO_BASE_OBJECT = "__MONGO_BASE_OBJECT";
11
+ exports.SQL_BASE_OBJECT = "__SQL_BASE_OBJECT";
11
12
  function getObjectServiceName(objectApiName) {
12
13
  return `@${objectApiName}`;
13
14
  }
@@ -15,30 +16,30 @@ exports.getObjectServiceName = getObjectServiceName;
15
16
  function getBaseObjectConfig(ctx, datasourceName) {
16
17
  var _a;
17
18
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
18
- const serviceName = '*';
19
+ const serviceName = "*";
19
20
  const metadataType = __1.METADATA_TYPE;
20
21
  let metadataApiName = exports.SQL_BASE_OBJECT;
21
- if (datasourceName === 'default' || datasourceName === 'meteor') {
22
+ if (datasourceName === "default" || datasourceName === "meteor") {
22
23
  metadataApiName = exports.MONGO_BASE_OBJECT;
23
24
  }
24
25
  const configs = yield ctx.broker.call(`metadata.getServiceMetadatas`, {
25
26
  serviceName,
26
27
  metadataType,
27
- metadataApiName: metadataApiName
28
+ metadataApiName: metadataApiName,
28
29
  });
29
30
  return configs && configs.length > 0 ? (_a = configs[0]) === null || _a === void 0 ? void 0 : _a.metadata : null;
30
31
  });
31
32
  }
32
33
  function getObjectConfigs(ctx, objectApiName) {
33
34
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
34
- const serviceName = '*';
35
+ const serviceName = "*";
35
36
  const metadataType = __1.METADATA_TYPE;
36
37
  const objectConfigs = yield ctx.broker.call(`metadata.getServiceMetadatas`, {
37
38
  serviceName,
38
39
  metadataType,
39
- metadataApiName: objectApiName
40
+ metadataApiName: objectApiName,
40
41
  });
41
- return _.compact(_.map(objectConfigs, 'metadata'));
42
+ return _.compact(_.map(objectConfigs, "metadata"));
42
43
  });
43
44
  }
44
45
  function getObjectDatasource(objectConfigs) {
@@ -75,7 +76,7 @@ function getOriginalObject(ctx, objectApiName) {
75
76
  if (field.is_name) {
76
77
  objectConfig.NAME_FIELD_KEY = field_name;
77
78
  }
78
- else if (field_name == 'name' && !objectConfig.NAME_FIELD_KEY) {
79
+ else if (field_name == "name" && !objectConfig.NAME_FIELD_KEY) {
79
80
  objectConfig.NAME_FIELD_KEY = field_name;
80
81
  }
81
82
  });
@@ -105,7 +106,7 @@ function refreshObject(ctx, objectApiName) {
105
106
  }
106
107
  else if (mainConfigs.length > 1) {
107
108
  let dbMainConfig = _.find(mainConfigs, (conf) => {
108
- return _.has(conf, '_id') && !_.has(conf, '__filename');
109
+ return _.has(conf, "_id") && !_.has(conf, "__filename");
109
110
  });
110
111
  if (dbMainConfig) {
111
112
  delete dbMainConfig.isMain;
@@ -120,12 +121,15 @@ function refreshObject(ctx, objectApiName) {
120
121
  if (!mainConfig) {
121
122
  return null;
122
123
  }
123
- objectConfig = _.defaultsDeep({}, ..._.sortBy(objectConfigs, function (o) { return o.isMain ? 1 : -1; }), objectConfig);
124
+ objectConfig = _.defaultsDeep({}, ..._.sortBy(objectConfigs, function (o) {
125
+ return o.isMain ? 1 : -1;
126
+ }), objectConfig);
124
127
  const _objectConfig = _.clone(objectConfig);
125
128
  objectConfig.fields = _.clone(_objectConfig.fields);
126
- if (objectApiName != exports.MONGO_BASE_OBJECT && objectApiName != exports.SQL_BASE_OBJECT) {
129
+ if (objectApiName != exports.MONGO_BASE_OBJECT &&
130
+ objectApiName != exports.SQL_BASE_OBJECT) {
127
131
  _.each(objectConfig.actions, (action) => {
128
- if (!_.has(action, '_visible') && _.has(action, 'visible')) {
132
+ if (!_.has(action, "_visible") && _.has(action, "visible")) {
129
133
  action._visible = `
130
134
  function(){
131
135
  return ${action.visible}
@@ -136,27 +140,52 @@ function refreshObject(ctx, objectApiName) {
136
140
  }
137
141
  objectConfig = _.defaultsDeep({}, clone(_objectConfig), baseObjectConfig, objectConfig);
138
142
  _.each(objectConfig.fields, function (field, field_name) {
143
+ if (objectDatasource != "default" && objectDatasource != "meteor") {
144
+ if (field.primary) {
145
+ objectConfig.idFieldName = field.name;
146
+ if (!objectConfig.idFieldNames) {
147
+ objectConfig.idFieldNames = [];
148
+ }
149
+ if (objectConfig.idFieldNames.indexOf(field.name) < 0) {
150
+ objectConfig.idFieldNames.push(field.name);
151
+ }
152
+ }
153
+ if (!field.fieldDBType &&
154
+ objectApiName != exports.MONGO_BASE_OBJECT &&
155
+ objectApiName != exports.SQL_BASE_OBJECT) {
156
+ try {
157
+ field.fieldDBType = fields_1.getDBType(objectApiName, field);
158
+ }
159
+ catch (error) {
160
+ console.log(`error`, error);
161
+ }
162
+ }
163
+ if (field.generated) {
164
+ field.omit = true;
165
+ }
166
+ }
139
167
  if (field.is_name) {
140
168
  objectConfig.NAME_FIELD_KEY = field_name;
141
169
  }
142
- else if (field_name == 'name' && !objectConfig.NAME_FIELD_KEY) {
170
+ else if (field_name == "name" && !objectConfig.NAME_FIELD_KEY) {
143
171
  objectConfig.NAME_FIELD_KEY = field_name;
144
172
  }
145
173
  });
146
174
  _.each(objectConfig.actions, (action, key) => {
147
- if (!_.has(action, 'name')) {
175
+ if (!_.has(action, "name")) {
148
176
  action.name = key;
149
177
  }
150
178
  });
151
179
  objectConfig.datasource = mainConfig.datasource;
152
180
  try {
153
- const maxSortNoField = _.maxBy(_.values(objectConfig.fields), function (field) { return field.sort_no; });
181
+ const maxSortNoField = _.maxBy(_.values(objectConfig.fields), function (field) {
182
+ return field.sort_no;
183
+ });
154
184
  if (maxSortNoField) {
155
185
  objectConfig.fields_serial_number = maxSortNoField.sort_no;
156
186
  }
157
187
  }
158
- catch (error) {
159
- }
188
+ catch (error) { }
160
189
  return objectConfig;
161
190
  });
162
191
  }
package/lib/objects/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/objects/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/objects/index.ts"],"names":[],"mappings":"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"}
package/lib/objects.service.js CHANGED
@@ -245,6 +245,7 @@ module.exports = {
245
245
  this.summaryActionHandler = new summaryActionHandler_1.SummaryActionHandler(this.broker);
246
246
  this.lookupActionHandler = new LookupActionHandler_1.LookupActionHandler(this.broker);
247
247
  this.objetActionHandlers = new actionsHandler_1.ActionHandlers((objectConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
248
+ yield this.masterDetailActionHandler.remove(objectConfig);
248
249
  yield this.masterDetailActionHandler.add(objectConfig);
249
250
  yield this.lookupActionHandler.add(objectConfig);
250
251
  yield this.formulaActionHandler.add(objectConfig);
package/lib/objects.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"objects.service.js","sourceRoot":"","sources":["../src/objects.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"objects.service.js","sourceRoot":"","sources":["../src/objects.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-metadata-objects",
3
- "version": "2.1.46",
3
+ "version": "2.1.50",
4
4
  "description": "",
5
5
  "main": "lib/objects.service.js",
6
6
  "scripts": {
@@ -41,5 +41,5 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "a86af19db1a486ead2b60e54b656ca845d8fa6a0"
44
+ "gitHead": "3df06ee3928dd49857dc6b98ae66fa4330459f81"
45
45
  }
package/src/master-detail/masterDetailActionHandler.ts CHANGED
@@ -80,6 +80,39 @@ export class MasterDetailActionHandler{
80
80
  return false
81
81
  }
82
82
 
83
+ async remove(objectConfig){
84
+ try {
85
+ await this.removeObjectMasterDetails(objectConfig);
86
+ return true
87
+ } catch (error) {
88
+ this.broker.logger.error(error);
89
+ }
90
+ return false
91
+ }
92
+
93
+ /**
94
+ * 删除 主表子表类型字段 时，清理关联对象上masters 、details属性。
95
+ * TODO: 解决的问题： master_detail字段删除后重建一个同名同类型字段不报错。
96
+ * 测试过程中发现的问题： 在graphql查询数据时，如果删除一个相关的主表子表字段， 此时还能查询到相关表信息， 重启服务和刷新页面后才查询不到。
97
+ * @param objectConfig
98
+ */
99
+ async removeObjectMasterDetails(objectConfig){
100
+ const { name: objectApiName } = objectConfig;
101
+ let masters = await this.getMastersInfo(objectApiName);
102
+ if(masters.length){
103
+ for await (const item of masters){
104
+ const fieldNameReferenceTo = item.split('.')[0];
105
+ const fieldName = item.split('.')[1];
106
+ const field = objectConfig.fields[fieldName];
107
+ // 考虑以下情况： (字段删除 | 字段名改变） 、 字段类型改变、 字段引用对象改变
108
+ if( !field || field.type !== 'master_detail' || field.reference_to !== fieldNameReferenceTo){
109
+ await this.removeMaster(objectApiName, fieldNameReferenceTo, fieldName);
110
+ await this.removeDetail(fieldNameReferenceTo, objectApiName, fieldName);
111
+ }
112
+ }
113
+ }
114
+ }
115
+
83
116
  async checkMasterDetails(objectApiName: string) {
84
117
  const mastersCount = (await this.getMasters(objectApiName)).length;
85
118
  const detailsCount = (await this.getDetails(objectApiName)).length;
@@ -192,13 +225,16 @@ export class MasterDetailActionHandler{
192
225
  return false;
193
226
  }
194
227
 
195
- async removeMaster(objectApiName: any, masterObjectApiName: string){
196
- let master = await this.getMasters(objectApiName);
197
- let index = master.indexOf(masterObjectApiName);
198
- if (index >= 0) {
199
- master.splice(index, 1);
228
+ async removeMaster(objectApiName: any, masterObjectApiName: string, masterFieldName: any){
229
+ let master = await this.getMastersInfo(objectApiName);
230
+ let maps = [];
231
+ if (master) {
232
+ maps = master;
200
233
  }
201
- await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName), data: master}, {meta: {}})
234
+ const masterFullName = `${masterObjectApiName}.${masterFieldName}`
235
+ maps = _.difference(maps, [masterFullName]);
236
+ await this.broker.call('metadata.add', { key: this.getMasterKey(objectApiName), data: maps }, { meta: {} })
237
+ return true;
202
238
  }
203
239
 
204
240
  getDetailKey(objectApiName){
@@ -243,13 +279,16 @@ export class MasterDetailActionHandler{
243
279
  }
244
280
 
245
281
 
246
- async removeDetail(objectApiName: any, detailObjectApiName: string){
247
- let detail = await this.getDetails(objectApiName);
248
- let index = detail.indexOf(detailObjectApiName);
249
- if (index >= 0) {
250
- detail.splice(index, 1);
282
+ async removeDetail(objectApiName: any, detailObjectApiName: string, detailFieldName: any){
283
+ let detail = await this.getDetailsInfo(objectApiName);
284
+ let maps = [];
285
+ if (detail) {
286
+ maps = detail;
251
287
  }
252
- await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName), data: detail}, {meta: {}})
288
+ const detailFullName = `${detailObjectApiName}.${detailFieldName}`
289
+ maps = _.difference(maps, [detailFullName]);
290
+ await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
291
+ return true;
253
292
  }
254
293
 
255
294
  async getDetailPaths(objectApiName: string){
package/src/objects/fields/index.ts CHANGED
@@ -1,3 +1,145 @@
1
- export async function addObjectField(){
2
-
3
- }
1
+ export async function addObjectField() {}
2
+
3
+ enum SteedosFieldDBType {
4
+ varchar = "varchar",
5
+ text = "text",
6
+ number = "number",
7
+ boolean = "boolean",
8
+ date = "date",
9
+ dateTime = "dateTime",
10
+ json = "json",
11
+ array = "array",
12
+ // oneToOne,
13
+ // oneToMany,
14
+ // manyToOne,
15
+ // manyToMany
16
+ }
17
+
18
+ export function getDBType(objectName, field) {
19
+ switch (field.type) {
20
+ case "text":
21
+ return SteedosFieldDBType.varchar;
22
+ case "textarea":
23
+ return SteedosFieldDBType.text;
24
+ case "html":
25
+ return SteedosFieldDBType.text;
26
+ case "select":
27
+ if (this.multiple) {
28
+ return SteedosFieldDBType.array;
29
+ } else {
30
+ return SteedosFieldDBType.varchar;
31
+ }
32
+ case "boolean":
33
+ return SteedosFieldDBType.boolean;
34
+ case "toggle":
35
+ return SteedosFieldDBType.boolean;
36
+ case "date":
37
+ return SteedosFieldDBType.date;
38
+ case "datetime":
39
+ return SteedosFieldDBType.dateTime;
40
+ case "number":
41
+ return SteedosFieldDBType.number;
42
+ case "currency":
43
+ if (!this.scale && this.scale != 0) {
44
+ this.scale = 2;
45
+ }
46
+ return SteedosFieldDBType.number;
47
+ case "password":
48
+ return SteedosFieldDBType.varchar;
49
+ case "lookup":
50
+ // let reference_to = this.reference_to
51
+ // if(_.isFunction(this.reference_to)){
52
+ // reference_to = this.reference_to()
53
+ // }
54
+
55
+ // if(_.isArray(reference_to)){
56
+ // this._columnType = SteedosColumnType.manyToMany
57
+ // }else{
58
+ // if(this.multiple){
59
+ // this._columnType = SteedosColumnType.oneToMany
60
+ // }else{
61
+ // this._columnType = SteedosColumnType.oneToOne
62
+ // }
63
+ // }
64
+ return SteedosFieldDBType.varchar;
65
+ case "master_detail":
66
+ // let reference_to2 = this.reference_to
67
+ // if(_.isFunction(this.reference_to)){
68
+ // reference_to2 = this.reference_to()
69
+ // }
70
+
71
+ // if(_.isArray(reference_to2)){
72
+ // this._columnType = SteedosColumnType.manyToMany
73
+ // }else{
74
+ // if(this.multiple){
75
+ // this._columnType = SteedosColumnType.manyToOne //TODO
76
+ // }else{
77
+ // this._columnType = SteedosColumnType.oneToOne
78
+ // }
79
+ // }
80
+ return SteedosFieldDBType.varchar;
81
+ case "grid":
82
+ return SteedosFieldDBType.array;
83
+ case "url":
84
+ return SteedosFieldDBType.varchar;
85
+ case "email":
86
+ return SteedosFieldDBType.varchar;
87
+ case "avatar":
88
+ return SteedosFieldDBType.varchar;
89
+ case "location":
90
+ return SteedosFieldDBType.json;
91
+ case "image":
92
+ return SteedosFieldDBType.varchar;
93
+ case "object":
94
+ return SteedosFieldDBType.json;
95
+ case "url":
96
+ return SteedosFieldDBType.varchar;
97
+ case "[object]":
98
+ return SteedosFieldDBType.array;
99
+ case "[Object]":
100
+ return SteedosFieldDBType.array;
101
+ case "[grid]":
102
+ return SteedosFieldDBType.array;
103
+ case "[text]":
104
+ return SteedosFieldDBType.array;
105
+ case "selectCity":
106
+ return SteedosFieldDBType.json;
107
+ case "audio":
108
+ return SteedosFieldDBType.varchar;
109
+ case "filesize":
110
+ return SteedosFieldDBType.number;
111
+ case "file":
112
+ return SteedosFieldDBType.varchar;
113
+ case "string":
114
+ return SteedosFieldDBType.varchar;
115
+ case "code":
116
+ return SteedosFieldDBType.varchar;
117
+ case "function Object() { [native code] }":
118
+ return SteedosFieldDBType.json;
119
+ case Object:
120
+ return SteedosFieldDBType.json;
121
+ case "function String() { [native code] }":
122
+ return SteedosFieldDBType.varchar;
123
+ case String:
124
+ return SteedosFieldDBType.varchar;
125
+ case "Object":
126
+ return SteedosFieldDBType.json;
127
+ case "autonumber":
128
+ return SteedosFieldDBType.varchar;
129
+ case "markdown":
130
+ return SteedosFieldDBType.varchar;
131
+ case "formula":
132
+ return this.getDBType(this.data_type);
133
+ case "summary":
134
+ //汇总不需要check类型
135
+ return SteedosFieldDBType.varchar;
136
+ case "percent":
137
+ //百分比字段按数值类型处理
138
+ return this.getDBType("number");
139
+ default:
140
+ console.log(`field`, field);
141
+ throw new Error(
142
+ `${objectName}.${field.name} invalid field type ${field.type}`
143
+ );
144
+ }
145
+ }
package/src/objects/index.ts CHANGED
@@ -1,53 +1,55 @@
1
- import * as _ from 'lodash';
2
- import { METADATA_TYPE } from '..';
3
- const clone = require('clone');
1
+ import * as _ from "lodash";
2
+ import { METADATA_TYPE } from "..";
3
+ import { getDBType } from "./fields";
4
+ const clone = require("clone");
4
5
 
5
- export const SYSTEM_DATASOURCE = '__SYSTEM_DATASOURCE';
6
- export const MONGO_BASE_OBJECT = '__MONGO_BASE_OBJECT';
7
- export const SQL_BASE_OBJECT = '__SQL_BASE_OBJECT';
6
+ export const SYSTEM_DATASOURCE = "__SYSTEM_DATASOURCE";
7
+ export const MONGO_BASE_OBJECT = "__MONGO_BASE_OBJECT";
8
+ export const SQL_BASE_OBJECT = "__SQL_BASE_OBJECT";
8
9
 
9
- export function getObjectServiceName(objectApiName: string){
10
+ export function getObjectServiceName(objectApiName: string) {
10
11
  return `@${objectApiName}`;
11
12
  }
12
13
 
13
-
14
14
  async function getBaseObjectConfig(ctx, datasourceName) {
15
- const serviceName = '*';
15
+ const serviceName = "*";
16
16
  const metadataType = METADATA_TYPE;
17
17
  let metadataApiName = SQL_BASE_OBJECT;
18
- if (datasourceName === 'default' || datasourceName === 'meteor') {
19
- metadataApiName = MONGO_BASE_OBJECT
18
+ if (datasourceName === "default" || datasourceName === "meteor") {
19
+ metadataApiName = MONGO_BASE_OBJECT;
20
20
  }
21
21
  const configs = await ctx.broker.call(`metadata.getServiceMetadatas`, {
22
22
  serviceName,
23
23
  metadataType,
24
- metadataApiName: metadataApiName
25
- })
24
+ metadataApiName: metadataApiName,
25
+ });
26
26
  return configs && configs.length > 0 ? configs[0]?.metadata : null;
27
27
  }
28
28
 
29
29
  async function getObjectConfigs(ctx, objectApiName) {
30
- const serviceName = '*';
30
+ const serviceName = "*";
31
31
  const metadataType = METADATA_TYPE;
32
- const objectConfigs = await ctx.broker.call(`metadata.getServiceMetadatas`, {
33
- serviceName,
34
- metadataType,
35
- metadataApiName: objectApiName
36
- })
37
- return _.compact(_.map(objectConfigs, 'metadata'));
32
+ const objectConfigs = await ctx.broker.call(
33
+ `metadata.getServiceMetadatas`,
34
+ {
35
+ serviceName,
36
+ metadataType,
37
+ metadataApiName: objectApiName,
38
+ }
39
+ );
40
+ return _.compact(_.map(objectConfigs, "metadata"));
38
41
  }
39
42
 
40
43
  function getObjectDatasource(objectConfigs: Array<any>) {
41
- const config = _.find(objectConfigs, function (objectConfig) {
44
+ const config = _.find(objectConfigs, function(objectConfig) {
42
45
  return objectConfig?.datasource;
43
- })
46
+ });
44
47
  // if(!config){
45
48
  // console.log(`getObjectDatasource`, _.map(objectConfigs, 'name'))
46
49
  // }
47
50
  return config?.datasource;
48
51
  }
49
52
 
50
-
51
53
  // async function refreshFields() {
52
54
 
53
55
  // }
@@ -56,7 +58,6 @@ function getObjectDatasource(objectConfigs: Array<any>) {
56
58
 
57
59
  // }
58
60
 
59
-
60
61
  // async function refreshListViews() {
61
62
 
62
63
  // }
@@ -69,30 +70,34 @@ function getObjectDatasource(objectConfigs: Array<any>) {
69
70
 
70
71
  // }
71
72
 
72
- export async function getOriginalObject(ctx, objectApiName){
73
+ export async function getOriginalObject(ctx, objectApiName) {
73
74
  let objectConfig: any = {};
74
75
 
75
76
  const objectConfigs = await getObjectConfigs(ctx, objectApiName);
76
77
 
77
- if(objectConfigs.length == 0){
78
- return null
78
+ if (objectConfigs.length == 0) {
79
+ return null;
79
80
  }
80
81
 
81
- objectConfig = _.defaultsDeep({}, ..._.reverse(objectConfigs), objectConfig)
82
+ objectConfig = _.defaultsDeep(
83
+ {},
84
+ ..._.reverse(objectConfigs),
85
+ objectConfig
86
+ );
82
87
 
83
- const _objectConfig = _.clone(objectConfig)
88
+ const _objectConfig = _.clone(objectConfig);
84
89
 
85
90
  objectConfig.fields = _.clone(_objectConfig.fields);
86
91
 
87
92
  objectConfig = _.defaultsDeep({}, clone(_objectConfig), objectConfig);
88
93
 
89
- _.each(objectConfig.fields, function(field, field_name){
94
+ _.each(objectConfig.fields, function(field, field_name) {
90
95
  if (field.is_name) {
91
- objectConfig.NAME_FIELD_KEY = field_name
92
- } else if (field_name == 'name' && !objectConfig.NAME_FIELD_KEY) {
93
- objectConfig.NAME_FIELD_KEY = field_name
96
+ objectConfig.NAME_FIELD_KEY = field_name;
97
+ } else if (field_name == "name" && !objectConfig.NAME_FIELD_KEY) {
98
+ objectConfig.NAME_FIELD_KEY = field_name;
94
99
  }
95
- })
100
+ });
96
101
  return objectConfig;
97
102
  }
98
103
 
@@ -101,15 +106,15 @@ export async function refreshObject(ctx, objectApiName) {
101
106
 
102
107
  const objectConfigs = await getObjectConfigs(ctx, objectApiName);
103
108
 
104
- if(objectConfigs.length == 0){
105
- return null
109
+ if (objectConfigs.length == 0) {
110
+ return null;
106
111
  }
107
112
 
108
113
  const objectDatasource = getObjectDatasource(objectConfigs);
109
114
 
110
115
  const baseObjectConfig = await getBaseObjectConfig(ctx, objectDatasource);
111
- if(baseObjectConfig){
112
- delete baseObjectConfig.datasource
116
+ if (baseObjectConfig) {
117
+ delete baseObjectConfig.datasource;
113
118
  delete baseObjectConfig.hidden;
114
119
  }
115
120
 
@@ -119,22 +124,22 @@ export async function refreshObject(ctx, objectApiName) {
119
124
 
120
125
  let mainConfig = null;
121
126
 
122
- if(mainConfigs.length == 1){
123
- mainConfig = mainConfigs[0]
124
- }else if(mainConfigs.length > 1){
125
- let dbMainConfig = _.find(mainConfigs, (conf)=>{
126
- return _.has(conf, '_id') && !_.has(conf, '__filename')
127
- })
127
+ if (mainConfigs.length == 1) {
128
+ mainConfig = mainConfigs[0];
129
+ } else if (mainConfigs.length > 1) {
130
+ let dbMainConfig = _.find(mainConfigs, (conf) => {
131
+ return _.has(conf, "_id") && !_.has(conf, "__filename");
132
+ });
128
133
  if (dbMainConfig) {
129
- delete dbMainConfig.isMain;
134
+ delete dbMainConfig.isMain;
130
135
  }
131
136
 
132
- mainConfig = _.find(mainConfigs, (conf)=>{
137
+ mainConfig = _.find(mainConfigs, (conf) => {
133
138
  return conf.isMain;
134
- })
139
+ });
135
140
 
136
- if(!mainConfig){
137
- mainConfig = mainConfigs[0]
141
+ if (!mainConfig) {
142
+ mainConfig = mainConfigs[0];
138
143
  }
139
144
  }
140
145
 
@@ -142,50 +147,92 @@ export async function refreshObject(ctx, objectApiName) {
142
147
  return null;
143
148
  }
144
149
 
145
- objectConfig = _.defaultsDeep({}, ..._.sortBy(objectConfigs, function(o){return o.isMain ? 1:-1}), objectConfig)
150
+ objectConfig = _.defaultsDeep(
151
+ {},
152
+ ..._.sortBy(objectConfigs, function(o) {
153
+ return o.isMain ? 1 : -1;
154
+ }),
155
+ objectConfig
156
+ );
146
157
 
147
- const _objectConfig = _.clone(objectConfig)
158
+ const _objectConfig = _.clone(objectConfig);
148
159
 
149
160
  objectConfig.fields = _.clone(_objectConfig.fields);
150
161
 
151
- if (objectApiName != MONGO_BASE_OBJECT && objectApiName != SQL_BASE_OBJECT){
162
+ if (
163
+ objectApiName != MONGO_BASE_OBJECT &&
164
+ objectApiName != SQL_BASE_OBJECT
165
+ ) {
152
166
  _.each(objectConfig.actions, (action) => {
153
- if (!_.has(action, '_visible') && _.has(action, 'visible')) {
167
+ if (!_.has(action, "_visible") && _.has(action, "visible")) {
154
168
  action._visible = `
155
169
  function(){
156
170
  return ${action.visible}
157
171
  }
158
172
  `;
159
173
  }
160
- })
174
+ });
161
175
  }
162
176
 
163
- objectConfig = _.defaultsDeep({}, clone(_objectConfig), baseObjectConfig, objectConfig);
177
+ objectConfig = _.defaultsDeep(
178
+ {},
179
+ clone(_objectConfig),
180
+ baseObjectConfig,
181
+ objectConfig
182
+ );
183
+
184
+ _.each(objectConfig.fields, function(field, field_name) {
185
+ if (objectDatasource != "default" && objectDatasource != "meteor") {
186
+ if (field.primary) {
187
+ objectConfig.idFieldName = field.name;
188
+ if (!objectConfig.idFieldNames) {
189
+ objectConfig.idFieldNames = [];
190
+ }
191
+ if (objectConfig.idFieldNames.indexOf(field.name) < 0) {
192
+ objectConfig.idFieldNames.push(field.name);
193
+ }
194
+ }
195
+ if (
196
+ !field.fieldDBType &&
197
+ objectApiName != MONGO_BASE_OBJECT &&
198
+ objectApiName != SQL_BASE_OBJECT
199
+ ) {
200
+ try {
201
+ field.fieldDBType = getDBType(objectApiName, field);
202
+ } catch (error) {
203
+ console.log(`error`, error);
204
+ }
205
+ }
164
206
 
165
- _.each(objectConfig.fields, function(field, field_name){
207
+ if (field.generated) {
208
+ field.omit = true;
209
+ }
210
+ }
166
211
  if (field.is_name) {
167
- objectConfig.NAME_FIELD_KEY = field_name
168
- } else if (field_name == 'name' && !objectConfig.NAME_FIELD_KEY) {
169
- objectConfig.NAME_FIELD_KEY = field_name
212
+ objectConfig.NAME_FIELD_KEY = field_name;
213
+ } else if (field_name == "name" && !objectConfig.NAME_FIELD_KEY) {
214
+ objectConfig.NAME_FIELD_KEY = field_name;
170
215
  }
171
- })
216
+ });
172
217
 
173
218
  _.each(objectConfig.actions, (action, key) => {
174
- if (!_.has(action, 'name')) {
219
+ if (!_.has(action, "name")) {
175
220
  action.name = key;
176
221
  }
177
222
  });
178
223
 
179
- objectConfig.datasource = mainConfig.datasource
224
+ objectConfig.datasource = mainConfig.datasource;
180
225
 
181
226
  try {
182
- const maxSortNoField = _.maxBy(_.values(objectConfig.fields), function(field) { return field.sort_no; })
183
- if(maxSortNoField){
227
+ const maxSortNoField = _.maxBy(_.values(objectConfig.fields), function(
228
+ field
229
+ ) {
230
+ return field.sort_no;
231
+ });
232
+ if (maxSortNoField) {
184
233
  objectConfig.fields_serial_number = maxSortNoField.sort_no;
185
234
  }
186
- } catch (error) {
187
-
188
- }
235
+ } catch (error) {}
189
236
 
190
237
  return objectConfig;
191
238
  }
package/src/objects.service.ts CHANGED
@@ -202,6 +202,7 @@ module.exports = {
202
202
  this.summaryActionHandler = new SummaryActionHandler(this.broker);
203
203
  this.lookupActionHandler = new LookupActionHandler(this.broker);
204
204
  this.objetActionHandlers = new ActionHandlers(async (objectConfig)=>{
205
+ await this.masterDetailActionHandler.remove(objectConfig);
205
206
  await this.masterDetailActionHandler.add(objectConfig);
206
207
  await this.lookupActionHandler.add(objectConfig);
207
208
  await this.formulaActionHandler.add(objectConfig);