@steedos-labs/plugin-workflow 3.0.83 → 3.0.85

package/main/default/test/test_getApproveValues.js

@@ -0,0 +1,221 @@
+/**
+ * 回归测试：UUFlowManager.getApproveValues 对公式子字段的兜底识别。
+ *
+ * 背景：
+ *  - issue: 子表保存后刷新，公式子字段计算结果丢失（线上现象）
+ *  - PR #781 在过滤规则中加 `c.formula ||` 放权
+ *  - 但部分历史表单设计器保存时丢失了字段的 `formula` 属性，
+ *    公式表达式被转存到 `default_value`，形如 "${...}"
+ *  - 因此除了 `c.formula` 之外，还需把 `default_value` 形如 "${...}" 的字段视为公式字段
+ *
+ * 用法：
+ *   node main/default/test/test_getApproveValues.js
+ *   或 yarn workspace @steedos-labs/plugin-workflow test:approve-values
+ */
+
+const assert = require('assert');
+
+// 注意：require uuflow_manager.js 会顺带加载 @steedos/objectql 等运行时依赖；
+// 本机已验证可独立加载，无需启动完整 server。
+const UUFlowManager = require('../manager/uuflow_manager.js');
+
+// Monkey-patch DB 读取函数，注入测试用 form schema
+const fakeForms = {};
+UUFlowManager.getForm = async function (form_id) {
+    if (!fakeForms[form_id]) throw new Error(`fake form not found: ${form_id}`);
+    return fakeForms[form_id];
+};
+UUFlowManager.getFormVersion = function (form, form_version) {
+    if (form.current && form.current._id === form_version) return form.current;
+    const h = (form.historys || []).find(f => f._id === form_version);
+    if (!h) throw new Error(`fake form version not found: ${form_version}`);
+    return h;
+};
+
+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}`);
+        if (e.actual !== undefined) {
+            console.log(`    actual:   ${JSON.stringify(e.actual)}`);
+            console.log(`    expected: ${JSON.stringify(e.expected)}`);
+        }
+        failed++;
+    }
+}
+
+(async () => {
+    console.log('UUFlowManager.getApproveValues 公式子字段兜底识别');
+
+    // 通用：父表 readonly，前两个子字段 editable，第三个（公式）无显式权限
+    const permissions = {
+        '表格': 'readable',
+        '加油量': 'editable',
+        '单价': 'editable',
+        '金额': 'readable',
+    };
+
+    const submittedRow = {
+        _id: 'row1',
+        '加油量': '10',
+        '单价': '8',
+        '金额': '80', // 客户端计算出的公式值
+    };
+
+    await run('公式子字段带 formula 属性（本地新版 schema）→ 保留金额', async () => {
+        fakeForms['F1'] = {
+            current: {
+                _id: 'V1',
+                fields: [{
+                    type: 'table',
+                    code: '表格',
+                    fields: [
+                        { type: 'number', code: '加油量' },
+                        { type: 'number', code: '单价' },
+                        { type: 'number', code: '金额', formula: '{加油量}*{单价}' },
+                    ],
+                }],
+            },
+        };
+        const approve_values = { '表格': [Object.assign({}, submittedRow)] };
+        const out = await UUFlowManager.getApproveValues(approve_values, permissions, 'F1', 'V1');
+        assert.deepStrictEqual(out['表格'][0], submittedRow);
+    });
+
+    await run('公式子字段无 formula、default_value 为 ${...}（线上老 schema）→ 保留金额', async () => {
+        fakeForms['F2'] = {
+            current: {
+                _id: 'V2',
+                fields: [{
+                    type: 'table',
+                    code: '表格',
+                    fields: [
+                        { type: 'number', code: '加油量', default_value: '0.00' },
+                        { type: 'number', code: '单价', default_value: '0.00' },
+                        { type: 'number', code: '金额', default_value: '${加油量*单价}' },
+                    ],
+                }],
+            },
+        };
+        const approve_values = { '表格': [Object.assign({}, submittedRow)] };
+        const out = await UUFlowManager.getApproveValues(approve_values, permissions, 'F2', 'V2');
+        assert.deepStrictEqual(out['表格'][0], submittedRow,
+            '老 schema 公式子字段应被识别保留，否则保存后刷新公式值会丢失');
+    });
+
+    await run('普通子字段 default_value 是纯字符串 → 不当作公式，无 editable 权限则删除', async () => {
+        fakeForms['F3'] = {
+            current: {
+                _id: 'V3',
+                fields: [{
+                    type: 'table',
+                    code: '表格',
+                    fields: [
+                        { type: 'text', code: '加油量' },
+                        { type: 'text', code: '单价' },
+                        { type: 'text', code: '备注', default_value: '默认备注' },
+                    ],
+                }],
+            },
+        };
+        const perms = { '表格': 'readable', '加油量': 'editable', '单价': 'editable', '备注': 'readable' };
+        const row = { _id: 'r', '加油量': '1', '单价': '2', '备注': '客户端写入' };
+        const approve_values = { '表格': [Object.assign({}, row)] };
+        const out = await UUFlowManager.getApproveValues(approve_values, perms, 'F3', 'V3');
+        assert.strictEqual(out['表格'][0]['备注'], undefined, '普通字段不应被当作公式保留');
+        assert.strictEqual(out['表格'][0]['加油量'], '1');
+    });
+
+    await run('default_value 形如 "${"... 但未完整闭合 → 不当作公式', async () => {
+        fakeForms['F4'] = {
+            current: {
+                _id: 'V4',
+                fields: [{
+                    type: 'table',
+                    code: '表格',
+                    fields: [
+                        { type: 'text', code: '加油量' },
+                        { type: 'text', code: '怪字段', default_value: '${unclosed' },
+                    ],
+                }],
+            },
+        };
+        const perms = { '表格': 'readable', '加油量': 'editable', '怪字段': 'readable' };
+        const row = { _id: 'r', '加油量': '1', '怪字段': 'x' };
+        const approve_values = { '表格': [Object.assign({}, row)] };
+        const out = await UUFlowManager.getApproveValues(approve_values, perms, 'F4', 'V4');
+        assert.strictEqual(out['表格'][0]['怪字段'], undefined);
+    });
+
+    await run('顶层公式字段无 formula、default_value=${...} → 保留', async () => {
+        fakeForms['F5'] = {
+            current: {
+                _id: 'V5',
+                fields: [
+                    { type: 'number', code: '数量' },
+                    { type: 'number', code: '小计', default_value: '${数量*10}' },
+                ],
+            },
+        };
+        const perms = { '数量': 'editable', '小计': 'readable' };
+        const approve_values = { '数量': '5', '小计': '50' };
+        const out = await UUFlowManager.getApproveValues(approve_values, perms, 'F5', 'V5');
+        assert.strictEqual(out['小计'], '50', '顶层公式字段应同样被兜底识别');
+    });
+
+    await run('section 内公式子字段无 formula、default_value=${...} → 保留', async () => {
+        fakeForms['F6'] = {
+            current: {
+                _id: 'V6',
+                fields: [{
+                    type: 'section',
+                    code: 'section1',
+                    fields: [
+                        { type: 'number', code: '数量' },
+                        { type: 'number', code: '小计', default_value: '${数量*10}' },
+                    ],
+                }],
+            },
+        };
+        const perms = { '数量': 'editable', '小计': 'readable' };
+        const approve_values = { '数量': '5', '小计': '50' };
+        const out = await UUFlowManager.getApproveValues(approve_values, perms, 'F6', 'V6');
+        assert.strictEqual(out['小计'], '50', 'section 内公式字段应同样被兜底识别');
+    });
+
+    await run('permissions 为 null → 直接返回 {}', async () => {
+        const out = await UUFlowManager.getApproveValues({ x: 1 }, null, 'F1', 'V1');
+        assert.deepStrictEqual(out, {});
+    });
+
+    await run('historys 版本中的老 schema 同样生效', async () => {
+        fakeForms['F7'] = {
+            current: { _id: 'V7_NEW', fields: [] },
+            historys: [{
+                _id: 'V7_OLD',
+                fields: [{
+                    type: 'table',
+                    code: '表格',
+                    fields: [
+                        { type: 'number', code: '加油量', default_value: '0.00' },
+                        { type: 'number', code: '单价', default_value: '0.00' },
+                        { type: 'number', code: '金额', default_value: '${加油量*单价}' },
+                    ],
+                }],
+            }],
+        };
+        const approve_values = { '表格': [Object.assign({}, submittedRow)] };
+        const out = await UUFlowManager.getApproveValues(approve_values, permissions, 'F7', 'V7_OLD');
+        assert.deepStrictEqual(out['表格'][0], submittedRow);
+    });
+
+    console.log(`\n${passed} passed, ${failed} failed`);
+    process.exit(failed === 0 ? 0 : 1);
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.83",
+  "version": "3.0.85",
   "main": "package.service.js",
   "license": "MIT",
   "files": [
@@ -23,7 +23,8 @@
     "release": "npm run build:designer && npm run stamp-version && npm publish --registry https://registry.npmjs.org && npx cnpm sync @steedos-labs/plugin-workflow",
     "export-templates": "node run.js export",
     "convert-templates": "node convert-templates.js",
-    "test:formula-compat": "node main/default/test/test_formula_compat.js"
+    "test:formula-compat": "node main/default/test/test_formula_compat.js",
+    "test:approve-values": "node main/default/test/test_getApproveValues.js"
   },
   "dependencies": {
     "graphql-parse-resolve-info": "^4.12.3",