weaver-e10-builder 1.0.8-beta → 1.0.9-beta

package/dist/commands/form-native.js

@@ -1,31 +1,130 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
+import { genSfId } from '../services/actionflow/id_generator.js';
 /**
- * 原生表单引擎（非 Ebuilder）表单管理。
+ * 原生表单引擎（非 Ebuilder）表单管理 — formdatareport/biaoge 引擎。
  *
- * scaffold-apis 文档（form/references/form-manage/）：
- *   建表/更新：POST /api/{module}/form/formmanage/saveForm   {module, form:{name,orgId,status,ownership,physicalTable}, customParam}
- *   复制：    POST /api/{module}/form/formmanage/copyForm    {module, formId, formManageCopyConfig, form}
- *   列表：    POST /api/{module}/form/formmanage/getFormPage {pageNo,pageSize,module,formSearchEntity:{isDelete,formIdList,orgId}}
- *   详情：    POST /api/{module}/form/formmanage/getForm      {module, form:{id,orgId}, customParam}
+ * 浏览器抓包实测（2026-08-27 mulinquan）：
+ *   建表/更新：POST /api/formdatareport/form/formmanage/saveForm
+ *     {module:"formdatareport", form:{associatedForm:"new", name, formCategory:null,
+ *       layoutType:"advanced"(EXCEL表格)/"flow"(流式), tableName, orgId?, formManageCopyConfig:["fieldLink"],
+ *       formType:"business", personalCategory:"other", isAdvance:true}, customParam:{personalCategory:null}}
+ *   加字段：POST /api/formdatareport/form/field/manage/saveFormFieldNew
+ *     {formId, module:"biaoge", jsonObj:"<字段jsonObj字符串,含预生成fieldId>"}
+ *     字段 jsonObj 里 required 不落库（必填走布局 comp config，见 layout init）。
+ *   批量加字段：POST /api/formdatareport/form/field/manage/batch/save/formField
+ *     {module:"biaoge", formId, forms:[], ids:[], delSubFormIds:[], delFormTableIdList:[],
+ *      jsonObjList:[<字段jsonObj字符串>], replaceFieldIdMap:{}}
+ *   建明细子表：POST /api/formdatareport/form/field/manage/saveSubForm
+ *     {physicalTable:false, order:0, subFormId:<预生成>, type:"DetailTable", module:"biaoge",
+ *      dataKey:"<tableName>_mxb1", formTable:{id:<主formId>, form:{id:<subFormId>, name, order:"0.00"}}}
+ *   明细加字段：复用 saveFormFieldNew，jsonObj 多 subFormId + describeType:"popover" + describePosition:"titleRight"
+ *   读字段：POST /api/formdatareport/form/field/manage/getFormFieldPage
+ *     {pageNo, pageSize, module:"biaoge", formFieldSearchEntity:{isDelete:0, status:"enable", formId, subFormId?}}
+ *     结果在 data.pageDatas.result[]
+ *   读布局：POST /api/formdatareport/form/view/relate/getConfig
+ *     {formId, module:"biaoge", apiModule:"formdatareport", layoutId, customParam:{}, initMode:5,
+ *      groupFieldIds:[], designerParam:{sourceModule:"biaoge"}}
+ *   init布局：POST /api/formdatareport/form/view/relate/initLayout
+ *     {formId, module:"biaoge", apiModule:"formdatareport", layoutId, generateCollapse,
+ *      styleTemplateId:"700000000000000007"(EXCEL)/"820000000000000001"(FLOW), styleTemplateType:1,
+ *      configs:[<comp>], addLayout:false, ecodeType:["js","css"], customParam:{},
+ *      formLayoutMultiple:{isSys, id, name, terminalType:"PC", layoutType},
+ *      designerParam:{onlyLayout:false}, initMode:"1"}
+ *     comp = {id(=fieldId), name, componentKey, display, show, readOnly, required, disableEdit,
+ *             singleRow, isDelete, showOrder, type, typeDescribe, dataKey, [config], [children]}
+ *     DetailTable comp 带 config:{allowDelete,requiredRows,allowEdit,allowAdd,allowCopy,readOnly,
+ *             componentKey:"DataTable",required:false} + children:[明细字段comp]
  *
- * 与 Ebuilder 表单的关键差异：
- *   - 显式 module（URL+Body 一致，如 formdatareport）；Ebuilder 走固定 ebuilder 前缀
- *   - 只有 formId，无 objId；Ebuilder 双 ID（objId+formId）
- *   - 字段/布局接口同名但前缀不同：原生 /api/{module}/form/...，Ebuilder /api/ebuilder/form/...
+ * 与 Ebuilder 表单/流程表单的关键差异：
+ *   - URL 前缀 /api/formdatareport/form/...；formmanage body module="formdatareport"，
+ *     字段/布局 body module="biaoge" + apiModule="formdatareport"。
+ *   - 只有 formId，无 objId。
+ *   - EXCEL 模板 id = 700000000000000007（workflow 引擎是 700000000000000008）。
+ *   - fieldId/subFormId 客户端预生成（genSfId 雪花），平台对 id 区间宽松。
  */
+const MOD_FORM = 'formdatareport'; // formmanage body module + URL 前缀
+const MOD_FIELD = 'biaoge'; // 字段/布局 body module
+const API_MOD = 'formdatareport'; // 布局 body apiModule
+const TPL_EXCEL = '700000000000000007';
+const TPL_FLOW = '820000000000000001';
+function placeholderFromFormat(fmt) {
+    if (fmt.includes('HH:mm:ss'))
+        return '年-月-日 时:分:秒';
+    if (fmt.includes('HH:mm'))
+        return '年-月-日 时:分';
+    return '年-月-日';
+}
+/** 构建 saveFormFieldNew 的 field jsonObj（未带 fieldId，调用方 genSfId 填）。对齐抓包结构。 */
+function buildFieldJsonObj(o) {
+    const { type: ck, title, dataKey, formId } = o;
+    const base = { type: ck, title, dataKey, formId, showOrder: '0.00', groupId: '-1' };
+    if (ck === 'Text')
+        Object.assign(base, { maxLen: 100, unique: false, scan: false, readonlyTransLink: false });
+    else if (ck === 'TextArea')
+        Object.assign(base, { height: 3, readonlyTransLink: false, maxLen: 4000 });
+    else if (ck === 'Number')
+        Object.assign(base, {
+            numberType: 'number', pointSize: '0', isDefault: false,
+            capitalPosition: 'outside', capitalSetting: 'system', capitalPrecision: 'yuan',
+        });
+    else if (ck === 'Money')
+        Object.assign(base, {
+            numberType: 'number', pointSize: '2', isDefault: false,
+            capitalPosition: 'outside', capitalSetting: 'system', capitalPrecision: 'yuan',
+        });
+    else if (ck === 'Date' || ck === 'DateTime') {
+        const fmt = o.format || (ck === 'DateTime' ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd');
+        Object.assign(base, {
+            type: 'Date', placeholder: placeholderFromFormat(fmt),
+            earlyDate: false, lateDate: false,
+            // date-only: earlyType/lateType + isSystemDate；datetime: minuteStep/secondStep/defaultExtend
+            ...(fmt.includes('HH') ? { minuteStep: 1, secondStep: 1, defaultExtend: { date: { type: 'custom' } } } : { earlyType: 'currentDay', lateType: 'currentDay', isSystemDate: false }),
+            format: fmt, timePanelStyle: { type: 'system' }, isDefault: false,
+        });
+    }
+    else if (ck === 'Select' || ck === 'SelectMultiple') {
+        Object.assign(base, {
+            optionBackgroundStyle: 'default', hideScore: true, templateId: '', detailDefaultId: '',
+            options: (o.options || []).map((op, i) => ({
+                componentKey: 'Option', name: op.name, order: i, selectionId: '', defOption: i === 0,
+                uid: crypto.randomUUID(), other: false, archive: false, isLimit: false,
+                optionNum: '1000000', score: '0', styleConfig: { OptionBackground: op.color || '#5DD4EF' },
+                valueKey: String(i), children: [],
+            })),
+            templateScore: {},
+        });
+    }
+    else if (ck === 'Employee' || ck === 'Department') {
+        Object.assign(base, {
+            isSingle: o.multiple ? false : false, allList: [], componentList: [], displayType: 'space',
+            defaultExtend: { type: 'custom', relation: 'current' },
+            viewDataDetail: true, showDimension: true,
+            pcDisplaySelectedCount: { type: 'default' }, mobileDisplaySelectedCount: { type: 'default' },
+        });
+    }
+    return base;
+}
+async function getLayoutMeta(client, baseUrl, formId) {
+    const res = await client.post(`${baseUrl}/api/${MOD_FORM}/form/builder/getFormLayout`, {
+        formId, module: MOD_FORM, customParam: {}, formTableIdList: [],
+        designerParam: { onlyLayout: false, convert: false }, form: { id: formId },
+    }, { ebbusinessid: formId });
+    if (res?.code !== 200 || !res?.status)
+        throw new Error(`getFormLayout 失败: ${res?.msg}`);
+    const fl = res.data?.formLayout || {}, flm = res.data?.formLayoutMultiple || {};
+    return { layoutId: fl.id || '', layoutMultiId: flm.id || '', layoutName: flm.name || '', layoutType: flm.layoutType || 'EXCEL' };
+}
 export function registerFormNativeCommands(form, program) {
-    const fn = form.command('native').description('原生表单引擎表单管理（非 Ebuilder，formId 体系）');
+    const fn = form.command('native').description('原生表单引擎表单管理（formdatareport/biaoge，非 Ebuilder，formId 体系）');
     // ─── CREATE ─────────────────────────────────────────────
     fn.command('create')
-        .description('新建原生表单引擎表单（saveForm，返回 formId）')
+        .description('新建原生表单（saveForm，layoutType:advanced=EXCEL表格 / flow=流式）')
         .argument('<name>', '表单名称')
-        .requiredOption('--module <m>', '模块来源（URL+Body 一致，如 formdatareport）')
-        .requiredOption('--org-id <id>', '所属组织 ID')
-        .option('--ownership <type>', '所有权类型（personal 等，按页面枚举）', 'personal')
-        .option('--status <s>', '状态：enable(默认) / disable', 'enable')
-        .option('--no-physical-table', '非物理表单（默认物理表 physicalTable=true）')
-        .option('--category <id>', '表单分类 ID（formCategory.id）')
+        .option('--module <m>', '模块（默认 formdatareport）', 'formdatareport')
+        .option('--layout-type <t>', '布局：advanced=EXCEL表格(默认) / flow=流式', 'advanced')
+        .option('--table-name <n>', '物理表名（默认 ft_拼音_随机）')
+        .option('--org-id <id>', '所属组织 ID（分权租户需要）')
         .action(async (name, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
@@ -33,104 +132,331 @@ export function registerFormNativeCommands(form, program) {
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
+        const tableName = cmdOpts.tableName || ('ft_' + name.replace(/[^\w]/g, '_').slice(0, 8).toLowerCase() + Math.floor(Math.random() * 9000 + 1000));
         const payload = {
             module: cmdOpts.module,
             form: {
-                name,
-                orgId: cmdOpts.orgId,
-                status: cmdOpts.status,
-                ownership: cmdOpts.ownership,
-                isAdvance: false,
-                physicalTable: cmdOpts.physicalTable,
-                formCategory: cmdOpts.category ? { id: cmdOpts.category } : null,
+                associatedForm: 'new', name, formCategory: null,
+                layoutType: cmdOpts.layoutType, tableName,
+                formManageCopyConfig: ['fieldLink'], formType: 'business',
+                personalCategory: 'other', isAdvance: true,
             },
-            customParam: {},
+            customParam: { personalCategory: null },
         };
+        if (cmdOpts.orgId)
+            payload.form.orgId = cmdOpts.orgId;
         const res = await client.post(`${baseUrl}/api/${cmdOpts.module}/form/formmanage/saveForm`, payload);
         if (res?.code !== 200 || !res?.status) {
             console.error(`新建失败: ${res?.msg || '未知错误'}`);
             process.exit(1);
         }
-        const formId = res?.data?.id || res?.data?.form?.id || '';
+        const formId = res?.data?.id || '';
         if (!formId) {
             console.error(`返回成功但未拿到 formId: ${JSON.stringify(res?.data).slice(0, 200)}`);
             process.exit(1);
         }
-        console.error(`表单已创建: ${name}  formId=${formId}`);
-        // 回读验收 getForm
-        try {
-            const getRes = await client.post(`${baseUrl}/api/${cmdOpts.module}/form/formmanage/getForm`, { module: cmdOpts.module, form: { id: formId, orgId: cmdOpts.orgId }, customParam: {} });
-            const f = getRes?.data?.form || {};
-            if (f.name)
-                console.error(`  回读: name=${f.name} status=${f.status} ownership=${f.ownership} physicalTable=${f.physicalTable}`);
-        }
-        catch { /* 回读不阻塞 */ }
-        if (opts.json) {
-            console.log(JSON.stringify({ formId, name, module: cmdOpts.module, orgId: cmdOpts.orgId }));
-        }
-        else {
+        console.error(`表单已创建: ${name}  formId=${formId}  布局=${cmdOpts.layoutType === 'advanced' ? 'EXCEL' : 'FLOW'}  tableName=${tableName}`);
+        if (opts.json)
+            console.log(JSON.stringify({ formId, name, layoutType: cmdOpts.layoutType, tableName, module: cmdOpts.module }));
+        else
             console.log(`formId: ${formId}`);
-        }
     });
-    // ─── LIST ───────────────────────────────────────────────
-    fn.command('list')
-        .description('分页查询原生表单列表（getFormPage）')
-        .requiredOption('--module <m>', '模块来源')
-        .option('--org-id <id>', '所属组织 ID')
-        .option('--page-size <n>', '每页条数', '20')
-        .action(async (cmdOpts) => {
+    // ─── READ（字段列表）────────────────────────────────────
+    fn.command('read')
+        .description('读取原生表单字段（getFormFieldPage；--sub-form-id 查明细）')
+        .argument('<formId>', '表单 ID')
+        .option('--sub-form-id <id>', '查指定明细子表字段')
+        .option('--page-size <n>', '每页条数', '100')
+        .action(async (formId, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
-        const res = await client.post(`${baseUrl}/api/${cmdOpts.module}/form/formmanage/getFormPage`, {
-            pageNo: 1, pageSize: Number(cmdOpts.pageSize), module: cmdOpts.module,
-            formSearchEntity: { isDelete: 0, formIdList: [], orgId: cmdOpts.orgId || '' },
+        const searchEntity = { isDelete: 0, status: 'enable', formId };
+        if (cmdOpts.subFormId)
+            searchEntity.subFormId = cmdOpts.subFormId;
+        const res = await client.post(`${baseUrl}/api/${MOD_FORM}/form/field/manage/getFormFieldPage`, {
+            pageNo: 1, pageSize: Number(cmdOpts.pageSize), module: MOD_FIELD, formFieldSearchEntity: searchEntity,
         });
         if (res?.code !== 200 || !res?.status) {
             console.error(`查询失败: ${res?.msg || '未知错误'}`);
             process.exit(1);
         }
-        const rows = res?.data?.pageDatas?.result || res?.data?.result || [];
+        const rows = res?.data?.pageDatas?.result || [];
         if (opts.json) {
             console.log(JSON.stringify(rows, null, 2));
             return;
         }
-        if (!Array.isArray(rows) || rows.length === 0) {
-            console.log('无表单');
-            return;
-        }
-        console.log(`原生表单 (${rows.length}):`);
+        console.log(`原生表单 ${formId} ${cmdOpts.subFormId ? '明细 ' + cmdOpts.subFormId : '主表'} 字段 (${rows.length}):`);
         for (const r of rows)
-            console.log(`  [${r.id}] ${r.name}  status=${r.status} ownership=${r.ownership}`);
+            console.log(`  [${r.fieldId}] ${r.title || r.name}  ${r.type}  format=${r.format || '-'}  required=${r.required ?? '-'}  dataKey=${r.dataKey}`);
     });
-    // ─── GET ────────────────────────────────────────────────
-    fn.command('get')
-        .description('查询表单详情（getForm，含完整 form 对象）')
+    // ─── ADD-FIELD ─────────────────────────────────────────
+    fn.command('add-field')
+        .description('给原生表单加字段（saveFormFieldNew + 预生成 fieldId）。类型见 --help')
         .argument('<formId>', '表单 ID')
-        .requiredOption('--module <m>', '模块来源')
-        .option('--org-id <id>', '所属组织 ID')
-        .action(async (formId, cmdOpts) => {
+        .argument('<fieldName>', '字段名')
+        .argument('<fieldType>', '类型：Text/TextArea/Number/Money/Date/DateTime/Select/SelectMultiple/Employee/Department')
+        .option('--sub-form-id <id>', '明细子表 ID（加明细字段）')
+        .option('--format <fmt>', '日期格式（Date 默认 yyyy-MM-dd / DateTime 默认 yyyy-MM-dd HH:mm）')
+        .option('--multiple', '多选（Employee/Department）')
+        .option('--options <json>', 'Select 选项：[{"name":"x","color":"#xxx"}] 或 @文件')
+        .action(async (formId, fieldName, fieldType, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
-        const res = await client.post(`${baseUrl}/api/${cmdOpts.module}/form/formmanage/getForm`, { module: cmdOpts.module, form: { id: formId, orgId: cmdOpts.orgId || '' }, customParam: {} });
+        const dataKey = 'f' + Math.random().toString(36).slice(2, 9);
+        let parsedOptions;
+        if (cmdOpts.options) {
+            const raw = cmdOpts.options.startsWith('@') ? (await import('node:fs')).readFileSync(cmdOpts.options.slice(1), 'utf-8') : cmdOpts.options;
+            parsedOptions = JSON.parse(raw);
+        }
+        const jsonObj = buildFieldJsonObj({ type: fieldType, title: fieldName, dataKey, formId, format: cmdOpts.format, multiple: cmdOpts.multiple, options: parsedOptions });
+        jsonObj.fieldId = genSfId();
+        if (cmdOpts.subFormId) {
+            jsonObj.subFormId = cmdOpts.subFormId;
+            jsonObj.describeType = 'popover';
+            jsonObj.describePosition = 'titleRight';
+        }
+        const res = await client.post(`${baseUrl}/api/${MOD_FORM}/form/field/manage/saveFormFieldNew`, {
+            formId, module: MOD_FIELD, jsonObj: JSON.stringify(jsonObj),
+        });
         if (res?.code !== 200 || !res?.status) {
-            console.error(`查询失败: ${res?.msg || '未知错误'}`);
+            console.error(`加字段失败: ${res?.msg || '未知错误'}`);
             process.exit(1);
         }
-        const f = res?.data?.form || {};
-        if (opts.json) {
-            console.log(JSON.stringify(res?.data, null, 2));
-            return;
+        console.error(`字段已加: ${fieldName} (${fieldType}) fieldId=${jsonObj.fieldId}${cmdOpts.subFormId ? ' (明细)' : ''}`);
+        if (opts.json)
+            console.log(JSON.stringify({ fieldId: jsonObj.fieldId, fieldName, fieldType, dataKey }));
+        else
+            console.log(`fieldId: ${jsonObj.fieldId}`);
+    });
+    // ─── ADD-DETAIL-TABLE ───────────────────────────────────
+    fn.command('add-detail-table')
+        .description('给原生表单加明细子表（saveSubForm + 预生成 subFormId + 可选首字段）')
+        .argument('<formId>', '表单 ID')
+        .argument('<name>', '明细表名')
+        .argument('[firstFieldName]', '首字段名（建议传，空子表 getConfig 读不到）')
+        .option('--first-field-type <t>', '首字段类型（默认 Text）', 'Text')
+        .option('--init', '建后跑 layout init 放入布局')
+        .action(async (formId, name, firstFieldName, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const subFormId = genSfId();
+        const tableName = 'tb' + Math.random().toString(36).slice(2, 8);
+        const dataKey = tableName + '_mxb1';
+        const res = await client.post(`${baseUrl}/api/${MOD_FORM}/form/field/manage/saveSubForm`, {
+            physicalTable: false, order: 0, subFormId, type: 'DetailTable', module: MOD_FIELD, dataKey,
+            formTable: { id: formId, form: { id: subFormId, name, order: '0.00' } },
+        });
+        if (res?.code !== 200 || !res?.status) {
+            console.error(`建明细失败: ${res?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        console.error(`子表已建: subFormId=${subFormId}  name=${name}  dataKey=${dataKey}`);
+        let firstFieldId = '';
+        if (firstFieldName) {
+            const dk = 'sf' + Math.random().toString(36).slice(2, 8);
+            const jsonObj = buildFieldJsonObj({ type: cmdOpts.firstFieldType, title: firstFieldName, dataKey: dk, formId });
+            jsonObj.fieldId = genSfId();
+            jsonObj.subFormId = subFormId;
+            jsonObj.describeType = 'popover';
+            jsonObj.describePosition = 'titleRight';
+            const fr = await client.post(`${baseUrl}/api/${MOD_FORM}/form/field/manage/saveFormFieldNew`, {
+                formId, module: MOD_FIELD, jsonObj: JSON.stringify(jsonObj),
+            });
+            if (fr?.code !== 200 || !fr?.status) {
+                console.error(`首字段失败: ${fr?.msg || '未知错误'}`);
+            }
+            else {
+                firstFieldId = jsonObj.fieldId;
+                console.error(`首字段已加: ${firstFieldName} (${cmdOpts.firstFieldType}) fieldId=${firstFieldId}`);
+            }
+        }
+        if (cmdOpts.init) {
+            try {
+                await initLayout(client, baseUrl, formId);
+                console.error('布局已 init');
+            }
+            catch (e) {
+                console.error(`布局 init 失败: ${e?.message || e}`);
+            }
+        }
+        if (opts.json)
+            console.log(JSON.stringify({ subFormId, name, dataKey, firstFieldId }));
+        else
+            console.log(`subFormId: ${subFormId}`);
+    });
+    // ─── LAYOUT INIT ────────────────────────────────────────
+    fn.command('init')
+        .description('初始化/重建原生表单布局（initLayout）：设字段 readOnly/required/singleRow + 分组 + 显示/隐藏')
+        .argument('<formId>', '表单 ID')
+        .option('--read-only', '字段只读（默认保留）')
+        .option('--required', '字段必填（默认保留）')
+        .option('--single-row', '独占一行（默认保留）')
+        .option('--generate-collapse', '生成折叠分组')
+        .option('--hide <names>', '隐藏字段（display=false），逗号分隔字段名/fieldId，其余 display=true')
+        .action(async (formId, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        try {
+            const hide = cmdOpts.hide ? new Set(cmdOpts.hide.split(',').map((s) => s.trim()).filter(Boolean)) : undefined;
+            const meta = await initLayout(client, baseUrl, formId, { ...cmdOpts, hide });
+            const hidden = hide ? ` 隐藏${hide.size}字段` : '';
+            console.error(`布局已初始化: 类型=${meta.layoutType} 模板=${meta.styleTemplateId} 组件=${meta.compCount}${hidden}`);
+        }
+        catch (e) {
+            console.error(`初始化失败: ${e?.message || e}`);
+            process.exit(1);
+        }
+        if (opts.json)
+            console.log(JSON.stringify({ formId, ok: true }));
+    });
+    // ─── FIELD-GROUP（字段分组）────────────────────────────
+    fn.command('field-group')
+        .description('字段分组（建组 saveFieldGroup → 分配 updateFormFieldGroup → re-init generateCollapse 渲染分组）')
+        .argument('<formId>', '表单 ID')
+        .requiredOption('--groups <json>', '分组 JSON：{"分组名":["字段名/fieldId",...],...} 或 @文件')
+        .option('--required', '同时设字段必填（re-init 时一起带上，防丢）')
+        .action(async (formId, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const ebb = { ebbusinessid: formId };
+        try {
+            const raw = cmdOpts.groups.startsWith('@') ? (await import('node:fs')).readFileSync(cmdOpts.groups.slice(1), 'utf-8') : cmdOpts.groups;
+            const groupsMap = JSON.parse(raw);
+            const entries = Object.entries(groupsMap);
+            if (!entries.length)
+                throw new Error('--groups 为空');
+            // getConfig 解析字段名→id
+            const meta = await getLayoutMeta(client, baseUrl, formId);
+            const cfgRes = await client.post(`${baseUrl}/api/${MOD_FORM}/form/view/relate/getConfig`, {
+                formId, module: MOD_FIELD, apiModule: API_MOD, layoutId: meta.layoutId,
+                customParam: {}, initMode: 5, groupFieldIds: [], designerParam: { sourceModule: MOD_FIELD },
+            }, 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) {
+                const sr = await client.post(`${baseUrl}/api/${MOD_FORM}/form/field/manage/saveFieldGroup`, { module: MOD_FIELD, formFieldGroup: { groupName: gname, formId } }, ebb);
+                if (sr?.code !== 200 || !sr?.status)
+                    throw new Error(`建分组「${gname}」失败: ${sr?.msg || '未知错误'}`);
+                const g = sr?.data?.group || {};
+                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(', ')}`);
+                created.push({ name: gname, groupId: String(g.id || ''), refFieldId: String(g.refFieldId || ''), fieldIds });
+                console.error(`  分组已建: ${gname} groupId=${g.id} refFieldId=${g.refFieldId}${fieldIds.length ? ` 字段×${fieldIds.length}` : '（空分组）'}`);
+                if (fieldIds.length) {
+                    const ur = await client.post(`${baseUrl}/api/${MOD_FORM}/form/field/manage/updateFormFieldGroup`, { module: MOD_FIELD, formFieldGroup: { id: created[created.length - 1].groupId }, form: { id: formId }, fieldList: fieldIds.map((id) => ({ id })) }, ebb);
+                    if (ur?.code !== 200 || !ur?.status)
+                        console.error(`  ⚠ 分组「${gname}」分配失败: ${ur?.msg || '未知错误'}`);
+                    else
+                        console.error(`  已分配: ${gname} ← ${fieldIds.length} 字段`);
+                }
+            }
+            // ③ re-init：generateCollapse:true 让平台从 saveFieldGroup 记录自动渲染 Collapse 分组。
+            // 复用 initLayout helper（normalize 保 DetailTable + 设 required + generateCollapse），对齐抓包正确 initLayout。
+            const meta2 = await initLayout(client, baseUrl, formId, { required: cmdOpts.required === true ? true : undefined, generateCollapse: true });
+            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 })), layoutType: meta2.layoutType })
+                : `字段分组完成: ${created.length} 个分组（generateCollapse 自动渲染，组件=${meta2.compCount}）`);
+        }
+        catch (e) {
+            console.error(`字段分组失败: ${e.message}`);
+            process.exitCode = 1;
         }
-        console.log(`表单: ${f.name || '(未命名)'}  formId=${f.id}`);
-        console.log(`  status=${f.status} ownership=${f.ownership} orgId=${f.orgId} physicalTable=${f.physicalTable}`);
     });
 }
+/** getConfig 读 configs → 按选项设 readOnly/required/singleRow/hide → initLayout 写回。 */
+async function initLayout(client, baseUrl, formId, flags = {}) {
+    const meta = await getLayoutMeta(client, baseUrl, formId);
+    const cfgRes = await client.post(`${baseUrl}/api/${MOD_FORM}/form/view/relate/getConfig`, {
+        formId, module: MOD_FIELD, apiModule: API_MOD, layoutId: meta.layoutId,
+        customParam: {}, initMode: 5, groupFieldIds: [], designerParam: { sourceModule: MOD_FIELD },
+    }, { ebbusinessid: formId });
+    if (cfgRes?.code !== 200 || !cfgRes?.status)
+        throw new Error(`getConfig 失败: ${cfgRes?.msg}`);
+    const configs = cfgRes?.data?.configs || [];
+    // normalize（对齐抓包正确 initLayout）：
+    // - display/show=true 对所有字段（含 DetailTable 容器，正确包 DetailTable display=true；不设会藏掉明细表）。
+    //   --hide 指定的字段 display=false（隐藏）。
+    // - readOnly/disableEdit=false 只对主表业务字段；容器(DetailTable) + 明细 children 保持 readOnly=true。
+    // - --required 只设主表业务字段（正确包 DetailTable + 明细日期 required=false）。
+    const isContainer = (c) => c.type === 'DetailTable' || c.componentKey === 'DataTable' || c.type === 'Collapse' || c.componentKey === 'Fold';
+    const isHidden = (c) => !!(flags.hide && (flags.hide.has(String(c.id)) || (c.name && flags.hide.has(String(c.name)))));
+    const apply = (c, isDetailChild = false) => {
+        if (c.isDelete)
+            return;
+        c.display = !isHidden(c);
+        c.show = !isHidden(c);
+        // readOnly/disableEdit=false 对所有业务字段（主表 + 明细 children），明细字段也要可编辑；
+        // 容器(DetailTable) 保持 readOnly=true（top-level，其 config.readOnly=false 控制表可编辑）。
+        if (!isContainer(c)) {
+            c.readOnly = false;
+            c.disableEdit = false;
+        }
+        if (flags.readOnly !== undefined && !isContainer(c))
+            c.readOnly = flags.readOnly;
+        // --required 只设主表业务字段（正确包 DetailTable + 明细日期 required=false）
+        if (flags.required !== undefined && !isContainer(c) && !isDetailChild)
+            c.required = flags.required;
+        if (flags.singleRow !== undefined && !isContainer(c) && !isDetailChild)
+            c.singleRow = flags.singleRow;
+    };
+    for (const c of configs) {
+        apply(c, false);
+        if (c.children?.length)
+            for (const ch of c.children)
+                apply(ch, true);
+    }
+    const styleTemplateId = meta.layoutType === 'EXCEL' ? TPL_EXCEL : TPL_FLOW;
+    const initRes = await client.post(`${baseUrl}/api/${MOD_FORM}/form/view/relate/initLayout`, {
+        formId, module: MOD_FIELD, apiModule: API_MOD, layoutId: meta.layoutId,
+        generateCollapse: flags.generateCollapse === true, styleTemplateId, styleTemplateType: 1,
+        configs, addLayout: false, ecodeType: ['js', 'css'], customParam: {},
+        formLayoutMultiple: { isSys: false, id: meta.layoutMultiId, name: meta.layoutName, terminalType: 'PC', layoutType: meta.layoutType },
+        designerParam: { onlyLayout: false }, initMode: '1',
+    }, { ebbusinessid: formId });
+    if (initRes?.code !== 200 || !initRes?.status)
+        throw new Error(`initLayout 失败: ${initRes?.msg}`);
+    return { layoutType: meta.layoutType, styleTemplateId, compCount: configs.length };
+}
 //# sourceMappingURL=form-native.js.map

package/dist/commands/form-native.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-native.js","sourceRoot":"","sources":["../../src/commands/form-native.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-native.js","sourceRoot":"","sources":["../../src/commands/form-native.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AAEH,MAAM,QAAQ,GAAG,gBAAgB,CAAC,CAAC,kCAAkC;AACrE,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAO,oBAAoB;AACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,CAAC,oBAAoB;AACtD,MAAM,SAAS,GAAG,oBAAoB,CAAC;AACvC,MAAM,QAAQ,GAAG,oBAAoB,CAAC;AAEtC,SAAS,qBAAqB,CAAC,GAAW;IACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,aAAa,CAAC;IACnD,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,WAAW,CAAC;IAC9C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,4EAA4E;AAC5E,SAAS,iBAAiB,CAAC,CAG1B;IACC,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAwB,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACzG,IAAI,EAAE,KAAK,MAAM;QAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;SACzG,IAAI,EAAE,KAAK,UAAU;QAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;SAClG,IAAI,EAAE,KAAK,QAAQ;QAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAC5C,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK;YACtD,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM;SAC/E,CAAC,CAAC;SACE,IAAI,EAAE,KAAK,OAAO;QAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAC3C,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK;YACtD,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM;SAC/E,CAAC,CAAC;SACE,IAAI,EAAE,KAAK,MAAM,IAAI,EAAE,KAAK,UAAU,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAChF,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,qBAAqB,CAAC,GAAG,CAAC;YACrD,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK;YACjC,6FAA6F;YAC7F,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;YAClL,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,KAAK;SAClE,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,gBAAgB,EAAE,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,qBAAqB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE;YACtF,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,KAAK,CAAC;gBACpF,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK;gBACtE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,gBAAgB,EAAE,EAAE,CAAC,KAAK,IAAI,SAAS,EAAE;gBAC1F,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;aAClC,CAAC,CAAC;YACH,aAAa,EAAE,EAAE;SAClB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,EAAE,KAAK,UAAU,IAAI,EAAE,KAAK,YAAY,EAAE,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO;YAC1F,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE;YACtD,cAAc,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI;YACzC,sBAAsB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,0BAA0B,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SAC7F,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,MAAiB,EAAE,OAAe,EAAE,MAAc;IAC7E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,6BAA6B,EAAE;QACrF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE;QAC9D,aAAa,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;KAC3E,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7B,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACxF,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,EAAE,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,kBAAkB,IAAI,EAAE,CAAC;IAChF,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,OAAO,EAAE,CAAC;AACnI,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAa,EAAE,OAAgB;IACxE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,wDAAwD,CAAC,CAAC;IAExG,2DAA2D;IAC3D,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,wDAAwD,CAAC;SACrE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC1B,MAAM,CAAC,cAAc,EAAE,uBAAuB,EAAE,gBAAgB,CAAC;SACjE,MAAM,CAAC,mBAAmB,EAAE,mCAAmC,EAAE,UAAU,CAAC;SAC5E,MAAM,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;SAC/C,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC;SAC1C,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,OAAmF,EAAE,EAAE;QAClH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACjJ,MAAM,OAAO,GAAQ;YACnB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAE;gBACJ,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI;gBAC/C,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,SAAS;gBACzC,oBAAoB,EAAE,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU;gBACzD,gBAAgB,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI;aAC3C;YACD,WAAW,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;SACxC,CAAC;QACF,IAAI,OAAO,CAAC,KAAK;YAAE,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,OAAO,CAAC,MAAM,2BAA2B,EAAE,OAAO,CAAC,CAAC;QACpG,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACzG,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC/G,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,YAAY,MAAM,QAAQ,OAAO,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,eAAe,SAAS,EAAE,CAAC,CAAC;QACtI,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;;YAC3H,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEL,qDAAqD;IACrD,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,8CAA8C,CAAC;SAC3D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;SAC7B,MAAM,CAAC,oBAAoB,EAAE,WAAW,CAAC;SACzC,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,CAAC;SACxC,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,OAAiD,EAAE,EAAE;QAClF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,YAAY,GAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACpE,IAAI,OAAO,CAAC,SAAS;YAAE,YAAY,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAClE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,qCAAqC,EAAE;YAC7F,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,qBAAqB,EAAE,YAAY;SACtG,CAAC,CAAC;QACH,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACzG,MAAM,IAAI,GAAG,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,QAAQ,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QAC3G,KAAK,MAAM,CAAC,IAAI,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,QAAQ,IAAI,GAAG,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACxK,CAAC,CAAC,CAAC;IAEL,0DAA0D;IAC1D,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,qDAAqD,CAAC;SAClE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;SAC7B,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC;SAC9B,QAAQ,CAAC,aAAa,EAAE,uFAAuF,CAAC;SAChH,MAAM,CAAC,oBAAoB,EAAE,gBAAgB,CAAC;SAC9C,MAAM,CAAC,gBAAgB,EAAE,yDAAyD,CAAC;SACnF,MAAM,CAAC,YAAY,EAAE,yBAAyB,CAAC;SAC/C,MAAM,CAAC,kBAAkB,EAAE,+CAA+C,CAAC;SAC3E,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,SAAiB,EAAE,SAAiB,EAAE,OAAsF,EAAE,EAAE;QAC7J,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7D,IAAI,aAAgC,CAAC;QACrC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAC1I,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,OAAO,GAAG,iBAAiB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QACtK,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;QAC5B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAAC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAAC,OAAO,CAAC,gBAAgB,GAAG,YAAY,CAAC;QAAC,CAAC;QAC5I,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,qCAAqC,EAAE;YAC7F,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC5D,CAAC,CAAC;QACH,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC1G,OAAO,CAAC,KAAK,CAAC,SAAS,SAAS,KAAK,SAAS,aAAa,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjH,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;;YACnG,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEL,2DAA2D;IAC3D,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,iDAAiD,CAAC;SAC9D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;SAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC1B,QAAQ,CAAC,kBAAkB,EAAE,6BAA6B,CAAC;SAC3D,MAAM,CAAC,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,CAAC;SAC1D,MAAM,CAAC,QAAQ,EAAE,sBAAsB,CAAC;SACxC,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,IAAY,EAAE,cAAkC,EAAE,OAAmD,EAAE,EAAE;QACtI,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,OAAO,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,gCAAgC,EAAE;YACxF,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;YAC1F,SAAS,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;SACxE,CAAC,CAAC;QACH,IAAI,GAAG,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC1G,OAAO,CAAC,KAAK,CAAC,mBAAmB,SAAS,UAAU,IAAI,aAAa,OAAO,EAAE,CAAC,CAAC;QAChF,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,iBAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YAChH,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;YAC5B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;YAAC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAAC,OAAO,CAAC,gBAAgB,GAAG,YAAY,CAAC;YACzG,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,qCAAqC,EAAE;gBAC5F,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aAC5D,CAAC,CAAC;YACH,IAAI,EAAE,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;YAAC,CAAC;iBACjF,CAAC;gBAAC,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,UAAU,cAAc,KAAK,OAAO,CAAC,cAAc,aAAa,YAAY,EAAE,CAAC,CAAC;YAAC,CAAC;QACzI,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC;gBAAC,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAAC,CAAC;YAC7E,OAAO,CAAM,EAAE,CAAC;gBAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;YAAC,CAAC;QACrE,CAAC;QACD,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;;YAClF,OAAO,CAAC,GAAG,CAAC,cAAc,SAAS,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEL,2DAA2D;IAC3D,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,uEAAuE,CAAC;SACpF,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;SAC7B,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC;SACnC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC;SAClC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC;SACpC,MAAM,CAAC,qBAAqB,EAAE,QAAQ,CAAC;SACvC,MAAM,CAAC,gBAAgB,EAAE,qDAAqD,CAAC;SAC/E,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,OAAmH,EAAE,EAAE;QACpJ,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9G,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,UAAU,OAAO,IAAI,CAAC,eAAe,OAAO,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC,CAAC;QAC1G,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACjF,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEL,oDAAoD;IACpD,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,mFAAmF,CAAC;SAChG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;SAC7B,cAAc,CAAC,iBAAiB,EAAE,+CAA+C,CAAC;SAClF,MAAM,CAAC,YAAY,EAAE,2BAA2B,CAAC;SACjD,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,OAA+C,EAAE,EAAE;QAChF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YACvI,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,OAAO,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;YACpD,qBAAqB;YACrB,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,6BAA6B,EAAE;gBACxF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACtE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;aAC5F,EAAE,GAAG,CAAC,CAAC;YACR,IAAI,MAAM,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7F,MAAM,UAAU,GAAU,MAAM,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC;YACtD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAe,CAAC;YACtC,MAAM,IAAI,GAAG,CAAC,GAAU,EAAE,EAAE,GAAG,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;gBAAC,IAAI,CAAC,CAAC,IAAI;oBAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBAAC,IAAI,CAAC,CAAC,EAAE;oBAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM;oBAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAAC,CAAC,CAAC,CAAC,CAAC;YACtL,IAAI,CAAC,UAAU,CAAC,CAAC;YACjB,gBAAgB;YAChB,MAAM,OAAO,GAAqF,EAAE,CAAC;YACrG,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,OAAO,EAAE,CAAC;gBACpC,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,mCAAmC,EACxF,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC5E,IAAI,EAAE,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;gBAC9F,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBAChC,MAAM,QAAQ,GAAa,EAAE,CAAC;gBAAC,MAAM,OAAO,GAAa,EAAE,CAAC;gBAC5D,KAAK,MAAM,GAAG,IAAK,IAAiB,IAAI,EAAE,EAAE,CAAC;oBAC3C,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBAClC,IAAI,CAAC;wBAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;;wBAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACrE,CAAC;gBACD,IAAI,OAAO,CAAC,MAAM;oBAAE,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,WAAW,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAClF,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC7G,OAAO,CAAC,KAAK,CAAC,WAAW,KAAK,YAAY,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBACpI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACpB,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,yCAAyC,EAC9F,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;oBAC5J,IAAI,EAAE,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,MAAM;wBAAE,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC,CAAC;;wBAC5F,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,MAAM,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YACD,0EAA0E;YAC1E,mGAAmG;YACnG,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5I,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;gBACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;gBACtM,CAAC,CAAC,WAAW,OAAO,CAAC,MAAM,iCAAiC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACP,CAAC;AAED,mFAAmF;AACnF,KAAK,UAAU,UAAU,CACvB,MAAiB,EAAE,OAAe,EAAE,MAAc,EAClD,QAAyH,EAAE;IAE3H,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,6BAA6B,EAAE;QACxF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACtE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;KAC5F,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7B,IAAI,MAAM,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7F,MAAM,OAAO,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC;IAC5C,gCAAgC;IAChC,qFAAqF;IACrF,oCAAoC;IACpC,wFAAwF;IACxF,gEAAgE;IAChE,MAAM,WAAW,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,YAAY,KAAK,WAAW,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,YAAY,KAAK,MAAM,CAAC;IACjJ,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5H,MAAM,KAAK,GAAG,CAAC,CAAM,EAAE,aAAa,GAAG,KAAK,EAAE,EAAE;QAC9C,IAAI,CAAC,CAAC,QAAQ;YAAE,OAAO;QACvB,CAAC,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAChD,kEAAkE;QAClE,8EAA8E;QAC9E,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YAAC,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC;YAAC,CAAC,CAAC,WAAW,GAAG,KAAK,CAAC;QAAC,CAAC;QACnE,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;YAAE,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QACjF,6DAA6D;QAC7D,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa;YAAE,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QACnG,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa;YAAE,CAAC,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IACxG,CAAC,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAChB,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM;YAAE,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,QAAQ;gBAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,QAAQ,QAAQ,8BAA8B,EAAE;QAC1F,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACtE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,KAAK,IAAI,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAC;QACxF,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE;QACpE,kBAAkB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;QACpI,aAAa,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG;KACpD,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7B,IAAI,OAAO,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IACjG,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;AACrF,CAAC"}

package/dist/commands/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/commands/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2CpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA4jF9D"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/commands/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2CpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA+jF9D"}

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 || '',