weaver-e10-builder 1.5.11 → 1.5.12

package/dist/services/actionflow/preflight_service.d.ts

@@ -13,6 +13,11 @@ export declare function resolveTargetForms(plan: Record<string, any>, client: Ap
 export declare function fillRequiredTriggerOperator(plan: Record<string, any>, client: ApiClient): Promise<any[]>;
 /** 把显式固定人员展开为当前租户 Browser 对象。 */
 export declare function resolveFixedPeople(plan: Record<string, any>, client: ApiClient): Promise<any[]>;
+/**
+ * DocumentSave.fileFolder 必须来自当前租户的文档目录 Browser。
+ * 只补全固定值；动态 FormulaBean 和已经构造好的 FormulaBean 不做目录搜索。
+ */
+export declare function resolveFixedDocumentFolders(plan: Record<string, any>, client: ApiClient): Promise<any[]>;
 /**
  * e-builder 关联字段的固定值必须是 Browser 对象，而不是名称字符串。
  * 设计器按名称输入时，先通过当前表单/字段的 complete 接口补齐真实 id 和显示名，

package/dist/services/actionflow/preflight_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preflight_service.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/preflight_service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preflight_service.d.ts","sourceRoot":"","sources":["../../../src/services/actionflow/preflight_service.ts"],"names":[],"mappings":"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"}

package/dist/services/actionflow/preflight_service.js

@@ -3,6 +3,7 @@ import * as workflowSource from './workflow_source.js';
 import * as personSource from './person_source.js';
 import * as contextSource from './context_source.js';
 import * as hrmSource from './hrm_source.js';
+import * as documentSource from './document_source.js';
 import { completeEbuilder, pickEbuilderBrowserRow } from './ebuilder_source.js';
 import { resolveHttpBindings } from './http_source.js';
 import { registerTargetFormFields, registerTargetDetailFields, registerWorkflowFieldIds, registerWorkflowContextFields, getWorkflowFieldIds, getWorkflowDetailFields, getWorkflowDetailNames, getTargetFormFields, getTargetDetailFields, } from './runtime_metadata.js';
@@ -524,6 +525,112 @@ export async function resolveFixedPeople(plan, client) {
         (plan._autoResources ??= []).push(...records);
     return records;
 }
+function documentFolderRows(response) {
+    const data = response && typeof response === 'object' && 'data' in response ? response.data : response;
+    if (Array.isArray(data))
+        return data;
+    if (Array.isArray(data?.data))
+        return data.data;
+    if (Array.isArray(data?.rows))
+        return data.rows;
+    if (Array.isArray(data?.list))
+        return data.list;
+    if (Array.isArray(data?.records))
+        return data.records;
+    return [];
+}
+function documentFolderId(row) {
+    return String(row?.id ?? row?.folderId ?? row?.fileFolderId ?? row?.value ?? '').trim();
+}
+function documentFolderNames(row) {
+    return [row?.name, row?.content, row?.title, row?.username, row?.path, row?.folderPath]
+        .filter((value) => value !== undefined && value !== null && String(value).trim() !== '')
+        .map((value) => String(value).trim());
+}
+function fixedDocumentFolderSelector(value) {
+    if (isDynamicAssignment(value))
+        return null;
+    const raw = value && typeof value === 'object' && value.kind === 'fixed' ? value.value : value;
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+        return null;
+    if (raw.type && raw.config && !raw.kind) {
+        const origin = Array.isArray(raw.config.originValue) ? raw.config.originValue[0] : raw.config.originValue;
+        return fixedDocumentFolderSelector(origin);
+    }
+    return {
+        id: String(raw.id ?? raw.folderId ?? raw.fileFolderId ?? raw.value ?? '').trim(),
+        name: String(raw.name ?? raw.content ?? raw.title ?? raw.username ?? raw.path ?? '').trim(),
+    };
+}
+function normalizeDocumentFolderBrowser(row) {
+    if (!row || typeof row !== 'object' || Array.isArray(row))
+        return row;
+    const normalized = { ...row };
+    if (normalized.name === undefined || normalized.name === null || String(normalized.name).trim() === '') {
+        const fallbackName = normalized.title ?? normalized.content ?? normalized.username ?? normalized.path ?? normalized.folderPath;
+        if (fallbackName !== undefined && fallbackName !== null && String(fallbackName).trim() !== '') {
+            normalized.name = String(fallbackName);
+        }
+    }
+    if (normalized.key && typeof normalized.key === 'object' && !Array.isArray(normalized.key)
+        && Object.keys(normalized.key).length === 0) {
+        delete normalized.key;
+    }
+    return normalized;
+}
+/**
+ * DocumentSave.fileFolder 必须来自当前租户的文档目录 Browser。
+ * 只补全固定值；动态 FormulaBean 和已经构造好的 FormulaBean 不做目录搜索。
+ */
+export async function resolveFixedDocumentFolders(plan, client) {
+    const records = [];
+    const targets = [...walkPlanSteps(plan.actions || [])].filter((step) => {
+        if (String(step.type || '') !== 'DocumentSave')
+            return false;
+        const value = step.params?.fileFolder;
+        return value !== undefined && value !== null && value !== '' && !isDynamicAssignment(value)
+            && !(value && typeof value === 'object' && value.type && value.config && !value.kind);
+    });
+    if (!targets.length)
+        return records;
+    const rows = await documentSource.esbCreateFolderComponentFolder(client, '');
+    const folders = documentFolderRows(rows);
+    const cache = new Map();
+    for (const step of targets) {
+        const params = step.params || {};
+        const raw = params.fileFolder;
+        if (raw === undefined || raw === null || raw === '' || isDynamicAssignment(raw))
+            continue;
+        if (raw && typeof raw === 'object' && raw.type && raw.config && !raw.kind)
+            continue;
+        const selector = fixedDocumentFolderSelector(raw);
+        if (!selector || (!selector.id && !selector.name)) {
+            throw new Error('DocumentSave.fileFolder 固定值必须包含真实文件夹 id 或 name；不能凭空生成目录对象');
+        }
+        const cacheKey = `${selector.id}\u0000${selector.name}`;
+        let matches = cache.get(cacheKey);
+        if (!matches) {
+            matches = selector.id
+                ? folders.filter((folder) => documentFolderId(folder) === selector.id)
+                : folders.filter((folder) => documentFolderNames(folder).includes(selector.name));
+            cache.set(cacheKey, matches);
+        }
+        if (matches.length !== 1) {
+            const target = selector.id || selector.name;
+            throw new Error(`DocumentSave.fileFolder 未能从文档文件夹 Browser 唯一匹配 '${target}'（匹配数: ${matches.length}）`);
+        }
+        params.fileFolder = normalizeDocumentFolderBrowser(matches[0]);
+        records.push({
+            path: `${step.type}.fileFolder`,
+            resourceType: 'document_folder_browser',
+            value: { id: documentFolderId(matches[0]), name: documentFolderNames(matches[0])[0] || selector.name },
+            reason: '新建文档目标文件夹已通过 esbCreateFolderComponentFolder 补全为当前租户真实 Browser 对象',
+        });
+    }
+    if (records.length)
+        (plan._autoResources ??= []).push(...records);
+    return records;
+}
 function isDynamicAssignment(value) {
     const kind = String(value?.kind ?? value?.assignmentKind ?? '').toLowerCase();
     return ['context', 'reference', 'system_variable', 'variable', 'constant', 'function', 'formula', 'query_result', 'transform'].includes(kind);
@@ -1690,6 +1797,12 @@ export async function preflightContext(plan, appId, client) {
     }
     await fillRequiredTriggerOperator(plan, client);
     await resolveFixedPeople(plan, client);
+    try {
+        await resolveFixedDocumentFolders(plan, client);
+    }
+    catch (error) {
+        errors.push(`DocumentSave 目标文件夹查询失败: ${String(error?.message || error)}`);
+    }
     await resolveEntrustFields(plan, client, errors);
     await resolveHrmFieldAssignments(plan, client, errors);
     await resolveHrmAlterTypeFieldAssignments(plan, client, errors);
@@ -1914,11 +2027,20 @@ export async function preflightContext(plan, appId, client) {
             for (const f of v.fields || []) {
                 if (!f || typeof f !== 'object')
                     continue;
+                const tablePrimaryKey = String(f.tablePrimaryKey || v.primaryKey || v.key || '').trim();
+                const tableName = String(f.tableName || v.name || v.label || tablePrimaryKey).trim();
+                const componentType = f.componentType || v.component;
                 if (f.showName && f.componentKey)
                     eventFieldTypes[String(f.showName)] = String(f.componentKey);
                 if (f.showName) {
                     const pk = String(f.paramKey || '');
-                    eventContextFields.push({ ...f, componentType: f.componentType || v.component });
+                    eventContextFields.push({
+                        ...f,
+                        componentType,
+                        tablePrimaryKey,
+                        tableName,
+                        contextGroup: tablePrimaryKey,
+                    });
                     const idx = seenPk[String(f.showName)];
                     if (idx === undefined) {
                         seenPk[String(f.showName)] = eventSourceFields.length;
@@ -1928,7 +2050,10 @@ export async function preflightContext(plan, appId, client) {
                             paramType: String(f.paramType || '').toLowerCase(),
                             paramKey: pk,
                             id: String(f.id || ''),
-                            componentType: f.componentType || v.component,
+                            componentType,
+                            tablePrimaryKey,
+                            tableName,
+                            contextGroup: tablePrimaryKey,
                         });
                     }
                     else if (pk.endsWith('[]') && !String(eventSourceFields[idx].paramKey).endsWith('[]')) {