@steedos/standard-object-database 2.4.10-beta.3 → 2.4.10-beta.6
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/objects/objects/buttons/delete_object.button.yml +9 -6
- package/main/default/objects/objects.core.js +27 -25
- package/main/default/routes/amis_button_design.ejs +1 -0
- package/main/default/routes/amis_listview_design.ejs +2 -1
- package/main/default/triggers/object_fields.trigger.js +1 -1
- package/package.json +2 -2
|
@@ -29,7 +29,7 @@ amis_schema: |-
|
|
|
29
29
|
"showCloseButton": true,
|
|
30
30
|
"data": {
|
|
31
31
|
"&": "$$",
|
|
32
|
-
"
|
|
32
|
+
"recordId": "${recordId}"
|
|
33
33
|
},
|
|
34
34
|
"onEvent": {
|
|
35
35
|
"confirm": {
|
|
@@ -43,9 +43,9 @@ amis_schema: |-
|
|
|
43
43
|
"method": "post",
|
|
44
44
|
"data": {
|
|
45
45
|
"&": "$$",
|
|
46
|
-
"
|
|
46
|
+
"recordId": "${recordId}"
|
|
47
47
|
},
|
|
48
|
-
"requestAdaptor": "
|
|
48
|
+
"requestAdaptor": "const recordId = api.data.recordId; \napi.data = {\n query: `\n mutation{\n objects__delete(id: \"${recordId}\")\n }\n `\n}",
|
|
49
49
|
"headers": {
|
|
50
50
|
"Authorization": "Bearer ${context.tenantId},${context.authToken}"
|
|
51
51
|
}
|
|
@@ -55,12 +55,15 @@ amis_schema: |-
|
|
|
55
55
|
"actionType": "ajax"
|
|
56
56
|
},
|
|
57
57
|
{
|
|
58
|
-
"
|
|
58
|
+
"actionType": "broadcast",
|
|
59
59
|
"args": {
|
|
60
|
-
"
|
|
60
|
+
"eventName": "@data.changed.objects"
|
|
61
61
|
},
|
|
62
|
-
"
|
|
62
|
+
"data": {
|
|
63
|
+
"objectName": "objects",
|
|
64
|
+
"__deletedRecord": true
|
|
63
65
|
}
|
|
66
|
+
}
|
|
64
67
|
]
|
|
65
68
|
}
|
|
66
69
|
}
|
|
@@ -225,22 +225,24 @@ function loadObject(doc, oldDoc) {
|
|
|
225
225
|
objectql.loadObjectLazyListenners(doc.name);
|
|
226
226
|
objectql.loadObjectLazyButtons(doc.name);
|
|
227
227
|
//获取到继承后的对象
|
|
228
|
-
const _doc = objectql.getObjectConfig(doc.name);
|
|
228
|
+
// const _doc = objectql.getObjectConfig(doc.name);
|
|
229
|
+
// console.log(`loadObject===>`, doc.name)
|
|
229
230
|
objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){
|
|
230
231
|
if(res){
|
|
231
|
-
datasource.setObject(doc.name, _doc);
|
|
232
|
-
try {
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
} catch (error) {
|
|
238
|
-
|
|
239
|
-
}
|
|
240
|
-
if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
}
|
|
232
|
+
// datasource.setObject(doc.name, _doc);
|
|
233
|
+
// try {
|
|
234
|
+
// if (!datasourceName || datasourceName == defaultDatasourceName) {
|
|
235
|
+
// Creator.Objects[doc.name] = _doc;
|
|
236
|
+
// Creator.loadObjects(_doc, _doc.name);
|
|
237
|
+
// }
|
|
238
|
+
// } catch (error) {
|
|
239
|
+
// console.log('error', error);
|
|
240
|
+
// }
|
|
241
|
+
// if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
|
|
242
|
+
// loadObjectTriggers(doc);
|
|
243
|
+
// loadObjectPermission(doc);
|
|
244
|
+
// }
|
|
245
|
+
|
|
244
246
|
objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
|
|
245
247
|
}
|
|
246
248
|
})
|
|
@@ -342,7 +344,7 @@ function reloadObject(changeLog){
|
|
|
342
344
|
return
|
|
343
345
|
}
|
|
344
346
|
//获取到最新的对象
|
|
345
|
-
const object = objectql.
|
|
347
|
+
const object = objectql.getOriginalObjectConfig(objectName);
|
|
346
348
|
|
|
347
349
|
let _mf = _.max(_.values(object.fields), function (field) { return field.sort_no; });
|
|
348
350
|
if(_mf && object.name){
|
|
@@ -355,18 +357,18 @@ function reloadObject(changeLog){
|
|
|
355
357
|
if(deleted.actions.length == 0){
|
|
356
358
|
deleted.actions = null;
|
|
357
359
|
}
|
|
358
|
-
|
|
360
|
+
// console.log(`reloadObject===>`, object.name)
|
|
359
361
|
objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, Object.assign({}, object, {isMain:false, __deleted: deleted})).then(function(res){
|
|
360
362
|
if(res){
|
|
361
|
-
datasource.setObject(object.name, object);
|
|
362
|
-
try {
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
} catch (error) {
|
|
368
|
-
|
|
369
|
-
}
|
|
363
|
+
// datasource.setObject(object.name, object);
|
|
364
|
+
// try {
|
|
365
|
+
// if(!objectDataSourceName || objectDataSourceName == defaultDatasourceName){
|
|
366
|
+
// Creator.Objects[object.name] = object;
|
|
367
|
+
// Creator.loadObjects(object, object.name);
|
|
368
|
+
// }
|
|
369
|
+
// } catch (error) {
|
|
370
|
+
// console.log('error', error);
|
|
371
|
+
// }
|
|
370
372
|
objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
|
|
371
373
|
}
|
|
372
374
|
})
|
|
@@ -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: 2023-
|
|
5
|
+
* @LastEditTime: 2023-04-04 16:00:34
|
|
6
6
|
* @Description:
|
|
7
7
|
-->
|
|
8
8
|
<html>
|
|
@@ -122,6 +122,7 @@
|
|
|
122
122
|
delete schema.data.context.tenantId;
|
|
123
123
|
delete schema.data.context.authToken;
|
|
124
124
|
delete schema.data.context.user;
|
|
125
|
+
delete schema.data.context.rootUrl;
|
|
125
126
|
}
|
|
126
127
|
return await axios.post(
|
|
127
128
|
`${rootUrl}/graphql`,
|
|
@@ -222,7 +222,7 @@ module.exports = {
|
|
|
222
222
|
objectName = filters._id.split('.')[0];
|
|
223
223
|
}
|
|
224
224
|
if(objectName){
|
|
225
|
-
let fields = await InternalData.getObjectFields(objectName, this.userId, true);
|
|
225
|
+
let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
|
|
226
226
|
if(fields){
|
|
227
227
|
_.each(fields, (field)=>{
|
|
228
228
|
this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/standard-object-database",
|
|
3
|
-
"version": "2.4.10-beta.
|
|
3
|
+
"version": "2.4.10-beta.6",
|
|
4
4
|
"main": "package.service.js",
|
|
5
5
|
"private": false,
|
|
6
6
|
"publishConfig": {
|
|
@@ -12,5 +12,5 @@
|
|
|
12
12
|
"description": "steedos package",
|
|
13
13
|
"repository": {},
|
|
14
14
|
"license": "MIT",
|
|
15
|
-
"gitHead": "
|
|
15
|
+
"gitHead": "203c2c77721188aa722c8454ec968466ba490606"
|
|
16
16
|
}
|