@steedos/standard-object-database 2.7.8-beta.6 → 2.7.8-beta.8
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.
- package/main/default/client/object_fields.client.js +0 -14
- package/main/default/routes/object_fields_design.ejs +4 -2
- package/main/default/server/object_fields.object.js +1 -1
- package/main/default/server/objects.object.js +53 -0
- package/main/default/services/object_fields.service.js +36 -5
- package/package.json +5 -5
|
@@ -239,12 +239,6 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
|
|
|
239
239
|
display: none;
|
|
240
240
|
}
|
|
241
241
|
|
|
242
|
-
.defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden .antd-Form-label {
|
|
243
|
-
/*html字段类型默认值，显示为静态值编辑器时，因为移除了flex样式类，不再把amis公式配置按钮显示在右侧，而是换行显示，此时label不可以display: none，否则缩进不对*/
|
|
244
|
-
display: block;
|
|
245
|
-
visibility: hidden;
|
|
246
|
-
}
|
|
247
|
-
|
|
248
242
|
.defaultValue_field .defaultValue_field_formula_hidden {
|
|
249
243
|
flex-grow: 0;
|
|
250
244
|
}
|
|
@@ -256,14 +250,6 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
|
|
|
256
250
|
.defaultValue_field.steedos-defaultValue-html-edit .defaultValue_field_formula_hidden {
|
|
257
251
|
margin-left: 0px;
|
|
258
252
|
}
|
|
259
|
-
|
|
260
|
-
.defaultValue_field .defaultValue_field_formula_hidden .antd-Form-label {
|
|
261
|
-
display: none;
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
.defaultValue_field .defaultValue_field_formula_hidden .antd-FormulaPicker-input {
|
|
265
|
-
display: none;
|
|
266
|
-
}
|
|
267
253
|
</style>`);
|
|
268
254
|
$("head").append(styleCss);
|
|
269
255
|
} catch (error) {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: baozhoutao@steedos.com
|
|
3
3
|
* @Date: 2022-06-02 17:45:15
|
|
4
4
|
* @LastEditors: baozhoutao@steedos.com
|
|
5
|
-
* @LastEditTime: 2024-09-
|
|
5
|
+
* @LastEditTime: 2024-09-11 11:49:37
|
|
6
6
|
* @Description:
|
|
7
7
|
-->
|
|
8
8
|
<html>
|
|
@@ -206,7 +206,6 @@
|
|
|
206
206
|
if(data.type === 'builder.loaded'){
|
|
207
207
|
comp.messageFrame('builder.EditorPropsChanged', { editorProps : JSON.stringify({
|
|
208
208
|
onDndAccept: function(event){
|
|
209
|
-
console.log(`onDndAccept===>`, event);
|
|
210
209
|
return true;
|
|
211
210
|
},
|
|
212
211
|
onInit: function(){
|
|
@@ -225,6 +224,9 @@
|
|
|
225
224
|
.ae-RendererList-tabs-header .antd-Tabs-link:nth-child(n+2) {
|
|
226
225
|
display: none !important;
|
|
227
226
|
}
|
|
227
|
+
.ae-RendererList-groupWrap .ae-RendererList-group.collapse-content .ae-RendererList-item:hover .ae-RendererIcon{
|
|
228
|
+
display: none !important;
|
|
229
|
+
}
|
|
228
230
|
`;
|
|
229
231
|
|
|
230
232
|
// 将 style 元素插入到 head 中
|
|
@@ -5,7 +5,7 @@ var objectCore = require('./objects.core.js');
|
|
|
5
5
|
|
|
6
6
|
const objectFieldsFind = function (filter) {
|
|
7
7
|
return objectql.wrapAsync(async function () {
|
|
8
|
-
return await objectql.getObject('object_fields').
|
|
8
|
+
return await objectql.getObject('object_fields').directFind(this.filter);
|
|
9
9
|
}, { filter: filter })
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -318,6 +318,59 @@ let objectTriggers = {
|
|
|
318
318
|
filterable: true,
|
|
319
319
|
sort_no: 10
|
|
320
320
|
});
|
|
321
|
+
Creator.getCollection("object_fields").insert({
|
|
322
|
+
object: doc.name,
|
|
323
|
+
owner: userId,
|
|
324
|
+
_name: "created",
|
|
325
|
+
label: "创建时间",
|
|
326
|
+
space: doc.space,
|
|
327
|
+
type: "datetime",
|
|
328
|
+
group: '',
|
|
329
|
+
sort_no: 9999,
|
|
330
|
+
readonly: true,
|
|
331
|
+
disabled: true,
|
|
332
|
+
sortable: true
|
|
333
|
+
});
|
|
334
|
+
Creator.getCollection("object_fields").insert({
|
|
335
|
+
object: doc.name,
|
|
336
|
+
owner: userId,
|
|
337
|
+
_name: "created_by",
|
|
338
|
+
label: "创建人",
|
|
339
|
+
space: doc.space,
|
|
340
|
+
type: "lookup",
|
|
341
|
+
reference_to: 'users',
|
|
342
|
+
group: '',
|
|
343
|
+
sort_no: 9999,
|
|
344
|
+
readonly: true,
|
|
345
|
+
disabled: true,
|
|
346
|
+
});
|
|
347
|
+
Creator.getCollection("object_fields").insert({
|
|
348
|
+
object: doc.name,
|
|
349
|
+
owner: userId,
|
|
350
|
+
_name: "modified",
|
|
351
|
+
label: "修改时间",
|
|
352
|
+
space: doc.space,
|
|
353
|
+
type: "datetime",
|
|
354
|
+
group: '',
|
|
355
|
+
sort_no: 9999,
|
|
356
|
+
readonly: true,
|
|
357
|
+
disabled: true,
|
|
358
|
+
sortable: true
|
|
359
|
+
});
|
|
360
|
+
Creator.getCollection("object_fields").insert({
|
|
361
|
+
object: doc.name,
|
|
362
|
+
owner: userId,
|
|
363
|
+
_name: "modified_by",
|
|
364
|
+
label: "修改人",
|
|
365
|
+
space: doc.space,
|
|
366
|
+
space: doc.space,
|
|
367
|
+
type: "lookup",
|
|
368
|
+
reference_to: 'users',
|
|
369
|
+
group: '',
|
|
370
|
+
sort_no: 9999,
|
|
371
|
+
readonly: true,
|
|
372
|
+
disabled: true,
|
|
373
|
+
});
|
|
321
374
|
// Creator.getCollection("object_fields").insert({
|
|
322
375
|
// object: doc.name,
|
|
323
376
|
// owner: userId,
|
|
@@ -7,7 +7,30 @@ const steedosI18n = require("@steedos/i18n");
|
|
|
7
7
|
const _ = require("lodash");
|
|
8
8
|
const clone = require("clone");
|
|
9
9
|
const serviceObjectMixin = require('@steedos/service-object-mixin');
|
|
10
|
+
const objectql = require('@steedos/objectql');
|
|
10
11
|
// 默认值字段代码：services/standard-object-database/main/default/services/object_fields.service.js
|
|
12
|
+
|
|
13
|
+
const initSummaryDoc = async (doc) => {
|
|
14
|
+
if (!doc.summary_object) {
|
|
15
|
+
throw new Error("object_fields_error_summary_object_required");
|
|
16
|
+
}
|
|
17
|
+
let summaryObject = register.getObjectConfig(doc.summary_object);
|
|
18
|
+
let summaryConfig = {
|
|
19
|
+
summary_object: doc.summary_object,
|
|
20
|
+
summary_type: doc.summary_type,
|
|
21
|
+
summary_field: doc.summary_field,
|
|
22
|
+
field_name: doc.name,
|
|
23
|
+
object_name: doc.object
|
|
24
|
+
};
|
|
25
|
+
const dataType = await objectql.getSummaryDataType(summaryConfig, summaryObject);
|
|
26
|
+
if (!dataType) {
|
|
27
|
+
throw new Error("object_fields_error_summary_data_type_not_found");
|
|
28
|
+
}
|
|
29
|
+
doc.data_type = dataType;
|
|
30
|
+
// objectql.validateFilters(doc.summary_filters, summaryObject.fields);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
|
|
11
34
|
module.exports = {
|
|
12
35
|
name: "object_fields",
|
|
13
36
|
mixins: [serviceObjectMixin],
|
|
@@ -291,7 +314,7 @@ module.exports = {
|
|
|
291
314
|
|
|
292
315
|
_.map(objectFields, (objectField)=>{
|
|
293
316
|
if(!objectField.group){
|
|
294
|
-
objectField.group = '
|
|
317
|
+
objectField.group = '通用'
|
|
295
318
|
}
|
|
296
319
|
})
|
|
297
320
|
|
|
@@ -358,7 +381,7 @@ module.exports = {
|
|
|
358
381
|
const groupName = group.title;
|
|
359
382
|
_.each(group.body, (field)=>{
|
|
360
383
|
if(_.startsWith(field.type, 'sfield-')){
|
|
361
|
-
fields.push(Object.assign({}, field.config, {group: groupName, sort_no}));
|
|
384
|
+
fields.push(Object.assign({}, field.config, {group: groupName, sort_no, _name: field.name}));
|
|
362
385
|
sort_no += 50;
|
|
363
386
|
}
|
|
364
387
|
})
|
|
@@ -368,7 +391,7 @@ module.exports = {
|
|
|
368
391
|
visible_on: group.visible_on
|
|
369
392
|
})
|
|
370
393
|
}else if(_.startsWith(field.type, 'sfield-')){
|
|
371
|
-
fields.push(Object.assign({}, field.config, {sort_no}));
|
|
394
|
+
fields.push(Object.assign({}, field.config, {sort_no, _name: field.name}));
|
|
372
395
|
sort_no += 50;
|
|
373
396
|
}
|
|
374
397
|
})
|
|
@@ -404,7 +427,7 @@ module.exports = {
|
|
|
404
427
|
const newId = await object_fields._makeNewID();
|
|
405
428
|
const now = new Date();
|
|
406
429
|
const field = _.find(fields, { name: fieldName });
|
|
407
|
-
|
|
430
|
+
const doc = Object.assign({}, field, {
|
|
408
431
|
_id: newId,
|
|
409
432
|
owner: userSession.userId,
|
|
410
433
|
space: userSession.spaceId,
|
|
@@ -415,7 +438,11 @@ module.exports = {
|
|
|
415
438
|
modified_by: userSession.userId,
|
|
416
439
|
company_id: userSession.company_id,
|
|
417
440
|
company_ids: userSession.company_ids
|
|
418
|
-
})
|
|
441
|
+
});
|
|
442
|
+
if(doc.type === "summary"){
|
|
443
|
+
await initSummaryDoc(doc);
|
|
444
|
+
}
|
|
445
|
+
await object_fields.directInsert(doc);
|
|
419
446
|
log.insert.success.push(fieldName);
|
|
420
447
|
} catch (e) {
|
|
421
448
|
log.insert.error.push(fieldName);
|
|
@@ -430,6 +457,10 @@ module.exports = {
|
|
|
430
457
|
const field = _.find(fields, { name: fieldName });
|
|
431
458
|
const id = _.find(dbFields, { name: fieldName })._id;
|
|
432
459
|
const submitField = _.omit(field, ['name', '_name']);
|
|
460
|
+
|
|
461
|
+
if(submitField.type === "summary"){
|
|
462
|
+
await initSummaryDoc(submitField);
|
|
463
|
+
}
|
|
433
464
|
await object_fields.directUpdate(id, Object.assign({}, submitField, {
|
|
434
465
|
modified: now,
|
|
435
466
|
modified_by: userSession.userId
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/standard-object-database",
|
|
3
|
-
"version": "2.7.8-beta.
|
|
3
|
+
"version": "2.7.8-beta.8",
|
|
4
4
|
"main": "package.service.js",
|
|
5
5
|
"private": false,
|
|
6
6
|
"publishConfig": {
|
|
@@ -12,14 +12,14 @@
|
|
|
12
12
|
"description": "steedos package",
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"@steedos-widgets/amis-lib": "^1.0.22",
|
|
15
|
-
"@steedos/metadata-core": "2.7.8-beta.
|
|
16
|
-
"@steedos/service-object-mixin": "2.7.8-beta.
|
|
17
|
-
"@steedos/standard-objects": "2.7.8-beta.
|
|
15
|
+
"@steedos/metadata-core": "2.7.8-beta.8",
|
|
16
|
+
"@steedos/service-object-mixin": "2.7.8-beta.8",
|
|
17
|
+
"@steedos/standard-objects": "2.7.8-beta.8",
|
|
18
18
|
"amis-formula": "~6.3.0",
|
|
19
19
|
"clone": "^2.1.2",
|
|
20
20
|
"moleculer-bullmq": "3.0.0"
|
|
21
21
|
},
|
|
22
22
|
"repository": {},
|
|
23
23
|
"license": "MIT",
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "28a04e959c048afaabd8450b51e42326e20fa072"
|
|
25
25
|
}
|