@steedos-labs/plugin-workflow 3.0.43 → 3.0.45

package/main/default/test/test_rollbackApprovalCommentsField.js

@@ -0,0 +1,235 @@
+const assert = require('assert');
+const mod = require('../../../src/rests/rollbackApprovalCommentsField');
+
+const { processFieldsArrayForRollback } = mod._helpers;
+
+let suitePassed = 0;
+let suiteFailed = 0;
+
+function runSuite(name, fn) {
+    let passed = 0;
+    let failed = 0;
+    const suiteAssert = {
+        strictEqual(a, b, msg) {
+            try {
+                assert.strictEqual(a, b, msg);
+                passed++;
+            } catch (e) {
+                failed++;
+                console.error(`  FAIL: ${msg || e.message}`);
+            }
+        },
+        ok(val, msg) {
+            try {
+                assert.ok(val, msg);
+                passed++;
+            } catch (e) {
+                failed++;
+                console.error(`  FAIL: ${msg || e.message}`);
+            }
+        }
+    };
+    fn(suiteAssert);
+    suitePassed += passed;
+    suiteFailed += failed;
+    if (failed === 0) {
+        console.log(`  ${name}: ${passed} assertions passed.`);
+    } else {
+        console.log(`  ${name}: ${passed} passed, ${failed} FAILED.`);
+    }
+}
+
+console.log('[test_rollbackApprovalCommentsField] running tests...');
+
+// ---------------------------------------------------------------------------
+// Flat (first-level) transformed field
+// ---------------------------------------------------------------------------
+runSuite('processFieldsArrayForRollback (flat)', (t) => {
+    const fields = [
+        {
+            code: 'mgr_comments',
+            type: 'steedos-field',
+            __approval_comments_transformed: true,
+            __approval_comments_original_type: 'input',
+            __approval_comments_original_formula: '{traces.主管审核}',
+            config: { type: 'approval_comments' }
+        },
+        { code: 'plain_field', type: 'text' }  // not transformed
+    ];
+    const { updates, unsets, fieldCount } = processFieldsArrayForRollback(
+        fields, 'current.fields', 'form1', 'TestForm'
+    );
+
+    t.strictEqual(fieldCount, 1, 'fieldCount should be 1');
+    t.ok(updates.some(u => u.path === 'current.fields.0.type' && u.value === 'input'),
+        'type path and value restored');
+    t.ok(updates.some(u => u.path === 'current.fields.0.formula' && u.value === '{traces.主管审核}'),
+        'formula path and value restored');
+    t.ok(unsets.includes('current.fields.0.__approval_comments_transformed'),
+        '__approval_comments_transformed unset');
+    t.ok(unsets.includes('current.fields.0.config'), 'config unset');
+    t.ok(unsets.includes('current.fields.0.__approval_comments_original_type'),
+        '__approval_comments_original_type backup removed');
+    t.ok(unsets.includes('current.fields.0.__approval_comments_original_formula'),
+        '__approval_comments_original_formula backup removed');
+});
+
+// ---------------------------------------------------------------------------
+// Nested (section container) — primary regression scenario
+// ---------------------------------------------------------------------------
+runSuite('processFieldsArrayForRollback (nested sections)', (t) => {
+    const fields = [
+        { code: 'plain_top', type: 'text' },  // index 0, not transformed
+        {
+            code: 'section_a',
+            type: 'section',
+            fields: [
+                { code: 'nested_plain', type: 'text' },  // index 0, not transformed
+                {
+                    code: 'dept_comments',
+                    type: 'steedos-field',
+                    __approval_comments_transformed: true,
+                    __approval_comments_original_type: 'input',
+                    __approval_comments_original_formula: '{traces.部门审核}',
+                    config: { type: 'approval_comments' }
+                }  // index 1
+            ]
+        }  // index 1
+    ];
+    const { updates, unsets, fieldCount } = processFieldsArrayForRollback(
+        fields, 'current.fields', 'form1', 'TestForm'
+    );
+
+    t.strictEqual(fieldCount, 1, 'fieldCount should be 1 (only nested field)');
+    t.ok(updates.some(u => u.path === 'current.fields.1.fields.1.type' && u.value === 'input'),
+        'nested type restored at correct path');
+    t.ok(updates.some(u => u.path === 'current.fields.1.fields.1.formula'),
+        'nested formula restored at correct path');
+    t.ok(unsets.includes('current.fields.1.fields.1.__approval_comments_transformed'),
+        'nested: __approval_comments_transformed unset at correct path');
+    t.ok(unsets.includes('current.fields.1.fields.1.config'),
+        'nested: config unset at correct path');
+    t.ok(unsets.includes('current.fields.1.fields.1.__approval_comments_original_type'),
+        'nested: original_type backup removed');
+    t.ok(unsets.includes('current.fields.1.fields.1.__approval_comments_original_formula'),
+        'nested: original_formula backup removed');
+});
+
+// ---------------------------------------------------------------------------
+// Deeply nested (section > panel)
+// ---------------------------------------------------------------------------
+runSuite('processFieldsArrayForRollback (deeply nested)', (t) => {
+    const fields = [
+        {
+            code: 'section1', type: 'section',
+            fields: [
+                {
+                    code: 'panel1', type: 'panel',
+                    fields: [
+                        {
+                            code: 'deep_field',
+                            type: 'steedos-field',
+                            __approval_comments_transformed: true,
+                            __approval_comments_original_type: 'textarea',
+                            config: {}
+                        }
+                    ]
+                }
+            ]
+        }
+    ];
+    const { updates, fieldCount } = processFieldsArrayForRollback(
+        fields, 'current.fields', 'form1', 'TestForm'
+    );
+
+    t.strictEqual(fieldCount, 1, 'deep: fieldCount=1');
+    t.ok(updates.some(u => u.path === 'current.fields.0.fields.0.fields.0.type' && u.value === 'textarea'),
+        'deeply nested type restored at correct path');
+    t.ok(!updates.some(u => u.path === 'current.fields.0.type'),
+        'section container itself not touched');
+});
+
+// ---------------------------------------------------------------------------
+// Mixed: top-level and nested transformed fields
+// ---------------------------------------------------------------------------
+runSuite('processFieldsArrayForRollback (mixed top-level and nested)', (t) => {
+    const fields = [
+        {
+            code: 'top_comments',
+            type: 'steedos-field',
+            __approval_comments_transformed: true,
+            __approval_comments_original_type: 'input',
+            config: {}
+        },
+        {
+            code: 'section_b', type: 'section',
+            fields: [
+                {
+                    code: 'nested_comments',
+                    type: 'steedos-field',
+                    __approval_comments_transformed: true,
+                    __approval_comments_original_type: 'input',
+                    config: {}
+                }
+            ]
+        }
+    ];
+    const { updates, fieldCount } = processFieldsArrayForRollback(
+        fields, 'current.fields', 'form1', 'TestForm'
+    );
+
+    t.strictEqual(fieldCount, 2, 'mixed: fieldCount=2 (one top-level, one nested)');
+    t.ok(updates.some(u => u.path === 'current.fields.0.type'), 'top-level type restored');
+    t.ok(updates.some(u => u.path === 'current.fields.1.fields.0.type'), 'nested type restored');
+});
+
+// ---------------------------------------------------------------------------
+// historys prefix
+// ---------------------------------------------------------------------------
+runSuite('processFieldsArrayForRollback (historys prefix)', (t) => {
+    const fields = [
+        {
+            code: 'hist_comments',
+            type: 'steedos-field',
+            __approval_comments_transformed: true,
+            __approval_comments_original_type: 'input',
+            config: {}
+        }
+    ];
+    const { updates, fieldCount } = processFieldsArrayForRollback(
+        fields, 'historys.0.fields', 'form1', 'TestForm'
+    );
+
+    t.strictEqual(fieldCount, 1, 'historys: fieldCount=1');
+    t.ok(updates.some(u => u.path === 'historys.0.fields.0.type'), 'historys prefix in path');
+});
+
+// ---------------------------------------------------------------------------
+// Non-transformed fields not touched
+// ---------------------------------------------------------------------------
+runSuite('processFieldsArrayForRollback (non-transformed skipped)', (t) => {
+    const fields = [
+        { code: 'f1', type: 'text' },
+        { code: 'section', type: 'section', fields: [
+            { code: 'f2', type: 'input' }
+        ]}
+    ];
+    const { updates, unsets, fieldCount } = processFieldsArrayForRollback(
+        fields, 'current.fields', 'form1', 'TestForm'
+    );
+
+    t.strictEqual(fieldCount, 0, 'non-transformed: fieldCount=0');
+    t.strictEqual(updates.length, 0, 'non-transformed: no updates');
+    t.strictEqual(unsets.length, 0, 'non-transformed: no unsets');
+});
+
+// ---------------------------------------------------------------------------
+// Summary
+// ---------------------------------------------------------------------------
+if (suiteFailed === 0) {
+    console.log('[test_rollbackApprovalCommentsField] All assertions passed.');
+    process.exit(0);
+} else {
+    console.error(`[test_rollbackApprovalCommentsField] ${suiteFailed} assertions FAILED.`);
+    process.exit(1);
+}

package/main/default/triggers/amis_form_design.trigger.js

@@ -105,7 +105,8 @@ function getFormInputFields(formSchema) {
 				// 考虑使用steedos-field组件时 name配置到config的情况
 				field.name = field.name || (field.config && field.config.name);
                 if(field.type === 'steedos-field-group'){
-                    field.name = field.title
+                    // steedos-field-group 去重时优先取 title，若 title 为 undefined（历史表单无 name 时生成的 schema 没有 title），则 fallback 到 label 或 name，防止 undefined===undefined 导致后续分组字段被误判为重复而丢失
+                    field.name = field.title || field.label || field.name
                 }
                 // 如果要添加的field重复 无需再添加
 				if (field.name === item.name) {

package/main/default/utils/designerManager.js

@@ -187,8 +187,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
             pass = true;
         }
     }
-
-    if (pass === true && ff["current"]["start_date"]) { // 升级表单
+    if (pass === true) { // 升级表单
         formUpdateObj.$push = {
             'historys': ff["current"]
         };
@@ -196,9 +195,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         current._rev = ff["current"]["_rev"] + 1;
         current.created = now;
         current.created_by = currentUserId;
-        if (ff.state === 'enabled') {
-            current.start_date = now;
-        }
+        current.start_date = now;
         // 更新流程版本
         let flowCursor = await flowCollection.find({form: formId});
         let flowList = await flowCursor.toArray();

package/package.json

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