weaver-e10-builder 1.0.8-beta → 1.0.10-beta

package/dist/commands/form.js

@@ -930,12 +930,15 @@ export function registerFormCommands(program) {
                     type: 'Date', title: df.fieldName,
                     placeholder: placeholderFromFormat(dtFmt),
                     earlyDate: false, lateDate: false,
-                    earlyType: 'currentDay', lateType: 'currentDay',
                     format: dtFmt,
+                    hasDisplayFormat: true,
+                    minuteStep: 1,
                     isSystemDate: false,
                     timePanelStyle: { type: 'system' },
                     isDefault: dtHasDefault,
-                    ...(dtHasDefault ? { defaultExtend: { date: { type: 'current' }, time: { customValue: '00:00', type: 'custom' } } } : {}),
+                    ...(dtHasDefault
+                        ? { defaultExtend: { date: { type: 'current' }, time: { customValue: '00:00', type: 'custom' } } }
+                        : { defaultExtend: { date: { type: 'custom' } } }),
                     ...(dtMinTargetId ? { min: { type: 'dateField', checkValue: String(dtMinTargetId) }, earlyDate: true } : {}),
                     ...(dtMaxTargetId ? { max: { type: 'dateField', checkValue: String(dtMaxTargetId) }, lateDate: true } : {}),
                     formTableId: dtDetail?.formTableId || '',
@@ -2466,6 +2469,176 @@ export function registerFormCommands(program) {
             }
         }
     });
+    // ─── FIELD-GROUP（字段分组，对齐 wf-form group / form native field-group）──────────
+    // eb 表建后加分组（form create 的 fields.json group 是建表时一次性带；已建表用本命令）。
+    // 三步（module=ebuilderform，apid=appId，customParam={appId,objId}）：
+    //   ① saveFieldGroup       建分组 → data.group.id + refFieldId(layout Collapse id)
+    //   ② updateFormFieldGroup 分配字段（fieldList）
+    //   ③ initLayout            手动 Collapse config{id:refFieldId,componentKey:Fold,type:Collapse,
+    //                           dataKey:f_refFieldId,children:[分组字段]} + generateCollapse:true
+    //   兼容 FLOW（手动 Collapse）+ EXCEL（generateCollapse 也生效）。
+    //   去重：saveFieldGroup 不幂等，重跑会建重复分组；先 getFieldGroupPage 读现有分组按名复用。
+    form.command('group')
+        .description('字段分组（建分组/分配字段/布局 Collapse 折叠，对齐 wf-form group）。给已建好的 eb 表加分组')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 appId')
+        .requiredOption('--groups <json>', '分组定义 JSON：{"分组名":["字段名或fieldId",...]}，可 @文件路径')
+        .option('--required', '同时设分组内字段必填（re-init 时一起带上，防丢）')
+        .action(async (objId, appId, o) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        // eb 表 layout/field-manage 接口认 formId（≠objId）：从应用表单列表按 objId 解析 formId
+        let formId = '';
+        try {
+            const listRes = await client.get(`${baseUrl}/api/bs/ebuilder/form/obj/getList/${encodeURIComponent(appId)}?apid=${encodeURIComponent(appId)}`);
+            const hit = (listRes?.data || []).find((f) => String(f.id) === String(objId));
+            formId = hit?.formId || '';
+        }
+        catch { /* 忽略，下面报错 */ }
+        if (!formId)
+            throw new Error(`无法从应用 ${appId} 解析 objId=${objId} 的 formId（表单不存在或已删除）`);
+        const ebb = { ebbusinessid: formId };
+        const apidQ = `?apid=${encodeURIComponent(appId)}`;
+        const customParam = { appId, objId };
+        try {
+            let raw = o.groups;
+            if (raw.startsWith('@')) {
+                if (!existsSync(raw.slice(1)))
+                    throw new Error(`文件不存在: ${raw.slice(1)}`);
+                raw = readFileSync(raw.slice(1), 'utf-8');
+            }
+            const groupsMap = JSON.parse(raw);
+            const entries = Object.entries(groupsMap || {});
+            if (!entries.length)
+                throw new Error('--groups 为空');
+            // 读现有分组（去重）：getFieldGroupPage 返回字段带 formField.group，按 groupName 复用
+            const existing = new Map();
+            try {
+                const gr = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/getFieldGroupPage${apidQ}`, { pageNo: 1, pageSize: 100, module: 'ebuilderform', formFieldSearchEntity: { formId }, customParam: {} }, ebb);
+                for (const f of (gr?.data?.pageDatas?.result || [])) {
+                    const g = f?.formField?.group;
+                    if (g?.id && g?.groupName && !existing.has(g.groupName)) {
+                        existing.set(g.groupName, { groupId: String(g.id), refFieldId: String(BigInt(g.id) - 1n) });
+                    }
+                }
+            }
+            catch { /* 忽略，按无现有处理 */ }
+            // getConfig 解析字段名→id
+            const preLayout = await client.post(`${baseUrl}/api/ebuilder/form/builder/getFormLayout`, {
+                formId, module: 'ebuilderform', customParam: {}, formTableIdList: [],
+                designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
+            }, ebb);
+            const layoutId = preLayout?.data?.formLayout?.id || '';
+            const layoutMultiId = preLayout?.data?.formLayout?.multipleLayoutId || '';
+            const layoutName = preLayout?.data?.formLayoutMultiple?.name || preLayout?.data?.formLayout?.name || '';
+            const layoutType = preLayout?.data?.formLayoutMultiple?.layoutType || 'EXCEL';
+            if (!layoutId)
+                throw new Error('无法获取 layoutId');
+            const cfgRes = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/getConfig`, {
+                formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId,
+                customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+                designerParam: { sourceModule: 'ebuilderform' },
+            }, ebb);
+            if (cfgRes?.code !== 200 || !cfgRes?.status)
+                throw new Error(`getConfig 失败: ${cfgRes?.msg}`);
+            const allConfigs = cfgRes?.data?.configs || [];
+            const byName = new Map();
+            const walk = (arr) => { for (const c of arr) {
+                if (c.name)
+                    byName.set(String(c.name), c);
+                if (c.id)
+                    byName.set(String(c.id), c);
+                if (c.children?.length)
+                    walk(c.children);
+            } };
+            walk(allConfigs);
+            // ① 建组（去重：同名复用）+ ② 分配字段
+            const created = [];
+            for (const [gname, refs] of entries) {
+                let groupId, refFieldId;
+                const ex = existing.get(gname);
+                if (ex) {
+                    groupId = ex.groupId;
+                    refFieldId = ex.refFieldId;
+                    console.error(`  分组复用: ${gname} groupId=${groupId} refFieldId=${refFieldId}`);
+                }
+                else {
+                    const sr = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFieldGroup${apidQ}`, { module: 'ebuilderform', formFieldGroup: { groupName: gname, formId }, customParam }, ebb);
+                    if (sr?.code !== 200 || !sr?.status)
+                        throw new Error(`建分组「${gname}」失败: ${sr?.msg || '未知错误'}`);
+                    const g = sr?.data?.group || {};
+                    groupId = String(g.id || '');
+                    refFieldId = String(g.refFieldId || '');
+                    console.error(`  分组已建: ${gname} groupId=${groupId} refFieldId=${refFieldId}`);
+                }
+                const fieldIds = [];
+                const missing = [];
+                for (const ref of refs || []) {
+                    const f = byName.get(String(ref));
+                    if (f)
+                        fieldIds.push(String(f.id));
+                    else
+                        missing.push(String(ref));
+                }
+                if (missing.length)
+                    console.error(`  ⚠ 分组「${gname}」未找到字段: ${missing.join(', ')}`);
+                if (fieldIds.length) {
+                    const ur = await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/updateFormFieldGroup${apidQ}`, { module: 'ebuilderform', formFieldGroup: { id: groupId }, form: { id: formId }, fieldList: fieldIds.map((id) => ({ id })), customParam }, ebb);
+                    if (ur?.code !== 200 || !ur?.status)
+                        console.error(`  ⚠ 分组「${gname}」分配字段失败: ${ur?.msg || '未知错误'}`);
+                    else
+                        console.error(`  已分配: ${gname} ← ${fieldIds.length} 字段`);
+                }
+                created.push({ name: gname, groupId, refFieldId, fieldIds });
+            }
+            // ③ 布局：对齐 form-create.ts EXCEL 分组路径——平铺 configs + 分组字段前置重排
+            // （分组字段 → 系统字段 → 未分组字段）+ generateCollapse:true + groupFieldIds=[]，
+            // 平台据 saveFieldGroup/updateFormFieldGroup 记录自动包 Collapse（eb 表 EXCEL 实测唯一生效方式）。
+            const cfgRes2 = await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/getConfig`, {
+                formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId,
+                customParam: { terminal: '', objId: formId }, initMode: 5, groupFieldIds: [],
+                designerParam: { sourceModule: 'ebuilderform' },
+            }, ebb);
+            const rawCfgs = cfgRes2?.data?.configs || [];
+            const groupFieldIdSet = new Set(created.flatMap((g) => g.fieldIds));
+            const ordered = [
+                ...rawCfgs.filter((c) => groupFieldIdSet.has(String(c.id))),
+                ...rawCfgs.filter((c) => c.system),
+                ...rawCfgs.filter((c) => !groupFieldIdSet.has(String(c.id)) && !c.system),
+            ];
+            const finalConfigs = ordered.map((c) => {
+                const isBusiness = !c.system && c.type !== 'DetailTable' && c.componentKey !== 'DataTable';
+                const out = { ...c, display: c.system ? c.display : true, show: c.system ? c.show : true };
+                if (isBusiness) {
+                    out.readOnly = false;
+                    out.disableEdit = false;
+                    if (o.required === true)
+                        out.required = true;
+                }
+                return out;
+            });
+            await client.post(`${baseUrl}/api/ebuilder/form/form/view/relate/initLayout${apidQ}`, {
+                formId, module: 'ebuilderform', apiModule: 'ebuilder/form', layoutId,
+                generateCollapse: true, styleTemplateId: layoutType === 'FLOW' ? '820000000000000001' : '700000000000000008', styleTemplateType: 1,
+                configs: finalConfigs, addLayout: false, ecodeType: ['js', 'css'], initMode: '5',
+                groupFieldIds: [],
+                customParam: { terminal: '', objId: formId },
+                formLayoutMultiple: { isSys: true, id: layoutMultiId, name: layoutName, terminalType: 'PC', layoutType },
+                designerParam: { onlyLayout: false },
+            }, ebb);
+            console.log(opts.json
+                ? JSON.stringify({ success: true, formId, groups: created.map((g) => ({ name: g.name, groupId: g.groupId, refFieldId: g.refFieldId, fieldCount: g.fieldIds.length, reused: existing.has(g.name) })) }, null, 2)
+                : `字段分组完成: ${created.length} 个分组（布局已重建，generateCollapse 自动渲染）`);
+        }
+        catch (e) {
+            console.error(`字段分组失败: ${e.message}`);
+            process.exitCode = 1;
+        }
+    });
     return form;
 }
 //# sourceMappingURL=form.js.map