@steedos-labs/plugin-workflow 3.0.1-beta.2 → 3.0.1-beta.4
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.
- package/main/default/client/instance.client.js +1 -1
- package/main/default/objects/instance_tasks/instance_tasks.object.yml +1 -0
- package/main/default/objects/instances/buttons/instance_new.button.yml +11 -4
- package/main/default/objects/instances/buttons/instance_retrieve.button.yml +1 -1
- package/main/default/objects/instances/buttons/instance_return.button.yml +2 -3
- package/main/default/objects/instances/instances.object.yml +1 -0
- package/main/default/pages/instance_detail.page.amis.json +2 -2
- package/main/default/pages/instance_tasks_detail.page.amis.json +5 -29
- package/main/default/pages/instance_tasks_list.page.amis.json +1 -1
- package/main/default/routes/api_workflow_nav.router.js +16 -16
- package/main/default/routes/flow_form_design.ejs +3 -3
- package/package.json +1 -1
|
@@ -69,7 +69,7 @@ window.SteedosWorkflow.InstanceTask = {
|
|
|
69
69
|
}
|
|
70
70
|
],
|
|
71
71
|
"listName": "inbox",
|
|
72
|
-
"rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance' : '' %>",
|
|
72
|
+
"rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance steedos-record-tr steedos-record-tr-'+data._id : 'steedos-record-tr steedos-record-tr-'+data._id %>",
|
|
73
73
|
"crudDataFilter": crudDataFilter
|
|
74
74
|
}
|
|
75
75
|
}
|
|
@@ -51,15 +51,22 @@ amis_schema: |-
|
|
|
51
51
|
},
|
|
52
52
|
"actionType": "ajax"
|
|
53
53
|
},
|
|
54
|
-
{
|
|
55
|
-
"actionType": "custom",
|
|
56
|
-
"script": "\nconst {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);if(window.Meteor && false){\ndoAction({\n actionType: 'link',\n args: {\n blank: false,\n url: `/workflow/space/${instance.space}/draft/${instance._id}?side_object=instances&side_listview_id=draft`\n }\n});\n return ;}\ndoAction({\n actionType: 'link',\n args: {\n blank: false,\n link: `/app/${appId}/${objectName}/view/${instance._id}?side_object=instances&side_listview_id=draft`\n }\n});\n"
|
|
57
|
-
},
|
|
58
54
|
{
|
|
59
55
|
"componentId": "",
|
|
60
56
|
"args": {
|
|
61
57
|
},
|
|
62
58
|
"actionType": "closeDrawer"
|
|
59
|
+
}
|
|
60
|
+
,
|
|
61
|
+
{
|
|
62
|
+
"actionType": "custom",
|
|
63
|
+
"script": "window.$('.list-view-btn-reload').click(); \nconst {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);if(window.Meteor && false){\ndoAction({\n actionType: 'link',\n args: {\n blank: false,\n url: `/workflow/space/${instance.space}/draft/${instance._id}?side_object=instances&side_listview_id=draft`\n }\n});\n return ;}\ndoAction({\n actionType: 'link',\n args: {\n blank: false,\n link: `/app/${appId}/${objectName}/view/${instance._id}?side_object=instances&side_listview_id=draft`\n }\n});\n;"
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
"actionType": "wait",
|
|
67
|
+
"args": {
|
|
68
|
+
"time": 2000
|
|
69
|
+
}
|
|
63
70
|
},
|
|
64
71
|
{
|
|
65
72
|
"actionType": "broadcast",
|
|
@@ -19,7 +19,7 @@ amis_schema: |-
|
|
|
19
19
|
"body": [
|
|
20
20
|
{
|
|
21
21
|
"type": "tpl",
|
|
22
|
-
"tpl": "
|
|
22
|
+
"tpl": "确认退回至上一步?",
|
|
23
23
|
"inline": true,
|
|
24
24
|
"wrapperComponent": "h2",
|
|
25
25
|
"id": "u:4d2fdd40be81",
|
|
@@ -101,8 +101,7 @@ amis_schema: |-
|
|
|
101
101
|
"weight": 0
|
|
102
102
|
}
|
|
103
103
|
},
|
|
104
|
-
"hiddenOn": "!(record.step && (record.step.step_type === 'submit' || record.step.step_type == 'sign' || record.step.step_type === 'counterSign') )"
|
|
105
|
-
"hidden": "typeof this.hiddenOn === \"string\" ? 2 : 1"
|
|
104
|
+
"hiddenOn": "!(record.step && (record.step.step_type === 'submit' || record.step.step_type == 'sign' || record.step.step_type === 'counterSign') && record.box == 'inbox' && record.approve && record.approve.type != 'cc')"
|
|
106
105
|
}
|
|
107
106
|
],
|
|
108
107
|
"regions": [
|
|
@@ -109,8 +109,8 @@
|
|
|
109
109
|
"id": "u:d6db0c84f150",
|
|
110
110
|
"schemaApi": {
|
|
111
111
|
"method": "get",
|
|
112
|
-
"url": "/api/health_check",
|
|
113
|
-
"adaptor": "
|
|
112
|
+
"url": "/api/health_check?trace=${recordId}",
|
|
113
|
+
"adaptor": "const result = {data: {'type':'wrapper','className':'p-0 h-full','body':[{'type':'steedos-instance-detail','id':'u:40052b3812c1','label':'Instance Detail','instanceId':context.recordId,'boxName':context.side_listview_id}],'id':'u:829a40757f0a'}};console.log('result===>', result); return result;"
|
|
114
114
|
},
|
|
115
115
|
"body": {},
|
|
116
116
|
"className": "h-full",
|
|
@@ -95,26 +95,10 @@
|
|
|
95
95
|
{
|
|
96
96
|
"type": "service",
|
|
97
97
|
"id": "u:d6db0c84f150",
|
|
98
|
-
"body":
|
|
99
|
-
{
|
|
100
|
-
"type": "wrapper",
|
|
101
|
-
"className": "p-0 h-full",
|
|
102
|
-
"body": [
|
|
103
|
-
{
|
|
104
|
-
"type": "steedos-instance-detail",
|
|
105
|
-
"label": "Instance Detail",
|
|
106
|
-
"id": "u:40052b3812c1",
|
|
107
|
-
"instanceId": "${instanceId}",
|
|
108
|
-
"boxName": "${boxName}",
|
|
109
|
-
"hiddenOn": "!!!this.instanceId"
|
|
110
|
-
}
|
|
111
|
-
],
|
|
112
|
-
"id": "u:dc5cb678096b"
|
|
113
|
-
}
|
|
114
|
-
],
|
|
98
|
+
"body": {},
|
|
115
99
|
"messages": {
|
|
116
100
|
},
|
|
117
|
-
"
|
|
101
|
+
"schemaApi": {
|
|
118
102
|
"url": "${context.rootUrl}/graphql?recordId=${recordId}",
|
|
119
103
|
"method": "post",
|
|
120
104
|
"messages": {
|
|
@@ -124,10 +108,10 @@
|
|
|
124
108
|
"Authorization": "Bearer ${context.tenantId},${context.authToken}"
|
|
125
109
|
},
|
|
126
110
|
"requestAdaptor": "\nconst { recordId } = api.body;\napi.data = {\n query: `{instance_task:instance_tasks__findOne(id: \"${recordId}\"){_id,instance,is_read}}`\n};\n\nreturn api;",
|
|
127
|
-
"adaptor": "\nlet boxName = api.body.side_listview_id === 'inbox' ? 'inbox' : 'outbox';\npayload.data = {\n instanceId: payload.data.instance_task.instance,\n boxName: boxName,\n isRead: payload.data.instance_task.is_read\n}\n; console.log('=======>payload===>', payload); \
|
|
111
|
+
"adaptor": "\nlet boxName = api.body.side_listview_id === 'inbox' ? 'inbox' : 'outbox';\npayload.data = {\n instanceId: payload.data.instance_task.instance,\n boxName: boxName,\n isRead: payload.data.instance_task.is_read\n}\n; console.log('=======>payload===>', payload); \n const result = {data: {'type':'wrapper','className':'p-0 h-full','body':[{'type':'steedos-instance-detail','id':'u:40052b3812c1','label':'Instance Detail','instanceId':payload.data.instanceId,'boxName':context.side_listview_id}],'id':'u:829a40757f0a'}};console.log('result===>', result); return result;"
|
|
128
112
|
},
|
|
129
113
|
"onEvent": {
|
|
130
|
-
"
|
|
114
|
+
"fetchSchemaInited": {
|
|
131
115
|
"actions": [
|
|
132
116
|
{
|
|
133
117
|
"actionType": "ajax",
|
|
@@ -135,7 +119,7 @@
|
|
|
135
119
|
"url": "${context.rootUrl}/api/workflow/v2/set_have_read",
|
|
136
120
|
"method": "post",
|
|
137
121
|
"requestAdaptor": "api.data={instanceTaskId: context.recordId, isRead: context.isRead}\n\n\nreturn api;",
|
|
138
|
-
"adaptor": "
|
|
122
|
+
"adaptor": "if(payload.success){$('.steedos-record-tr-'+context.recordId).removeClass('unread-instance')}; return {data: {...payload}, status: 0};"
|
|
139
123
|
},
|
|
140
124
|
"expression": "${!event.data.isRead}"
|
|
141
125
|
}
|
|
@@ -152,14 +136,6 @@
|
|
|
152
136
|
"body"
|
|
153
137
|
],
|
|
154
138
|
"data": {
|
|
155
|
-
"objectName": "instance_tasks",
|
|
156
|
-
"recordId": "5f032f591d4951790b84f3a0",
|
|
157
|
-
"context": {
|
|
158
|
-
"rootUrl": "http://127.0.0.1:5000",
|
|
159
|
-
"tenantId": "644484b7aff6100247b3e6cf",
|
|
160
|
-
"userId": "6c017281-b966-49fe-aa2b-f09b835feed7",
|
|
161
|
-
"authToken": "ec7b993f86f01162b471f17d9063241beb7c57987a45d40f911e40269ca2e21b8f806cba87de7be1a07c41"
|
|
162
|
-
}
|
|
163
139
|
},
|
|
164
140
|
"className": "steedos-instance-wrapper",
|
|
165
141
|
"id": "u:d37465183f56",
|
|
@@ -189,7 +189,7 @@
|
|
|
189
189
|
}
|
|
190
190
|
],
|
|
191
191
|
"listName": "inbox",
|
|
192
|
-
"rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance' : '' %>",
|
|
192
|
+
"rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance steedos-record-tr steedos-record-tr-'+data._id : 'steedos-record-tr steedos-record-tr-'+data._id %>",
|
|
193
193
|
"rebuildOn": "\\${flowId || categoryId}",
|
|
194
194
|
"adaptor": "const isSearch = _.some(_.keys(api.body.self), key => key.includes('__keywords') || key.includes('__searchable__'));\nif(payload.data.count==0 && !isSearch){\n const searchParams = new URLSearchParams(window.location.search);\n const flowId = searchParams.get(\"flowId\");\n const categoryId = searchParams.get(\"categoryId\");\n const pathname = window.location.pathname;\n if(flowId || categoryId){\n window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n }\n // if(flowId) {\n // window.FlowRouter.go(pathname + \"?additionalFilters=['category','=','\" + categoryId +\"']&flowId=&categoryId=\" + categoryId);\n // }else if(categoryId) {\n // window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n // }\n};\nif (api.body.self.listName == \"inbox\") {\n _.each(payload.data.rows, function (item, index) {\n if (item.type == 'cc') {\n item.instance_name += '（传阅）';\n }\n if (item.instance__expand.values) {\n const form_fields = api.body.self.form_fields;\n _.each(item.instance__expand.values, function (field, field_code) {\n const form_field = _.find(form_fields, { code: field_code });\n if (form_field && form_field.type == \"group\") {\n if (form_field.is_multiselect) {\n item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n } else {\n item.instance__expand.values[field_code] = field ? field.fullname : \"\";\n }\n } else if (form_field && form_field.type == \"user\") {\n if (form_field.is_multiselect) {\n item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n } else {\n item.instance__expand.values[field_code] = field ? field.name : \"\";\n }\n }\n })\n }\n })\n}\n"
|
|
195
195
|
},
|
|
@@ -62,10 +62,10 @@ const getCategoriesInbox = async (userSession, req, currentUrl) => {
|
|
|
62
62
|
let categoryBadge = 0;
|
|
63
63
|
const flowGroups = lodash.groupBy(v, 'flow_name');
|
|
64
64
|
const flows = [];
|
|
65
|
-
const categoryValue = `/app/${appId}/instance_tasks/
|
|
65
|
+
const categoryValue = `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=['category','=',${v[0].category?"'" + v[0].category + "'":v[0].category}]&flowId=&categoryId=${v[0].category}`;
|
|
66
66
|
let categoryIsUnfolded = false;
|
|
67
67
|
lodash.each(flowGroups, (v2, k2)=>{
|
|
68
|
-
const flowValue = `/app/${appId}/instance_tasks/
|
|
68
|
+
const flowValue = `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=['flow','=','${v2[0].flow}']&flowId=${v2[0].flow}&categoryId=${v[0].category}`;
|
|
69
69
|
let flowIsUnfolded = false;
|
|
70
70
|
if(currentUrl == flowValue){
|
|
71
71
|
flowIsUnfolded = true;
|
|
@@ -182,10 +182,10 @@ const getCategoriesMonitor = async (userSession, req, currentUrl) => {
|
|
|
182
182
|
lodash.each(categoryGroups, (v, k) => {
|
|
183
183
|
const flowGroups = lodash.groupBy(v, 'name');
|
|
184
184
|
const flows = [];
|
|
185
|
-
const categoryValue = `/app/${appId}/instances/
|
|
185
|
+
const categoryValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['category','=',${v[0].category__expand?"'" + v[0].category__expand._id + "'":null}]&flowId=&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
|
|
186
186
|
let categoryIsUnfolded = false;
|
|
187
187
|
lodash.each(flowGroups, (v2, k2) => {
|
|
188
|
-
const flowValue = `/app/${appId}/instances/
|
|
188
|
+
const flowValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['flow','=','${v2[0]._id}']&flowId=${v2[0]._id}&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
|
|
189
189
|
let flowIsUnfolded = false;
|
|
190
190
|
if(currentUrl == flowValue){
|
|
191
191
|
flowIsUnfolded = true;
|
|
@@ -253,18 +253,18 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
|
|
|
253
253
|
"tag":inboxResult.count,
|
|
254
254
|
"options":{
|
|
255
255
|
"level":1,
|
|
256
|
-
"to": `/app/${appId}/instance_tasks/
|
|
256
|
+
"to": `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=&flowId=&categoryId=`
|
|
257
257
|
},
|
|
258
|
-
"value": `/app/${appId}/instance_tasks/
|
|
258
|
+
"value": `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=&flowId=&categoryId=`,
|
|
259
259
|
"children": inboxResult.schema
|
|
260
260
|
},
|
|
261
261
|
{
|
|
262
262
|
"label": t('outbox', {}, userSession.language),
|
|
263
263
|
"options":{
|
|
264
264
|
"level":1,
|
|
265
|
-
"to": `/app/${appId}/instance_tasks/
|
|
265
|
+
"to": `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=outbox&additionalFilters=&flowId=&categoryId=`
|
|
266
266
|
},
|
|
267
|
-
"value": `/app/${appId}/instance_tasks/
|
|
267
|
+
"value": `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=outbox&additionalFilters=&flowId=&categoryId=`,
|
|
268
268
|
"icon": "fa fa-check"
|
|
269
269
|
},
|
|
270
270
|
{
|
|
@@ -272,9 +272,9 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
|
|
|
272
272
|
"icon": "fa fa-eye",
|
|
273
273
|
"options":{
|
|
274
274
|
"level":1,
|
|
275
|
-
"to": `/app/${appId}/instances/
|
|
275
|
+
"to": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=&flowId=&categoryId=`,
|
|
276
276
|
},
|
|
277
|
-
"value": `/app/${appId}/instances/
|
|
277
|
+
"value": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=&flowId=&categoryId=`,
|
|
278
278
|
"children": monitorResult.schema,
|
|
279
279
|
"unfolded": monitorResult.monitorIsUnfolded,
|
|
280
280
|
"visible": monitorResult.hasFlowsPer
|
|
@@ -291,9 +291,9 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
|
|
|
291
291
|
"label": t('draft', {}, userSession.language),
|
|
292
292
|
"options":{
|
|
293
293
|
"level":1,
|
|
294
|
-
"to": `/app/${appId}/instances/
|
|
294
|
+
"to": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=draft&additionalFilters=&flowId=&categoryId=`
|
|
295
295
|
},
|
|
296
|
-
"value": `/app/${appId}/instances/
|
|
296
|
+
"value": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=draft&additionalFilters=&flowId=&categoryId=`,
|
|
297
297
|
"icon": "fa fa-pencil",
|
|
298
298
|
"tag": draftCount
|
|
299
299
|
},
|
|
@@ -301,18 +301,18 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
|
|
|
301
301
|
"label": t('pending', {}, userSession.language),
|
|
302
302
|
"options":{
|
|
303
303
|
"level":1,
|
|
304
|
-
"to": `/app/${appId}/instances/
|
|
304
|
+
"to": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=pending&additionalFilters=&flowId=&categoryId=`,
|
|
305
305
|
},
|
|
306
|
-
"value": `/app/${appId}/instances/
|
|
306
|
+
"value": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=pending&additionalFilters=&flowId=&categoryId=`,
|
|
307
307
|
"icon": "fa fa-circle"
|
|
308
308
|
},
|
|
309
309
|
{
|
|
310
310
|
"label": t('completed', {}, userSession.language),
|
|
311
311
|
"options":{
|
|
312
312
|
"level":1,
|
|
313
|
-
"to": `/app/${appId}/instances/
|
|
313
|
+
"to": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=completed&additionalFilters=&flowId=&categoryId=`,
|
|
314
314
|
},
|
|
315
|
-
"value": `/app/${appId}/instances/
|
|
315
|
+
"value": `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=completed&additionalFilters=&flowId=&categoryId=`,
|
|
316
316
|
"icon": "fa fa-check-square"
|
|
317
317
|
}
|
|
318
318
|
]
|
|
@@ -440,11 +440,11 @@
|
|
|
440
440
|
return payload;
|
|
441
441
|
`,
|
|
442
442
|
requestAdaptor: `
|
|
443
|
-
const filters =
|
|
444
|
-
const url =
|
|
443
|
+
const filters = \`${_.replace(field.filters, /_.pluck/g, '_.map')}\`;
|
|
444
|
+
const url = \`${field.url}\`;
|
|
445
445
|
if(filters){
|
|
446
446
|
console.log('filters', filters);
|
|
447
|
-
const joinKey =
|
|
447
|
+
const joinKey = url.indexOf('?') > 0 ? '&' : '?';
|
|
448
448
|
if(filters.startsWith('function(') || filters.startsWith('function (')){
|
|
449
449
|
const argsName = ${JSON.stringify(argsName)};
|
|
450
450
|
const fun = eval('_fun='+filters);
|