@steedos/standard-object-database 2.6.8-beta.6 → 2.6.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.
Files changed (8) hide show
  1. package/main/default/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml +3 -3
  2. package/main/default/objectTranslations/object_fields.zh-CN/object_fields.zh-CN.objectTranslation.yml +3 -3
  3. package/main/default/objects/14.object_fields.observe.object.js +50 -50
  4. package/main/default/objects/15.permission_objects.observe.object.js +51 -51
  5. package/main/default/objects/object_fields.object.yml +4 -3
  6. package/main/default/pages/object_fields_form.page.amis.json +93 -4
  7. package/main/default/triggers/object_fields.trigger.js +8 -8
  8. package/package.json +4 -4
package/main/default/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml CHANGED
@@ -313,11 +313,11 @@ fields:
313
313
  description:
314
314
  readonly:
315
315
  label: Readonly
316
- help:
316
+ help: It is read-only and does not appear on the form when you create or edit records.
317
317
  description:
318
318
  static:
319
- label: Static
320
- help: Static mode, displayed as read-only, but the field value can be set by default, autofill, or custom scripts.
319
+ label: Readonly and displayed while editing
320
+ help: Displays as read-only, but the field value can be set by default, autofill, or custom scripts when creating and editing records.
321
321
  description:
322
322
  hidden:
323
323
  label: Hidden
package/main/default/objectTranslations/object_fields.zh-CN/object_fields.zh-CN.objectTranslation.yml CHANGED
@@ -297,11 +297,11 @@ fields:
297
297
  description:
298
298
  readonly:
299
299
  label: 只读
300
- help:
300
+ help: 只读，且新建和编辑记录时不显示在表单上
301
301
  description:
302
302
  static:
303
- label: 静态模式
304
- help: 显示为只读，但是可以通过默认值，自动填充或自定义脚本设置该字段值
303
+ label: 只读且编辑时显示
304
+ help: 显示为只读，但是在新建和编辑记录时可以通过默认值，自动填充或自定义脚本设置该字段值
305
305
  description:
306
306
  hidden:
307
307
  label: 隐藏
package/main/default/objects/14.object_fields.observe.object.js CHANGED
@@ -1,55 +1,55 @@
1
1
  /*
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2022-08-05 14:17:44
4
- * @LastEditors: sunhaolin@hotoa.com
5
- * @LastEditTime: 2023-05-12 09:33:27
4
+ * @LastEditors: baozhoutao@steedos.com
5
+ * @LastEditTime: 2024-02-27 15:41:42
6
6
  * @Description:
7
7
  */
8
- const objectql = require("@steedos/objectql");
9
- const objectName = "object_fields";
10
- Meteor.startup(function () {
11
- var _change, _remove, inited = false;
12
- _change = function (document) {
13
- // 重置字段权限延迟10秒,防止对象服务未上线
14
- setTimeout(()=>{
15
- try {
16
- // console.log("====resetAllPermissionSetFieldPermissions====")
17
- objectql.getSteedosSchema().broker.call(`permission_fields.resetAllPermissionSetFieldPermissions`, {
18
- objectName: document.object
19
- }, {
20
- meta: {
21
- user: {
22
- userId: document.owner,
23
- spaceId: document.space,
24
- company_id: document.company_id,
25
- company_ids: document.company_ids,
26
- }
27
- }
28
- });
29
- } catch (error) {
30
- console.error(`resetAllPermissionSetFieldPermissions`, error)
31
- }
32
- }, 1000 * 10)
33
- };
34
- Creator.getCollection(objectName).find({}, {
35
- fields: {
36
- created: 0,
37
- created_by: 0,
38
- modified: 0,
39
- modified_by: 0
40
- }
41
- }).observe({
42
- added: function (newDocument) {
43
- if (inited) {
44
- return _change(newDocument);
45
- }
46
- },
47
- changed: function (newDocument, oldDocument) {
48
- return _change(newDocument);
49
- },
50
- removed: function (oldDocument) {
51
- return _change(oldDocument);
52
- }
53
- });
54
- inited = true;
55
- });
8
+ // const objectql = require("@steedos/objectql");
9
+ // const objectName = "object_fields";
10
+ // Meteor.startup(function () {
11
+ // var _change, _remove, inited = false;
12
+ // _change = function (document) {
13
+ // // 重置字段权限延迟10秒,防止对象服务未上线
14
+ // setTimeout(()=>{
15
+ // try {
16
+ // // console.log("====resetAllPermissionSetFieldPermissions====")
17
+ // objectql.getSteedosSchema().broker.call(`permission_fields.resetAllPermissionSetFieldPermissions`, {
18
+ // objectName: document.object
19
+ // }, {
20
+ // meta: {
21
+ // user: {
22
+ // userId: document.owner,
23
+ // spaceId: document.space,
24
+ // company_id: document.company_id,
25
+ // company_ids: document.company_ids,
26
+ // }
27
+ // }
28
+ // });
29
+ // } catch (error) {
30
+ // console.error(`resetAllPermissionSetFieldPermissions`, error)
31
+ // }
32
+ // }, 1000 * 10)
33
+ // };
34
+ // Creator.getCollection(objectName).find({}, {
35
+ // fields: {
36
+ // created: 0,
37
+ // created_by: 0,
38
+ // modified: 0,
39
+ // modified_by: 0
40
+ // }
41
+ // }).observe({
42
+ // added: function (newDocument) {
43
+ // if (inited) {
44
+ // return _change(newDocument);
45
+ // }
46
+ // },
47
+ // changed: function (newDocument, oldDocument) {
48
+ // return _change(newDocument);
49
+ // },
50
+ // removed: function (oldDocument) {
51
+ // return _change(oldDocument);
52
+ // }
53
+ // });
54
+ // inited = true;
55
+ // });
package/main/default/objects/15.permission_objects.observe.object.js CHANGED
@@ -1,56 +1,56 @@
1
1
  /*
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2022-08-05 14:17:44
4
- * @LastEditors: sunhaolin@hotoa.com
5
- * @LastEditTime: 2023-05-13 17:09:31
4
+ * @LastEditors: baozhoutao@steedos.com
5
+ * @LastEditTime: 2024-02-27 15:48:50
6
6
  * @Description:
7
7
  */
8
- const objectql = require("@steedos/objectql");
9
- const objectName = "permission_objects";
10
- Meteor.startup(function () {
11
- var _change, _remove, inited = false;
12
- _change = function (document) {
13
- setTimeout(()=>{
14
- try {
15
- objectql.getSteedosSchema().broker.call(`permission_fields.resetFieldPermissions`, {
16
- permissionObjectId: document._id
17
- }, {
18
- meta: {
19
- user: {
20
- userId: document.owner,
21
- spaceId: document.space,
22
- company_id: document.company_id,
23
- company_ids: document.company_ids,
24
- }
25
- }
26
- });
27
- } catch (error) {
28
- console.error(`resetFieldPermissions`, error)
29
- }
30
- }, 1000 * 10)
31
- };
32
- Creator.getCollection(objectName).find({}, {
33
- fields: {
34
- created: 0,
35
- created_by: 0,
36
- modified: 0,
37
- modified_by: 0
38
- }
39
- }).observe({
40
- added: function (newDocument) {
41
- if (newDocument.copy_from) { // 通过复制简档创建的对象权限，不需要重置字段权限
42
- return;
43
- }
44
- if (inited) {
45
- return _change(newDocument);
46
- }
47
- },
48
- changed: function (newDocument, oldDocument) {
49
- return _change(newDocument);
50
- },
51
- // removed: function (oldDocument) {
52
- // return _change(oldDocument);
53
- // }
54
- });
55
- inited = true;
56
- });
8
+ // const objectql = require("@steedos/objectql");
9
+ // const objectName = "permission_objects";
10
+ // Meteor.startup(function () {
11
+ // var _change, _remove, inited = false;
12
+ // _change = function (document) {
13
+ // setTimeout(()=>{
14
+ // try {
15
+ // objectql.getSteedosSchema().broker.call(`permission_fields.resetFieldPermissions`, {
16
+ // permissionObjectId: document._id
17
+ // }, {
18
+ // meta: {
19
+ // user: {
20
+ // userId: document.owner,
21
+ // spaceId: document.space,
22
+ // company_id: document.company_id,
23
+ // company_ids: document.company_ids,
24
+ // }
25
+ // }
26
+ // });
27
+ // } catch (error) {
28
+ // console.error(`resetFieldPermissions`, error)
29
+ // }
30
+ // }, 1000 * 10)
31
+ // };
32
+ // Creator.getCollection(objectName).find({}, {
33
+ // fields: {
34
+ // created: 0,
35
+ // created_by: 0,
36
+ // modified: 0,
37
+ // modified_by: 0
38
+ // }
39
+ // }).observe({
40
+ // added: function (newDocument) {
41
+ // if (newDocument.copy_from) { // 通过复制简档创建的对象权限，不需要重置字段权限
42
+ // return;
43
+ // }
44
+ // if (inited) {
45
+ // return _change(newDocument);
46
+ // }
47
+ // },
48
+ // changed: function (newDocument, oldDocument) {
49
+ // return _change(newDocument);
50
+ // },
51
+ // // removed: function (oldDocument) {
52
+ // // return _change(oldDocument);
53
+ // // }
54
+ // });
55
+ // inited = true;
56
+ // });
package/main/default/objects/object_fields.object.yml CHANGED
@@ -820,12 +820,13 @@ fields:
820
820
  readonly:
821
821
  type: boolean
822
822
  label: Readonly
823
+ inlineHelpText: It is read-only and does not appear on the form when you create or edit records.
823
824
  group: ui
824
825
  static:
825
826
  type: boolean
826
- label: Static
827
- group: Advanced
828
- inlineHelpText: Static mode, displayed as read-only, but the field value can be set by default, autofill, or custom scripts.
827
+ label: Readonly and displayed while editing
828
+ group: ui
829
+ inlineHelpText: Displays as read-only, but the field value can be set by default, autofill, or custom scripts when creating and editing records.
829
830
  hidden:
830
831
  type: boolean
831
832
  label: Hidden
package/main/default/pages/object_fields_form.page.amis.json CHANGED
@@ -35,12 +35,101 @@
35
35
  {
36
36
  "actionType": "toast",
37
37
  "args": {
38
- "msgType": "success",
39
- "msg": "操作成功, 请刷新浏览器后查看效果",
40
- "position": "top-right"
38
+ "msgType": "success",
39
+ "msg": "操作成功, 请刷新浏览器后查看效果",
40
+ "position": "top-right"
41
41
  }
42
42
  }
43
- ]
43
+ ],
44
+ "fieldsExtend": {
45
+ "readonly": {
46
+ "amis": {
47
+ "onEvent": {
48
+ "change": {
49
+ "actions": [
50
+ {
51
+ "actionType": "setValue",
52
+ "componentId": "steedos_object_fields_form",
53
+ "args": {
54
+ "value": {
55
+ "static": false
56
+ }
57
+ },
58
+ "expression": "!!readonly"
59
+ }
60
+ ]
61
+ }
62
+ },
63
+ "id": "u:a32a4c461450"
64
+ }
65
+ },
66
+ "static": {
67
+ "amis": {
68
+ "onEvent": {
69
+ "change": {
70
+ "actions": [
71
+ {
72
+ "actionType": "setValue",
73
+ "componentId": "steedos_object_fields_form",
74
+ "args": {
75
+ "value": {
76
+ "readonly": false
77
+ }
78
+ },
79
+ "expression": "!!static"
80
+ }
81
+ ]
82
+ }
83
+ },
84
+ "id": "u:7affdbb0ef6d"
85
+ }
86
+ },
87
+ "required": {
88
+ "amis": {
89
+ "onEvent": {
90
+ "change": {
91
+ "actions": [
92
+ {
93
+ "actionType": "setValue",
94
+ "args": {
95
+ "value": {
96
+ "hidden": false
97
+ }
98
+ },
99
+ "componentId": "steedos_object_fields_form",
100
+ "expression": "${event.data.value}"
101
+ }
102
+ ]
103
+ }
104
+ },
105
+ "id": "u:adf4200a2170"
106
+ }
107
+ },
108
+ "hidden": {
109
+ "amis": {
110
+ "onEvent": {
111
+ "change": {
112
+ "actions": [
113
+ {
114
+ "actionType": "setValue",
115
+ "args": {
116
+ "value": {
117
+ "required": false
118
+ }
119
+ },
120
+ "componentId": "steedos_object_fields_form",
121
+ "expression": "${event.data.value}"
122
+ }
123
+ ]
124
+ }
125
+ },
126
+ "id": "u:adf4200a2170"
127
+ }
128
+ }
129
+ },
130
+ "form": {
131
+ "id": "steedos_object_fields_form"
132
+ }
44
133
  }
45
134
  ],
46
135
  "data": {
package/main/default/triggers/object_fields.trigger.js CHANGED
@@ -125,14 +125,14 @@ async function checkMasterDetailTypeField(doc, oldReferenceTo) {
125
125
 
126
126
  const mastersCount = currentMasters.length;
127
127
  const detailsCount = currentDetails.length;
128
- if (mastersCount > 1) {
129
- throw new Meteor.Error(doc.name, "您无法创建此类型的字段，因为此对象已有两种主表子表关系。");
130
- }
131
- else if (mastersCount > 0) {
132
- if (detailsCount > 0) {
133
- throw new Meteor.Error(doc.name, "由于此对象上已经存在主表子表关系，同时是另一个主表子表关系的主对象，无法创建此类字段。");
134
- }
135
- }
128
+ if (mastersCount > 5) {
129
+ throw new Meteor.Error(doc.name, "您无法创建此类型的字段，因为此对象已有5种主表子表关系。");
130
+ }
131
+ // else if (mastersCount > 0) { // 当前对象已经有1个主子表字段
132
+ // if (detailsCount > 0) { // 当前对象已经作为了其他对象的主子表字段的关联对象
133
+ // throw new Meteor.Error(doc.name, "由于此对象上已经存在主表子表关系，同时是另一个主表子表关系的主对象，无法创建此类字段。");
134
+ // }
135
+ // }
136
136
 
137
137
  const detailPaths = await obj.getDetailPaths();
138
138
  const masterPaths = await refObj.getMasterPaths();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/standard-object-database",
3
- "version": "2.6.8-beta.6",
3
+ "version": "2.6.8-beta.8",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -12,10 +12,10 @@
12
12
  "description": "steedos package",
13
13
  "dependencies": {
14
14
  "@steedos-widgets/amis-lib": "^1.0.22",
15
- "@steedos/metadata-core": "2.6.8-beta.6",
16
- "@steedos/standard-objects": "2.6.8-beta.6"
15
+ "@steedos/metadata-core": "2.6.8-beta.8",
16
+ "@steedos/standard-objects": "2.6.8-beta.8"
17
17
  },
18
18
  "repository": {},
19
19
  "license": "MIT",
20
- "gitHead": "dc91074a4f6662d1a2f49e03d6b5efd45e8cb9bf"
20
+ "gitHead": "9bd8e831f7078537495f2d48e24185803ac42373"
21
21
  }