weaver-e10-builder 1.5.11 → 1.5.12

package/dist/commands/form-obj-meta.js

@@ -0,0 +1,116 @@
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { renameFormObj, getFormTitle, setFormTitle, } from '../services/form-obj-meta.js';
+/**
+ * form rename / form title —— 表单**名称**与**自定义标题**。
+ *
+ * 平台上这是两套名字，端点不同、字段不重叠：
+ *   - 表单名称   `name`                      → obj/saveOrUpdate（整对象覆盖）
+ *   - 自定义标题 `showName` / `formPageName` → obj/saveOrUpdateTitle（小报文）
+ *
+ * 因此两条命令互不影响：`rename` 只改 name，`title set` 只改标题字段。
+ */
+export function registerFormObjMetaCommands(form, program) {
+    form.command('rename')
+        .description('修改表单名称（name）。不影响自定义标题，名称与标题是分开的两套')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<name>', '新表单名称')
+        .action(async (objId, appId, name) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const result = await renameFormObj(new ApiClient(auth), auth.getBaseUrl(), appId, objId, name);
+            if (opts.json)
+                console.log(JSON.stringify({ success: true, ...result }, null, 2));
+            else if (!result.changed)
+                console.log(`表单名称已是「${result.name}」，无需修改  (${result.objId})`);
+            else
+                console.log(`表单名称已修改: ${result.oldName} → ${result.name}  (${result.objId})`);
+        }
+        catch (error) {
+            console.error(`修改表单名称失败: ${error.message}`);
+            process.exitCode = 1;
+        }
+    });
+    const title = form.command('title')
+        .description('表单自定义标题（标题文本 / 隐藏头部等）。与表单名称是分开的两套');
+    title.command('get')
+        .description('查看自定义标题')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .action(async (objId, appId) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const current = await getFormTitle(new ApiClient(auth), auth.getBaseUrl(), appId, objId);
+            if (opts.json)
+                console.log(JSON.stringify(current, null, 2));
+            else {
+                console.log(`标题文本:     ${current.showName || '(空)'}`);
+                console.log(`表单页面名:   ${current.formPageName || '(空)'}`);
+                console.log(`隐藏页面头部: ${current.isHiddenHeader ? '是' : '否'}`);
+                console.log(`隐藏表单标题: ${current.hiddenFormTitle ? '是' : '否'}`);
+                console.log(`页面名全含:   ${current.pageNameAllIn}`);
+                if (current.hiddenFormTitle)
+                    console.log('  ⚠ 表单标题当前是隐藏的 —— 改了标题文本，界面上也看不到变化');
+            }
+        }
+        catch (error) {
+            console.error(`读取表单标题失败: ${error.message}`);
+            process.exitCode = 1;
+        }
+    });
+    title.command('set')
+        .description('修改自定义标题（至少要给一个标题选项）')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .option('--show-name <text>', '标题文本')
+        .option('--form-page-name <text>', '表单页面名')
+        .option('--hide-header', '隐藏页面头部')
+        .option('--no-hide-header', '显示页面头部')
+        .option('--hide-title', '隐藏表单标题')
+        .option('--no-hide-title', '显示表单标题')
+        .option('--page-name-all-in <n>', '页面名是否全含（0/1）')
+        .action(async (objId, appId, cmdOpts) => {
+        try {
+            const opts = program.opts();
+            const auth = await AuthSession.fromOptions(opts);
+            if (!auth)
+                throw new Error('无法加载认证');
+            const patch = {};
+            if (cmdOpts.showName !== undefined)
+                patch.showName = String(cmdOpts.showName);
+            if (cmdOpts.formPageName !== undefined)
+                patch.formPageName = String(cmdOpts.formPageName);
+            if (cmdOpts.hideHeader !== undefined)
+                patch.isHiddenHeader = cmdOpts.hideHeader ? 1 : 0;
+            if (cmdOpts.hideTitle !== undefined)
+                patch.hiddenFormTitle = cmdOpts.hideTitle ? 1 : 0;
+            if (cmdOpts.pageNameAllIn !== undefined) {
+                const n = Number(cmdOpts.pageNameAllIn);
+                if (n !== 0 && n !== 1)
+                    throw new Error('--page-name-all-in 只接受 0 或 1');
+                patch.pageNameAllIn = n;
+            }
+            const result = await setFormTitle(new ApiClient(auth), auth.getBaseUrl(), appId, objId, patch);
+            if (opts.json)
+                console.log(JSON.stringify({ success: true, ...result }, null, 2));
+            else {
+                const keys = Object.keys(patch).join(', ');
+                console.log(`表单标题已修改（${keys}）  (${objId})`);
+                console.log(`  标题文本:     ${result.after.showName || '(空)'}`);
+                console.log(`  表单页面名:   ${result.after.formPageName || '(空)'}`);
+            }
+        }
+        catch (error) {
+            console.error(`修改表单标题失败: ${error.message}`);
+            process.exitCode = 1;
+        }
+    });
+}
+//# sourceMappingURL=form-obj-meta.js.map

package/dist/commands/form-obj-meta.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-obj-meta.js","sourceRoot":"","sources":["../../src/commands/form-obj-meta.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,aAAa,EACb,YAAY,EACZ,YAAY,GAEb,MAAM,8BAA8B,CAAC;AAEtC;;;;;;;;GAQG;AACH,MAAM,UAAU,2BAA2B,CAAC,IAAa,EAAE,OAAgB;IACzE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;SACnB,WAAW,CAAC,mCAAmC,CAAC;SAChD,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;SAC3B,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,IAAY,EAAE,EAAE;QAC3D,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC/F,IAAI,IAAI,CAAC,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;iBAC7E,IAAI,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,IAAI,YAAY,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;;gBACnF,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,CAAC,OAAO,MAAM,MAAM,CAAC,IAAI,MAAM,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACrF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,aAAc,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;SAChC,WAAW,CAAC,mCAAmC,CAAC,CAAC;IAEpD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;SACjB,WAAW,CAAC,SAAS,CAAC;SACtB,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,EAAE;QAC7C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;YACrC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACzF,IAAI,IAAI,CAAC,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;iBACxD,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;gBACtD,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,YAAY,IAAI,KAAK,EAAE,CAAC,CAAC;gBACzD,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;gBACjD,IAAI,OAAO,CAAC,eAAe;oBAAE,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,aAAc,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;SACjB,WAAW,CAAC,qBAAqB,CAAC;SAClC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;SAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5B,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC;SACpC,MAAM,CAAC,yBAAyB,EAAE,OAAO,CAAC;SAC1C,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC;SACjC,MAAM,CAAC,kBAAkB,EAAE,QAAQ,CAAC;SACpC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;SAChC,MAAM,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SACnC,MAAM,CAAC,wBAAwB,EAAE,cAAc,CAAC;SAChD,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,KAAa,EAAE,OAA4B,EAAE,EAAE;QAC3E,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;YAErC,MAAM,KAAK,GAAmB,EAAE,CAAC;YACjC,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;gBAAE,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9E,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS;gBAAE,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC1F,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;gBAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxF,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS;gBAAE,KAAK,CAAC,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvF,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBACxE,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/F,IAAI,IAAI,CAAC,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;iBAC7E,CAAC;gBACJ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,KAAK,GAAG,CAAC,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,KAAK,EAAE,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,aAAc,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"form-validate.d.ts","sourceRoot":"","sources":["../../src/commands/form-validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BpC,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAyGlF"}
+{"version":3,"file":"form-validate.d.ts","sourceRoot":"","sources":["../../src/commands/form-validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiHpC,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAgKlF"}

package/dist/commands/form-validate.js

@@ -3,6 +3,83 @@ import { ApiClient } from '../core/client.js';
 // objId → formId：obj/getList 不含三方表单（专项应用），内部带 getInfoById 兜底。
 import { resolveFormId as resolveFormIdShared } from '../services/form-id.js';
 import { createMultilangLabel, resolveLabelText } from '../services/form-i18n-label.js';
+import { renderValidateHelp, resolveHelpInput } from '../services/validate-help.js';
+const MODULE = 'ebuilderform';
+const PAGE = 100;
+/** 翻页取全：固定 pageSize 会在规则数超过一页时静默漏显示。 */
+async function fetchRules(client, baseUrl, formId) {
+    const rules = [];
+    for (let pageNo = 1;; pageNo++) {
+        // 路径是 /api/ebuilder/...；MODULE（ebuilderform）只是报文里的 module 值
+        const res = await client.post(`${baseUrl}/api/ebuilder/form/validate/pageFormDataValidate`, {
+            module: MODULE, formId, pageNo, pageSize: PAGE,
+        });
+        // 该接口不返回 status（只有 code），不能按 save 那套判
+        if (res?.code !== 200)
+            throw new Error(res?.msg || '查询查重规则失败');
+        const page = res?.data?.records || [];
+        rules.push(...page);
+        if (page.length < PAGE)
+            break;
+    }
+    return rules;
+}
+/** 主表 + 明细字段，作为查重字段候选。 */
+async function loadFields(client, baseUrl, objId, formId, userId, tenantKey) {
+    const fieldsRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
+        objId, userid: userId, tenantKey, isReturnDetail: 'y',
+    });
+    const candidates = [];
+    for (const m of fieldsRes?.data?.mainFields || []) {
+        if (/^\d+$/.test(String(m.fieldId))) {
+            candidates.push({ fieldName: String(m.fieldName), fieldId: String(m.fieldId), subFormId: String(formId) });
+        }
+    }
+    for (const dt of fieldsRes?.data?.detailFields || []) {
+        for (const sf of dt.fields || []) {
+            if (/^\d+$/.test(String(sf.fieldId))) {
+                candidates.push({
+                    fieldName: String(sf.fieldName), fieldId: String(sf.fieldId),
+                    subFormId: String(sf.subFormId || dt.id || formId),
+                });
+            }
+        }
+    }
+    return candidates;
+}
+function pickFields(candidates, names) {
+    const out = [];
+    for (const name of names) {
+        const c = candidates.find((x) => x.fieldName === name || String(x.fieldId) === name);
+        if (!c) {
+            console.error(`未找到字段: ${name}，可用: ${candidates.map((x) => x.fieldName).join(', ')}`);
+            process.exit(1);
+        }
+        out.push(c);
+    }
+    return out;
+}
+/** 读回里的 checkFields 只有 fieldId，没有 subFormId —— 按 fieldId 回候选表补齐。 */
+function fieldsById(candidates, rule) {
+    const out = [];
+    for (const c of rule?.checkFields || []) {
+        const fieldId = String(c.fieldId ?? '');
+        const hit = candidates.find((x) => x.fieldId === fieldId);
+        if (!hit) {
+            console.error(`规则里的字段 ${c.fieldName || fieldId}（${fieldId}）已不在当前表单中，请用 --fields 重新指定查重字段`);
+            process.exit(1);
+        }
+        out.push(hit);
+    }
+    if (!out.length) {
+        console.error('规则里没有查重字段，请用 --fields 指定');
+        process.exit(1);
+    }
+    return out;
+}
+function methodOf(rule) {
+    return rule?.treatmentMethod === 'REMINDER' ? '提醒' : '禁止提交';
+}
 export function registerFormValidateCommands(form, program) {
     const val = form.command('validate').description('字段查重校验规则（重名校验/重复日期，多字段 AND）');
     val.command('list')
@@ -17,10 +94,7 @@ export function registerFormValidateCommands(form, program) {
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
         const formId = await resolveFormId(client, baseUrl, appId, objId);
-        const res = await client.post(`${baseUrl}/api/ebuilder/form/validate/pageFormDataValidate`, {
-            module: 'ebuilderform', formId, pageNo: 1, pageSize: 100,
-        });
-        const rules = res?.data?.records || [];
+        const rules = await fetchRules(client, baseUrl, formId);
         if (opts.json) {
             console.log(JSON.stringify(rules, null, 2));
             return;
@@ -32,12 +106,11 @@ export function registerFormValidateCommands(form, program) {
         // 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'));
+            helpOf.set(String(r.id), await resolveLabelText(client, baseUrl, r.helpContent, MODULE));
         }));
         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} | ${helpOf.get(String(r.id)) || ''}`);
+            console.log(`[${r.id}] ${methodOf(r)} | ${fields} | ${helpOf.get(String(r.id)) || ''}`);
         }
     });
     val.command('add')
@@ -45,7 +118,7 @@ export function registerFormValidateCommands(form, program) {
         .argument('<objId>', '表单 objId')
         .argument('<appId>', '应用 ID')
         .argument('<fields...>', '查重字段名（可多个，如 "填报人" "工时日期"）')
-        .option('--help <text>', '重复时的提示内容（会建一条多语言标签，存的是标签 id）', '字段值不允许重复')
+        .option('--help <text>', '重复时的提示内容；可写 #[字段名]# 插入变量，或 @文件（会建一条多语言标签，存的是标签 id）', '字段值不允许重复')
         .option('--remind', '重复时仅提醒允许提交（缺省禁止提交 NOSUBMISSION）')
         .action(async (objId, appId, fieldNames, cmdOpts) => {
         const opts = program.opts();
@@ -55,34 +128,13 @@ export function registerFormValidateCommands(form, program) {
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
         const formId = await resolveFormId(client, baseUrl, appId, objId);
-        // 取字段（主表 + 明细），解析 fieldId/fieldName/subFormId
-        const fieldsRes = await client.post(`${baseUrl}/api/ebuilder/form/dataset/v1/getFields`, {
-            objId, userid: auth.userId, tenantKey: auth.tenantKey, isReturnDetail: 'y',
-        });
-        const candidates = [];
-        for (const m of fieldsRes?.data?.mainFields || []) {
-            if (/^\d+$/.test(String(m.fieldId)))
-                candidates.push({ fieldName: m.fieldName, fieldId: String(m.fieldId), subFormId: String(formId) });
-        }
-        for (const dt of fieldsRes?.data?.detailFields || []) {
-            for (const sf of dt.fields || []) {
-                if (/^\d+$/.test(String(sf.fieldId)))
-                    candidates.push({ fieldName: sf.fieldName, fieldId: String(sf.fieldId), subFormId: String(sf.subFormId || dt.id || formId) });
-            }
-        }
-        const checkFields = [];
-        for (const name of fieldNames) {
-            const c = candidates.find((x) => x.fieldName === name || String(x.fieldId) === name);
-            if (!c) {
-                console.error(`未找到字段: ${name}`);
-                process.exit(1);
-            }
-            checkFields.push(c);
-        }
+        const candidates = await loadFields(client, baseUrl, objId, formId, auth.userId, auth.tenantKey);
+        const checkFields = pickFields(candidates, fieldNames);
         // 提示语必须走多语言标签：直接传文本会被服务端拒（提示内容格式不正确。）
-        const helpLabelId = await createMultilangLabel(client, baseUrl, String(cmdOpts.help || '字段值不允许重复'), 'ebuilderform');
+        const helpText = renderValidateHelp(resolveHelpInput(String(cmdOpts.help || '字段值不允许重复')), candidates);
+        const helpLabelId = await createMultilangLabel(client, baseUrl, helpText, MODULE);
         const payload = {
-            module: 'ebuilderform', formId,
+            module: MODULE, formId,
             treatmentMethod: cmdOpts.remind ? 'REMINDER' : 'NOSUBMISSION',
             remindTime: 'SUB_REMIND', taggingColour: '#000000', subFieldCheckType: 'ALL_DATA',
             helpContent: helpLabelId,
@@ -96,6 +148,86 @@ export function registerFormValidateCommands(form, program) {
         const method = cmdOpts.remind ? '提醒' : '禁止提交';
         console.log(`已保存查重规则: ${fieldNames.join(' + ')}（${method}）ruleId=${res?.data?.id || ''}`);
     });
+    val.command('update')
+        .description('修改查重规则（只改传入的项，其余保持原值）')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<ruleId>', '规则 ID（form validate list 查看）')
+        .option('--fields <names...>', '改查重字段（多个 AND；不给则沿用原字段）')
+        .option('--help <text>', '改提示内容；可写 #[字段名]# 插入变量，或 @文件（不给则沿用原提示）')
+        .option('--remind', '改成重复时仅提醒（允许提交）')
+        .option('--no-remind', '改成重复时禁止提交（NOSUBMISSION）')
+        .action(async (objId, appId, ruleId, 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 formId = await resolveFormId(client, baseUrl, appId, objId);
+        if (cmdOpts.fields === undefined && cmdOpts.help === undefined && cmdOpts.remind === undefined) {
+            console.error('没有要修改的项（至少给 --fields / --help / --remind / --no-remind 之一）');
+            process.exit(1);
+        }
+        const rules = await fetchRules(client, baseUrl, formId);
+        const rule = rules.find((r) => String(r.id) === String(ruleId));
+        if (!rule) {
+            console.error(`规则不存在或不属于该表单: ${ruleId}（form validate list 查看可用规则）`);
+            process.exit(1);
+        }
+        const candidates = await loadFields(client, baseUrl, objId, formId, auth.userId, auth.tenantKey);
+        // checkFields 是整组替换：无论改不改字段，都要把完整一组带上
+        const checkFields = cmdOpts.fields !== undefined
+            ? pickFields(candidates, cmdOpts.fields)
+            : fieldsById(candidates, rule);
+        const treatmentMethod = cmdOpts.remind === undefined
+            ? (rule.treatmentMethod === 'REMINDER' ? 'REMINDER' : 'NOSUBMISSION')
+            : (cmdOpts.remind ? 'REMINDER' : 'NOSUBMISSION');
+        const helpContent = cmdOpts.help === undefined
+            ? rule.helpContent
+            : await createMultilangLabel(client, baseUrl, renderValidateHelp(resolveHelpInput(String(cmdOpts.help)), candidates), MODULE);
+        const payload = {
+            id: String(ruleId),
+            module: MODULE, formId,
+            treatmentMethod,
+            remindTime: rule.remindTime || 'SUB_REMIND',
+            taggingColour: rule.taggingColour || '#000000',
+            subFieldCheckType: rule.subFieldCheckType || 'ALL_DATA',
+            helpContent,
+            checkFields,
+        };
+        const res = await client.post(`${baseUrl}/api/ebuilder/form/validate/save`, payload);
+        if (res?.code !== 200 || !res?.status) {
+            console.error(`保存失败: ${res?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        // 回读校验：处理方式、查重字段集合、提示标签引用
+        const after = (await fetchRules(client, baseUrl, formId)).find((r) => String(r.id) === String(ruleId));
+        if (!after) {
+            console.error(`保存后回读不到规则 ${ruleId}`);
+            process.exit(1);
+        }
+        const wantFields = checkFields.map((f) => f.fieldId).sort().join(',');
+        const gotFields = (after.checkFields || []).map((c) => String(c.fieldId)).sort().join(',');
+        const diffs = [];
+        if (after.treatmentMethod !== treatmentMethod)
+            diffs.push(`处理方式 期望=${treatmentMethod} 实际=${after.treatmentMethod}`);
+        if (gotFields !== wantFields)
+            diffs.push(`查重字段 期望=${wantFields} 实际=${gotFields}`);
+        if (String(after.helpContent) !== String(helpContent))
+            diffs.push(`提示内容 期望=${helpContent} 实际=${after.helpContent}`);
+        if (diffs.length) {
+            console.error(`保存后回读不一致：${diffs.join('; ')}`);
+            process.exit(1);
+        }
+        const fieldNames = (after.checkFields || []).map((c) => c.fieldName);
+        if (opts.json) {
+            console.log(JSON.stringify({ success: true, ruleId: String(ruleId), fields: fieldNames, method: treatmentMethod }, null, 2));
+        }
+        else {
+            console.log(`已修改查重规则 [${ruleId}]：${fieldNames.join(' + ')}（${methodOf(after)}）`);
+        }
+    });
     val.command('delete')
         .description('删除查重规则')
         .argument('<objId>', '表单 objId')
@@ -110,7 +242,7 @@ export function registerFormValidateCommands(form, program) {
         const baseUrl = auth.getBaseUrl();
         const formId = await resolveFormId(client, baseUrl, appId, objId);
         const res = await client.post(`${baseUrl}/api/ebuilder/form/validate/batchDelete`, {
-            module: 'ebuilderform', formId, idList: [ruleId],
+            module: MODULE, formId, idList: [ruleId],
         });
         if (res?.code !== 200 || !res?.status) {
             console.error(`删除失败: ${res?.msg || '未知错误'}`);

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;AAwBpC,OAAO,EAAE,kBAAkB,EAAyD,MAAM,oCAAoC,CAAC;AAK/H;;;;;;GAMG;AACH,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAgF9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA2jG9D"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/commands/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyBpC,OAAO,EAAE,kBAAkB,EAAyD,MAAM,oCAAoC,CAAC;AAO/H;;;;;;GAMG;AACH,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAgF9B,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CA8kG9D"}

package/dist/commands/form.js

@@ -1,6 +1,7 @@
 import { writeFileSync, existsSync, readFileSync } from 'fs';
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
+import { parseLayoutJson } from '../services/form-layout-source/json.js';
 import { toColumnName, toTableName, resolveFieldKeys } from '../utils/column-name.js';
 import { createCustomPhysicalForm, applyInitialFieldsToNewForm, placeholderFromFormat, reapplyGroupLayout, queryFormStorageSetting } from '../services/form-create.js';
 import { getRichType, richIdUnits, BROWSER_KINDS } from '../services/rich-types.js';
@@ -22,6 +23,8 @@ import { FIELD_TYPE_CHOICES, canonComponentKey, assertFieldType, normalizeFieldD
 import { listFormTables, readFieldRecords, mapFieldsToTables } from '../services/form-physical-table.js';
 import { buildFormulaParameters, defaultReturnType } from '../services/formula-detail.js';
 import { registerOptionTemplateCommand } from './form-option-template.js';
+import { registerFormObjMetaCommands } from './form-obj-meta.js';
+import { prepareSourceLayoutInputs, restoreSourceLayoutAfterCreate } from '../services/form-layout-source/creation.js';
 /**
  * 字段类型归一 / 校验 / 校验清单已抽到 `services/form-field-validate.ts` ——
  * 「标准建表」与「专项建表」两个入口共用同一份，避免两处真相。
@@ -99,6 +102,7 @@ async function fetchFieldPageRecords(client, baseUrl, appId, formId, subFormId)
 export function registerFormCommands(program) {
     const form = program.command('form').description('表单管理');
     registerOptionTemplateCommand(form, program);
+    registerFormObjMetaCommands(form, program);
     form.command('read')
         .description('读取表单字段结构')
         .argument('<objId>', '表单 objId')
@@ -316,14 +320,18 @@ export function registerFormCommands(program) {
         + 'valueKey 须为数字、省略则平台生成）')
         .option('--menu', '建表后添加台账菜单（默认不加；漏加可用 `e10-cli menu add-table` 补）')
         .option('--layout <type>', '表单布局类型：FLOW(流式)/EXCEL(表格，缺省)。布局类型建表后不可切换', 'EXCEL')
+        .option('--layout-source <json>', 'extract 输出的源证据；搭配 layout-spec 和 layout-artifact-out')
+        .option('--layout-spec <json>', '字段位置描述；字段创建和归组结束后还原源样式')
+        .option('--layout-artifact-out <file>', '保存源布局编译产物及原生前置快照，用于验收和重试')
         .option('--table-name <name>', '自定义数据库表名。平台前缀（如 uf_）由 CLI 自动补，传 uf_xxx 或只传自定义部分都可以；'
         + '须字母开头、只含字母数字下划线。缺省按表单名拼音首字母 + 随机数生成')
         .action(async (appId, name, cmdOpts) => {
+        const sourceLayout = await prepareSourceLayoutInputs(cmdOpts);
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
-        const client = new ApiClient(auth);
+        const client = new ApiClient(auth, 3, sourceLayout ? parseLayoutJson : undefined);
         const baseUrl = auth.getBaseUrl();
         const { randomUUID } = await import('crypto');
         // Fields are required — parse from file (must start with @)
@@ -1736,8 +1744,24 @@ export function registerFormCommands(program) {
         catch (e) {
             console.error(`  显示列兜底失败: ${e.message}（可用 \`e10-cli form table-view ensure ${objId} ${appId}\` 手动补加）`);
         }
+        let layoutRestoration;
+        if (sourceLayout) {
+            try {
+                // 独立单次提交客户端：不能让默认重试把结果未知的布局写入重复发送。
+                layoutRestoration = await restoreSourceLayoutAfterCreate(new ApiClient(auth, 1, parseLayoutJson), baseUrl, { module: 'ebuilderform', formId, objId, appId, routeKind: 'default' }, sourceLayout);
+                if (!layoutRestoration.saved || layoutRestoration.reportWriteError)
+                    process.exitCode = 1;
+            }
+            catch (e) {
+                layoutRestoration = { saved: false, partial: true, error: e.message, artifactOut: sourceLayout.artifactOut };
+                process.exitCode = 1;
+            }
+            console.error(layoutRestoration.saved ? `  源布局结构回读通过，产物: ${sourceLayout.artifactOut}` : `  表单 ${objId} 已创建，源布局还原未通过: ${layoutRestoration.error || '请查看差异报告'}；重试只处理此已有表单`);
+            if (layoutRestoration.reportWriteError)
+                console.error(`  业务保存已回读通过，但报告落盘失败: ${layoutRestoration.reportWriteError}`);
+        }
         if (opts.json) {
-            console.log(JSON.stringify({ objId, name, menuId, skippedSys }));
+            console.log(JSON.stringify({ objId, name, menuId, skippedSys, ...(sourceLayout ? { formId, layoutRestoration } : {}) }));
         }
         else {
             console.log(`完成: ${objId}${skippedSys.length ? `（跳过系统字段重名: ${skippedSys.map((s) => s.name).join('、')}）` : ''}`);