weaver-e10-builder 1.5.13 → 1.5.15

package/dist/commands/form.js

@@ -3,8 +3,9 @@ import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { parseLayoutJson } from '../services/form-layout-source/json.js';
 import { toColumnName, toTableName, resolveFieldKeys } from '../utils/column-name.js';
-import { createCustomPhysicalForm, applyInitialFieldsToNewForm, placeholderFromFormat, reapplyGroupLayout, queryFormStorageSetting } from '../services/form-create.js';
+import { createCustomPhysicalForm, applyInitialFieldsToNewForm, collectDetailEBuilderFields, defaultSwitchOptions, placeholderFromFormat, reapplyGroupLayout, queryFormStorageSetting } from '../services/form-create.js';
 import { getRichType, richIdUnits, BROWSER_KINDS } from '../services/rich-types.js';
+import { BROWSER_BEAN_SEARCH, browserBeanRows, resolveBrowserByName } from '../services/browser.js';
 import { dropFieldComponents, prepareLayoutForSave } from '../services/form-field-drop.js';
 import { describeEditBaseFailure, resolveEditBase as resolveEditBasePure } from '../services/form-edit-base.js';
 import { applyFieldPatches, platformFieldShape } from '../services/form-field-patch.js';
@@ -22,6 +23,7 @@ import { resolveFormRecord, resolveFormId, appendThirdPartyForms, resolveObjIdBy
 import { FIELD_TYPE_CHOICES, canonComponentKey, assertFieldType, normalizeFieldDef } from '../services/form-field-validate.js';
 import { listFormTables, readFieldRecords, mapFieldsToTables } from '../services/form-physical-table.js';
 import { buildFormulaParameters, defaultReturnType } from '../services/formula-detail.js';
+import { assertViewLinkageFormulaFunctions, loadViewLinkageFunctions } from '../services/form-view-linkage-functions.js';
 import { registerOptionTemplateCommand } from './form-option-template.js';
 import { registerFormObjMetaCommands } from './form-obj-meta.js';
 import { prepareSourceLayoutInputs, restoreSourceLayoutAfterCreate } from '../services/form-layout-source/creation.js';
@@ -310,6 +312,19 @@ export function registerFormCommands(program) {
             }
         }
     });
+    form.command('browser-source')
+        .description('检索当前环境可用的关联浏览数据源（含自定义浏览框）')
+        .option('--keyword <name>', '按名称关键词检索', '')
+        .action(async (o) => {
+        const auth = await AuthSession.fromOptions(program.opts());
+        if (!auth)
+            throw new Error('无法加载认证');
+        const client = new ApiClient(auth);
+        const res = await client.get(`${auth.getBaseUrl()}${BROWSER_BEAN_SEARCH}?searchValue=${encodeURIComponent(o.keyword)}`);
+        if (res?.code !== 200 || res?.status === false)
+            throw new Error(res?.msg || '浏览数据源检索失败');
+        console.log(JSON.stringify(browserBeanRows(res).map((b) => ({ id: b.id, name: b.name, module: b.module, type: b.type })), null, 2));
+    });
     form.command('create')
         .description('创建表单')
         .argument('<appId>', '应用 ID')
@@ -571,6 +586,8 @@ export function registerFormCommands(program) {
         let objId = '';
         let formId = '';
         let fieldGroups = [];
+        /** 明细表定义 → 建出来的 subFormId（明细 EBuilder 关联绑定要用）。 */
+        let detailTables = [];
         try {
             const result = await createCustomPhysicalForm(client, baseUrl, appId, name, requestedTableName, false, layoutType);
             objId = result.objId;
@@ -586,6 +603,7 @@ export function registerFormCommands(program) {
             // services/form-create.ts 的 applyInitialFieldsToNewForm，「专项建表」共用同一条链。
             const fieldResult = await applyInitialFieldsToNewForm(client, baseUrl, appId, objId, formId, fieldDefs, { tenantKey: auth.tenantKey, layoutType, systemOverrides });
             fieldGroups = fieldResult.fieldGroups;
+            detailTables = fieldResult.detailTables || [];
         }
         catch (e) {
             console.error(`创建失败: ${e.message}`);
@@ -637,15 +655,22 @@ export function registerFormCommands(program) {
         // Step 2: EBuilder fields need follow-up binding to target forms.
         // 无 sformId 的 EBuilder 会被建成裸关联字段（isAddForRelation=false，无目标表），
         // 这是"关联ebuilder不对"的常见来源，明确警告避免静默。
-        const ebNoTarget = fieldDefs.filter(f => f.componentKey === 'EBuilder' && !f.sformId);
+        // 明细表里的 EBuilder 子字段也要绑定 —— 它们不在 fieldDefs 顶层，必须从 DetailTable.formFields 里取。
+        // 只靠下面的顶层循环，明细 EBuilder 会建成`isAddForRelation=false`、没有 sformId/formName 的裸字段。
+        const detailEbDefs = collectDetailEBuilderFields(fieldDefs);
+        const ebNoTarget = [
+            ...fieldDefs.filter(f => f.componentKey === 'EBuilder' && !f.sformId),
+            ...detailEbDefs.filter((f) => !f.sformId).map((f) => ({ ...f, fieldName: `${f.detailName}.${f.fieldName}` })),
+        ];
         if (ebNoTarget.length > 0) {
             console.error(`  ⚠ ${ebNoTarget.length} 个 EBuilder 字段缺少 sformId，将建成无关联裸字段:`);
             for (const f of ebNoTarget)
                 console.error(`    - ${f.fieldName}（需在 fields.json 指定 sformId=<目标表单objId> 与 dataTitle=<显示字段>）`);
         }
         const ebFields = fieldDefs.filter(f => f.componentKey === 'EBuilder' && f.sformId);
-        if (ebFields.length > 0) {
-            console.error(`  绑定 ${ebFields.length} 个 EBuilder 关联字段...`);
+        const detailEbFields = detailEbDefs.filter((f) => f.sformId);
+        if (ebFields.length > 0 || detailEbFields.length > 0) {
+            console.error(`  绑定 ${ebFields.length + detailEbFields.length} 个 EBuilder 关联字段...`);
             // Resolve target form names and field IDs from sformId
             const formList = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${appId}?apid=${appId}`, { ebbusinessid: appId });
             const allForms = formList?.data || [];
@@ -807,6 +832,81 @@ export function registerFormCommands(program) {
                     console.error(`    关联失败: ${ef.fieldName} — ${updateRes?.msg || '未知错误'}`);
                 }
             }
+            // 明细表子字段：创建时不在主表字段记录里，按 subFormId 单独读回再补关联。
+            // 用 getFormField 的完整记录做底保存 —— 只发少数字段会把 subFormId / formTableId 等冲掉。
+            if (detailEbFields.length > 0) {
+                const subFormIdByDetail = new Map(detailTables.map((dt) => [String(dt.definition?.fieldName ?? ''), String(dt.subFormId ?? '')]));
+                const childRowsCache = new Map();
+                const childRowsOf = async (subFormId) => {
+                    if (!childRowsCache.has(subFormId)) {
+                        const r = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormFieldPage?apid=${appId}`, {
+                            pageNo: 1, pageSize: 500, module: 'ebuilderform',
+                            customParam: { appId, objId },
+                            formFieldSearchEntity: { isDelete: 0, status: 'enable', formId: resolvedFormId, subFormId },
+                        }, { ebbusinessid: resolvedFormId });
+                        childRowsCache.set(subFormId, r?.data?.pageDatas?.result || r?.data?.data?.records || r?.data?.data || []);
+                    }
+                    return childRowsCache.get(subFormId);
+                };
+                for (const ef of detailEbFields) {
+                    const subFormId = subFormIdByDetail.get(String(ef.detailName)) || '';
+                    if (!subFormId) {
+                        console.error(`    警告: 找不到明细表「${ef.detailName}」的 subFormId，跳过 ${ef.fieldName}`);
+                        continue;
+                    }
+                    const rows = await childRowsOf(subFormId);
+                    const hits = rows.filter((r) => String(r.title ?? r.fieldName ?? '') === String(ef.fieldName));
+                    if (hits.length !== 1) {
+                        console.error(`    警告: 明细表「${ef.detailName}」里${hits.length ? '有多个' : '找不到'}「${ef.fieldName}」，无法绑定，跳过`);
+                        continue;
+                    }
+                    const child = hits[0];
+                    const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: child.fieldId, form: { id: resolvedFormId } } } }, { ebbusinessid: resolvedFormId });
+                    const full = gf?.data || child;
+                    let targetBizFields = [];
+                    try {
+                        const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+                            objId: ef.sformId, userid: auth.userId, tenantKey: auth.tenantKey,
+                        });
+                        targetBizFields = (tfd?.data?.mainFields || [])
+                            .filter((f) => /^\d+$/.test(String(f.fieldId)))
+                            .map((f) => ({ id: String(f.fieldId), name: String(f.fieldName || f.title || '') }))
+                            .slice(0, 5);
+                    }
+                    catch { /* 目标表查询失败则显示列留空 */ }
+                    const jsonObj = {
+                        ...full,
+                        formId: resolvedFormId,
+                        sformId: ef.sformId,
+                        formName: ef.formName || formNameById.get(ef.sformId || '') || ef.sformId || '',
+                        dataTitle: await resolveDataTitle(ef.sformId || '', ef.dataTitle || 'name'),
+                        appId,
+                        isAddForRelation: true,
+                        displayType: 'line',
+                        viewDataDetail: true,
+                        quickAddParams: [],
+                        relateViewData: [],
+                        relateField: null,
+                        virtualForm: false,
+                        virtualTable: false,
+                        type: 'EBuilder',
+                        componentKey: 'Ebuilder',
+                        isSingle: ef.multiple ? false : true,
+                        ffDisplayColumns: Array.isArray(ef.displayColumns) && ef.displayColumns.length
+                            ? ef.displayColumns
+                                .map((name) => targetBizFields.find((f) => f.name === name))
+                                .filter((f) => !!f)
+                            : targetBizFields,
+                    };
+                    const res = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId: resolvedFormId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify(jsonObj) }, { ebbusinessid: resolvedFormId });
+                    if (res?.code === 200 && res?.status) {
+                        console.error(`    已关联: ${ef.detailName}.${ef.fieldName} → ${ef.sformId}`);
+                    }
+                    else {
+                        console.error(`    关联失败: ${ef.detailName}.${ef.fieldName} — ${res?.msg || '未知错误'}`);
+                    }
+                }
+            }
         }
         // Step 2a: Select 绑定选项预设模板（fields.json optionTemplate 属性）。
         // 建表时字段已建成裸 Select（无选项），此处补 templateId/templateName/publicTemplate:false/options:[]。
@@ -1838,11 +1938,19 @@ export function registerFormCommands(program) {
         if (config.formulaId) {
             if (!config.formulaName)
                 throw new Error('引用已有公式需同时提供 formulaName');
+            const detail = await client.post(`${baseUrl}/api/excel/formula/detail`, { formulaId: config.formulaId });
+            const existing = detail?.resultJson?.data;
+            if (!detail?.resultJson?.excute || !existing?.expressSql)
+                throw new Error('无法读取已有公式表达式，已停止绑定显示属性联动');
+            if (String(existing.returnType || '').toLowerCase() !== 'boolean')
+                throw new Error('显示属性联动引用的已有公式必须返回 Boolean');
+            assertViewLinkageFormulaFunctions(String(existing.expressSql), await loadViewLinkageFunctions(client, baseUrl));
             return { id: String(config.formulaId), name: String(config.formulaName) };
         }
         if (!config.formula)
             return undefined;
         const expression = String(config.formula).trim();
+        assertViewLinkageFormulaFunctions(expression, await loadViewLinkageFunctions(client, baseUrl));
         const parsed = await buildFormulaParameters(client, baseUrl, objId, appId, formId, expression);
         if (parsed.errors.length)
             throw new Error(`公式引用无效: ${parsed.errors.join('; ')}`);
@@ -2359,6 +2467,7 @@ export function registerFormCommands(program) {
         .option('--data-title <field>', '目标表单的显示字段名（仅 EBuilder；缺省 name=目标表含"名称"的字段，无则第一个业务字段）')
         .option('--form-name <name>', '目标表单名称（仅 EBuilder 类型，可选）')
         .option('--browser-type <type>', `通用浏览类型：${BROWSER_KINDS.join('、')}`)
+        .option('--browser-name <name>', '按名称精确指定浏览数据源（含自定义浏览框）；优先于 --browser-type')
         .option('--browser-form-source <source>', '表单浏览数据源：business 或 ebuilder（仅 --browser-type form）')
         .option('--format <fmt>', '日期精度格式（Date/DateTime/DateRange），如 yyyy-MM-dd、yyyy-MM-dd HH:mm')
         .option('--min-field <field>', 'Date/DateTime 日期限制：最早不得早于该字段（字段名，min.dateField）')
@@ -2413,6 +2522,12 @@ export function registerFormCommands(program) {
         const endId = genIds[2] || '';
         const labelFieldId = genIds[idCount] || String(Date.now());
         const cmdOpts = cmdOptsRaw || {};
+        if (cmdOpts.browserName) {
+            if (fieldType !== 'Browser' && fieldType !== 'RelateBrowser') {
+                throw new Error('--browser-name 仅适用于 Browser/RelateBrowser 字段');
+            }
+            cmdOpts.browserType = await resolveBrowserByName(client, baseUrl, cmdOpts.browserName, { ebbusinessid: formId });
+        }
         const sformId = cmdOpts.sformId || '';
         const dataTitle = cmdOpts.dataTitle || '';
         const formName = cmdOpts.formName || '';
@@ -2499,7 +2614,7 @@ export function registerFormCommands(program) {
                         console.error('  本表还没有这个类型，改用平台给的字段模板合成组件...');
                         placed = await insertFieldIntoLayout(client, baseUrl, formId, { ...insertArgs, fieldTypeTemplate: tpl });
                     }
-                    console.error(`  布局已更新: excel[${placed.row},${placed.col}]（增量插入，未重建）`);
+                    console.error(`  布局已更新: ${placed.row ? `excel[${placed.row},${placed.col}]` : 'FLOW'}（增量插入，未重建）`);
                     // 网格补格这类「改成功了但不干净」的情况要让人看见，不能闷掉。
                     for (const w of placed.warnings)
                         console.error(`  ⚠ ${w}`);
@@ -2593,6 +2708,29 @@ export function registerFormCommands(program) {
                     console.error(`  布局更新失败: ${e.message}`);
                 }
             }
+            // 开关：布局写入会把字段 options 冲回空（模板 comp 里没有选项），
+            // 必须在布局之后按完整记录补一次 开启=1 / 关闭=0。
+            if (fieldType === 'Switch') {
+                try {
+                    const gf = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFormField`, { module: 'ebuilderform', formTableField: { formField: { id: fieldId, form: { id: formId } } } }, { ebbusinessid: formId });
+                    const full = gf?.data || {};
+                    if (full.fieldId) {
+                        const ogen = await client.post(`${baseUrl}/api/form/local/generatorIds?size=2&apid=${appId}`, {});
+                        const optionIds = (ogen?.data?.generatorIds || []).map(String);
+                        const ores = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, {
+                            formId, module: 'ebuilderform', customParam: { appId, objId },
+                            jsonObj: JSON.stringify({ ...full, options: defaultSwitchOptions(fieldId, optionIds) }),
+                        }, { ebbusinessid: formId });
+                        if (ores?.code === 200 && ores?.status)
+                            console.error('  开关默认选项已配置: 开启=1 / 关闭=0');
+                        else
+                            console.error(`  ⚠ 开关默认选项未确认保存: ${ores?.msg || '未知错误'}`);
+                    }
+                }
+                catch (e) {
+                    console.error(`  ⚠ 开关默认选项配置失败: ${e.message}`);
+                }
+            }
         }
         else {
             console.error(`添加失败: ${data?.msg || JSON.stringify(data) || '未知错误'}`);