@steedos/standard-object-database 2.6.7-beta.8 → 2.6.7
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/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml +4 -0
- package/main/default/objectTranslations/object_fields.zh-CN/object_fields.zh-CN.objectTranslation.yml +4 -0
- package/main/default/objectTranslations/object_layouts.zh-CN/object_layouts.zh-CN.objectTranslation.yml +4 -0
- package/main/default/objects/object_fields.object.yml +6 -0
- package/main/default/objects/object_layouts.object.yml +3 -0
- package/main/default/objects/object_listviews.action.js +3 -3
- package/main/default/objects/object_listviews.object.js +12 -18
- package/main/default/objects/object_listviews.object.yml +4 -6
- package/main/default/objects/objects.core.js +6 -0
- package/main/default/objects/objects.object.js +5 -4
- package/main/default/objects/objects.object.yml +2 -0
- package/main/default/pages/design_field_layout.page.amis.json +18 -5
- package/package.json +4 -3
- package/package.service.js +1 -1
|
@@ -694,6 +694,12 @@ fields:
|
|
|
694
694
|
# group: Advanced
|
|
695
695
|
visible_on: "{{['autonumber','summary','formula'].indexOf(formData.type) > -1 ? false: true}}"
|
|
696
696
|
sort_no: 272
|
|
697
|
+
enable_thousands:
|
|
698
|
+
type: boolean
|
|
699
|
+
label: 显示千分符
|
|
700
|
+
sort_no: 273
|
|
701
|
+
visible_on: "{{['number','currency','percent'].indexOf(formData.type) > -1 ? true: false}}"
|
|
702
|
+
defaultValue: true
|
|
697
703
|
deleted_lookup_record_behavior:
|
|
698
704
|
type: select
|
|
699
705
|
label: 如果相关表记录被删除怎么办？
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/*
|
|
2
2
|
* @Author: baozhoutao@steedos.com
|
|
3
3
|
* @Date: 2022-03-28 09:35:34
|
|
4
|
-
* @LastEditors:
|
|
5
|
-
* @LastEditTime:
|
|
4
|
+
* @LastEditors: liaodaxue
|
|
5
|
+
* @LastEditTime: 2024-02-18 14:56:30
|
|
6
6
|
* @Description:
|
|
7
7
|
*/
|
|
8
8
|
module.exports = {
|
|
@@ -86,7 +86,7 @@ module.exports = {
|
|
|
86
86
|
data._filters_function = data.filters;
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
Steedos.Page.Form.StandardNew.render(Session.get("app_id"), 'object_listviews', t("creator_list_copy_list_view"), data, {});
|
|
89
|
+
Steedos.Page.Form.StandardNew.render(Session.get("app_id"), 'object_listviews', t("creator_list_copy_list_view"), { defaultData:data }, {});
|
|
90
90
|
},
|
|
91
91
|
copyVisible: function(object_name, record_id, record_permissions, data){
|
|
92
92
|
return true;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: baozhoutao@steedos.com
|
|
3
3
|
* @Date: 2022-03-28 09:35:34
|
|
4
4
|
* @LastEditors: 殷亮辉 yinlianghui@hotoa.com
|
|
5
|
-
* @LastEditTime: 2024-02-
|
|
5
|
+
* @LastEditTime: 2024-02-19 17:28:37
|
|
6
6
|
* @Description:
|
|
7
7
|
*/
|
|
8
8
|
const _ = require("underscore");
|
|
@@ -64,16 +64,10 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
|
|
|
64
64
|
todo: function (userId, doc) {
|
|
65
65
|
checkName(doc.name);
|
|
66
66
|
if (!Steedos.isSpaceAdmin(doc.space, userId)) {
|
|
67
|
-
doc.
|
|
68
|
-
delete doc.shared_to;
|
|
67
|
+
doc.shared_to = "mine";
|
|
69
68
|
delete doc.shared_to_organizations;
|
|
70
69
|
}
|
|
71
|
-
|
|
72
|
-
doc.shared = false;
|
|
73
|
-
}
|
|
74
|
-
else if(doc.shared_to === "space"){
|
|
75
|
-
doc.shared = true;
|
|
76
|
-
}
|
|
70
|
+
delete doc.shared;
|
|
77
71
|
if(doc.shared_to !== "organizations"){
|
|
78
72
|
delete doc.shared_to_organizations;
|
|
79
73
|
}
|
|
@@ -85,24 +79,24 @@ Creator.Objects['object_listviews'].triggers = Object.assign(Creator.Objects['ob
|
|
|
85
79
|
when: "before.update",
|
|
86
80
|
todo: function (userId, doc, fieldNames, modifier, options) {
|
|
87
81
|
modifier.$set = modifier.$set || {}
|
|
82
|
+
if (!modifier.$unset) {
|
|
83
|
+
modifier.$unset = {};
|
|
84
|
+
}
|
|
88
85
|
|
|
89
86
|
if(_.has(modifier.$set, "name") && modifier.$set.name != doc.name){
|
|
90
87
|
checkName(modifier.$set.name);
|
|
91
88
|
}
|
|
92
89
|
|
|
93
90
|
if (!Steedos.isSpaceAdmin(doc.space, userId)) {
|
|
94
|
-
modifier.$set.
|
|
95
|
-
delete modifier.$set.shared_to;
|
|
91
|
+
modifier.$set.shared_to = "mine";
|
|
96
92
|
delete modifier.$set.shared_to_organizations;
|
|
93
|
+
modifier.$unset.shared_to_organizations = 1;
|
|
97
94
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
else if(modifier.$set.shared_to === "space"){
|
|
102
|
-
modifier.$set.shared = true;
|
|
103
|
-
}
|
|
104
|
-
if(modifier.$set.shared_to !== "organizations"){
|
|
95
|
+
delete modifier.$set.shared;
|
|
96
|
+
modifier.$unset.shared = 1;
|
|
97
|
+
if(modifier.$set.shared_to && modifier.$set.shared_to !== "organizations"){
|
|
105
98
|
delete modifier.$set.shared_to_organizations;
|
|
99
|
+
modifier.$unset.shared_to_organizations = 1;
|
|
106
100
|
}
|
|
107
101
|
if(modifier.$set.filters){
|
|
108
102
|
modifier.$set.filters = transformFilters(modifier.$set.filters);
|
|
@@ -38,12 +38,13 @@ fields:
|
|
|
38
38
|
shared:
|
|
39
39
|
label: Shared to All Users
|
|
40
40
|
type: boolean
|
|
41
|
-
visible_on: "{{
|
|
41
|
+
visible_on: "{{false}}"
|
|
42
42
|
group: share_rules
|
|
43
43
|
shared_to:
|
|
44
44
|
label: Who can see this list view?
|
|
45
45
|
type: select
|
|
46
46
|
defaultValue: mine
|
|
47
|
+
required: true
|
|
47
48
|
options:
|
|
48
49
|
- label: Only I can view this list view.
|
|
49
50
|
value: mine
|
|
@@ -53,9 +54,6 @@ fields:
|
|
|
53
54
|
value: organizations
|
|
54
55
|
visible_on: "${global.user.is_space_admin}"
|
|
55
56
|
group: share_rules
|
|
56
|
-
amis:
|
|
57
|
-
type: radios
|
|
58
|
-
inline: false
|
|
59
57
|
shared_to_organizations:
|
|
60
58
|
label: Shared to which organizations?
|
|
61
59
|
type: lookup
|
|
@@ -337,7 +335,7 @@ list_views:
|
|
|
337
335
|
columns:
|
|
338
336
|
- label
|
|
339
337
|
- name
|
|
340
|
-
-
|
|
338
|
+
- shared_to
|
|
341
339
|
- owner
|
|
342
340
|
- modified
|
|
343
341
|
- is_enable
|
|
@@ -348,7 +346,7 @@ list_views:
|
|
|
348
346
|
columns:
|
|
349
347
|
- label
|
|
350
348
|
- name
|
|
351
|
-
-
|
|
349
|
+
- shared_to
|
|
352
350
|
- owner
|
|
353
351
|
- modified
|
|
354
352
|
- is_system
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
var objectql = require('@steedos/objectql');
|
|
2
|
+
const { DEFAULT_FIELD } = require('@steedos/metadata-core');
|
|
2
3
|
const register = require('@steedos/metadata-registrar');
|
|
3
4
|
const clone = require('clone');
|
|
4
5
|
const defaultDatasourceName = 'default';
|
|
@@ -69,6 +70,11 @@ function getObjectFields(object) {
|
|
|
69
70
|
var fields = {};
|
|
70
71
|
var table_fields = {};
|
|
71
72
|
_.forEach(object_fields, function (f) {
|
|
73
|
+
_.each(DEFAULT_FIELD, (value, key) => {
|
|
74
|
+
if (!_.has(f, key)) {
|
|
75
|
+
f[key] = value;
|
|
76
|
+
}
|
|
77
|
+
});
|
|
72
78
|
var cf_arr, child_fields;
|
|
73
79
|
if (/^[a-zA-Z_]\w*(\.\$\.\w+){1}[a-zA-Z0-9]*$/.test(f.name)) {
|
|
74
80
|
cf_arr = f.name.split(".$.");
|
|
@@ -78,6 +78,7 @@ function initObjectPermission(userId, doc){
|
|
|
78
78
|
}
|
|
79
79
|
let psetsUserId = null;
|
|
80
80
|
let psetsUserLabel = null;
|
|
81
|
+
let psetsUserName = null;
|
|
81
82
|
let psetsUser = Creator.getCollection("permission_set").findOne({space: spaceId, name: 'user'});
|
|
82
83
|
if(!psetsUser){
|
|
83
84
|
psetsUserLabel = TAPi18n.__(`permission_set_user`, {}, lng)
|
|
@@ -88,14 +89,14 @@ function initObjectPermission(userId, doc){
|
|
|
88
89
|
}
|
|
89
90
|
|
|
90
91
|
Creator.getCollection("permission_objects").insert(Object.assign({}, Creator.getObject("base").permission_set.user, {
|
|
91
|
-
name: doc.
|
|
92
|
+
name: doc.name + '.' + "user",
|
|
92
93
|
permission_set_id : psetsUserId,
|
|
93
94
|
object_name : doc.name,
|
|
94
95
|
space: doc.space
|
|
95
96
|
}));
|
|
96
97
|
|
|
97
98
|
Creator.getCollection("permission_objects").insert(Object.assign({}, Creator.getObject("base").permission_set.admin, {
|
|
98
|
-
name: doc.
|
|
99
|
+
name: doc.name + '.' + "admin",
|
|
99
100
|
permission_set_id : psetsAdminId,
|
|
100
101
|
object_name : doc.name,
|
|
101
102
|
space: doc.space
|
|
@@ -336,7 +337,7 @@ let objectTriggers = {
|
|
|
336
337
|
space: doc.space,
|
|
337
338
|
owner: userId,
|
|
338
339
|
object_name: doc.name,
|
|
339
|
-
|
|
340
|
+
shared_to: "space",
|
|
340
341
|
filter_scope: "space",
|
|
341
342
|
columns: [{field: 'name'}],
|
|
342
343
|
"sort" : [
|
|
@@ -352,7 +353,7 @@ let objectTriggers = {
|
|
|
352
353
|
space: doc.space,
|
|
353
354
|
owner: userId,
|
|
354
355
|
object_name: doc.name,
|
|
355
|
-
|
|
356
|
+
shared_to: "space",
|
|
356
357
|
filter_scope: "space",
|
|
357
358
|
columns: [{field: 'name'}]
|
|
358
359
|
});
|
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"body": [
|
|
40
40
|
{
|
|
41
41
|
"type": "steedos-input-table",
|
|
42
|
+
"inlineEditMode": true,
|
|
42
43
|
"fields": [
|
|
43
44
|
{
|
|
44
45
|
"name": "group_name",
|
|
@@ -52,6 +53,22 @@
|
|
|
52
53
|
"type": "text",
|
|
53
54
|
"id": "u:8d7551abcd28",
|
|
54
55
|
"value": null
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
"name": "collapsed",
|
|
59
|
+
"label": "默认折叠",
|
|
60
|
+
"type": "boolean"
|
|
61
|
+
}
|
|
62
|
+
],
|
|
63
|
+
"columns": [
|
|
64
|
+
{
|
|
65
|
+
"name": "group_name",
|
|
66
|
+
"inlineEditMode": false
|
|
67
|
+
},
|
|
68
|
+
"visible_on",
|
|
69
|
+
{
|
|
70
|
+
"name": "collapsed",
|
|
71
|
+
"width": 50
|
|
55
72
|
}
|
|
56
73
|
],
|
|
57
74
|
"name": "groups",
|
|
@@ -110,8 +127,6 @@
|
|
|
110
127
|
"recordId": "",
|
|
111
128
|
"mode": "edit",
|
|
112
129
|
"defaultData": {
|
|
113
|
-
"name": "",
|
|
114
|
-
"shared": false,
|
|
115
130
|
"object": "${designObjectName}"
|
|
116
131
|
},
|
|
117
132
|
"fieldsExtend": {
|
|
@@ -210,8 +225,6 @@
|
|
|
210
225
|
"recordId": "${_id}",
|
|
211
226
|
"mode": "edit",
|
|
212
227
|
"defaultData": {
|
|
213
|
-
"name": "",
|
|
214
|
-
"shared": false,
|
|
215
228
|
"object": "${designObjectName}"
|
|
216
229
|
},
|
|
217
230
|
"fields": [
|
|
@@ -378,7 +391,7 @@
|
|
|
378
391
|
},
|
|
379
392
|
"messages": {},
|
|
380
393
|
"requestAdaptor": "",
|
|
381
|
-
"adaptor": "const field_groups = payload.data.objects[0] && _.map(payload.data.objects[0].field_groups, function (obj) {\
|
|
394
|
+
"adaptor": "const field_groups = payload.data.objects[0] && _.map(payload.data.objects[0].field_groups, function (obj) {\n return {\n \"id\": obj.group_name,\n \"group_name\": obj.group_name,\n \"visible_on\": obj.visible_on,\n \"default_folded\": obj.default_folded\n }\n});\nfield_groups.unshift({\n id: \"隐藏\",\n group_name: \"隐藏\",\n visible_on: \"\",\n is_hidden: true\n});\nfield_groups.unshift({\n id: \"未分组\",\n group_name: \"未分组\",\n visible_on: \"\",\n is_default: true\n});\n\n\n\nconst designObjectId = payload.data.objects[0] && payload.data.objects[0]._id;\nreturn payload = {\n data: {\n field_groups,\n designObjectId,\n designObjectLabel: payload.data.objects[0] && payload.data.objects[0].label,\n _master: {\n recordId: designObjectId\n }\n }\n}"
|
|
382
395
|
},
|
|
383
396
|
"messages": {},
|
|
384
397
|
"onEvent": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/standard-object-database",
|
|
3
|
-
"version": "2.6.7
|
|
3
|
+
"version": "2.6.7",
|
|
4
4
|
"main": "package.service.js",
|
|
5
5
|
"private": false,
|
|
6
6
|
"publishConfig": {
|
|
@@ -12,9 +12,10 @@
|
|
|
12
12
|
"description": "steedos package",
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"@steedos-widgets/amis-lib": "^1.0.22",
|
|
15
|
-
"@steedos/
|
|
15
|
+
"@steedos/metadata-core": "2.6.7",
|
|
16
|
+
"@steedos/standard-objects": "2.6.7"
|
|
16
17
|
},
|
|
17
18
|
"repository": {},
|
|
18
19
|
"license": "MIT",
|
|
19
|
-
"gitHead": "
|
|
20
|
+
"gitHead": "7852282dc4524d9669457debd787bcd6c8614a3d"
|
|
20
21
|
}
|
package/package.service.js
CHANGED
|
@@ -116,7 +116,7 @@ module.exports = {
|
|
|
116
116
|
}
|
|
117
117
|
if(data.is_system){
|
|
118
118
|
// 'label' 先禁止编辑label , 目前由于i18n的问题导致 label无效.
|
|
119
|
-
data = _.pick(data, ['defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior']);
|
|
119
|
+
data = _.pick(data, ['defaultValue', 'group', 'rows', 'sort_no', 'is_wide', 'index', 'sortable', 'searchable', 'filterable', 'visible_on', 'inlineHelpText', 'description', 'amis', 'required', 'unique', 'readonly', 'hidden', 'deleted_lookup_record_behavior', 'enable_thousands', 'autonumber_enable_modify']);
|
|
120
120
|
}
|
|
121
121
|
return object.update(id, data, userSession)
|
|
122
122
|
},
|