@steedos/service-pages 2.7.1-beta.8 → 2.7.1

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 (12) hide show
  1. package/main/default/objects/pages/fields/is_active.field.yml +2 -1
  2. package/main/default/objects/pages/fields/label.field.yml +1 -0
  3. package/main/default/objects/pages/fields/name.field.yml +2 -1
  4. package/main/default/objects/pages/fields/type.field.yml +2 -1
  5. package/main/default/objects/pages/listviews/all.listview.yml +0 -1
  6. package/main/default/objects/pages/listviews/customize.listview.yml +0 -1
  7. package/main/default/objects/pages/listviews/recent.listview.yml +0 -1
  8. package/main/default/objects/pages/listviews/system.listview.yml +0 -1
  9. package/main/default/triggers/page_assignments_metadata.trigger.js +7 -27
  10. package/main/default/triggers/page_versions_metadata.trigger.js +7 -27
  11. package/main/default/triggers/pages_metadata.trigger.js +5 -26
  12. package/package.json +3 -2
package/main/default/objects/pages/fields/is_active.field.yml CHANGED
@@ -3,4 +3,5 @@ label: 状态
3
3
  sort_no: 130
4
4
  type: toggle
5
5
  defaultValue: true
6
- visible_on: "{{'redash' != formData.render_engine ? true: false}}"
6
+ visible_on: "{{'redash' != formData.render_engine ? true: false}}"
7
+ filterable: true
package/main/default/objects/pages/fields/label.field.yml CHANGED
@@ -6,3 +6,4 @@ searchable: true
6
6
  sort_no: 120
7
7
  is_name: true
8
8
  type: text
9
+ filterable: true
package/main/default/objects/pages/fields/name.field.yml CHANGED
@@ -4,4 +4,5 @@ label: API Name
4
4
  required: true
5
5
  searchable: true
6
6
  sort_no: 100
7
- type: text
7
+ type: text
8
+ filterable: true
package/main/default/objects/pages/fields/type.field.yml CHANGED
@@ -13,4 +13,5 @@ options:
13
13
  - label: 表单
14
14
  value: form
15
15
  sort_no: 130
16
- visible_on: "{{'redash' != formData.render_engine ? true: false}}"
16
+ visible_on: "{{'redash' != formData.render_engine ? true: false}}"
17
+ filterable: true
package/main/default/objects/pages/listviews/all.listview.yml CHANGED
@@ -2,7 +2,6 @@ name: all
2
2
  columns:
3
3
  - field: label
4
4
  - field: name
5
- - field: render_engine
6
5
  - field: type
7
6
  - field: object_name
8
7
  - field: is_active
package/main/default/objects/pages/listviews/customize.listview.yml CHANGED
@@ -2,7 +2,6 @@ name: customize
2
2
  columns:
3
3
  - field: label
4
4
  - field: name
5
- - field: render_engine
6
5
  - field: type
7
6
  - field: object_name
8
7
  - field: is_active
package/main/default/objects/pages/listviews/recent.listview.yml CHANGED
@@ -2,7 +2,6 @@ name: recent
2
2
  columns:
3
3
  - field: label
4
4
  - field: name
5
- - field: render_engine
6
5
  - field: type
7
6
  - field: is_active
8
7
  - field: version
package/main/default/objects/pages/listviews/system.listview.yml CHANGED
@@ -2,7 +2,6 @@ name: system
2
2
  columns:
3
3
  - field: label
4
4
  - field: name
5
- - field: render_engine
6
5
  - field: type
7
6
  - field: object_name
8
7
  - field: is_active
package/main/default/triggers/page_assignments_metadata.trigger.js CHANGED
@@ -1,14 +1,15 @@
1
1
  /*
2
2
  * @Author: sunhaolin@hotoa.com
3
3
  * @Date: 2022-04-10 14:34:08
4
- * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2023-05-30 16:14:11
4
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
5
+ * @LastEditTime: 2024-05-11 13:52:15
6
6
  * @Description:
7
7
  */
8
8
  const objectql = require('@steedos/objectql');
9
9
  const register = require('@steedos/metadata-registrar');
10
10
  const auth = require('@steedos/auth');
11
11
  const _ = require('underscore');
12
+ const clone = require('clone');
12
13
  async function getAll() {
13
14
  const schema = objectql.getSteedosSchema();
14
15
  const configs = await register.registerPage.getAll(schema.broker)
@@ -44,22 +45,19 @@ module.exports = {
44
45
  delete this.query.fields;
45
46
  },
46
47
 
47
- beforeAggregate: async function () {
48
- delete this.query.fields;
49
- },
50
-
51
48
  afterFind: async function () {
52
49
  const { spaceId } = this;
53
50
  let dataList = await getAll();
54
51
  if (dataList) {
52
+ const cloneValues = clone(this.data.values, false);
55
53
  dataList.forEach((doc) => {
56
54
  if (!_.find(this.data.values, (value) => {
57
55
  return value._id === doc._id
58
56
  })) {
59
- this.data.values.push(doc);
57
+ cloneValues.push(doc);
60
58
  }
61
59
  })
62
- const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
60
+ const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
63
61
  if (records.length > 0) {
64
62
  this.data.values = records;
65
63
  } else {
@@ -68,25 +66,7 @@ module.exports = {
68
66
  }
69
67
 
70
68
  },
71
- afterAggregate: async function () {
72
- const { spaceId } = this;
73
- let dataList = await getAll();
74
- if (dataList) {
75
- dataList.forEach((doc) => {
76
- if (!_.find(this.data.values, (value) => {
77
- return value._id === doc._id
78
- })) {
79
- this.data.values.push(doc);
80
- }
81
- })
82
- const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
83
- if (records.length > 0) {
84
- this.data.values = records;
85
- } else {
86
- this.data.values.length = 0;
87
- }
88
- }
89
- },
69
+
90
70
  afterCount: async function () {
91
71
  delete this.query.fields;
92
72
  let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
package/main/default/triggers/page_versions_metadata.trigger.js CHANGED
@@ -1,14 +1,15 @@
1
1
  /*
2
2
  * @Author: sunhaolin@hotoa.com
3
3
  * @Date: 2022-04-10 14:27:24
4
- * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2023-05-30 16:20:54
4
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
5
+ * @LastEditTime: 2024-05-11 13:53:30
6
6
  * @Description:
7
7
  */
8
8
  const objectql = require('@steedos/objectql');
9
9
  const auth = require('@steedos/auth');
10
10
  const _ = require('underscore');
11
11
  const register = require('@steedos/metadata-registrar');
12
+ const clone = require('clone');
12
13
  async function getAll(){
13
14
  const schema = objectql.getSteedosSchema();
14
15
  const configs = await register.registerPage.getAll(schema.broker)
@@ -39,22 +40,19 @@ module.exports = {
39
40
  delete this.query.fields;
40
41
  },
41
42
 
42
- beforeAggregate: async function () {
43
- delete this.query.fields;
44
- },
45
-
46
43
  afterFind: async function(){
47
44
  const { spaceId } = this;
48
45
  let dataList = await getAll();
49
46
  if (dataList) {
47
+ const cloneValues = clone(this.data.values, false);
50
48
  dataList.forEach((doc) => {
51
49
  if (!_.find(this.data.values, (value) => {
52
50
  return value._id === doc._id
53
51
  })) {
54
- this.data.values.push(doc);
52
+ cloneValues.push(doc);
55
53
  }
56
54
  })
57
- const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
55
+ const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
58
56
  if (records.length > 0) {
59
57
  this.data.values = records;
60
58
  } else {
@@ -63,25 +61,7 @@ module.exports = {
63
61
  }
64
62
 
65
63
  },
66
- afterAggregate: async function(){
67
- const { spaceId } = this;
68
- let dataList = await getAll();
69
- if (dataList) {
70
- dataList.forEach((doc) => {
71
- if (!_.find(this.data.values, (value) => {
72
- return value._id === doc._id
73
- })) {
74
- this.data.values.push(doc);
75
- }
76
- })
77
- const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
78
- if (records.length > 0) {
79
- this.data.values = records;
80
- } else {
81
- this.data.values.length = 0;
82
- }
83
- }
84
- },
64
+
85
65
  afterCount: async function(){
86
66
  delete this.query.fields;
87
67
  let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
package/main/default/triggers/pages_metadata.trigger.js CHANGED
@@ -2,13 +2,14 @@
2
2
  * @Author: baozhoutao@hotoa.com
3
3
  * @Date: 2022-03-28 17:09:20
4
4
  * @LastEditors: 孙浩林 sunhaolin@steedos.com
5
- * @LastEditTime: 2024-01-29 13:20:30
5
+ * @LastEditTime: 2024-05-11 13:53:52
6
6
  * @Description:
7
7
  */
8
8
  const objectql = require('@steedos/objectql');
9
9
  const register = require('@steedos/metadata-registrar');
10
10
  const auth = require('@steedos/auth');
11
11
  const _ = require('underscore');
12
+ const clone = require('clone');
12
13
  async function getAll(){
13
14
  const schema = objectql.getSteedosSchema();
14
15
  const configs = await register.registerPage.getAll(schema.broker)
@@ -42,22 +43,19 @@ module.exports = {
42
43
  delete this.query.fields;
43
44
  },
44
45
 
45
- beforeAggregate: async function () {
46
- delete this.query.fields;
47
- },
48
-
49
46
  afterFind: async function(){
50
47
  const { spaceId } = this;
51
48
  let dataList = await getAll();
52
49
  if (!_.isEmpty(dataList)) {
50
+ const cloneValues = clone(this.data.values, false);
53
51
  dataList.forEach((doc) => {
54
52
  if (!_.find(this.data.values, (value) => {
55
53
  return value.name === doc.name
56
54
  })) {
57
- this.data.values.push(doc);
55
+ cloneValues.push(doc);
58
56
  }
59
57
  })
60
- const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
58
+ const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
61
59
  if (records.length > 0) {
62
60
  this.data.values = records;
63
61
  } else {
@@ -66,25 +64,6 @@ module.exports = {
66
64
  }
67
65
 
68
66
  },
69
- afterAggregate: async function(){
70
- const { spaceId } = this;
71
- let dataList = await getAll();
72
- if (!_.isEmpty(dataList)) {
73
- dataList.forEach((doc) => {
74
- if (!_.find(this.data.values, (value) => {
75
- return value.name === doc.name
76
- })) {
77
- this.data.values.push(doc);
78
- }
79
- })
80
- const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
81
- if (records.length > 0) {
82
- this.data.values = records;
83
- } else {
84
- this.data.values.length = 0;
85
- }
86
- }
87
- },
88
67
  afterCount: async function(){
89
68
  delete this.query.fields;
90
69
  let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-pages",
3
- "version": "2.7.1-beta.8",
3
+ "version": "2.7.1",
4
4
  "main": "package.service.js",
5
5
  "scripts": {},
6
6
  "license": "MIT",
@@ -8,8 +8,9 @@
8
8
  "publishConfig": {
9
9
  "access": "public"
10
10
  },
11
- "gitHead": "6c6d45b547b6f1f511f1d3f8a4bd5b06caf0b113",
11
+ "gitHead": "5485c0bd811776f2ffde988c0a9394d778a2dc90",
12
12
  "dependencies": {
13
+ "clone": "^2.1.2",
13
14
  "ejs": "^3.1.8"
14
15
  }
15
16
  }