weaver-e10-builder 1.5.10 → 1.5.12

package/dist/commands/form-button-permission-cmd.js

@@ -0,0 +1,132 @@
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { readButtonContext } from '../services/form-button-context.js';
+import { saveButtonState, assertUntouched } from '../services/form-button-save.js';
+import { buildPermissionEntry, allPermissionEntry, permissionLabel, permissionSignature, hasPermission, findPermission, } from '../services/form-button-permission.js';
+import { resolvePermissionSubject } from '../services/form-button-org.js';
+export function registerFormButtonPermissionCommands(btnCmd, program) {
+    btnCmd.command('permission')
+        .description('查看/配置按钮权限（哪些人能看见并点击这个按钮）；不带任何选项时列出')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<buttonId>', '按钮 ID')
+        .option('--add-all', '加「全体」')
+        .option('--add-company <分部>', '加「分部」（名称或 ID）')
+        .option('--add-department <部门>', '加「部门」（名称或 ID）')
+        .option('--add-people <人员>', '加「人员」（姓名或 ID）')
+        .option('--contain-extra', '本次加入的部门/分部含下级')
+        .option('--remove <序号|id>', '删除一条：列表里的序号（从 1 起）或权限 id，可逗号分隔')
+        .option('--clear', '清空全部按钮权限')
+        .option('--json', 'JSON 输出')
+        .action(async (objId, appId, buttonId, o) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth) {
+            process.exitCode = 1;
+            return;
+        }
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const isJson = Boolean(o.json || opts.json);
+        try {
+            const context = await readButtonContext(client, baseUrl, appId, objId, buttonId);
+            const current = context.details.permissions;
+            const adding = Boolean(o.addAll || o.addCompany || o.addDepartment || o.addPeople);
+            const editing = adding || o.remove !== undefined || Boolean(o.clear);
+            if (!editing) {
+                if (isJson) {
+                    console.log(JSON.stringify(current, null, 2));
+                    return;
+                }
+                if (!current.length) {
+                    console.log('当前没有按钮权限配置');
+                    return;
+                }
+                console.log(`按钮权限（${current.length} 条）：`);
+                current.forEach((p, i) => console.log(`  ${i + 1}. ${permissionLabel(p)}  [${p.id ?? '-'}] containExtra=${p.containExtra ?? '-'}`));
+                return;
+            }
+            // 系统按钮由平台判定能不能配权限（自定义按钮恒为 true）。
+            if (context.details.canSetButtonPermission === false) {
+                throw new Error('该按钮不支持配置按钮权限（平台标记 canSetButtonPermission=false）');
+            }
+            let next = [...current];
+            const changes = [];
+            const removedSignatures = [];
+            if (o.clear) {
+                if (adding || o.remove !== undefined)
+                    throw new Error('--clear 不能与 --add-*/--remove 同用');
+                removedSignatures.push(...current.map(permissionSignature));
+                next = [];
+                changes.push('清空全部权限');
+            }
+            else {
+                if (o.remove !== undefined) {
+                    for (const sel of o.remove.split(',').map((s) => s.trim()).filter(Boolean)) {
+                        const { entry, index } = findPermission(next, sel);
+                        removedSignatures.push(permissionSignature(entry));
+                        changes.push(`- ${permissionLabel(entry)}`);
+                        next.splice(index, 1);
+                    }
+                }
+                // 固定顺序：全体 → 分部 → 部门 → 人员（commander 不保留不同选项之间的先后）。
+                // 授权对象按「名称或 ID」解析成 content+contentSpan —— 拆成两步是为了先解析再写，
+                // 解析失败就整条命令不落库。
+                const adds = [
+                    { label: '全体', value: o.addAll ? 'all' : undefined },
+                    { kind: 'company', label: '分部', value: o.addCompany },
+                    { kind: 'department', label: '部门', value: o.addDepartment },
+                    { kind: 'resource', label: '人员', value: o.addPeople },
+                ];
+                for (const item of adds) {
+                    if (item.value === undefined)
+                        continue;
+                    let built;
+                    if (item.kind === undefined) {
+                        built = allPermissionEntry();
+                    }
+                    else {
+                        const subject = await resolvePermissionSubject(client, baseUrl, item.kind, item.value);
+                        built = buildPermissionEntry({
+                            permissionType: item.kind, content: subject.id, contentSpan: subject.name,
+                            containExtra: o.containExtra,
+                        });
+                    }
+                    if (hasPermission(next, built)) {
+                        changes.push(`= ${permissionLabel(built)}（已存在，跳过）`);
+                        continue;
+                    }
+                    next.push(built);
+                    changes.push(`+ ${permissionLabel(built)}`);
+                }
+            }
+            const statePatch = { permissionDatas: next };
+            const { after } = await saveButtonState(client, baseUrl, appId, objId, context, statePatch);
+            assertUntouched(context, after, statePatch); // 只改权限时，动作不能被顺手删掉
+            // 回读校验：要加的一条都不能少、要删的一条都不能还在（平台自己补的条目不算错）。
+            const gotSignatures = new Set(after.details.permissions.map(permissionSignature));
+            const missing = next.filter((p) => !gotSignatures.has(permissionSignature(p)));
+            if (missing.length) {
+                throw new Error(`已提交，但回读少了 ${missing.length} 条权限：${missing.map(permissionLabel).join('、')}`);
+            }
+            const stillThere = removedSignatures.filter((sig) => gotSignatures.has(sig));
+            if (stillThere.length)
+                throw new Error(`已提交，但要删的 ${stillThere.length} 条权限回读仍在`);
+            if (isJson) {
+                console.log(JSON.stringify({
+                    success: true, verified: true, buttonId, changes, permissions: after.details.permissions,
+                }, null, 2));
+            }
+            else {
+                console.log(`按钮权限已更新并回读校验: [${buttonId}] 共 ${after.details.permissions.length} 条`);
+                for (const c of changes)
+                    console.log(`  ${c}`);
+            }
+        }
+        catch (error) {
+            console.error(error?.message || error);
+            process.exitCode = 1;
+        }
+    });
+}
+//# sourceMappingURL=form-button-permission-cmd.js.map

package/dist/commands/form-button-permission-cmd.js.map

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

package/dist/commands/form-button-props-cmd.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare function registerFormButtonPropsCommands(btnCmd: Command, program: Command): void;
+//# sourceMappingURL=form-button-props-cmd.d.ts.map

package/dist/commands/form-button-props-cmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-button-props-cmd.d.ts","sourceRoot":"","sources":["../../src/commands/form-button-props-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkGpC,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAiJvF"}

package/dist/commands/form-button-props-cmd.js

@@ -0,0 +1,236 @@
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { readButtonContext } from '../services/form-button-context.js';
+import { saveButtonState, buildButtonSavePayload, assertUntouched } from '../services/form-button-save.js';
+import { buildIconPath, parseIconPath, iconSignature, buildLogMessage } from '../services/form-button-props.js';
+import { encodeRootdata, parseRootdata, semanticEqualRootdata } from '../services/form-button-condition.js';
+import { fetchFields, buildConditionTree, appendConditions, removeConditions, condLeaves, relationCode, renderCond, parseConditionInput, validateConditionFields, } from './form-list-utils.js';
+/** 算一遍「数据过滤」要写成什么明文树，并回条件条数。语义与 `form list-filter` 完全一致。 */
+async function editFilter(client, baseUrl, appId, objId, currentTree, o) {
+    const countOf = (tree) => (tree ? condLeaves(tree).length : 0);
+    if (o.clearFilter) {
+        if (o.add !== undefined || o.replace !== undefined || o.remove !== undefined || o.relation !== undefined) {
+            throw new Error('--clear-filter 不能与 --add/--replace/--remove/--relation 同用');
+        }
+        return { plain: '', count: 0 };
+    }
+    if (o.add !== undefined && o.replace !== undefined) {
+        throw new Error('--add 与 --replace 只能给一个：--add 是叠加，--replace 是整体覆盖');
+    }
+    if (o.add !== undefined || o.replace !== undefined) {
+        const nodes = parseConditionInput((o.add ?? o.replace));
+        const fields = await fetchFields(client, baseUrl, objId);
+        await validateConditionFields(client, baseUrl, appId, objId, nodes, fields);
+        if (o.replace !== undefined) {
+            const plain = buildConditionTree(nodes, fields, objId, true, { relation: o.relation });
+            return { plain, count: countOf(JSON.parse(plain)) };
+        }
+        const merged = appendConditions(currentTree, nodes, fields, objId, { relation: o.relation });
+        return { plain: JSON.stringify(merged), count: countOf(merged) };
+    }
+    if (o.remove !== undefined) {
+        const { filter, removed } = removeConditions(currentTree, o.remove.split(','));
+        if (!removed)
+            throw new Error(`没有匹配的数据过滤条件可摘（--remove ${o.remove}）`);
+        return { plain: JSON.stringify(filter), count: countOf(filter) };
+    }
+    // 只调顶层关系
+    if (!currentTree?.datas?.length)
+        throw new Error('当前没有数据过滤条件，--relation 无从设置');
+    currentTree.relationship = relationCode(o.relation, String(currentTree.relationship ?? '1'));
+    currentTree.rootStr = renderCond(currentTree);
+    return { plain: JSON.stringify(currentTree), count: countOf(currentTree) };
+}
+/**
+ * 回读校验。
+ *
+ * ⚠ 一律**按语义比**，不逐字比 JSON：平台会补 `style.fillType`、`condition.moduleId`、
+ * 重排条件树的 key/rootStr（教训同「count 统计项的 fieldId 会被平台改写」）。
+ */
+function verifyProps(after, patch, logMessage) {
+    const got = after.button;
+    const strict = (key, actual, label) => {
+        if (String(actual ?? '') !== String(patch[key] ?? '')) {
+            throw new Error(`已提交，但回读不一致（${label}）：期望 ${JSON.stringify(patch[key])}，回读 ${JSON.stringify(actual)}`);
+        }
+    };
+    if ('name' in patch)
+        strict('name', got.name, '名称');
+    if ('tipsMessage' in patch)
+        strict('tipsMessage', got.tipsMessage, '提示内容');
+    if ('buttonDescription' in patch)
+        strict('buttonDescription', got.buttonDescription, '备注');
+    if ('iconPath' in patch && iconSignature(got.iconPath) !== iconSignature(String(patch.iconPath))) {
+        throw new Error('已提交，但图标回读不一致');
+    }
+    if ('onlyIcon' in patch && Number(got.onlyIcon ?? 0) !== Number(patch.onlyIcon)) {
+        throw new Error('已提交，但「只显示图标」回读不一致');
+    }
+    if ('conditionEnable' in patch && Number(got.conditionEnable ?? 0) !== Number(patch.conditionEnable)) {
+        throw new Error('已提交，但数据过滤开关回读不一致');
+    }
+    if ('condition' in patch
+        && !semanticEqualRootdata(patch.condition.rootdata, got.condition?.rootdata)) {
+        throw new Error('已提交，但数据过滤条件回读不一致');
+    }
+    if ('disableCondition' in patch
+        && !semanticEqualRootdata(patch.disableCondition.rootdata, got.disableCondition?.rootdata)) {
+        throw new Error('已提交，但禁用条件回读不一致');
+    }
+    if (logMessage && Number(after.details.logMessage?.enableLog ?? -1) !== Number(logMessage.enableLog)) {
+        throw new Error('已提交，但点击日志开关回读不一致');
+    }
+}
+export function registerFormButtonPropsCommands(btnCmd, program) {
+    btnCmd.command('set')
+        .description('修改按钮基础属性：名称 / 提示内容 / 备注 / 图标 / 点击日志 / 数据过滤 —— 已有的动作与权限原样保留')
+        .argument('<objId>', '表单 objId')
+        .argument('<appId>', '应用 ID')
+        .argument('<buttonId>', '按钮 ID')
+        .option('--name <名称>', '按钮名称')
+        .option('--tips <文本>', '提示内容（按钮上的说明文字）')
+        .option('--desc <文本>', '备注')
+        .option('--icon <图标名>', '图标名，如 Icon-N-Offer-management（不带 # 会自动补）')
+        .option('--icon-color <色值>', '图标颜色，缺省沿用现有/#999')
+        .option('--icon-bg <色值>', '图标背景色，缺省沿用现有（空=无背景）')
+        .option('--icon-display <line|fill>', '图标描边（line）或填充（fill）')
+        .option('--icon-none', '清空图标')
+        .option('--only-icon', '只显示图标（不显示文字）')
+        .option('--no-only-icon', '显示「图标 + 文字」')
+        .option('--log', '开启点击日志')
+        .option('--no-log', '关闭点击日志')
+        .option('--log-message <文本>', '日志文案（缺省 点击了“<按钮名>”）')
+        .option('--add <json|@file>', '数据过滤：**叠加**条件（同 form list-filter --add）')
+        .option('--replace <json|@file>', '数据过滤：整体覆盖条件')
+        .option('--remove <fieldId>', '数据过滤：按字段 ID 摘条件（逗号分隔）')
+        .option('--relation <and|or>', '数据过滤：顶层关系')
+        .option('--clear-filter', '清空数据过滤（同时把开关置 0）')
+        .option('--disable-condition <json|@file>', '禁用条件：整体覆盖')
+        .option('--clear-disable-condition', '清空禁用条件')
+        .option('--dry-run', '只打印将要提交的报文，不保存')
+        .option('--json', 'JSON 输出')
+        .action(async (objId, appId, buttonId, o) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth) {
+            process.exitCode = 1;
+            return;
+        }
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const isJson = Boolean(o.json || opts.json);
+        try {
+            const context = await readButtonContext(client, baseUrl, appId, objId, buttonId);
+            const { button } = context;
+            if (button.system === 1)
+                throw new Error('系统按钮不支持修改（只支持自定义按钮）');
+            const patch = {};
+            const changes = [];
+            if (o.name !== undefined) {
+                patch.name = o.name;
+                changes.push(`名称→${o.name}`);
+            }
+            if (o.tips !== undefined) {
+                patch.tipsMessage = o.tips;
+                changes.push('提示内容');
+            }
+            if (o.desc !== undefined) {
+                patch.buttonDescription = o.desc;
+                changes.push('备注');
+            }
+            // —— 图标 ——
+            const iconStyleTouched = o.iconColor !== undefined || o.iconBg !== undefined || o.iconDisplay !== undefined;
+            if (o.iconNone && (o.icon !== undefined || iconStyleTouched)) {
+                throw new Error('--icon-none 不能与 --icon/--icon-color/--icon-bg/--icon-display 同用');
+            }
+            if (o.iconNone) {
+                patch.iconPath = '';
+                changes.push('清空图标');
+            }
+            else if (o.icon !== undefined || iconStyleTouched) {
+                if (o.iconDisplay !== undefined && !['line', 'fill'].includes(String(o.iconDisplay))) {
+                    throw new Error('--icon-display 只支持 line / fill');
+                }
+                const current = parseIconPath(button.iconPath);
+                if (o.icon === undefined && !current) {
+                    throw new Error('当前按钮没有图标，请用 --icon 指定图标名（只改颜色/描边得先有图标）');
+                }
+                patch.iconPath = buildIconPath({
+                    path: o.icon ?? current.path,
+                    color: o.iconColor ?? current?.color,
+                    bgColor: o.iconBg ?? current?.bgColor,
+                    display: o.iconDisplay ?? current?.display,
+                });
+                changes.push('图标');
+            }
+            if (o.onlyIcon !== undefined) {
+                patch.onlyIcon = o.onlyIcon ? 1 : 0;
+                changes.push(o.onlyIcon ? '只显示图标' : '图标+文字');
+            }
+            // —— 数据过滤 ——
+            const filterTouched = o.add !== undefined || o.replace !== undefined || o.remove !== undefined
+                || Boolean(o.clearFilter) || o.relation !== undefined;
+            if (filterTouched) {
+                const currentTree = parseRootdata(button.condition?.rootdata);
+                const { plain, count } = await editFilter(client, baseUrl, appId, objId, currentTree, o);
+                patch.condition = { rootdata: encodeRootdata(plain) };
+                patch.conditionEnable = plain ? 1 : 0;
+                changes.push(plain ? `数据过滤（${count} 条）` : '清空数据过滤');
+            }
+            // —— 禁用条件 ——
+            if (o.clearDisableCondition && o.disableCondition !== undefined) {
+                throw new Error('--clear-disable-condition 不能与 --disable-condition 同用');
+            }
+            if (o.clearDisableCondition) {
+                patch.disableCondition = { rootdata: '' };
+                changes.push('清空禁用条件');
+            }
+            else if (o.disableCondition !== undefined) {
+                const nodes = parseConditionInput(o.disableCondition);
+                const fields = await fetchFields(client, baseUrl, objId);
+                await validateConditionFields(client, baseUrl, appId, objId, nodes, fields);
+                const plain = buildConditionTree(nodes, fields, objId, true);
+                if (!plain)
+                    throw new Error('禁用条件为空');
+                patch.disableCondition = { rootdata: encodeRootdata(plain) };
+                changes.push('禁用条件');
+            }
+            // —— 点击日志 ——
+            let logMessage;
+            if (o.log !== undefined || o.logMessage !== undefined) {
+                const previous = context.details.logMessage;
+                const enable = o.log === undefined ? (previous?.enableLog ? 1 : 0) : (o.log ? 1 : 0);
+                logMessage = buildLogMessage(enable, String(patch.name ?? button.name ?? ''), o.logMessage, previous?.message);
+                changes.push(o.logMessage !== undefined ? '日志文案' : (enable ? '开启点击日志' : '关闭点击日志'));
+            }
+            if (!changes.length) {
+                throw new Error('没有指定任何要改的项（--name / --tips / --desc / --icon / --only-icon / --log / --add …）');
+            }
+            const statePatch = { button: patch };
+            if (logMessage)
+                statePatch.logMessage = logMessage;
+            if (o.dryRun) {
+                const payload = buildButtonSavePayload(context, statePatch);
+                console.log(isJson
+                    ? JSON.stringify(payload, null, 2)
+                    : `（--dry-run）将修改：${changes.join(' / ')}`);
+                return;
+            }
+            const { after } = await saveButtonState(client, baseUrl, appId, objId, context, statePatch);
+            assertUntouched(context, after, statePatch); // 只改属性时，动作/权限不能被顺手删掉
+            verifyProps(after, patch, logMessage);
+            if (isJson) {
+                console.log(JSON.stringify({ success: true, verified: true, buttonId, changes }, null, 2));
+            }
+            else {
+                console.log(`按钮已更新并回读校验: [${buttonId}] ${String(after.button.name ?? '')}`);
+                console.log(`  ${changes.join(' / ')}`);
+            }
+        }
+        catch (error) {
+            console.error(error?.message || error);
+            process.exitCode = 1;
+        }
+    });
+}
+//# sourceMappingURL=form-button-props-cmd.js.map

package/dist/commands/form-button-props-cmd.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["../../src/commands/form-button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAqbhF"}
+{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["../../src/commands/form-button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA+bhF"}

package/dist/commands/form-button.js

@@ -1,8 +1,14 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { readButtonContext, buildButtonPosition, resolveButtonView, parsePositions, saveButtonPosition } from '../services/form-button-position.js';
-import { buildPlatformButtonAction, mappingInputs, verifyButtonAction } from '../services/form-button-action.js';
+import { buildPlatformButtonAction, buildUrlButtonAction, mappingInputs, verifyButtonAction } from '../services/form-button-action.js';
 import { AssociationService, buildUrlActionParams } from '../services/form-association.js';
+import { buildIconPath, buildLogMessage } from '../services/form-button-props.js';
+import { encodeRootdata } from '../services/form-button-condition.js';
+import { fetchFields, buildConditionTree, parseConditionInput, validateConditionFields } from './form-list-utils.js';
+import { registerFormButtonPropsCommands } from './form-button-props-cmd.js';
+import { registerFormButtonPermissionCommands } from './form-button-permission-cmd.js';
+import { registerFormButtonActionCommands } from './form-button-actions-cmd.js';
 export function registerFormButtonCommands(form, program) {
     const btnCmd = form.command('button').description('表单台账按钮管理');
     btnCmd.command('list')
@@ -51,6 +57,16 @@ export function registerFormButtonCommands(form, program) {
         .option('--open-type <type>', '打开方式: 1=弹窗 / 2=当前页 / 3=新窗口', '1')
         .option('--position <pos...>', '显示位置（可多个）：右上/右上下拉/行上/行末下拉（缺省右上）')
         .option('--view <view...>', '显示视图（可多个）：视图 ID/唯一名称/新建/编辑/显示；台账仅在唯一时可用')
+        .option('--tips <文本>', '提示内容')
+        .option('--desc <文本>', '备注')
+        .option('--icon <图标名>', '图标名，如 Icon-N-Offer-management（不带 # 会自动补）')
+        .option('--icon-color <色值>', '图标颜色（缺省 #999）')
+        .option('--icon-bg <色值>', '图标背景色')
+        .option('--icon-display <line|fill>', '图标描边（line）或填充（fill）')
+        .option('--only-icon', '只显示图标（不显示文字）')
+        .option('--no-log', '关闭点击日志（缺省开启「点击了“<按钮名>”」）')
+        .option('--log-message <文本>', '点击日志文案')
+        .option('--data-filter <json|@file>', '数据过滤条件，结构同 form button set --replace')
         .option('--page-type <type>', 'URL 动作的页面类型（缺省 LINK —— 平台自己的设计器对 URL 路径用的就是这个；'
         + 'CUSTOMPAGE 是「自定义页面」类型，pageId 要页面 id，装 URL 路径点不开）')
         .action(async (objId, appId, name, cmdOpts) => {
@@ -99,27 +115,65 @@ export function registerFormButtonCommands(form, program) {
             process.exitCode = 1;
             return;
         }
+        // 基础属性按需写。**不传的键与加这些参数之前逐字一致**（含 onlyIcon:0 / conditionEnable:0）。
+        const button = {
+            objId,
+            name,
+            buttonType: 'CUSTOM',
+            enable: 1,
+            showPosition,
+            showPositionSpan,
+            conditionEnable: 0,
+            condition: { rootdata: '' },
+            disableCondition: { rootdata: '' },
+            onlyIcon: cmdOpts.onlyIcon ? 1 : 0,
+            operateType: '1',
+            sysParams: '[]',
+            enableHelp: 0,
+            listDataFilterType: 'LIST',
+        };
+        if (cmdOpts.tips !== undefined)
+            button.tipsMessage = cmdOpts.tips;
+        if (cmdOpts.desc !== undefined)
+            button.buttonDescription = cmdOpts.desc;
+        if (cmdOpts.icon !== undefined) {
+            if (cmdOpts.iconDisplay !== undefined && !['line', 'fill'].includes(cmdOpts.iconDisplay)) {
+                console.error('--icon-display 只支持 line / fill');
+                process.exitCode = 1;
+                return;
+            }
+            button.iconPath = buildIconPath({
+                path: cmdOpts.icon, color: cmdOpts.iconColor, bgColor: cmdOpts.iconBg,
+                display: cmdOpts.iconDisplay,
+            });
+        }
+        else if (cmdOpts.iconColor !== undefined || cmdOpts.iconBg !== undefined || cmdOpts.iconDisplay !== undefined) {
+            console.error('--icon-color/--icon-bg/--icon-display 需要同时给 --icon');
+            process.exitCode = 1;
+            return;
+        }
+        if (cmdOpts.dataFilter !== undefined) {
+            try {
+                const nodes = parseConditionInput(cmdOpts.dataFilter);
+                const fields = await fetchFields(client, baseUrl, objId);
+                await validateConditionFields(client, baseUrl, appId, objId, nodes, fields);
+                const plain = buildConditionTree(nodes, fields, objId, true);
+                button.condition = { rootdata: encodeRootdata(plain) };
+                button.conditionEnable = plain ? 1 : 0;
+            }
+            catch (error) {
+                console.error(error.message);
+                process.exitCode = 1;
+                return;
+            }
+        }
         const payload = {
-            button: {
-                objId,
-                name,
-                buttonType: 'CUSTOM',
-                enable: 1,
-                showPosition,
-                showPositionSpan,
-                conditionEnable: 0,
-                condition: { rootdata: '' },
-                disableCondition: { rootdata: '' },
-                onlyIcon: 0,
-                operateType: '1',
-                sysParams: '[]',
-                enableHelp: 0,
-                listDataFilterType: 'LIST',
-            },
+            button,
             actionDatas: [],
             permissionDatas: [],
             customTips: { tipsCustomApi: '' },
-            logMessage: { enableLog: 1, message: '点击了"' + name + '"' },
+            // 日志文案与 form button set 统一走 buildLogMessage（中文引号，与设计器一致）
+            logMessage: buildLogMessage(cmdOpts.log === false ? 0 : 1, name, cmdOpts.logMessage),
         };
         if (cmdOpts.url) {
             // Fix MSYS path mangling: /sp/... → D:/Program Files/Git/sp/...
@@ -146,42 +200,8 @@ export function registerFormButtonCommands(form, program) {
                     return;
                 }
             }
-            const actionUrl = JSON.stringify({
-                name: '',
-                openMode: '0',
-                microCode: '',
-                isRelationCustomPage: false,
-                page: { pageType, pageId: url, pageName: url },
-                params,
-            });
-            payload.actionDatas.push({
-                name: url,
-                conditionTxt: '',
-                id: '-' + Date.now(),
-                enable: 1,
-                actionType: 'openpage',
-                buttonId: '',
-                windowSize: 30,
-                executeSelectedDatas: 0,
-                url: actionUrl,
-                openType: cmdOpts.openType || '1',
-                index: 0,
-                interfacePath: '',
-                desc: '',
-                urlType: '0',
-                urlFieldId: '',
-                interfaceType: '',
-                confirmTitle: '',
-                ecode: '',
-                littlecardName: '',
-                littlecardJson: '',
-                dataSource: '2',
-                fieldAssignType: '[]',
-                confirmContent: '',
-                confirmTrue: '',
-                confirmFalse: '',
-                enableLog: 0,
-            });
+            // 动作形状统一由 service 产出（与 `form button action` 共用同一份，别再在命令里内联拼）
+            payload.actionDatas.push(buildUrlButtonAction({ url, pageType, params, openType: cmdOpts.openType }));
         }
         else if (cmdOpts.openView || cmdOpts.openLayout || cmdOpts.startWorkflow) {
             try {
@@ -233,7 +253,7 @@ export function registerFormButtonCommands(form, program) {
         }
     });
     btnCmd.command('action-set')
-        .description('设置已有按钮的单一打开页面动作（视图/表单布局/流程），保留按钮位置和权限')
+        .description('[已废弃，改用 form button action] 设置已有按钮的单一打开页面动作（视图/表单布局/流程），保留按钮位置和权限')
         .argument('<objId>', '表单 objId').argument('<appId>', '应用 ID').argument('<buttonId>', '按钮 ID')
         .option('--open-view <view>', '打开平台视图（名称或 viewId）')
         .option('--open-layout <form>', '打开目标表单布局（名称或 objId）')
@@ -249,6 +269,8 @@ export function registerFormButtonCommands(form, program) {
                 process.exitCode = 1;
                 return;
             }
+            console.error('[deprecated] action-set 已被 form button action 取代，'
+                + '例：form button action <objId> <appId> <buttonId> --clear --add-view <视图>');
             const client = new ApiClient(auth);
             const base = auth.getBaseUrl();
             const context = await readButtonContext(client, base, appId, objId, buttonId);
@@ -459,5 +481,10 @@ export function registerFormButtonCommands(form, program) {
             process.exit(1);
         }
     });
+    // 基础属性（名称/提示内容/备注/图标/点击日志/数据过滤）、按钮权限、动作，各自一个子命令组：
+    // 单独放文件，不把这几坨塞进本文件（本文件已经很长了）。
+    registerFormButtonPropsCommands(btnCmd, program);
+    registerFormButtonPermissionCommands(btnCmd, program);
+    registerFormButtonActionCommands(btnCmd, program);
 }
 //# sourceMappingURL=form-button.js.map