weaver-e10-builder 1.2.2 → 1.2.5

package/dist/commands/form-validate.js

@@ -1,5 +1,6 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
+import { createMultilangLabel, resolveLabelText } from '../services/form-i18n-label.js';
 export function registerFormValidateCommands(form, program) {
     const val = form.command('validate').description('字段查重校验规则（重名校验/重复日期，多字段 AND）');
     val.command('list')
@@ -26,10 +27,15 @@ export function registerFormValidateCommands(form, program) {
             console.log('当前表单无查重规则');
             return;
         }
+        // helpContent 存的是标签 id，解回文本再显示；老规则（存的中文原文）原样显示
+        const helpOf = new Map();
+        await Promise.all(rules.map(async (r) => {
+            helpOf.set(String(r.id), await resolveLabelText(client, baseUrl, r.helpContent, 'ebuilderform'));
+        }));
         for (const r of rules) {
             const method = r.treatmentMethod === 'REMINDER' ? '提醒' : '禁止提交';
             const fields = (r.checkFields || []).map((c) => c.fieldName).join(' + ');
-            console.log(`[${r.id}] ${method} | ${fields} | ${r.helpContent || ''}`);
+            console.log(`[${r.id}] ${method} | ${fields} | ${helpOf.get(String(r.id)) || ''}`);
         }
     });
     val.command('add')
@@ -37,7 +43,7 @@ export function registerFormValidateCommands(form, program) {
         .argument('<objId>', '表单 objId')
         .argument('<appId>', '应用 ID')
         .argument('<fields...>', '查重字段名（可多个，如 "填报人" "工时日期"）')
-        .option('--help <text>', '重复时的提示内容', '字段值不允许重复')
+        .option('--help <text>', '重复时的提示内容（会建一条多语言标签，存的是标签 id）', '字段值不允许重复')
         .option('--remind', '重复时仅提醒允许提交（缺省禁止提交 NOSUBMISSION）')
         .action(async (objId, appId, fieldNames, cmdOpts) => {
         const opts = program.opts();
@@ -71,11 +77,13 @@ export function registerFormValidateCommands(form, program) {
             }
             checkFields.push(c);
         }
+        // 提示语必须走多语言标签：直接传文本会被服务端拒（提示内容格式不正确。）
+        const helpLabelId = await createMultilangLabel(client, baseUrl, String(cmdOpts.help || '字段值不允许重复'), 'ebuilderform');
         const payload = {
             module: 'ebuilderform', formId,
             treatmentMethod: cmdOpts.remind ? 'REMINDER' : 'NOSUBMISSION',
             remindTime: 'SUB_REMIND', taggingColour: '#000000', subFieldCheckType: 'ALL_DATA',
-            helpContent: cmdOpts.help,
+            helpContent: helpLabelId,
             checkFields,
         };
         const res = await client.post(`${baseUrl}/api/ebuilder/form/validate/save`, payload);

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

@@ -1 +1 @@
-{"version":3,"file":"form-validate.js","sourceRoot":"","sources":["../../src/commands/form-validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-validate.js","sourceRoot":"","sources":["../../src/commands/form-validate.ts"],"names":[],"mappings":"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"}

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;AA8CpC;0DAC0D;AAC1D,eAAO,MAAM,kBAAkB,EAAE,MAAM,EAI7B,CAAC;AAwHX,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA4vG9D"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/commands/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiDpC;0DAC0D;AAC1D,eAAO,MAAM,kBAAkB,EAAE,MAAM,EAI7B,CAAC;AAwHX,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAq0G9D"}

package/dist/commands/form.js

@@ -3,10 +3,13 @@ import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { toColumnName, toTableName } from '../utils/column-name.js';
 import { createCustomPhysicalForm, addInitialFieldsToCustomPhysicalForm, placeholderFromFormat, reapplyGroupLayout } from '../services/form-create.js';
-import { FormSubDetailService } from '../services/form-sub-detail.js';
+import { FormSubDetailService, resolveDetailTable } from '../services/form-sub-detail.js';
 import { RICH_TYPE_MAP, getRichType, richIdUnits, BROWSER_KINDS } from '../services/rich-types.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';
+import { ensureDisplayColumns } from '../services/form-ebuilder-columns.js';
+import { buildFormulaParameters, defaultReturnType } from '../services/formula-detail.js';
 import { registerOptionTemplateCommand } from './form-option-template.js';
 /**
  * componentKey 大小写归一：用户/示例常写 "Textarea"/"Ebuilder" 等小写变体，但代码各处
@@ -1645,8 +1648,9 @@ export function registerFormCommands(program) {
             catch { /* 读不到字段则公式会报"引用字段不存在" */ }
             for (const fd of formulaDefs) {
                 try {
+                    // formula 写字符串时**不再默认 Number** —— 返回类型留空，由下面按目标字段类型推断。
                     const formula = (typeof fd.formula === 'string')
-                        ? { expression: fd.formula, returnType: 'Number' }
+                        ? { expression: fd.formula }
                         : (fd.formula || {});
                     const expression = formula.expression || formula.formulaExpress || '';
                     if (!expression) {
@@ -1667,52 +1671,25 @@ export function registerFormCommands(program) {
                         continue;
                     }
                     const targetFieldId = String(targetField.fieldId);
-                    // 解析 {主表.字段名} / {明细表名.字段名} 引用（不去重：同一字段引用多次时每个出现位置
-                    // 都要一个参数，否则平台报「参数列表与执行语句不一致」）
-                    const refRegex = /\{(?:主表|([^.}]+))\.([^}]+)\}/g;
-                    const refNames = [];
-                    let rm;
-                    while ((rm = refRegex.exec(expression)) !== null) {
-                        const table = rm[1] ? rm[1].trim() : '主表';
-                        const field = rm[2].trim();
-                        refNames.push({ table, field });
-                    }
-                    const parameters = [];
-                    let refMissing = false;
-                    for (const ref of refNames) {
-                        let rf;
-                        if (ref.table === '主表') {
-                            rf = allFields.find((f) => f.fieldName === ref.field || f.title === ref.field || String(f.fieldId) === ref.field);
-                        }
-                        else {
-                            const dt = detailFields.find((d) => d.name === ref.table || String(d.id) === ref.table);
-                            rf = dt && (dt.fields || []).find((f) => f.fieldName === ref.field || String(f.fieldId) === ref.field);
-                        }
-                        if (!rf) {
-                            console.error(`    ⚠ 公式引用字段不存在: ${ref.table}.${ref.field}`);
-                            refMissing = true;
-                            break;
-                        }
-                        const param = {
-                            fieldId: String(rf.fieldId), formId: resolvedFormId, module: 'ebuilderform',
-                            properKey: rf.fieldKey || rf.type || 'Text', title: rf.title || rf.fieldName,
-                            name: rf.fieldName || rf.title, appId, id: null,
-                        };
-                        if (ref.table !== '主表') {
-                            const dt = detailFields.find((d) => d.name === ref.table || String(d.id) === ref.table);
-                            if (dt) {
-                                param.sFormId = String(dt.id);
-                                param.sFormName = dt.name;
-                            }
-                        }
-                        parameters.push(param);
-                    }
-                    if (refMissing)
+                    // 引用解析与归一化**统一走 services/formula-detail.ts**，与 `form formula set` 同一套：
+                    // 两种写法都收（`{主表.x}` 与编辑器里的 `[x]`），方括号一律归一化成花括号再存 ——
+                    // 方括号直接下发会「保存成功但字段没接上」；参数按出现位置逐个给，不去重。
+                    const parsed = await buildFormulaParameters(client, baseUrl, objId, appId, resolvedFormId, expression);
+                    if (parsed.errors.length > 0) {
+                        for (const e of parsed.errors)
+                            console.error(`    ⚠ ${e}`);
                         continue;
+                    }
+                    for (const w of parsed.warnings)
+                        console.error(`    ⚠ ${w}`);
+                    const parameters = parsed.parameters;
                     const formulaName = formula.name || `公式_${fd.fieldName}`;
                     const savePayload = {
-                        expressSql: expression, name: formulaName, parameters,
-                        returnType: formula.returnType || 'Number', validateType: 'normal',
+                        expressSql: parsed.normalizedExpression, name: formulaName, parameters,
+                        // 返回类型：显式给了就用，否则按目标字段类型推断。此前一律 Number，
+                        // 给文本/日期字段挂公式必被平台拒（「公式计算结果必须为: 数字」）。
+                        returnType: formula.returnType || defaultReturnType(targetField.fieldKey || targetField.type),
+                        validateType: 'normal',
                         referenceType: 'assign',
                         extendParam: JSON.stringify({ exceptIds: targetFieldId, createType: 'once' }),
                         formulaId: null, dataSources: [], formulaType: 'normal',
@@ -2144,7 +2121,9 @@ export function registerFormCommands(program) {
         .option('--max-field <field>', 'Date/DateTime 日期限制：最晚不得晚于该字段（字段名，max.dateField）')
         .option('--precision <n>', '小数位数（Number/Money 类型，缺省 Number=0 整数、Money=2、百分比=1）')
         .option('--percent', 'Number 百分比显示（numberType=percentage）')
-        .option('--default <value>', 'Number/Money 默认值（content + isDefault，如 工时单价默认 1000）')
+        .option('--default <value>', '默认值（Text / TextArea / Number / Money，如 工时单价默认 1000）')
+        .option('--data-key <key>', '数据库字段名（默认按字段名生成拼音；字母数字下划线，不以数字开头）')
+        .option('--desc <text>', '字段描述（设计器字段属性里的「描述」）')
         .option('--delimiter', 'Number/Money 千分位（Money 默认开，--no-delimiter 关闭）')
         .option('--capital', 'Number/Money 大写金额显示')
         .option('--sub-form-id <id>', '明细表 subFormId（在指定明细表里加字段）')
@@ -2197,18 +2176,19 @@ export function registerFormCommands(program) {
             dataKey: colName,
             columnName: colName,
         };
-        // 明细表字段：--sub-form-id 时 formTableId 用明细表的，jsonObj 带 subFormId
+        // 明细表字段：--sub-form-id 时 jsonObj 带 subFormId —— **字段落点由它决定**。
+        // 必须用 resolveDetailTable 而不是直接查 getEbField：后者列不出空明细表，
+        // 用户把明细字段删光后就再也加不回去（详见 services/form-sub-detail.ts）。
         if (cmdOpts.subFormId) {
-            const eb = await client.post(`${baseUrl}/api/bs/esb/setting/component/getEbField`, { tableId: objId, appId });
-            const dt = (eb?.data?.detail || []).find((d) => String(d.detailTableId) === String(cmdOpts.subFormId));
-            if (!dt) {
-                console.error(`未找到明细表 subFormId=${cmdOpts.subFormId}`);
+            const sub = await resolveDetailTable(client, baseUrl, appId, objId, formId, cmdOpts.subFormId);
+            if (!sub) {
+                console.error(`未找到明细表 subFormId=${cmdOpts.subFormId}（getEbField 与 querySubForms 均无此表，请确认 id）`);
                 process.exit(1);
             }
             Object.assign(jsonObj, { subFormId: cmdOpts.subFormId });
-            const detailFormTableId = dt.fields?.[0]?.formTableId || '';
-            if (detailFormTableId)
-                jsonObj.formTableId = detailFormTableId;
+            // 空表拿不到物理表 id，保持主表的值不动：实测带主表 formTableId 一样落进明细表。
+            if (sub.formTableId)
+                jsonObj.formTableId = sub.formTableId;
         }
         // 富组件：映射到平台真实 type/componentKey + 附加配置（对齐 batch/save/formField 抓包）。
         // 之前 jsonObj 只有 type 没有 componentKey → 平台 FormFieldDto.getComponentKey() 为 null → NPE。
@@ -2537,6 +2517,21 @@ export function registerFormCommands(program) {
                 console.error('提示：模板下拉当前按单选（currentLevel=1）绑定；多选+模板组合未验证');
             }
         }
+        // 默认值 / 数据库字段名 / 描述：与 edit-field 共用同一套补丁规则。
+        // 放在最后 —— 前面各类型分支会写 content（如 TextArea 恒置 ''），先打补丁会被冲掉。
+        const patch = applyFieldPatches(jsonObj, {
+            defaultValue: cmdOpts.default,
+            dataKey: cmdOpts.dataKey,
+            desc: cmdOpts.desc,
+        });
+        if (patch.errors.length > 0) {
+            for (const e of patch.errors)
+                console.error(`  ❌ ${e}`);
+            console.error('  已中止，未做任何改动。');
+            process.exit(1);
+        }
+        for (const w of patch.warnings)
+            console.error(`  ⚠ ${w}`);
         const payload = {
             formId, module: 'ebuilderform',
             customParam: { appId, objId },
@@ -2546,26 +2541,13 @@ export function registerFormCommands(program) {
         if (data?.code === 200 && data?.status) {
             const msg = opts.json ? JSON.stringify({ fieldId, fieldName }) : `字段已添加: ${fieldName} (fieldId=${fieldId})`;
             console.log(msg);
-            // 关联浏览弹窗显示列：add-field 的 EBuilder 字段自动配 ffDisplayColumns = 目标表全部业务字段（去系统字段），
-            // 对齐 create Step2。直接带 ffDisplayColumns 进 jsonObj 不落库，需 getFormField 完整配置 + 单独 save。
+            // 关联浏览弹窗显示列：新建的 EBuilder 字段自动配 ffDisplayColumns = 目标表业务字段（去系统字段，最多 5 个）。
+            // 直接带 ffDisplayColumns 进 jsonObj 不落库，需 getFormField 完整配置 + 单独 save。
             if (fieldType === 'EBuilder' && sformId) {
                 try {
-                    const tfd = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
-                        objId: sformId, userid: auth.userId, tenantKey: auth.tenantKey,
-                    });
-                    // 默认显示列最多 5 个（去系统字段后取前 5 个业务字段）
-                    const bizCols = (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);
-                    if (bizCols.length) {
-                        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) {
-                            await client.post(`${baseUrl}/api/ebuilder/form/form/field/manage/saveFormFieldNew?apid=${appId}`, { formId, module: 'ebuilderform', customParam: { appId, objId }, jsonObj: JSON.stringify({ ...full, ffDisplayColumns: bizCols }) }, { ebbusinessid: formId });
-                            console.error(`  关联显示列已自动配置 (${bizCols.length} 列)`);
-                        }
-                    }
+                    const applied = await ensureDisplayColumns(client, baseUrl, appId, objId, formId, fieldId, sformId, auth.userId, auth.tenantKey);
+                    if (applied)
+                        console.error(`  关联显示列已自动配置 (${applied} 列)`);
                 }
                 catch (e) {
                     console.error(`  关联显示列设置失败: ${e.message}`);
@@ -2663,6 +2645,7 @@ export function registerFormCommands(program) {
         .option('--title <title>', '修改字段标题')
         .option('--type <type>', '修改字段类型（如 Text/Number/Date/Select/Department；取值同 form add-field 的 <fieldType>）。'
         + '⚠ 字段已有数据时平台会拒绝')
+        .option('--format <fmt>', '日期精度格式，配合 --type Date/DateTime（缺省 Date=yyyy-MM-dd、DateTime=yyyy-MM-dd HH:mm）')
         .option('--required', '设为必填')
         .option('--no-required', '取消必填')
         .option('--sform-id <id>', 'EBuilder 关联的目标表单 objId（更新关联）')
@@ -2672,6 +2655,11 @@ export function registerFormCommands(program) {
         .option('--relate-from-source <fieldId>', '目标表单源字段 fieldId（复制哪个字段的值）')
         .option('--multiple', '设为多选（人员/部门/EBuilder/关联类字段）')
         .option('--no-multiple', '设为单选（人员/部门/EBuilder/关联类字段）')
+        .option('--max-len <n>', '最大长度（正整数）。日期/时间/省市区/身份证/电子发票/下拉多选这几类没有该属性')
+        .option('--default <value>', '默认值（Text / TextArea / Number / Money）')
+        .option('--clear-default', '清空默认值')
+        .option('--data-key <key>', '数据库字段名（同时改 dataKey 与 columnName；字段已有数据时平台会拒绝）')
+        .option('--desc <text>', '字段描述（设计器字段属性里的「描述」）')
         .action(async (objId, appId, fieldId, editOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
@@ -2738,16 +2726,10 @@ export function registerFormCommands(program) {
             console.error(`读到的字段定义里没有 type（fieldId=${fieldId}），拒绝写回 —— 全量覆盖会把它改成默认类型。`);
             process.exit(1);
         }
-        // 兜底补 componentKey：saveFormFieldNew 要求（getComponentKey() 为 null 会 NPE）。
-        // getFields 兜底路径建不出 componentKey，这里按类型映射补上。
+        // 兜底补 componentKey：saveFormFieldNew 要求非空（getComponentKey() 为 null 直接 500）。
+        // 用平台归一的 componentKey（`platformFieldShape`），不是 CLI 类型名 —— 见下方改类型分支的说明。
         if (!jsonObj.componentKey) {
-            const CK = {
-                Date: 'DateComponent', DateTime: 'DateComponent', Text: 'Text', Textarea: 'TextArea', Number: 'NumberComponent',
-                Money: 'Money', Select: 'Select', CheckBox: 'CheckBox', RadioBox: 'RadioBox',
-                Employee: 'Employee', Department: 'Department', EBuilder: 'Ebuilder',
-                Phone: 'Phone', Email: 'Email', Mobile: 'Mobile', Location: 'Location', Switch: 'Switch', IDCard: 'IDCard',
-            };
-            jsonObj.componentKey = CK[jsonObj.type] || jsonObj.type;
+            jsonObj.componentKey = platformFieldShape(String(jsonObj.type)).componentKey;
         }
         // Apply title change
         if (editOpts.title) {
@@ -2758,6 +2740,7 @@ export function registerFormCommands(program) {
         // `type` 取值与 add-field 一致（CLI 规范名；富组件换成 platformType + componentKey），
         // 回读时对应显示为 `form read` 的 fieldKey（如 Number→NumberComponent）。
         // ⚠ 字段**已存在数据**时平台会拒绝改结构（报「此列已存在数据不可修改数据库字段名称」）。
+        let typeChangeApplied = false;
         if (editOpts.type) {
             const targetType = canonComponentKey(editOpts.type);
             assertFieldType(targetType, 'edit-field ');
@@ -2766,14 +2749,72 @@ export function registerFormCommands(program) {
                 console.error(`改成 ${targetType} 需要同时指定 --sform-id <目标表 objId>（Flow 用流程绑定的表单 objId）`);
                 process.exit(1);
             }
-            if (targetType !== String(jsonObj.type)) {
-                const richTarget = getRichType(targetType);
-                jsonObj.type = richTarget ? richTarget.platformType : targetType;
-                if (richTarget)
+            const richTarget = getRichType(targetType);
+            const shape = platformFieldShape(targetType);
+            const desiredFormat = editOpts.format || shape.format;
+            // 变更判定要按**平台形状**比，不能只比类型名：
+            // 「日期」与「日期时间」在存储层同为 `type=Date` + `componentKey=DateComponent`，
+            // 只有 `format` 不同（yyyy-MM-dd vs yyyy-MM-dd HH:mm）。只比 type 会把
+            // 「DateTime → Date」判成没变化而静默跳过，精度留在原地 —— 命令报成功、字段没动。
+            const typeChanged = richTarget
+                ? targetType !== String(jsonObj.componentKey ?? '')
+                : shape.type !== String(jsonObj.type)
+                    || shape.componentKey !== String(jsonObj.componentKey ?? '')
+                    || (shape.format !== undefined && String(desiredFormat) !== String(jsonObj.format ?? ''));
+            if (editOpts.format && shape.format === undefined) {
+                console.error(`--format 只对 Date / DateTime 有意义，${targetType} 没有这个属性，已忽略。`);
+            }
+            typeChangeApplied = typeChanged;
+            if (typeChanged) {
+                if (richTarget) {
+                    jsonObj.type = richTarget.platformType;
                     jsonObj.componentKey = richTarget.platformComponentKey;
-                // 旧类型残留的组件键会在回读时盖过新类型，清掉让平台按新 type 推导
-                else
-                    delete jsonObj.componentKey;
+                }
+                else {
+                    // 非富组件：写**平台归一形状**，不是 CLI 类型名。
+                    // 曾经的 bug：这里写的是 `delete jsonObj.componentKey`（想让平台按新 type 推导），
+                    // 而上面那段兜底补 componentKey 在**这之前**就执行完了 → 改完没人再补 →
+                    // 全量覆盖时缺键 → `getComponentKey() is null` 500「程序异常」，字段改不动。
+                    // 而平台的 componentKey 也不是类型名：送 `componentKey=Date` 配 `type=DateTime`
+                    // 照样 500，必须是 `DateComponent`。
+                    jsonObj.type = shape.type;
+                    jsonObj.componentKey = shape.componentKey;
+                    // 日期/日期时间/时间：精度全靠 format，平台**不会**补默认值
+                    // （只送 type+componentKey 会存成 format 为空）。所以一起写。
+                    if (shape.format !== undefined)
+                        jsonObj.format = desiredFormat;
+                    // 切到用不到 format 的类型时清掉旧值，免得留个说不清来路的精度配置
+                    else if (jsonObj.format !== undefined)
+                        delete jsonObj.format;
+                    // 日期区间还要 `start`/`end` 两个 DateComponent 子对象（各带一个新 fieldId）。
+                    // 少了平台直接 500：`DateIntervalFieldDto.getEnd() is null`。
+                    // 子 id 对齐 add-field 的建法现取。
+                    if (targetType === 'DateRange' || targetType === 'DateInterval') {
+                        const idsRes = await client.post(`${baseUrl}/api/form/local/generatorIds?size=2&apid=${appId}`, {});
+                        const ids = (idsRes?.data?.generatorIds || []).map(String);
+                        if (ids.length < 2) {
+                            console.error('日期区间需要两个子字段 ID，服务端未返回，已中止（字段未改动）。');
+                            process.exit(1);
+                        }
+                        const fmt = desiredFormat || 'yyyy-MM-dd';
+                        const rangeTitle = String(jsonObj.title || '');
+                        const start = {
+                            componentKey: 'DateComponent', content: '', describe: '', earlyDate: 'false',
+                            format: fmt, isDefault: 'false', lateDate: 'false',
+                            placeholder: placeholderFromFormat(fmt),
+                            position: '', relateMultiple: 'false', required: 'false', size: 'medium',
+                            title: `${rangeTitle}(开始时间)`, fieldId: ids[0],
+                            min: { type: 'currentHour' }, max: { type: 'currentHour' },
+                        };
+                        Object.assign(jsonObj, {
+                            isDefault: false,
+                            start,
+                            end: { ...start, title: `${rangeTitle}(结束时间)`, fieldId: ids[1] },
+                            hasDisplayFormat: true,
+                            rangeInterval: { limitType: 'max', timeUnit: 'day' },
+                        });
+                    }
+                }
                 // 富组件还要补**附加配置**，否则改出来的字段是残缺的：
                 // add-field 走的是同一张表的 build()，两边不一致会导致「新建的对、改类型的错」
                 // （实测 Time：改出来缺 minuteStep/timePanelStyle/defaultExtend，earlyDate/lateDate
@@ -2942,6 +2983,23 @@ export function registerFormCommands(program) {
                 };
             }
         }
+        // 长度 / 默认值 / 数据库字段名 / 描述：共用一套补丁规则（哪些类型适用、取值边界）。
+        // 放在类型变更之后 —— 改完 type 才知道该不该放行 maxLen 这类按类型受限的属性。
+        const patch = applyFieldPatches(jsonObj, {
+            maxLen: editOpts.maxLen,
+            defaultValue: editOpts.default,
+            clearDefault: editOpts.clearDefault,
+            dataKey: editOpts.dataKey,
+            desc: editOpts.desc,
+        });
+        if (patch.errors.length > 0) {
+            for (const e of patch.errors)
+                console.error(`  ❌ ${e}`);
+            console.error('  已中止，未做任何改动。');
+            process.exit(1);
+        }
+        for (const w of patch.warnings)
+            console.error(`  ⚠ ${w}`);
         const payload = {
             formId, module: 'ebuilderform',
             customParam: { appId, objId: resolvedObjId },
@@ -2952,8 +3010,11 @@ export function registerFormCommands(program) {
             const changes = [];
             if (editOpts.title)
                 changes.push(`title="${editOpts.title}"`);
-            if (editOpts.type)
-                changes.push(`type=${editOpts.type}`);
+            // 只有**真的换了形状**才回显类型。原样重跑同一类型（尤其 Date/DateTime 在存储层同为
+            // type=Date）时没做任何改动，回显「type=…」会让人以为写过了。
+            if (editOpts.type) {
+                changes.push(typeChangeApplied ? `type=${editOpts.type}` : `type=${editOpts.type}(未变化)`);
+            }
             if (editOpts.required)
                 changes.push('required');
             if (editOpts.noRequired)
@@ -2966,6 +3027,23 @@ export function registerFormCommands(program) {
                 changes.push(`relateFrom ${editOpts.relateFrom}→${editOpts.relateFromSource || ''}`);
             if (editOpts.multiple !== undefined)
                 changes.push(editOpts.multiple ? 'multiple' : '!multiple');
+            changes.push(...patch.applied);
+            // EBuilder 字段的浏览显示列：add-field 建出来的会自动配，edit-field 改出来的此前漏了这一步
+            // —— 字段能建出来，但浏览弹窗回落平台默认列，会把目标表的系统字段也列出来。
+            // ensureDisplayColumns 只在「没配过」或「旧列对不上当前目标表」时才写，不会冲掉手工配好的列。
+            if (['EBuilder', 'Ebuilder'].includes(String(jsonObj.type))) {
+                const targetId = String(jsonObj.sformId || '');
+                if (targetId) {
+                    try {
+                        const applied = await ensureDisplayColumns(client, baseUrl, appId, objId, formId, fieldId, targetId, auth.userId, auth.tenantKey);
+                        if (applied)
+                            changes.push(`浏览显示列=${applied}列`);
+                    }
+                    catch (e) {
+                        console.error(`  警告: 浏览显示列设置失败（字段本身已改好）: ${e.message}`);
+                    }
+                }
+            }
             const msg = opts.json ? JSON.stringify({ fieldId, changes }) : `字段已更新: ${fieldId} (${changes.join(', ') || 'no changes'})`;
             console.log(msg);
         }