@steedos-labs/plugin-workflow 3.0.51 → 3.0.53

package/main/default/test/scan_production_formulas.js

@@ -139,7 +139,7 @@ function extractAggregationFieldRefs(formula) {
  * @returns {{ issues: object[], convertedResult: string|null }}
  */
 function checkFormula({ formula, tableFieldMap, formId, formName, formVersionType,
-    field, fieldLocation, formulaSource, siblingCodes }) {
+    field, fieldLocation, formulaSource, siblingCodes, inSection }) {
 
     const fieldCode = field.code || '';
     const fieldType = field.type || '';
@@ -236,6 +236,21 @@ function checkFormula({ formula, tableFieldMap, formId, formName, formVersionTyp
         }
     }
 
+    // E6: 设计器 section 嵌套兼容性 — 检测设计器对 section 子字段传递 true 而非 tableFieldMap 的问题
+    if (inSection && convertedResult && tableFieldMap && Object.keys(tableFieldMap).length > 0) {
+        const designerResult = mapFormula(formula, true);
+        if (designerResult !== convertedResult) {
+            issues.push({
+                level: 'ERROR',
+                ruleId: 'E6',
+                ...baseInfo,
+                convertedResult,
+                errorDetail: `设计器兼容性: section 子字段公式转换结果与引擎不一致。引擎正确结果="${convertedResult}", 设计器结果="${designerResult}"。原因: flow_form_design.ejs 对 section 子字段传递 true 而非 tableFieldMap`,
+                siblingFields: siblingCodes,
+            });
+        }
+    }
+
     // W1: 除零风险（含除法且除数是字段引用）
     if (/\/\s*\{[^{}]+\}/.test(formula)) {
         issues.push({
@@ -278,9 +293,10 @@ function detectSafeCodeConflicts(codes) {
  * @param {object[]} fields
  * @param {object}   tableFieldMap   顶层 getTableFieldMap 结果
  * @param {string}   locationPrefix  "top" 或 "table:{tableCode}"
- * @returns {object[]} 每项包含 field, formula, source, location, siblingCodes
+ * @param {boolean}  inSection       是否嵌套在 section 内部
+ * @returns {object[]} 每项包含 field, formula, source, location, siblingCodes, inSection
  */
-function collectFormulaFields(fields, tableFieldMap, locationPrefix) {
+function collectFormulaFields(fields, tableFieldMap, locationPrefix, inSection = false) {
     if (!Array.isArray(fields)) return [];
     const results = [];
 
@@ -293,7 +309,8 @@ function collectFormulaFields(fields, tableFieldMap, locationPrefix) {
             const childLocation = field.type === 'table'
                 ? `table:${field.code}`
                 : locationPrefix;
-            results.push(...collectFormulaFields(field.fields, tableFieldMap, childLocation));
+            const childInSection = field.type === 'section' || inSection;
+            results.push(...collectFormulaFields(field.fields, tableFieldMap, childLocation, childInSection));
         }
 
         // formula 属性
@@ -304,6 +321,7 @@ function collectFormulaFields(fields, tableFieldMap, locationPrefix) {
                 source: 'formula',
                 location: locationPrefix,
                 siblingCodes: siblingCodes.filter(c => c !== field.code),
+                inSection,
             });
         }
 
@@ -317,6 +335,7 @@ function collectFormulaFields(fields, tableFieldMap, locationPrefix) {
                 source: 'default_value',
                 location: locationPrefix,
                 siblingCodes: siblingCodes.filter(c => c !== field.code),
+                inSection,
             });
         }
     }
@@ -352,7 +371,7 @@ function scanForm(form) {
         const tableFieldMap = getTableFieldMap(fields);
         const formulaFields = collectFormulaFields(fields, tableFieldMap, 'top');
 
-        for (const { field, formula, source, location, siblingCodes } of formulaFields) {
+        for (const { field, formula, source, location, siblingCodes, inSection } of formulaFields) {
             const dedupeKey = JSON.stringify({ code: field.code, location, source, formula });
 
             // current 版本直接处理，history 版本若 current 已有则跳过
@@ -369,6 +388,7 @@ function scanForm(form) {
                 fieldLocation: location,
                 formulaSource: source,
                 siblingCodes,
+                inSection,
             });
 
             const status = fieldIssues.length > 0

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

@@ -568,24 +568,25 @@ module.exports = {
             let spaceId = this.spaceId || this.doc?.space;
 
             let userSession = await auth.getSessionByUserId(userId, spaceId)
-            let roles = userSession.roles;
-            // 执行者的身份校验
-            await desingerManager.checkSpaceUserBeforeUpdate(spaceId, userId, roles);
-            // 更新表单
-            await desingerManager.updateForm(this.id, form, updatedForms, updatedFlows, userId);
-
-            const flows = await objectql.getObject('flows').directFind({
-                filters: ['form', '=', this.id],
-                fields: ['_id']
-            });
-
-            for (const flow of flows) {
-                await objectql.getObject('flows').directUpdate(flow._id, {
-                    modified: new Date(),
-                    modified_by: userId
-                })
+            if(userSession){
+                let roles = userSession.roles;
+                // 执行者的身份校验
+                await desingerManager.checkSpaceUserBeforeUpdate(spaceId, userId, roles);
+                // 更新表单
+                await desingerManager.updateForm(this.id, form, updatedForms, updatedFlows, userId);
+
+                const flows = await objectql.getObject('flows').directFind({
+                    filters: ['form', '=', this.id],
+                    fields: ['_id']
+                });
+
+                for (const flow of flows) {
+                    await objectql.getObject('flows').directUpdate(flow._id, {
+                        modified: new Date(),
+                        modified_by: userId
+                    })
+                }
             }
-
         }
 
     },

package/package.json

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