@steedos/standard-process-approval 3.0.0-beta.30 → 3.0.0-beta.33

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 (3) hide show
  1. package/main/default/objects/process/approval/process_definition/process_definition.object.yml +48 -16
  2. package/main/default/pages/workflow_rule_form.page.amis.json +19 -2
  3. package/package.json +3 -3
package/main/default/objects/process/approval/process_definition/process_definition.object.yml CHANGED
@@ -123,8 +123,12 @@ fields:
123
123
  - object_name
124
124
  filtersFunction: !!js/function |
125
125
  function (filters, dependValues) {
126
- if(dependValues && dependValues.object_name){
127
- return "object_name eq '" + dependValues.object_name + "'";
126
+ var pObjectName = dependValues && dependValues.object_name;
127
+ if(pObjectName){
128
+ return ['object_name', '=', pObjectName];
129
+ }
130
+ else{
131
+ return ['object_name', '=', -1];
128
132
  }
129
133
  }
130
134
  group: Initial Submission Actions
@@ -138,8 +142,12 @@ fields:
138
142
  - object_name
139
143
  filtersFunction: !!js/function |
140
144
  function (filters, dependValues) {
141
- if(dependValues && dependValues.object_name){
142
- return "object_name eq '" + dependValues.object_name + "'";
145
+ var pObjectName = dependValues && dependValues.object_name;
146
+ if(pObjectName){
147
+ return ['object_name', '=', pObjectName];
148
+ }
149
+ else{
150
+ return ['object_name', '=', -1];
143
151
  }
144
152
  }
145
153
  group: Initial Submission Actions
@@ -165,8 +173,12 @@ fields:
165
173
  - object_name
166
174
  filtersFunction: !!js/function |
167
175
  function (filters, dependValues) {
168
- if(dependValues && dependValues.object_name){
169
- return "object_name eq '" + dependValues.object_name + "'";
176
+ var pObjectName = dependValues && dependValues.object_name;
177
+ if(pObjectName){
178
+ return ['object_name', '=', pObjectName];
179
+ }
180
+ else{
181
+ return ['object_name', '=', -1];
170
182
  }
171
183
  }
172
184
  group: Final Approval Actions
@@ -180,8 +192,12 @@ fields:
180
192
  - object_name
181
193
  filtersFunction: !!js/function |
182
194
  function (filters, dependValues) {
183
- if(dependValues && dependValues.object_name){
184
- return "object_name eq '" + dependValues.object_name + "'";
195
+ var pObjectName = dependValues && dependValues.object_name;
196
+ if(pObjectName){
197
+ return ['object_name', '=', pObjectName];
198
+ }
199
+ else{
200
+ return ['object_name', '=', -1];
185
201
  }
186
202
  }
187
203
  group: Final Approval Actions
@@ -207,8 +223,12 @@ fields:
207
223
  - object_name
208
224
  filtersFunction: !!js/function |
209
225
  function (filters, dependValues) {
210
- if(dependValues && dependValues.object_name){
211
- return "object_name eq '" + dependValues.object_name + "'";
226
+ var pObjectName = dependValues && dependValues.object_name;
227
+ if(pObjectName){
228
+ return ['object_name', '=', pObjectName];
229
+ }
230
+ else{
231
+ return ['object_name', '=', -1];
212
232
  }
213
233
  }
214
234
  group: Final Rejection Actions
@@ -222,8 +242,12 @@ fields:
222
242
  - object_name
223
243
  filtersFunction: !!js/function |
224
244
  function (filters, dependValues) {
225
- if(dependValues && dependValues.object_name){
226
- return "object_name eq '" + dependValues.object_name + "'";
245
+ var pObjectName = dependValues && dependValues.object_name;
246
+ if(pObjectName){
247
+ return ['object_name', '=', pObjectName];
248
+ }
249
+ else{
250
+ return ['object_name', '=', -1];
227
251
  }
228
252
  }
229
253
  group: Final Rejection Actions
@@ -250,8 +274,12 @@ fields:
250
274
  - object_name
251
275
  filtersFunction: !!js/function |
252
276
  function (filters, dependValues) {
253
- if(dependValues && dependValues.object_name){
254
- return "object_name eq '" + dependValues.object_name + "'";
277
+ var pObjectName = dependValues && dependValues.object_name;
278
+ if(pObjectName){
279
+ return ['object_name', '=', pObjectName];
280
+ }
281
+ else{
282
+ return ['object_name', '=', -1];
255
283
  }
256
284
  }
257
285
  group: Recall Actions
@@ -265,8 +293,12 @@ fields:
265
293
  - object_name
266
294
  filtersFunction: !!js/function |
267
295
  function (filters, dependValues) {
268
- if(dependValues && dependValues.object_name){
269
- return "object_name eq '" + dependValues.object_name + "'";
296
+ var pObjectName = dependValues && dependValues.object_name;
297
+ if(pObjectName){
298
+ return ['object_name', '=', pObjectName];
299
+ }
300
+ else{
301
+ return ['object_name', '=', -1];
270
302
  }
271
303
  }
272
304
  group: Recall Actions
package/main/default/pages/workflow_rule_form.page.amis.json CHANGED
@@ -12,6 +12,8 @@
12
12
  "mode": "edit",
13
13
  "layout": "normal",
14
14
  "tabsMode": "",
15
+ "initApiAdaptor": "if (recordId) {\n var data = payload.data;\n if (data) {\n data.filters = window.amisConvert.filtersToConditions(data.filters || []);\n }\n payload.data = data;\n}\nreturn payload;",
16
+ "apiRequestAdaptor": "if (formData.filters) {\n formData.filters = window.amisConvert.conditionsToFilters(formData.filters);\n}\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\n",
15
17
  "fieldsExtend": {
16
18
  "formula": {
17
19
  "amis": {
@@ -24,8 +26,23 @@
24
26
  "trackExpression": "${object_name}",
25
27
  "sendOn": "${object_name}"
26
28
  },
27
- "dsType": "api",
28
- "id": "u:508198dbfac7"
29
+ "dsType": "api"
30
+ }
31
+ },
32
+ "filters": {
33
+ "amis": {
34
+ "type": "condition-builder",
35
+ "description": "",
36
+ "source": {
37
+ "method": "get",
38
+ "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${object_name}",
39
+ "dataType": "json",
40
+ "headers": {
41
+ "Authorization": "Bearer ${context.tenantId},${context.authToken}"
42
+ }
43
+ },
44
+ "className": "col-span-2 m-0",
45
+ "visibleOn": "${object_name}"
29
46
  }
30
47
  }
31
48
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/standard-process-approval",
3
- "version": "3.0.0-beta.30",
3
+ "version": "3.0.0-beta.33",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -10,11 +10,11 @@
10
10
  "steedos"
11
11
  ],
12
12
  "dependencies": {
13
- "@steedos/process": "3.0.0-beta.30",
13
+ "@steedos/process": "3.0.0-beta.33",
14
14
  "nanoid": "^3.3.4"
15
15
  },
16
16
  "description": "steedos package",
17
17
  "repository": {},
18
18
  "license": "MIT",
19
- "gitHead": "179adc36b9bc560bad5673f0a068600f5af4848f"
19
+ "gitHead": "240a409b40d5e5e25cf2451b63e611ba7b8e4533"
20
20
  }