@steedos-labs/plugin-workflow 3.0.96 → 3.0.98

package/main/default/client/flow2_render.client.js

@@ -1,5 +1,5 @@
 waitForThing(window, 'antd').then(function(){
-    var v = '3.0.96';
+    var v = '3.0.98';
     loadJs('/amis-renderer/amis-renderer.js?v=' + v);
     loadCss('/amis-renderer/amis-renderer.css?v=' + v)
 })

package/main/default/manager/uuflow_manager.js

@@ -1676,8 +1676,23 @@ UUFlowManager.workflow_engine = async function (approve_from_client, current_use
     const t8 = Date.now();
     // Update instance
     const t8_1 = Date.now();
+    // 当步骤发生流转时，current_step_name 的变更必须经由 objectql 写入，
+    // 以触发 instances 的 afterUpdate（uuflowManager.triggerRecordInstanceQueue），
+    // 否则 instance_record_queue 不会生成同步记录。
+    // 这里先把 current_step_name 从原子 raw 写入中剥离（保留 $push traces 等原子性），
+    // raw 写入后 DB 仍保留旧的 current_step_name，再由 objectql 单独应用新步骤名，
+    // 使 afterUpdate 检测到 current_step_name 变化并触发同步。
+    const nextStepNameForQueue = updateObj.$set ? updateObj.$set.current_step_name : undefined;
+    const prevStepNameForQueue = updatedInstance.current_step_name;
+    const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== prevStepNameForQueue;
+    if (stepNameChangedForQueue) {
+        delete updateObj.$set.current_step_name;
+    }
     const instancesCollection = await getCollection('instances');
     await instancesCollection.updateOne({ _id: instance_id }, updateObj);
+    if (stepNameChangedForQueue) {
+        await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+    }
     console.log(`[workflow/engine] [workflow_engine] second updateOne took ${Date.now() - t8_1}ms`);
 
     // Insert new instance tasks if needed
@@ -1980,6 +1995,14 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
                 }
             }
 
+            // current_step_name 的变更必须经由 objectql 写入，以触发 instances 的 afterUpdate
+            // (uuflowManager.triggerRecordInstanceQueue)，否则滑步到结束不会生成 instance_record_queue 台账同步记录。
+            const nextStepNameForQueue = otherSetObj1.current_step_name;
+            const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== instance.current_step_name;
+            if (stepNameChangedForQueue) {
+                delete otherSetObj1.current_step_name;
+            }
+
             if (Object.keys(traceSetObj1).length > 0) {
                 await instancesCollection.updateOne(
                     { _id: instance_id },
@@ -2000,6 +2023,10 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
                 }
             );
 
+            if (stepNameChangedForQueue) {
+                await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+            }
+
             // Update instance tasks for skipped approves
             for (const approve of shouldSkipApproves) {
                 await update_instance_tasks(instance_id, lastTrace._id, approve._id);
@@ -2124,6 +2151,14 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
                 }
             }
 
+            // current_step_name 的变更必须经由 objectql 写入，以触发 instances 的 afterUpdate
+            // (uuflowManager.triggerRecordInstanceQueue)，否则滑步到下一步不会生成 instance_record_queue 台账同步记录。
+            const nextStepNameForQueue = otherSetObj2.current_step_name;
+            const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== instance.current_step_name;
+            if (stepNameChangedForQueue) {
+                delete otherSetObj2.current_step_name;
+            }
+
             if (Object.keys(traceSetObj2).length > 0) {
                 await instancesCollection.updateOne(
                     { _id: instance_id },
@@ -2144,6 +2179,10 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
                 }
             );
 
+            if (stepNameChangedForQueue) {
+                await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+            }
+
             // Update instance tasks for skipped approves
             for (const approve of shouldSkipApproves) {
                 await update_instance_tasks(instance_id, lastTrace._id, approve._id);
@@ -5007,6 +5046,14 @@ UUFlowManager.relocate = async function (instance_from_client, current_user_info
     setObj.traces = traces;
 
     // Update instance
+    // current_step_name 的变更必须经由 objectql 写入，以触发 instances 的 afterUpdate
+    // (uuflowManager.triggerRecordInstanceQueue)，否则移交不会生成 instance_record_queue 台账同步记录。
+    const nextStepNameForQueue = setObj.current_step_name;
+    const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== instance.current_step_name;
+    if (stepNameChangedForQueue) {
+        delete setObj.current_step_name;
+    }
+
     const updateOperation = setObj.state === 'completed'
         ? { $set: setObj }
         : { $set: setObj, $unset: { finish_date: 1 } };
@@ -5016,6 +5063,10 @@ UUFlowManager.relocate = async function (instance_from_client, current_user_info
         updateOperation
     );
 
+    if (stepNameChangedForQueue) {
+        await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+    }
+
     if (result.modifiedCount > 0) {
         // Update instance tasks
         await remove_many_instance_tasks(finishedApproveIds);

package/main/default/routes/api_workflow_instance_return.router.js

@@ -16,6 +16,7 @@ const {
 } = require('../manager/instance_tasks_manager')
 const UUFlowManager = require('../manager/uuflow_manager');
 const { getCollection, _makeNewID } = require('../utils/collection');
+const { getObject } = require('@steedos/objectql');
 
 router.post('/api/workflow/v2/instance/return', requireAuthentication, async function (req, res) {
     try {
@@ -157,6 +158,15 @@ router.post('/api/workflow/v2/instance/return', requireAuthentication, async fun
         setObj.modified_by = current_user;
         setObj.values = ins.values;
         setObj.current_step_name = pre_trace.name;
+
+        // current_step_name 的变更必须经由 objectql 写入，以触发 instances 的 afterUpdate
+        // (uuflowManager.triggerRecordInstanceQueue)，否则退回不会生成 instance_record_queue 台账同步记录。
+        const nextStepNameForQueue = setObj.current_step_name;
+        const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== ins.current_step_name;
+        if (stepNameChangedForQueue) {
+            delete setObj.current_step_name;
+        }
+
         r = await instancesCollection.updateOne({
             _id: instance_id,
             'traces._id': last_trace._id
@@ -181,6 +191,11 @@ router.post('/api/workflow/v2/instance/return', requireAuthentication, async fun
             { $set: { processed_user_ids: [ins.applicant] } }
         );
 
+        // 台账同步：经 objectql 重新写入 current_step_name，触发 afterUpdate 生成同步记录
+        if (stepNameChangedForQueue) {
+            await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+        }
+
         if (r && b) {
             await pushManager.send_message_to_specifyUser("current_user", current_user);
             instance = await UUFlowManager.getInstance(instance_id);

package/main/default/routes/api_workflow_instance_terminate.router.js

@@ -16,6 +16,7 @@ const PermissionManager = require('../manager/permission_manager');
 const UUFlowManager = require('../manager/uuflow_manager');
 const pushManager = require('../manager/push_manager');
 const { _makeNewID, getCollection } = require('../utils/collection');
+const { getObject } = require('@steedos/objectql');
 
 /**
  * Terminate a workflow instance
@@ -168,11 +169,23 @@ router.post("/api/workflow/v2/instance/terminate", requireAuthentication, async
         // Update instance
         const instancesCollection = await getCollection('instances');
 
+        // current_step_name 的变更必须经由 objectql 写入，以触发 instances 的 afterUpdate
+        // (uuflowManager.triggerRecordInstanceQueue)，否则取消申请不会生成 instance_record_queue 台账同步记录。
+        const nextStepNameForQueue = setObj.current_step_name;
+        const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== instance.current_step_name;
+        if (stepNameChangedForQueue) {
+            delete setObj.current_step_name;
+        }
+
         const result = await instancesCollection.updateOne(
             { _id: instance_id },
             { $set: setObj }
         );
 
+        if (stepNameChangedForQueue) {
+            await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+        }
+
         if (result.modifiedCount > 0) {
             // Remove instance tasks
             await remove_many_instance_tasks(finishedApproveIds);

package/main/default/routes/api_workflow_retrieve.router.js

@@ -19,6 +19,7 @@ const {
 const UUFlowManager = require('../manager/uuflow_manager');
 const pushManager = require('../manager/push_manager');
 const { getCollection, _makeNewID } = require('../utils/collection');
+const { getObject } = require('@steedos/objectql');
 /**
 @api {post} /api/workflow/retrieve 取回
 @apiVersion 0.0.0
@@ -252,12 +253,24 @@ router.post('/api/workflow/retrieve', requireAuthentication, async function (req
             setObj.current_step_name = previous_trace_name;
             setObj.current_step_auto_submit = await UUFlowManager.getCurrentStepAutoSubmit(flow.timeout_auto_submit, previous_step.lines);
 
+            // current_step_name 的变更必须经由 objectql 写入，以触发 instances 的 afterUpdate
+            // (uuflowManager.triggerRecordInstanceQueue)，否则取回不会生成 instance_record_queue 台账同步记录。
+            const nextStepNameForQueue = setObj.current_step_name;
+            const stepNameChangedForQueue = nextStepNameForQueue !== undefined && nextStepNameForQueue !== instance.current_step_name;
+            if (stepNameChangedForQueue) {
+                delete setObj.current_step_name;
+            }
+
             r = await instancesCollection.updateOne({
                 _id: instance_id,
             }, {
                 $set: setObj,
             });
 
+            if (stepNameChangedForQueue) {
+                await getObject('instances').update(instance_id, { current_step_name: nextStepNameForQueue });
+            }
+
             // 更新被取回的approve
             await update_many_instance_tasks(instance_id, last_trace_id, finishedApproveIds)
             // 插入取回操作的approve

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.96",
+  "version": "3.0.98",
   "main": "package.service.js",
   "license": "MIT",
   "files": [