@steedos/service-core-objects 3.0.0-beta.136 → 3.0.0-beta.138

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 (10) hide show
  1. package/README.md +3 -3
  2. package/main/default/objectTranslations/reports.en/reports.en.objectTranslation.yml +7 -1
  3. package/main/default/objectTranslations/reports.zh-CN/reports.zh-CN.objectTranslation.yml +7 -1
  4. package/main/default/objects/license.object.yml +13 -33
  5. package/main/default/objects/notifications/fields/related_to.field.yml +12 -4
  6. package/main/default/objects/reports.object.yml +142 -182
  7. package/main/default/objects/roles.object.yml +1 -0
  8. package/main/default/objects/space_users/buttons/setPassword.button.js +12 -12
  9. package/main/default/routes/object_fields_design.ejs +2 -1
  10. package/package.json +3 -3
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @steedos/standard-space
2
2
 
3
- ### 服务名称 `~packages-@steedos/standard-space`
3
+ ### 服务名称 `@steedos/standard-space`
4
4
 
5
5
  ## actions
6
6
 
@@ -16,7 +16,7 @@
16
16
 
17
17
  示例
18
18
  ```
19
- this.broker.call('~packages-@steedos/standard-space.upsetOrganizations', {
19
+ this.broker.call('@steedos/standard-space.upsetOrganizations', {
20
20
  organizations: [{
21
21
  qywx_id: "1",
22
22
  name: "组织1"
@@ -46,7 +46,7 @@ this.broker.call('~packages-@steedos/standard-space.upsetOrganizations', {
46
46
 
47
47
  示例
48
48
  ```
49
- this.broker.call('~packages-@steedos/standard-space.upsetSpaceUsers', {
49
+ this.broker.call('@steedos/standard-space.upsetSpaceUsers', {
50
50
  spaceUsers: [{
51
51
  name: "user1",
52
52
  organizations: ['1']
package/main/default/objectTranslations/reports.en/reports.en.objectTranslation.yml CHANGED
@@ -9,7 +9,13 @@ fields:
9
9
  report_type:
10
10
  label: Report Type
11
11
  help:
12
- options: []
12
+ options:
13
+ - label: Tabular
14
+ value: tabular
15
+ - label: Summary
16
+ value: summary
17
+ - label: Matrix
18
+ value: matrix
13
19
  description:
14
20
  data_source:
15
21
  label: Data Source
package/main/default/objectTranslations/reports.zh-CN/reports.zh-CN.objectTranslation.yml CHANGED
@@ -9,7 +9,13 @@ fields:
9
9
  report_type:
10
10
  label: 报表类型
11
11
  help:
12
- options: []
12
+ options:
13
+ - label: 表格
14
+ value: tabular
15
+ - label: 摘要
16
+ value: summary
17
+ - label: 矩阵
18
+ value: matrix
13
19
  description:
14
20
  data_source:
15
21
  label: 报表数据来源
package/main/default/objects/license.object.yml CHANGED
@@ -4,16 +4,6 @@ icon: webcart
4
4
  hidden: true
5
5
  enable_audit: false
6
6
  fields:
7
- edition:
8
- type: text
9
- label: Edition
10
- hidden: true
11
- edition_label:
12
- type: text
13
- label: Edition
14
- is_name: true
15
- filterable: true
16
- searchable: true
17
7
  license:
18
8
  type: textarea
19
9
  rows: 8
@@ -26,13 +16,22 @@ fields:
26
16
  hidden: true
27
17
  product:
28
18
  type: text
29
- label: Product
30
- hidden: true
19
+ label: Product ID
31
20
  product_label:
32
21
  type: text
33
22
  label: Product
34
23
  filterable: true
35
24
  searchable: true
25
+ edition:
26
+ type: text
27
+ label: Edition
28
+ hidden: true
29
+ edition_label:
30
+ type: text
31
+ label: Edition
32
+ is_name: true
33
+ filterable: true
34
+ searchable: true
36
35
  is_trial:
37
36
  type: boolean
38
37
  label: Trial
@@ -75,34 +74,15 @@ fields:
75
74
  is_local:
76
75
  type: boolean
77
76
  hidden: true
78
- actions:
79
- apply:
80
- label: Apply
81
- on: list
82
- visible: false
83
- changeSpaceLicense:
84
- label: 更新许可证
85
- on: list
86
- visible: true
87
- copySpaceId:
88
- label: Copy space id
89
- on: list
90
- visible: false
91
- upgrade:
92
- label: Upgrade
93
- on: list
94
- visible: true
95
77
  list_views:
96
78
  all:
97
- label: Al
79
+ label: All
98
80
  columns:
99
- - edition_label
100
81
  - product_label
82
+ - product
101
83
  - user_number
102
84
  - verify_status
103
85
  - end_date
104
- filters:
105
- - [['lid', '<>', 'None'], ['invalid','!=',true]]
106
86
  permission_set:
107
87
  user:
108
88
  allowCreate: false
package/main/default/objects/notifications/fields/related_to.field.yml CHANGED
@@ -6,11 +6,19 @@ reference_to: !<tag:yaml.org,2002:js/function> |-
6
6
  function anonymous(
7
7
  ) {
8
8
 
9
- var o = [];
10
- _.each(Creator.Objects, function (object, object_name) {
11
- return o.push(object.name);
9
+ try{
10
+ let objects = [];
11
+ var queryResult = Steedos.authRequest(`/graphql`, {
12
+ type: 'POST', async: false,
13
+ data: JSON.stringify({
14
+ query: `{ objects{ name } }`
15
+ })
12
16
  });
13
- return o;
17
+ objects = queryResult && queryResult.data && queryResult.data.objects;
18
+ return _.map(objects, 'name') ;
19
+ }catch(e){
20
+ return []
21
+ }
14
22
 
15
23
  }
16
24
  filterable: true
package/main/default/objects/reports.object.yml CHANGED
@@ -16,50 +16,26 @@ fields:
16
16
  label: Report Type
17
17
  type: select
18
18
  defaultValue: tabular
19
- options: !<tag:yaml.org,2002:js/function> |-
20
- function () {
21
- var types = [
22
- {
23
- "label": t("reports_field_report_type_options_tabular"),
24
- "value": "tabular"
25
- },
26
- {
27
- "label": t("reports_field_report_type_options_summary"),
28
- "value": "summary"
29
- },
30
- {
31
- "label": t("reports_field_report_type_options_matrix"),
32
- "value": "matrix"
33
- }
34
- ];
35
- var plugins = Creator.Plugins;
36
- if(plugins["@steedos/plugin-jsreport"]){
37
- types.push({
38
- "label": "JsReport",
39
- "value": "jsreport"
40
- });
41
- }
42
- if(plugins["@steedos/plugin-stimulsoft-report"]){
43
- types.push({
44
- "label": "StimulsoftReport",
45
- "value": "stimulsoft-report"
46
- });
47
- }
48
- return types;
49
- }
19
+ options:
20
+ - label: Tabular
21
+ value: tabular
22
+ - label: Summary
23
+ value: summary
24
+ - label: Matrix
25
+ value: matrix
50
26
  name: report_type
51
27
  filterable: true
52
- data_source:
53
- label: Data Source
54
- type: select
55
- defaultValue: odata
56
- options:
57
- - label: OData
58
- value: odata
59
- - label: Graphql
60
- value: graphql
61
- name: data_source
62
- filterable: true
28
+ # data_source:
29
+ # label: Data Source
30
+ # type: select
31
+ # defaultValue: odata
32
+ # options:
33
+ # - label: OData
34
+ # value: odata
35
+ # - label: Graphql
36
+ # value: graphql
37
+ # name: data_source
38
+ # filterable: true
63
39
  object_name:
64
40
  label: Object
65
41
  type: lookup
@@ -68,52 +44,52 @@ fields:
68
44
  required: true
69
45
  name: object_name
70
46
  filterable: true
71
- filter_scope:
72
- label: Filter Scope
73
- type: select
74
- defaultValue: '"space"'
75
- hidden: true
76
- options:
77
- - label: All
78
- value: space
79
- - label: Mine
80
- value: mine
81
- name: filter_scope
82
- filterable: true
83
- filters:
84
- label: Filters
85
- type: '[Object]'
86
- omit: true
87
- name: filters
88
- filters.$:
89
- label: Filter
90
- blackbox: true
91
- omit: true
92
- hidden: true
93
- name: filters.$
94
- filters.$.field:
95
- label: Field
96
- type: text
97
- name: filters.$.field
98
- filters.$.operation:
99
- label: Operator
100
- type: select
101
- defaultValue: =
102
- options: !<tag:yaml.org,2002:js/function> |-
103
- function () {
104
- return Creator.getFieldOperation();
105
- }
106
- name: filters.$.operation
107
- filterable: true
108
- filters.$.value:
109
- label: Value
110
- blackbox: true
111
- name: filters.$.value
112
- filter_logic:
113
- label: Filter Logic
114
- type: text
115
- omit: true
116
- name: filter_logic
47
+ # filter_scope:
48
+ # label: Filter Scope
49
+ # type: select
50
+ # defaultValue: '"space"'
51
+ # hidden: true
52
+ # options:
53
+ # - label: All
54
+ # value: space
55
+ # - label: Mine
56
+ # value: mine
57
+ # name: filter_scope
58
+ # filterable: true
59
+ # filters:
60
+ # label: Filters
61
+ # type: '[Object]'
62
+ # omit: true
63
+ # name: filters
64
+ # filters.$:
65
+ # label: Filter
66
+ # blackbox: true
67
+ # omit: true
68
+ # hidden: true
69
+ # name: filters.$
70
+ # filters.$.field:
71
+ # label: Field
72
+ # type: text
73
+ # name: filters.$.field
74
+ # filters.$.operation:
75
+ # label: Operator
76
+ # type: select
77
+ # defaultValue: =
78
+ # options: !<tag:yaml.org,2002:js/function> |-
79
+ # function () {
80
+ # return Creator.getFieldOperation();
81
+ # }
82
+ # name: filters.$.operation
83
+ # filterable: true
84
+ # filters.$.value:
85
+ # label: Value
86
+ # blackbox: true
87
+ # name: filters.$.value
88
+ # filter_logic:
89
+ # label: Filter Logic
90
+ # type: text
91
+ # omit: true
92
+ # name: filter_logic
117
93
  fields:
118
94
  label: Fields
119
95
  type: lookup
@@ -122,10 +98,14 @@ fields:
122
98
  depend_on:
123
99
  - object_name
124
100
  defaultIcon: service_contract
125
- optionsFunction: !<tag:yaml.org,2002:js/function> |-
126
- function (values) {
127
- return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
128
- }
101
+ reference_to: object_fields
102
+ reference_to_field: name
103
+ enable_enhanced_lookup: false
104
+ filtersFunction: !<tag:yaml.org,2002:js/function> |-
105
+ function anonymous(filters,values
106
+ ) {
107
+ return ['object', '=', values.object_name]
108
+ }
129
109
  name: fields
130
110
  filterable: true
131
111
  rows:
@@ -136,10 +116,14 @@ fields:
136
116
  depend_on:
137
117
  - object_name
138
118
  defaultIcon: service_contract
139
- optionsFunction: !<tag:yaml.org,2002:js/function> |-
140
- function (values) {
141
- return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
142
- }
119
+ reference_to: object_fields
120
+ reference_to_field: name
121
+ enable_enhanced_lookup: false
122
+ filtersFunction: !<tag:yaml.org,2002:js/function> |-
123
+ function anonymous(filters,values
124
+ ) {
125
+ return ['object', '=', values.object_name]
126
+ }
143
127
  name: rows
144
128
  filterable: true
145
129
  columns:
@@ -150,10 +134,14 @@ fields:
150
134
  depend_on:
151
135
  - object_name
152
136
  defaultIcon: service_contract
153
- optionsFunction: !<tag:yaml.org,2002:js/function> |-
154
- function (values) {
155
- return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
156
- }
137
+ reference_to: object_fields
138
+ reference_to_field: name
139
+ enable_enhanced_lookup: false
140
+ filtersFunction: !<tag:yaml.org,2002:js/function> |-
141
+ function anonymous(filters,values
142
+ ) {
143
+ return ['object', '=', values.object_name]
144
+ }
157
145
  name: columns
158
146
  filterable: true
159
147
  values:
@@ -164,37 +152,41 @@ fields:
164
152
  depend_on:
165
153
  - object_name
166
154
  defaultIcon: service_contract
167
- optionsFunction: !<tag:yaml.org,2002:js/function> |-
168
- function (values) {
169
- return Creator.getObjectLookupFieldOptions(values != null ? values.object_name : void 0, true, true);
170
- }
155
+ reference_to: object_fields
156
+ reference_to_field: name
157
+ enable_enhanced_lookup: false
158
+ filtersFunction: !<tag:yaml.org,2002:js/function> |-
159
+ function anonymous(filters,values
160
+ ) {
161
+ return ['object', '=', values.object_name]
162
+ }
171
163
  name: values
172
164
  filterable: true
173
- filter_fields:
174
- label: Filter Fields
175
- type: grid
176
- is_wide: true
177
- name: filter_fields
178
- depend_on:
179
- - object_name
180
- filter_fields.$:
181
- label: Filter Field
182
- blackbox: true
183
- type: object
184
- name: filter_fields.$
185
- filter_fields.$.field:
186
- label: Field
187
- type: lookup
188
- optionsFunction: !<tag:yaml.org,2002:js/function> |-
189
- function (values) {
190
- return Creator.getObjectFilterFieldOptions(values != null ? values.object_name : void 0);
191
- }
192
- name: filter_fields.$.field
193
- filterable: true
194
- filter_fields.$.required:
195
- label: Required
196
- type: boolean
197
- name: filter_fields.$.required
165
+ # filter_fields:
166
+ # label: Filter Fields
167
+ # type: grid
168
+ # is_wide: true
169
+ # name: filter_fields
170
+ # depend_on:
171
+ # - object_name
172
+ # filter_fields.$:
173
+ # label: Filter Field
174
+ # blackbox: true
175
+ # type: object
176
+ # name: filter_fields.$
177
+ # filter_fields.$.field:
178
+ # label: Field
179
+ # type: lookup
180
+ # optionsFunction: !<tag:yaml.org,2002:js/function> |-
181
+ # function (values) {
182
+ # return Creator.getObjectFilterFieldOptions(values != null ? values.object_name : void 0);
183
+ # }
184
+ # name: filter_fields.$.field
185
+ # filterable: true
186
+ # filter_fields.$.required:
187
+ # label: Required
188
+ # type: boolean
189
+ # name: filter_fields.$.required
198
190
  options:
199
191
  label: Options
200
192
  omit: true
@@ -225,39 +217,6 @@ fields:
225
217
  type: boolean
226
218
  defaultValue: true
227
219
  name: counting
228
- graphql:
229
- label: Graphql
230
- type: textarea
231
- is_wide: true
232
- hidden: false
233
- group: JsReport
234
- name: graphql
235
- html:
236
- label: Html
237
- type: textarea
238
- is_wide: true
239
- hidden: false
240
- group: JsReport
241
- name: html
242
- helper:
243
- label: Helper
244
- type: textarea
245
- is_wide: true
246
- hidden: false
247
- group: JsReport
248
- name: helper
249
- script:
250
- label: Script
251
- type: textarea
252
- is_wide: true
253
- hidden: false
254
- group: JsReport
255
- name: script
256
- mrt:
257
- label: Mrt
258
- type: textarea
259
- is_wide: true
260
- hidden: true
261
220
  is_system:
262
221
  type: boolean
263
222
  label: System
@@ -278,18 +237,18 @@ list_views:
278
237
  filter_fields:
279
238
  - report_type
280
239
  - created
281
- application:
282
- label: Application Reports
283
- filter_scope: space
284
- filters: !<tag:yaml.org,2002:js/function> |-
285
- function () {
286
- var object_names;
287
- object_names = Creator.getAppObjectNames();
288
- return [["object_name", "=", object_names]];
289
- }
290
- filter_fields:
291
- - report_type
292
- - created
240
+ # application:
241
+ # label: Application Reports
242
+ # filter_scope: space
243
+ # filters: !<tag:yaml.org,2002:js/function> |-
244
+ # function () {
245
+ # var object_names;
246
+ # object_names = Creator.getAppObjectNames();
247
+ # return [["object_name", "=", object_names]];
248
+ # }
249
+ # filter_fields:
250
+ # - report_type
251
+ # - created
293
252
  mine:
294
253
  label: My Reports
295
254
  filter_scope: mine
@@ -309,14 +268,15 @@ list_views:
309
268
  actions:
310
269
  standard_new_by_template:
311
270
  label: Pull from Library
312
- visible: !<tag:yaml.org,2002:js/function> |-
313
- function () {
314
- var permissions;
315
- permissions = Creator.getPermissions();
316
- if (Creator.getTemplateSpaceId() && permissions) {
317
- return permissions["allowCreate"];
318
- }
319
- }
271
+ visible: false
272
+ # visible: !<tag:yaml.org,2002:js/function> |-
273
+ # function () {
274
+ # var permissions;
275
+ # permissions = Creator.getPermissions();
276
+ # if (Creator.getTemplateSpaceId() && permissions) {
277
+ # return permissions["allowCreate"];
278
+ # }
279
+ # }
320
280
  'on': list
321
281
  todo: !<tag:yaml.org,2002:js/function> |-
322
282
  function (object_name, record_id, fields) {
package/main/default/objects/roles.object.yml CHANGED
@@ -3,6 +3,7 @@ label: Role
3
3
  icon: job_family
4
4
  hidden: true
5
5
  version: 2
6
+ isMetadata: true
6
7
  fields:
7
8
  name:
8
9
  label: Name
package/main/default/objects/space_users/buttons/setPassword.button.js CHANGED
@@ -70,18 +70,18 @@ module.exports = {
70
70
  autoComplete: "new-password",
71
71
  className: "ant-input",
72
72
  ref: inputRef,
73
- onKeyDown: (event) => {
74
- // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
75
- if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {
76
- event.preventDefault();
77
- return false;
78
- }
79
- },
80
- onContextMenu: (event) => {
81
- // 禁用鼠标右键菜单
82
- event.preventDefault();
83
- return false;
84
- }
73
+ // onKeyDown: (event) => {
74
+ // // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
75
+ // if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {
76
+ // event.preventDefault();
77
+ // return false;
78
+ // }
79
+ // },
80
+ // onContextMenu: (event) => {
81
+ // // 禁用鼠标右键菜单
82
+ // event.preventDefault();
83
+ // return false;
84
+ // }
85
85
  });
86
86
  let observered = false;
87
87
  const modalName = "modal-setPassword";
package/main/default/routes/object_fields_design.ejs CHANGED
@@ -9,7 +9,8 @@
9
9
  <script src="/toast/toastr.min.js"></script>
10
10
  <script>
11
11
  window._disabledFields = [
12
- 'table'
12
+ 'table',
13
+ 'approval_comments'
13
14
  ]
14
15
  </script>
15
16
  <style>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-core-objects",
3
- "version": "3.0.0-beta.136",
3
+ "version": "3.0.0-beta.138",
4
4
  "main": "package.service.js",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -9,12 +9,12 @@
9
9
  "steedos"
10
10
  ],
11
11
  "dependencies": {
12
- "@steedos/service-package-loader": "3.0.0-beta.136",
12
+ "@steedos/service-package-loader": "3.0.0-beta.138",
13
13
  "json2xls": "^0.1.2",
14
14
  "lodash": "^4.17.21"
15
15
  },
16
16
  "description": "steedos package",
17
17
  "repository": {},
18
18
  "license": "MIT",
19
- "gitHead": "2ee21243684e8a72dd62c08fd1fa9be8fc51095b"
19
+ "gitHead": "7fb737dcbfd3ad7d7b8303e17ea3fff57f45da98"
20
20
  }