@steedos/standard-process-approval 2.5.3-beta.1 → 2.5.3-beta.2

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 (4) hide show
  1. package/main/default/services/action_field_updates.service.js +9 -9
  2. package/main/default/triggers/process_definition.trigger.js +6 -7
  3. package/main/default/triggers/workflow_rule.trigger.js +9 -10
  4. package/package.json +3 -3
package/main/default/services/action_field_updates.service.js CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Description: 提供action_field_updates(字段更新对象)需要的数据接口
3
3
  */
4
4
 
5
- const register = require("@steedos/metadata-registrar");
5
+ const objectql = require("@steedos/objectql");
6
6
  const steedosI18n = require("@steedos/i18n");
7
7
  const _ = require("lodash");
8
8
  const clone = require("clone");
@@ -93,14 +93,14 @@ module.exports = {
93
93
  if(!objectName){
94
94
  return []
95
95
  }
96
- const objectConfig = await register.getObjectConfig(objectName);
96
+ const objectConfig = await objectql.getObjectConfig(objectName);
97
97
  steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
98
98
 
99
99
  const options = [{ label: objectConfig.label, value: objectConfig.name }];
100
100
  for (fieldName in objectConfig.fields) {
101
101
  const field = objectConfig.fields[fieldName]
102
102
  if (field && field.type === 'master_detail' && _.isString(field.reference_to)) {
103
- const referenceToObjectConfig = await register.getObjectConfig(field.reference_to);
103
+ const referenceToObjectConfig = await objectql.getObjectConfig(field.reference_to);
104
104
  steedosI18n.translationObject(lng, referenceToObjectConfig.name, referenceToObjectConfig);
105
105
  if (referenceToObjectConfig) {
106
106
  options.push({
@@ -126,13 +126,13 @@ module.exports = {
126
126
 
127
127
  let mainObjectName = null;
128
128
  if (targetObject && targetObject != objectName) {
129
- const targetField = await register.getObjectConfig(objectName).fields[targetObject];
129
+ const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
130
130
  mainObjectName = targetField && targetField.reference_to;
131
131
  } else {
132
132
  mainObjectName = objectName;
133
133
  }
134
134
 
135
- const objectConfig = await register.getObjectConfig(mainObjectName);
135
+ const objectConfig = await objectql.getObjectConfig(mainObjectName);
136
136
  const options = [];
137
137
  if (objectConfig) {
138
138
  steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
@@ -164,13 +164,13 @@ module.exports = {
164
164
 
165
165
  let mainObjectName = null;
166
166
  if (targetObject && targetObject != objectName) {
167
- const targetField = await register.getObjectConfig(objectName).fields[targetObject];
167
+ const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
168
168
  mainObjectName = targetField && targetField.reference_to;
169
169
  } else {
170
170
  mainObjectName = objectName;
171
171
  }
172
172
 
173
- const objectConfig = await register.getObjectConfig(mainObjectName);
173
+ const objectConfig = await objectql.getObjectConfig(mainObjectName);
174
174
  const options = [];
175
175
  if (objectConfig) {
176
176
  steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
@@ -208,13 +208,13 @@ module.exports = {
208
208
 
209
209
  let mainObjectName = null;
210
210
  if (targetObject && targetObject != objectName) {
211
- const targetField = await register.getObjectConfig(objectName).fields[targetObject];
211
+ const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
212
212
  mainObjectName = targetField && targetField.reference_to;
213
213
  } else {
214
214
  mainObjectName = objectName;
215
215
  }
216
216
 
217
- const objectConfig = await register.getObjectConfig(mainObjectName);
217
+ const objectConfig = await objectql.getObjectConfig(mainObjectName);
218
218
  let literal_value_schema = {
219
219
  "type": "text",
220
220
  "name": "literal_value",
package/main/default/triggers/process_definition.trigger.js CHANGED
@@ -1,7 +1,6 @@
1
1
  const _ = require("underscore");
2
2
  const util = require('@steedos/standard-objects').util;
3
3
  const objectql = require('@steedos/objectql');
4
- const register = require('@steedos/metadata-registrar');
5
4
  const InternalData = require('@steedos/standard-objects').internalData;
6
5
 
7
6
  function setSpaceAndOwner(record, that){
@@ -56,12 +55,12 @@ module.exports = {
56
55
  let filters = InternalData.parserFilters(this.query.filters)
57
56
  let approvalProcesses = [];
58
57
  if(filters.name){
59
- approvalProcess = register.getSourceApprovalProcess(filters.name);
58
+ approvalProcess = objectql.getSourceApprovalProcess(filters.name);
60
59
  if(approvalProcess){
61
60
  approvalProcesses.push(approvalProcess);
62
61
  }
63
62
  }else{
64
- approvalProcesses = register.getSourceApprovalProcesses();
63
+ approvalProcesses = objectql.getSourceApprovalProcesses();
65
64
  }
66
65
 
67
66
  if (filters.object_name){
@@ -78,12 +77,12 @@ module.exports = {
78
77
  let filters = InternalData.parserFilters(this.query.filters)
79
78
  let approvalProcesses = [];
80
79
  if(filters.name){
81
- approvalProcess = register.getSourceApprovalProcess(filters.name);
80
+ approvalProcess = objectql.getSourceApprovalProcess(filters.name);
82
81
  if(approvalProcess){
83
82
  approvalProcesses.push(approvalProcess);
84
83
  }
85
84
  }else{
86
- approvalProcesses = register.getSourceApprovalProcesses();
85
+ approvalProcesses = objectql.getSourceApprovalProcesses();
87
86
  }
88
87
 
89
88
  if (filters.object_name){
@@ -100,12 +99,12 @@ module.exports = {
100
99
  let filters = InternalData.parserFilters(this.query.filters)
101
100
  let approvalProcesses = [];
102
101
  if(filters.name){
103
- approvalProcess = register.getSourceApprovalProcess(filters.name);
102
+ approvalProcess = objectql.getSourceApprovalProcess(filters.name);
104
103
  if(approvalProcess){
105
104
  approvalProcesses.push(approvalProcess);
106
105
  }
107
106
  }else{
108
- approvalProcesses = register.getSourceApprovalProcesses();
107
+ approvalProcesses = objectql.getSourceApprovalProcesses();
109
108
  }
110
109
 
111
110
  if (filters.object_name){
package/main/default/triggers/workflow_rule.trigger.js CHANGED
@@ -1,14 +1,13 @@
1
1
  /*
2
2
  * @Author: sunhaolin@hotoa.com
3
3
  * @Date: 2021-08-30 12:06:41
4
- * @LastEditors: baozhoutao@steedos.com
5
- * @LastEditTime: 2023-05-30 17:29:53
4
+ * @LastEditors: sunhaolin@hotoa.com
5
+ * @LastEditTime: 2022-07-29 16:03:50
6
6
  * @Description:
7
7
  */
8
8
  const _ = require("underscore");
9
9
  const util = require('@steedos/standard-objects').util;
10
10
  const objectql = require("@steedos/objectql");
11
- const register = require("@steedos/metadata-registrar")
12
11
  const InternalData = require('@steedos/standard-objects').internalData;
13
12
 
14
13
  const getInternalWorkflowRules = function(sourceWorkflowRules, filters){
@@ -41,10 +40,10 @@ module.exports = {
41
40
  let filters = InternalData.parserFilters(this.query.filters)
42
41
  let workflowRules = [];
43
42
  if(filters.object_name){
44
- workflowRules = register.getObjectWorkflowRules(filters.object_name);
43
+ workflowRules = objectql.getObjectWorkflowRules(filters.object_name);
45
44
  delete filters.object_name;
46
45
  }else{
47
- workflowRules = register.getAllWorkflowRules();
46
+ workflowRules = objectql.getAllWorkflowRules();
48
47
  }
49
48
 
50
49
  workflowRules = getInternalWorkflowRules(workflowRules, filters);
@@ -57,10 +56,10 @@ module.exports = {
57
56
  let filters = InternalData.parserFilters(this.query.filters)
58
57
  let workflowRules = [];
59
58
  if(filters.object_name){
60
- workflowRules = register.getObjectWorkflowRules(filters.object_name);
59
+ workflowRules = objectql.getObjectWorkflowRules(filters.object_name);
61
60
  delete filters.object_name;
62
61
  }else{
63
- workflowRules = register.getAllWorkflowRules();
62
+ workflowRules = objectql.getAllWorkflowRules();
64
63
  }
65
64
 
66
65
  workflowRules = getInternalWorkflowRules(workflowRules, filters);
@@ -73,10 +72,10 @@ module.exports = {
73
72
  let filters = InternalData.parserFilters(this.query.filters)
74
73
  let workflowRules = [];
75
74
  if(filters.object_name){
76
- workflowRules = register.getObjectWorkflowRules(filters.object_name);
75
+ workflowRules = objectql.getObjectWorkflowRules(filters.object_name);
77
76
  delete filters.object_name;
78
77
  }else{
79
- workflowRules = register.getAllWorkflowRules();
78
+ workflowRules = objectql.getAllWorkflowRules();
80
79
  }
81
80
 
82
81
  workflowRules = getInternalWorkflowRules(workflowRules, filters);
@@ -88,7 +87,7 @@ module.exports = {
88
87
  afterFindOne: async function(){
89
88
  if(_.isEmpty(this.data.values)){
90
89
  let id = this.id
91
- let workflowRule = register.getWorkflowRule(id);
90
+ let workflowRule = objectql.getWorkflowRule(id);
92
91
  if(workflowRule){
93
92
  this.data.values = workflowRule;
94
93
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/standard-process-approval",
3
- "version": "2.5.3-beta.1",
3
+ "version": "2.5.3-beta.2",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -10,10 +10,10 @@
10
10
  "steedos"
11
11
  ],
12
12
  "dependencies": {
13
- "@steedos/process": "2.5.3-beta.1"
13
+ "@steedos/process": "2.5.3-beta.2"
14
14
  },
15
15
  "description": "steedos package",
16
16
  "repository": {},
17
17
  "license": "MIT",
18
- "gitHead": "a2e723ed4256279e8e6fa9f67d7f607c83f8638f"
18
+ "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
19
19
  }