npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.88 → 3.0.90 - Mend

@steedos-labs/plugin-workflow 3.0.88 → 3.0.90

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 (11) hide show

package/designer/dist/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="shortcut icon" type="image/svg+xml" href="/images/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>designer</title>
-    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-Cg85h361.js"></script>
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-jGaJitaP.js"></script>
     <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-CNcDjHgd.css">
   </head>
   <body>

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

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

package/main/default/manager/import.js CHANGED Viewed

@@ -151,7 +151,8 @@ async function upgradeForm(formId, form, currentUserId, spaceId) {
         'help_text': form["help_text"],
         'error_message': form["error_message"],
         'category': form["category"],
-        'instance_style': form["instance_style"]
+        'instance_style': form["instance_style"],
+        'chineseFieldNames': form["chineseFieldNames"] || false
     };
     return formCollection.updateOne({ _id: formId }, formUpdateObj);

package/main/default/manager/uuflow_manager.js CHANGED Viewed

@@ -1722,7 +1722,12 @@ UUFlowManager.workflow_engine = async function (approve_from_client, current_use
         }
     }
     // Skip Processed: Check if next step should be auto-skipped
-    await UUFlowManager.handleSkipProcessed(instance_id, flow);
+    // 滑步是已审批之后的附加处理，不应让其异常导致审批主流程失败回滚。
+    try {
+        await UUFlowManager.handleSkipProcessed(instance_id, flow);
+    } catch (error) {
+        console.error('[workflow/engine] [workflow_engine] handleSkipProcessed failed, ignored', error && error.message);
+    }
     console.log(`[workflow/engine] [workflow_engine] handleSkipProcessed took ${Date.now() - t8_skip}ms`);
     const t9 = Date.now();
@@ -2002,7 +2007,15 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
         } else {
             // Create new trace for the next step
             const space_id = instance.space;
-            const next_step_users = await HandlersManager.getHandlers(instance_id, next_step_id, instance.applicant);
+            let next_step_users;
+            try {
+                next_step_users = await HandlersManager.getHandlers(instance_id, next_step_id, instance.applicant);
+            } catch (error) {
+                // 下一步处理人解析失败（如角色/岗位未匹配到人）时，中止滑步，
+                // 让实例停留在当前已提交的步骤，避免把异常抛回已提交成功的主流程。
+                console.warn('[workflow/engine] [handleSkipProcessed] getHandlers failed, aborting skip', error && error.message);
+                return;
+            }
             if (!next_step_users || next_step_users.length === 0) {
                 console.warn('[workflow/engine] [handleSkipProcessed] No handlers found for next step after skip');
@@ -3825,8 +3838,15 @@ UUFlowManager.submit_instance = async function (instance_from_client, user_info)
     );
     // Skip Processed: Check if next step should be auto-skipped
+    // 申请单已提交（state 已更新为 pending），滑步是提交后的附加处理。
+    // 滑步失败不能把异常抛回提交接口，否则前台会提示失败但申请单其实已提交成功。
+    // 失败时让实例停留在第一个审批步骤。
     if (next_step.step_type !== "end") {
-        await UUFlowManager.handleSkipProcessed(instance_id, flow);
+        try {
+            await UUFlowManager.handleSkipProcessed(instance_id, flow);
+        } catch (error) {
+            console.error('[workflow/engine] [submit_instance] handleSkipProcessed failed, ignored', error && error.message);
+        }
     }
     if (next_step.step_type !== "end") {

package/main/default/routes/api_designer_startup.router.js CHANGED Viewed

@@ -87,7 +87,8 @@ router.get('/api/designer/startup', requireAuthentication, async function (req,
                         current: 1,
                         category: 1,
                         instance_style: 1,
-                        company_id: 1
+                        company_id: 1,
+                        chineseFieldNames: 1
                     }
                 }).fetch();
                 flows = db.flows.find(query, {

package/main/default/test/test_handleSkipProcessed_handlerError.js ADDED Viewed

@@ -0,0 +1,142 @@
+/**
+ * 回归测试：滑步（handleSkipProcessed）解析下一步处理人抛异常时，
+ * 不能把异常抛回已提交/已审批的主流程。
+ *
+ * 背景（线上现象）：
+ *  - 接口 /api/workflow/submit 返回
+ *      {"errors":[{"errorMessage":"error! 根据user_id和role_ids没查到对应的处理人"}]}
+ *    前台弹出该错误，但申请单其实已经提交出去了。
+ *  - 根因：submit_instance 先把实例 state 改成 pending（已提交，COMMIT），
+ *    然后才调用 handleSkipProcessed（提交后的附加处理）。当第一个审批步骤的
+ *    处理人就是申请人时，会触发滑步去解析“下一步骤”的处理人；若下一步用了
+ *    角色/岗位类处理人且没匹配到人，HandlersManager.getHandlers 会 throw。
+ *    该异常一路冒泡到路由 catch，返回 errors，但实例早已提交、无法回滚 →
+ *    “前台报错但申请单已提交”。
+ *
+ * 期望（修复后）：
+ *  - getHandlers 抛异常时，滑步中止（不再向上抛），handleSkipProcessed 正常返回。
+ *  - 实例不会被滑步进一步改动，停留在当前（第一个）审批步骤。
+ *
+ * 用法：
+ *   node main/default/test/test_handleSkipProcessed_handlerError.js
+ *   或 npm run test:skip-handler-error
+ */
+const assert = require('assert');
+// uuflow_manager 依赖运行时全局 `_`（lodash，由 Steedos server 注入），
+// 独立跑测试时手动补上。
+global._ = global._ || require('lodash');
+// 注入假 getCollection，使 uuflow_manager 不依赖真实数据库。
+// uuflow_manager 在加载时解构 `const { getCollection } = require('../utils/collection')`，
+// 解构后无法从外部改写其绑定；因此在 require uuflow_manager 之前，先把
+// utils/collection.js 的 require 缓存替换成假模块（两处解析到同一绝对路径，缓存键相同）。
+let updateCallCount = 0;
+const dummyCollection = {
+    // 修复正确时，else 分支在 getHandlers 抛错前不会用到这些方法；
+    // 一旦被调用说明滑步越过了中止点，计数用于断言“实例未被改动”。
+    updateOne: async function () { updateCallCount++; return { modifiedCount: 1 }; },
+    findOne: async function () { return null; },
+    find: function () { return { toArray: async () => [] }; },
+};
+const collectionPath = require.resolve('../utils/collection.js');
+require.cache[collectionPath] = {
+    id: collectionPath,
+    filename: collectionPath,
+    loaded: true,
+    exports: {
+        getCollection: async () => dummyCollection,
+        _makeNewID: () => 'fake_id',
+    },
+};
+const UUFlowManager = require('../manager/uuflow_manager.js');
+const HandlersManager = require('../manager/handlers_manager.js');
+let passed = 0;
+let failed = 0;
+async function run(name, fn) {
+    try {
+        await fn();
+        console.log(`  ✓ ${name}`);
+        passed++;
+    } catch (e) {
+        console.log(`  ✗ ${name}`);
+        console.log(`    ${e.message}`);
+        failed++;
+    }
+}
+const APPLICANT = 'user_applicant';
+function buildFakeInstance() {
+    return {
+        _id: 'ins1',
+        state: 'pending',
+        space: 'space1',
+        applicant: APPLICANT,
+        processed_user_ids: [APPLICANT], // 申请人默认已处理
+        traces: [
+            {
+                _id: 'trace1',
+                step: 'step1',
+                is_finished: false,
+                previous_trace_ids: [],
+                approves: [
+                    // type 缺省 → isNormalApprove 为 true；处理人就是申请人
+                    { _id: 'app1', user: APPLICANT, handler: APPLICANT },
+                ],
+            },
+        ],
+    };
+}
+(async () => {
+    console.log('UUFlowManager.handleSkipProcessed 下一步处理人解析异常兜底');
+    await run('getHandlers 抛异常 → 滑步中止，不向上抛，实例停留在当前步骤', async () => {
+        updateCallCount = 0;
+        const fakeInstance = buildFakeInstance();
+        UUFlowManager.getInstance = async function (id) {
+            assert.strictEqual(id, 'ins1');
+            return fakeInstance;
+        };
+        // 第一个审批步骤（sign，处理人=申请人，可滑步），出线指向 step2
+        // 下一步 step2 仍是审批步骤（非 end / 非 condition）→ 进入解析处理人的 else 分支
+        UUFlowManager.getStep = function (instance, flow, stepId) {
+            if (stepId === 'step1') {
+                return {
+                    _id: 'step1', name: 'Step1', step_type: 'sign',
+                    skip_enabled: true,
+                    lines: [{ state: 'approved', to_step: 'step2' }],
+                };
+            }
+            if (stepId === 'step2') {
+                return { _id: 'step2', name: 'Step2', step_type: 'sign' };
+            }
+            throw new Error('unexpected step ' + stepId);
+        };
+        // 模拟线上根因：角色/岗位没匹配到人 → 抛错
+        HandlersManager.getHandlers = async function () {
+            throw new Error('error! 根据user_id和role_ids没查到对应的处理人');
+        };
+        let thrown = null;
+        try {
+            await UUFlowManager.handleSkipProcessed('ins1', { _id: 'flow1' });
+        } catch (e) {
+            thrown = e;
+        }
+        assert.strictEqual(thrown, null,
+            '修复后 getHandlers 抛错不应再向上抛，否则已提交的申请单会被路由当成失败返回');
+        assert.strictEqual(updateCallCount, 0,
+            '滑步中止后不应再改动实例，申请单应停留在第一个审批步骤');
+    });
+    console.log(`\n${passed} passed, ${failed} failed`);
+    process.exit(failed > 0 ? 1 : 0);
+})();

package/main/default/utils/designerManager.js CHANGED Viewed

@@ -70,13 +70,13 @@ async function getByAdminSpaceIds(spaceIds, companyId, isCompanyAdmin, flowId) {
             }
             return await getObject('forms').find({
                 filters: formsFilters,
-                fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id']
+                fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id', 'chineseFieldNames']
             })
         })
     } else {
         formsPromise = getObject('forms').find({
             filters: filters,
-            fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id']
+            fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id', 'chineseFieldNames']
         })
     }
@@ -223,6 +223,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
                     'created': now,
                     'created_by': currentUserId,
                     'steps': flow.current.steps,
+                    'nextEvents': flow.current.nextEvents || {},
                     '_rev': flow.current._rev + 1,
                     'flow': flow._id,
                     'form_version': current._id,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.88",
+  "version": "3.0.90",
   "main": "package.service.js",
   "license": "MIT",
   "files": [
@@ -24,7 +24,8 @@
     "export-templates": "node run.js export",
     "convert-templates": "node convert-templates.js",
     "test:formula-compat": "node main/default/test/test_formula_compat.js",
-    "test:approve-values": "node main/default/test/test_getApproveValues.js"
+    "test:approve-values": "node main/default/test/test_getApproveValues.js",
+    "test:skip-handler-error": "node main/default/test/test_handleSkipProcessed_handlerError.js"
   },
   "dependencies": {
     "graphql-parse-resolve-info": "^4.12.3",