@steedos-labs/plugin-workflow 3.0.68 → 3.0.69
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/manager/uuflow_manager.js +10 -1
- package/main/default/objects/instance_tasks/buttons/instance_new.button.yml +1 -1
- package/main/default/objects/instances/buttons/instance_delete.button.yml +1 -1
- package/main/default/objects/instances/buttons/instance_new.button.yml +1 -1
- package/main/default/pages/page_instance_print.page.amis.json +37 -8
- package/main/default/routes/am.router.js +1 -1
- package/main/default/routes/api_workflow_next_step_users.router.js +12 -12
- package/package.json +1 -1
|
@@ -1699,8 +1699,17 @@ UUFlowManager.workflow_engine = async function (approve_from_client, current_use
|
|
|
1699
1699
|
const t10 = Date.now();
|
|
1700
1700
|
// Send message to current user and trigger webhook
|
|
1701
1701
|
await pushManager.send_message_current_user(current_user_info);
|
|
1702
|
-
|
|
1702
|
+
|
|
1703
|
+
// 给下一步处理人（inbox_users）推送 badge，确保被驳回人/审批人的待办角标实时更新
|
|
1703
1704
|
let to_users = finalInstance.inbox_users;
|
|
1705
|
+
if (to_users && to_users.length > 0) {
|
|
1706
|
+
for (const to_user_id of to_users) {
|
|
1707
|
+
if (to_user_id !== current_user) {
|
|
1708
|
+
await pushManager.send_message_to_specifyUser("current_user", to_user_id);
|
|
1709
|
+
}
|
|
1710
|
+
}
|
|
1711
|
+
}
|
|
1712
|
+
|
|
1704
1713
|
const last_trace = _.last(finalInstance.traces);
|
|
1705
1714
|
const last_step = await UUFlowManager.getStep(finalInstance, flow, last_trace.step);
|
|
1706
1715
|
|
|
@@ -62,7 +62,7 @@ amis_schema: |-
|
|
|
62
62
|
},
|
|
63
63
|
{
|
|
64
64
|
"actionType": "custom",
|
|
65
|
-
"script": "const {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);doAction({\n actionType: 'link',\n args: {\n blank: false,\n link: `/app/${appId}/instances/view/${instance._id}?side_object=instances&side_listview_id=draft
|
|
65
|
+
"script": "const {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);doAction({\n actionType: 'link',\n args: {\n blank: false,\n link: `/app/${appId}/instances/view/${instance._id}?side_object=instances&side_listview_id=draft`\n }\n});\n;"
|
|
66
66
|
},
|
|
67
67
|
{
|
|
68
68
|
"actionType": "wait",
|
|
@@ -27,7 +27,7 @@ amis_schema: |-
|
|
|
27
27
|
{
|
|
28
28
|
"ignoreError": false,
|
|
29
29
|
"actionType": "custom",
|
|
30
|
-
"script": "SteedosWorkflow.Instance.changed=false; navigate('/app/approve_workflow/instances/view/none?side_object=instances&side_listview_id=draft
|
|
30
|
+
"script": "SteedosWorkflow.Instance.changed=false; navigate('/app/approve_workflow/instances/view/none?side_object=instances&side_listview_id=draft')"
|
|
31
31
|
},
|
|
32
32
|
{
|
|
33
33
|
"actionType": "wait",
|
|
@@ -63,7 +63,7 @@ amis_schema: |-
|
|
|
63
63
|
,
|
|
64
64
|
{
|
|
65
65
|
"actionType": "custom",
|
|
66
|
-
"script": "const {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);doAction({\n actionType: 'link',\n args: {\n blank: false,\n link: `/app/${appId}/instances/view/${instance._id}?side_object=instances&side_listview_id=draft
|
|
66
|
+
"script": "const {instance, appId, objectName} = event.data;\nconsole.log(`instance===`);doAction({\n actionType: 'link',\n args: {\n blank: false,\n link: `/app/${appId}/instances/view/${instance._id}?side_object=instances&side_listview_id=draft`\n }\n});\n;"
|
|
67
67
|
},
|
|
68
68
|
{
|
|
69
69
|
"actionType": "wait",
|
|
@@ -246,7 +246,8 @@
|
|
|
246
246
|
"background-color": "#fff"
|
|
247
247
|
},
|
|
248
248
|
".steedos-instance-related-view-wrapper .steedos-amis-instance-view-content": {
|
|
249
|
-
"min-width": "0 !important"
|
|
249
|
+
"min-width": "0 !important",
|
|
250
|
+
"padding": "12px 15px 0 15px"
|
|
250
251
|
},
|
|
251
252
|
".steedos-instance-related-view-wrapper > .antd-Page-content": {
|
|
252
253
|
"transition": "width 0.5s ease-in-out"
|
|
@@ -254,13 +255,11 @@
|
|
|
254
255
|
".steedos-instance-related-view-wrapper .instance-form": {
|
|
255
256
|
"width": "100%",
|
|
256
257
|
"margin": "0 auto",
|
|
257
|
-
"padding": "0 15px",
|
|
258
258
|
"transition": "width 0.5s ease-in-out"
|
|
259
259
|
},
|
|
260
260
|
".steedos-instance-related-view-wrapper .instance-approve-history": {
|
|
261
261
|
"width": "100%",
|
|
262
262
|
"margin": "0 auto",
|
|
263
|
-
"padding": "0 15px",
|
|
264
263
|
"transition": "width 0.5s ease-in-out"
|
|
265
264
|
},
|
|
266
265
|
".steedos-instance-related-view-wrapper .instance-approve-history table td": {
|
|
@@ -317,7 +316,8 @@
|
|
|
317
316
|
".instance-approve-history": {
|
|
318
317
|
},
|
|
319
318
|
".instance-file-list": {
|
|
320
|
-
"display": "none"
|
|
319
|
+
"display": "none",
|
|
320
|
+
"margin-bottom": "8px"
|
|
321
321
|
},
|
|
322
322
|
".instance-file-list .no-print": {
|
|
323
323
|
"display": "none !important"
|
|
@@ -328,6 +328,9 @@
|
|
|
328
328
|
".instance-related-list .no-print": {
|
|
329
329
|
"display": "none !important"
|
|
330
330
|
},
|
|
331
|
+
".instance-file-list .liquid-amis-container button, .instance-related-list .liquid-amis-container a": {
|
|
332
|
+
"font-weight": "400 !important"
|
|
333
|
+
},
|
|
331
334
|
".antd-Form-star":{
|
|
332
335
|
"display": "none !important"
|
|
333
336
|
},
|
|
@@ -403,14 +406,18 @@
|
|
|
403
406
|
"padding": "0 !important",
|
|
404
407
|
"margin": "0 !important"
|
|
405
408
|
},
|
|
409
|
+
".steedos-instance-related-view-wrapper .steedos-amis-instance-view-content": {
|
|
410
|
+
"padding": "0 15px !important"
|
|
411
|
+
},
|
|
412
|
+
".steedos-instance-related-view-wrapper .steedos-amis-instance-view-content > .antd-TplField": {
|
|
413
|
+
"display": "block !important"
|
|
414
|
+
},
|
|
406
415
|
".steedos-instance-related-view-wrapper .instance-form": {
|
|
407
416
|
"margin": "0 auto",
|
|
408
|
-
"padding": "0 15px !important",
|
|
409
417
|
"width": "100% !important"
|
|
410
418
|
},
|
|
411
419
|
".steedos-instance-related-view-wrapper .instance-approve-history": {
|
|
412
420
|
"margin": "0 auto",
|
|
413
|
-
"padding": "0 15px !important",
|
|
414
421
|
"width": "100% !important"
|
|
415
422
|
},
|
|
416
423
|
".steedos-instance-related-view-wrapper .instance-form-view": {
|
|
@@ -428,8 +435,9 @@
|
|
|
428
435
|
"height": "auto !important"
|
|
429
436
|
},
|
|
430
437
|
".steedos-instance-related-view-wrapper .instance-form .td-childfield": {
|
|
431
|
-
"overflow
|
|
432
|
-
"
|
|
438
|
+
"overflow": "visible !important",
|
|
439
|
+
"vertical-align": "top !important",
|
|
440
|
+
"padding": "0 !important"
|
|
433
441
|
},
|
|
434
442
|
".steedos-instance-related-view-wrapper .instance-form-view td": {
|
|
435
443
|
"border-width": "1px !important"
|
|
@@ -460,6 +468,20 @@
|
|
|
460
468
|
".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td": {
|
|
461
469
|
"border": "1px solid #000 !important"
|
|
462
470
|
},
|
|
471
|
+
".steedos-instance-related-view-wrapper td.td-childfield .antd-Form-item, .steedos-instance-related-view-wrapper td.td-childfield .antd-Service, .steedos-instance-related-view-wrapper td.td-childfield .antd-InputTable, .steedos-instance-related-view-wrapper td.td-childfield .antd-Table, .steedos-instance-related-view-wrapper td.td-childfield .antd-Table-contentWrap, .steedos-instance-related-view-wrapper td.td-childfield .antd-Table-content": {
|
|
472
|
+
"padding-top": "0 !important",
|
|
473
|
+
"margin-top": "0 !important",
|
|
474
|
+
"border-top": "0 !important",
|
|
475
|
+
"border-radius": "0 !important"
|
|
476
|
+
},
|
|
477
|
+
".steedos-instance-related-view-wrapper .steedos-input-table table.antd-Table-table th, .steedos-instance-related-view-wrapper .steedos-input-table table.antd-Table-table td": {
|
|
478
|
+
"box-shadow": "inset -1px 0 0 #666, inset 0 -1px 0 #666 !important",
|
|
479
|
+
"background-image": "none !important",
|
|
480
|
+
"outline": "0 !important"
|
|
481
|
+
},
|
|
482
|
+
".steedos-instance-related-view-wrapper .steedos-input-table table.antd-Table-table th:last-child, .steedos-instance-related-view-wrapper .steedos-input-table table.antd-Table-table td:last-child": {
|
|
483
|
+
"box-shadow": "inset 0 -1px 0 #666 !important"
|
|
484
|
+
},
|
|
463
485
|
".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table th.antd-Table-operationCell, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td.antd-Table-operationCell, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td.steedos-input-table-column-operation": {
|
|
464
486
|
"display": "none !important"
|
|
465
487
|
},
|
|
@@ -510,6 +532,13 @@
|
|
|
510
532
|
},
|
|
511
533
|
".steedos-instance-related-view-wrapper .table-page-body.form-table > tbody > tr:nth-child(2) td": {
|
|
512
534
|
"border-top": "none !important"
|
|
535
|
+
},
|
|
536
|
+
".instance-related-list .liquid-amis-container a": {
|
|
537
|
+
"display": "inline !important",
|
|
538
|
+
"font-weight": "400 !important"
|
|
539
|
+
},
|
|
540
|
+
".instance-file-list .liquid-amis-container button": {
|
|
541
|
+
"font-weight": "400 !important"
|
|
513
542
|
}
|
|
514
543
|
}
|
|
515
544
|
},
|
|
@@ -181,7 +181,7 @@ router.post('/am/forms', async function (req, res) {
|
|
|
181
181
|
space: form['space'],
|
|
182
182
|
user: userId
|
|
183
183
|
});
|
|
184
|
-
let companyId = currentSpaceUser.company_id;
|
|
184
|
+
let companyId = form.company_id || currentSpaceUser.company_id;
|
|
185
185
|
let newForm = {
|
|
186
186
|
_id: form["id"] || form["_id"],
|
|
187
187
|
name: form["name"],
|
|
@@ -280,19 +280,19 @@ router.post('/api/workflow/v2/nextStepUsersValue', requireAuthentication, async
|
|
|
280
280
|
|
|
281
281
|
let instance = await UUFlowManager.getInstance(instanceId);
|
|
282
282
|
|
|
283
|
-
// 优先从最近一次 traces 中查找 nextStepId 对应的处理人
|
|
283
|
+
// // 优先从最近一次 traces 中查找 nextStepId 对应的处理人
|
|
284
284
|
let newNextUsers = [];
|
|
285
|
-
const traces = instance.traces || [];
|
|
286
|
-
for (let i = traces.length - 1; i >= 0; i--) {
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
}
|
|
285
|
+
// const traces = instance.traces || [];
|
|
286
|
+
// for (let i = traces.length - 1; i >= 0; i--) {
|
|
287
|
+
// const trace = traces[i];
|
|
288
|
+
// if (trace.step === nextStepId && trace.approves && trace.approves.length > 0) {
|
|
289
|
+
// // 需要排除以下 approve.jude ['returned', 'terminated', 'retrieved'].includes(judge)
|
|
290
|
+
// newNextUsers = trace.approves
|
|
291
|
+
// .filter(approve => !['returned', 'terminated', 'retrieved'].includes(approve.judge))
|
|
292
|
+
// .map(approve => approve.handler);
|
|
293
|
+
// break;
|
|
294
|
+
// }
|
|
295
|
+
// }
|
|
296
296
|
|
|
297
297
|
// 如果 traces 中没有找到，回退到 step_approve
|
|
298
298
|
if (newNextUsers.length === 0) {
|