weaver-e10-builder 1.5.9 → 1.5.11

package/dist/services/workflow-opinion-settings.d.ts

@@ -0,0 +1,67 @@
+import { type Client, type Config, type Form } from './workflow-function-management.js';
+export declare const signFields: string[];
+export declare const draftFields: string[];
+export declare const widgetFields: string[];
+export declare function booleanValue(v: any): boolean;
+export declare function resultData(r: any, label: string): any;
+export declare function settings(form: Form): Config;
+export declare function verifySettings(expected: Config, actual: Config, fields: string[]): void;
+/** Endpoint-specific snapshots; GET defaults, explicit patch, single POST, verified readback. */
+export declare class OpinionSettings {
+    client: Client;
+    base: string;
+    constructor(client: Client, base: string);
+    get(path: string, query: Config): Promise<any>;
+    post(path: string, payload: Config): Promise<any>;
+    sign(workflowId: string, nodeId: string): Promise<Form>;
+    browserOptions(form: Form, field: string): Promise<Config[]>;
+    browserValues(form: Form, field: string, input: any): Promise<Config[]>;
+    patchForm(form: Form, patch: Config, allowed: string[]): Promise<Config>;
+    private wire;
+    saveSign(w: string, n: string, patch: Config): Promise<{
+        workflowId: string;
+        nodeId: string;
+        before: Config;
+        after: Config;
+        verified: boolean;
+    }>;
+    forward(w: string, n: string): Promise<Config>;
+    saveForward(w: string, n: string, patch: Config): Promise<{
+        workflowId: string;
+        nodeId: string;
+        before: Config;
+        after: Config;
+        verified: boolean;
+    }>;
+    draft(w: string): Promise<Form>;
+    saveDraft(w: string, patch: Config): Promise<{
+        workflowId: string;
+        before: Config;
+        after: Config;
+        verified: boolean;
+    }>;
+    widgets(w: string): Promise<Config[]>;
+    widget(w: string, widgetId: string): Promise<Form>;
+    saveWidget(w: string, widgetId: string, patch: Config): Promise<{
+        workflowId: string;
+        widgetId: string;
+        before: Config;
+        after: Config;
+        verified: boolean;
+    }>;
+    content(w: string): Promise<any>;
+    saveContent(w: string, patch: Config): Promise<{
+        workflowId: string;
+        before: any;
+        after: any;
+        verified: boolean;
+    }>;
+    style(w: string): Promise<any>;
+    saveStyle(w: string, patch: Config): Promise<{
+        workflowId: string;
+        before: any;
+        after: any;
+        verified: boolean;
+    }>;
+}
+//# sourceMappingURL=workflow-opinion-settings.d.ts.map

package/dist/services/workflow-opinion-settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-opinion-settings.d.ts","sourceRoot":"","sources":["../../src/services/workflow-opinion-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,MAAM,mCAAmC,CAAC;AAI5F,eAAO,MAAM,UAAU,UAAkR,CAAC;AAC1S,eAAO,MAAM,WAAW,UAAyJ,CAAC;AAClL,eAAO,MAAM,YAAY,UAA6N,CAAC;AAGvP,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAI5C;AACD,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAKrD;AAKD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAQ3C;AAqBD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAGhF;AAED,iGAAiG;AACjG,qBAAa,eAAe;IACP,MAAM,EAAE,MAAM;IAAS,IAAI,EAAE,MAAM;gBAAnC,MAAM,EAAE,MAAM,EAAS,IAAI,EAAE,MAAM;IAChD,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAG/B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAClC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAGvD,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgB5D,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWvE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAY9E,OAAO,CAAC,IAAI;IAKN,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAC,CAAC,EAAE,MAAM,EAAC,KAAK,EAAE,MAAM;;;;;;;IAc1C,OAAO,CAAC,CAAC,EAAE,MAAM,EAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7C,WAAW,CAAC,CAAC,EAAE,MAAM,EAAC,CAAC,EAAE,MAAM,EAAC,KAAK,EAAE,MAAM;;;;;;;IAgB7C,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAG/B,SAAS,CAAC,CAAC,EAAE,MAAM,EAAC,KAAK,EAAE,MAAM;;;;;;IASjC,OAAO,CAAC,CAAC,EAAE,MAAM;IAYjB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,UAAU,CAAC,CAAC,EAAE,MAAM,EAAC,QAAQ,EAAE,MAAM,EAAC,KAAK,EAAE,MAAM;;;;;;;IAkBnD,OAAO,CAAC,CAAC,EAAE,MAAM;IACjB,WAAW,CAAC,CAAC,EAAE,MAAM,EAAC,KAAK,EAAE,MAAM;;;;;;IAWnC,KAAK,CAAC,CAAC,EAAE,MAAM;IACf,SAAS,CAAC,CAAC,EAAE,MAAM,EAAC,KAAK,EAAE,MAAM;;;;;;CA0BxC"}

package/dist/services/workflow-opinion-settings.js

@@ -0,0 +1,328 @@
+import { isDeepStrictEqual } from 'node:util';
+import { id } from './workflow-function-management.js';
+const P = '/api/bs/workflow/pathdef';
+const D = `${P}/pathSet/draftopinion`;
+export const signFields = ['mustInputDto', 'inputOperateTypeSelectDto', 'inputOperateTypeDto', 'hideInput', 'signOperateTypeSelect', 'signOperateTypeList', 'hideArea', 'viewTypeSelectDto', 'viewTypeDto', 'viewEmptyNotShow', 'viewRangeSelectDto', 'viewRangeDto', 'notSeeEachOther', 'feedback', 'nullNotFeedback'];
+export const draftFields = ['openCustomSet', 'openTextarea', 'defautFont', 'defaultFontSize', 'showBlank', 'openSearch', 'opinionOrder', 'showLog', 'pcFillMethod', 'alertEndCountersign'];
+export const widgetFields = ['opinionType', 'enableCountersign', 'conterSignType', 'typeBfSignDepart', 'typeBfSignSubcom', 'typeAfSign', 'enableCopyClear', 'copyClearOperate', 'copyClearNode', 'enableGenerateRecord', 'agentRecordOperate', 'agentRecordNode'];
+const forwardFields = ['isForward', 'allowSubOpt', 'allowForward', 'allowSubOptCusName', 'allowForwardCusName'];
+const scalar = (v) => String(Array.isArray(v) ? v[0] ?? '' : v ?? '');
+export function booleanValue(v) {
+    if ([true, 1, '1'].includes(v))
+        return true;
+    if ([false, 0, '0'].includes(v))
+        return false;
+    throw Error('开关必须为 true/false 或 0/1');
+}
+export function resultData(r, label) {
+    if (!r || r.code !== 200 || r.status === false || r.fail === true || r.data === false || r.data?.status === false || r.data?.status === 'failed') {
+        throw Error(`${label}失败: ${r?.data?.errorInfo || r?.msg || '无有效响应'}`);
+    }
+    return r.data;
+}
+function formOf(v) {
+    if (!v?.data || !v?.items || Array.isArray(v.data) || !Object.keys(v.data).length)
+        throw Error('未读到服务端配置/默认值，停止写入');
+    return v;
+}
+export function settings(form) {
+    const d = structuredClone(form.data);
+    for (const [k, item] of Object.entries(form.items)) {
+        if (!(k in d))
+            continue;
+        if (item.itemType === 'SWITCH')
+            d[k] = booleanValue(d[k]);
+        else if (['SELECT', 'RADIO'].includes(item.itemType))
+            d[k] = scalar(d[k]);
+    }
+    return d;
+}
+function keys(p, allowed) {
+    if (!p || typeof p !== 'object' || Array.isArray(p))
+        throw Error('设置必须是 JSON 对象');
+    for (const k of Object.keys(p))
+        if (!allowed.includes(k))
+            throw Error(`不支持设置 ${k}；可用字段：${allowed.join(', ')}`);
+}
+function enumValue(v, item, k) {
+    const s = scalar(v), options = item?.options;
+    if (!Array.isArray(options) || !options.length)
+        throw Error(`${k} 未返回服务端选项`);
+    const matches = options.filter((o) => !o.disabled && (String(o.id) === s || o.content === s));
+    if (matches.length !== 1)
+        throw Error(`${k} 无效或有歧义：${s}；允许：${options.filter((o) => !o.disabled).map((o) => `${o.id}=${o.content}`).join(', ')}`);
+    return String(matches[0].id);
+}
+function comparable(v) {
+    if (Array.isArray(v))
+        return v.map(x => x && typeof x === 'object' && 'id' in x ? String(x.id) : comparable(x)).sort();
+    if (v && typeof v === 'object') {
+        if ('inputValue' in v)
+            return v.inputValue;
+        return Object.fromEntries(Object.keys(v).sort().map(k => [k, comparable(v[k])]));
+    }
+    if (v === true || v === false)
+        return v ? '1' : '0';
+    return v == null ? v : String(v);
+}
+export function verifySettings(expected, actual, fields) {
+    const diff = fields.filter(k => k in expected && !isDeepStrictEqual(comparable(expected[k]), comparable(actual[k])));
+    if (diff.length)
+        throw Error(`保存已发出，但回读不一致：${diff.join(', ')}。请先查询当前状态，不要直接重试。`);
+}
+/** Endpoint-specific snapshots; GET defaults, explicit patch, single POST, verified readback. */
+export class OpinionSettings {
+    client;
+    base;
+    constructor(client, base) {
+        this.client = client;
+        this.base = base;
+    }
+    async get(path, query) {
+        return resultData(await this.client.get(this.base + path + '?' + new URLSearchParams(Object.entries(query).map(([k, v]) => [k, String(v)]))), path);
+    }
+    async post(path, payload) { return resultData(await this.client.post(this.base + path, payload), path); }
+    async sign(workflowId, nodeId) {
+        return formOf(await this.get(`${P}/nodesign/getSignConfigForm`, { workflowId: id(workflowId), nodeId: id(nodeId) }));
+    }
+    async browserOptions(form, field) {
+        const b = form.items[field]?.browserBean;
+        // Only the two workflow-owned browser types are needed here; never follow arbitrary URLs.
+        if (b?.module !== 'workflow/pathdef' || !['workflowOperateTypeBrowser', 'workflowPathNodeBrowser'].includes(b.type))
+            throw Error(`${field} 未返回支持的浏览类型`);
+        const all = [], seen = new Set();
+        for (let current = 1; current <= 100; current++) {
+            const d = await this.post(`/api/${b.module}/common/browser/data/${b.type}`, { ...b.commonParams, ...b.dataParams, current, pageNo: current, pageSize: 100 });
+            if (!Array.isArray(d?.data))
+                throw Error(`${field} 浏览候选格式异常`);
+            const rows = d.data;
+            if (rows.some((r) => seen.has(String(r.id))))
+                throw Error(`${field} 浏览分页重复，停止写入`);
+            rows.forEach((r) => { seen.add(String(r.id)); all.push(r); });
+            if (d.total !== undefined ? all.length >= Number(d.total) : rows.length < 100)
+                return all;
+            if (!rows.length)
+                throw Error(`${field} 浏览候选分页不完整`);
+        }
+        throw Error(`${field} 浏览候选超过分页上限`);
+    }
+    async browserValues(form, field, input) {
+        if (!Array.isArray(input) || input.some(v => typeof v !== 'string'))
+            throw Error(`${field} 请传名称或字符串 ID 数组`);
+        if (!input.length)
+            return [];
+        const available = await this.browserOptions(form, field), used = new Set();
+        return input.map(v => {
+            const found = available.filter(o => String(o.id) === v || (o.name ?? o.content) === v);
+            if (found.length !== 1 || found[0].disabled || found[0].isDelete)
+                throw Error(`${field} 未找到唯一可选值：${v}`);
+            const row = found[0], key = String(row.id);
+            if (used.has(key))
+                throw Error(`${field} 重复值：${v}`);
+            used.add(key);
+            return { id: key, dataId: key, content: row.name ?? row.content, isDelete: false, isComplete: false, _entityImId: 0, _secretLevel: 0, _secretLevelEnd: 0 };
+        });
+    }
+    async patchForm(form, patch, allowed) {
+        keys(patch, allowed);
+        const next = settings(form);
+        for (const [k, v] of Object.entries(patch)) {
+            const item = form.items[k];
+            if (!item || !(k in next) || item.readOnly || item.disable)
+                throw Error(`${k} 当前环境不可编辑`);
+            if (item.itemType === 'SWITCH')
+                next[k] = booleanValue(v);
+            else if (['SELECT', 'RADIO'].includes(item.itemType))
+                next[k] = enumValue(v, item, k);
+            else if (item.itemType === 'BROWSER')
+                next[k] = await this.browserValues(form, k, v);
+            else
+                throw Error(`${k} 不支持直接写入；需使用对应子配置命令`);
+        }
+        return next;
+    }
+    wire(form, data) {
+        const out = { ...data };
+        for (const [k, item] of Object.entries(form.items))
+            if (k in out && item.itemType === 'SWITCH')
+                out[k] = booleanValue(out[k]) ? 1 : 0;
+        return out;
+    }
+    async saveSign(w, n, patch) {
+        const form = await this.sign(w, n), before = settings(form), next = await this.patchForm(form, patch, signFields);
+        if (next.mustInputDto === '1' && next.hideInput && ('hideInput' in patch || 'mustInputDto' in patch))
+            throw Error('全部必填时不能隐藏意见输入框；请显式设置 hideInput:false');
+        for (const [mode, list] of [['inputOperateTypeSelectDto', 'inputOperateTypeDto'], ['viewTypeSelectDto', 'viewTypeDto'], ['viewRangeSelectDto', 'viewRangeDto']]) {
+            if ((mode in patch || list in patch) && next[mode] !== '0' && !(next[list]?.length) && (mode !== 'inputOperateTypeSelectDto' || next.mustInputDto === '2'))
+                throw Error(`${mode} 为选择/排除时 ${list} 不能为空`);
+        }
+        // Server clears node selection for mode=all. Make that deliberate, rather than silently discarding it.
+        if (next.viewRangeSelectDto === '0' && next.viewRangeDto?.length && 'viewRangeSelectDto' in patch)
+            throw Error('全部节点模式须同时显式传 viewRangeDto:[]');
+        const payload = { ...this.wire(form, next), workflowId: w, nodeId: n, workflowIdDto: w, nodeIdDto: n, isSync: false };
+        delete payload.id;
+        await this.post(`${P}/nodesign/saveSignConfig`, payload);
+        const after = settings(await this.sign(w, n));
+        verifySettings(next, after, signFields);
+        return { workflowId: w, nodeId: n, before, after, verified: true };
+    }
+    async forward(w, n) {
+        const d = await this.get(`${P}/nodeForwardSet/getNodeForwardSet`, { workflowId: id(w), nodeId: id(n) });
+        for (const k of ['todo', 'done', 'end'])
+            if (!d?.[k] || forwardFields.some(f => !(f in d[k])))
+                throw Error('节点转发默认值不完整，停止写入');
+        return d;
+    }
+    async saveForward(w, n, patch) {
+        keys(patch, ['todo', 'done', 'end']);
+        const before = await this.forward(w, n), next = structuredClone(before);
+        for (const [stage, changes] of Object.entries(patch)) {
+            keys(changes, forwardFields);
+            for (const [k, v] of Object.entries(changes)) {
+                if (k.endsWith('CusName')) {
+                    if (typeof v !== 'string')
+                        throw Error(`${stage}.${k} 应为名称字符串（空串恢复默认名称）`);
+                    next[stage][k] = { ...next[stage][k], inputValue: v };
+                }
+                else
+                    next[stage][k] = booleanValue(v);
+            }
+        }
+        await this.post(`${P}/nodeForwardSet/saveNodeForwardSet`, { ...next, workflowId: w, nodeId: n, isSync: false });
+        const after = await this.forward(w, n);
+        for (const s of ['todo', 'done', 'end'])
+            verifySettings(next[s], after[s], forwardFields);
+        return { workflowId: w, nodeId: n, before, after, verified: true };
+    }
+    async draft(w) {
+        return formOf((await this.get(`${D}/getDraftOpinionConfig`, { workflowId: id(w), isGlobal: false }))?.weaForm);
+    }
+    async saveDraft(w, patch) {
+        const form = await this.draft(w), before = settings(form), next = await this.patchForm(form, patch, draftFields);
+        const payload = this.wire(form, next);
+        // Gear ticks are view state. Sending displayContent:false to the entity's String field would corrupt the template.
+        for (const k of ['fieldSet', 'displayContent', 'menuStyle', 'logviewer'])
+            delete payload[k];
+        await this.post(`${D}/saveDraftOpinionConfig`, { ...payload, workflowid: w, isGlobal: 0 });
+        const after = settings(await this.draft(w));
+        verifySettings(next, after, draftFields);
+        return { workflowId: w, before, after, verified: true };
+    }
+    async widgets(w) {
+        id(w);
+        const all = [];
+        for (let current = 1; current <= 100; current++) {
+            const d = await this.post(`${D}/getDraftOpinionWidgetList`, { workflowId: w, current, pageSize: 100 });
+            if (!Array.isArray(d?.data))
+                throw Error('拟签字段列表格式异常');
+            if (d.data.some((r) => all.some(o => String(o.widgetId) === String(r.widgetId))))
+                throw Error('拟签字段分页重复');
+            all.push(...d.data);
+            if (d.total !== undefined ? all.length >= Number(d.total) : d.data.length < 100)
+                return all;
+            if (!d.data.length)
+                throw Error('拟签字段分页不完整');
+        }
+        throw Error('拟签字段超出分页上限');
+    }
+    async widget(w, widgetId) {
+        id(widgetId);
+        if (!(await this.widgets(w)).some(r => String(r.widgetId) === widgetId))
+            throw Error(`拟签控件 ${widgetId} 不属于流程或尚未在布局中保存`);
+        return formOf((await this.get(`${D}/getDraftOpinionWidgetConfig`, { workflowId: w, widgetId, isDesign: false }))?.weaForm);
+    }
+    async saveWidget(w, widgetId, patch) {
+        const form = await this.widget(w, widgetId), before = settings(form), next = await this.patchForm(form, patch, widgetFields);
+        if (next.opinionType !== '1' && (next.enableCopyClear || next.enableGenerateRecord))
+            throw Error('抄清、代录仅支持一人一条意见；切换类型前请显式关闭二者');
+        const dimension = ['0', '1'].includes(next.conterSignType) ? 'typeBfSignDepart' : 'typeBfSignSubcom';
+        const inactive = dimension === 'typeBfSignDepart' ? 'typeBfSignSubcom' : 'typeBfSignDepart';
+        if (inactive in patch && next[inactive] !== next[dimension])
+            throw Error(`${inactive} 与当前拟签维度不符，请设置 ${dimension}`);
+        if (next.opinionType === '0' && next[dimension] === '2')
+            throw Error('多人编辑同一条意见不支持“不允许互相查看”');
+        for (const [enabled, mode, list, group] of [['enableCopyClear', 'copyClearOperate', 'copyClearNode', 'copyClearOpGroupid'], ['enableGenerateRecord', 'agentRecordOperate', 'agentRecordNode', 'agentRecordOpGroupid']]) {
+            if (next[enabled] && next[mode] === '1' && (!next[list]?.length || !/^[1-9]\d*$/.test(String(next[group]))))
+                throw Error(`${enabled} 选择节点操作者需要已设置节点及操作者范围`);
+        }
+        if (next.enableCountersign && !(next.finishOperator?.length || next.finishNode?.length))
+            throw Error('启用组织拟签前需在系统配置结束拟签操作者/节点');
+        await this.post(`${D}/saveDraftOpinionWidgetConfig`, { ...this.wire(form, next), workflowid: w, widgetId, isDesign: false });
+        const after = settings(await this.widget(w, widgetId));
+        // Both UI aliases read the same stored typeBfSign column.
+        next.typeBfSignDepart = next.typeBfSignSubcom = next[dimension];
+        verifySettings(next, after, [...widgetFields, 'finishNode', 'finishOperator', 'copyClearOpGroupid', 'agentRecordOpGroupid']);
+        return { workflowId: w, widgetId, before, after, verified: true };
+    }
+    async content(w) { return this.get(`${P}/drapOpinionContent/getOpinionContent`, { workflowId: id(w) }); }
+    async saveContent(w, patch) {
+        keys(patch, ['displayContent']);
+        if (typeof patch.displayContent !== 'string')
+            throw Error('displayContent 必须为模板 HTML 字符串');
+        const before = await this.content(w);
+        const known = new Set([...before.contentFieldList, ...before.contentLabelList].map(o => o.key));
+        for (const m of patch.displayContent.matchAll(/\$([^$\s]+)\$/g))
+            if (!known.has(m[1]))
+                throw Error(`未知模板占位符：${m[1]}`);
+        // The template endpoint only UPDATEs; the configuration GET initializes a missing workflow record.
+        await this.draft(w);
+        await this.post(`${P}/drapOpinionContent/saveOpinionContent`, { workflowId: w, displayContent: encodeURIComponent(patch.displayContent) });
+        const after = await this.content(w);
+        verifySettings(patch, after, ['displayContent']);
+        return { workflowId: w, before, after, verified: true };
+    }
+    async style(w) { return this.get(`${P}/drapOpinionMenuStyle/getOpinionMenuStyle`, { workflowId: id(w) }); }
+    async saveStyle(w, patch) {
+        keys(patch, ['menuFont', 'fontSize', 'buttons']);
+        const before = await this.style(w);
+        const stylePatch = { ...patch };
+        delete stylePatch.buttons;
+        const form = formOf(before.menuStyleForm), next = await this.patchForm(form, stylePatch, ['menuFont', 'fontSize']);
+        const rows = structuredClone(before.menuTable.data);
+        if (patch.buttons !== undefined) {
+            if (!Array.isArray(patch.buttons))
+                throw Error('buttons 必须是以 menuKey 定位的局部修改数组');
+            const seen = new Set();
+            for (const b of patch.buttons) {
+                keys(b, ['menuKey', 'customName', 'menuColor', 'menuFontColor', 'menuBorderColor', 'menuOrderNum']);
+                const row = rows.find((r) => r.menuKey === b.menuKey);
+                if (!row || seen.has(b.menuKey))
+                    throw Error(`按钮不存在或重复：${b.menuKey}`);
+                seen.add(b.menuKey);
+                for (const [k, v] of Object.entries(b)) {
+                    if (k === 'menuKey')
+                        continue;
+                    if (k === 'customName') {
+                        if (typeof v !== 'string')
+                            throw Error('customName 必须为字符串');
+                        row.menuNameMultilang = { ...row.menuNameMultilang, inputValue: v };
+                    }
+                    else if (k === 'menuOrderNum') {
+                        if (!Number.isInteger(v) || Number(v) < 0)
+                            throw Error('menuOrderNum 必须为非负整数');
+                        row[k] = v;
+                    }
+                    else {
+                        if (typeof v !== 'string' || !/^(-1|transparent|#[0-9a-fA-F]{3,8}|rgba?\([\d\s,.%]+\))$/.test(v))
+                            throw Error(`${k} 颜色格式不正确`);
+                        row[k] = v;
+                    }
+                }
+            }
+            if (new Set(rows.map((r) => r.menuOrderNum)).size !== rows.length)
+                throw Error('按钮顺序重复，请同时指定相关按钮的新序号');
+        }
+        await this.draft(w);
+        await this.post(`${P}/drapOpinionMenuStyle/saveOpinionMenuStyle`, { workflowId: w, ...next, tableDatas: rows });
+        const after = await this.style(w);
+        verifySettings(next, settings(formOf(after.menuStyleForm)), ['menuFont', 'fontSize']);
+        for (const row of rows) {
+            const actual = after.menuTable.data.find((r) => r.menuKey === row.menuKey);
+            if (!actual)
+                throw Error(`回读缺少按钮 ${row.menuKey}`);
+            verifySettings(row, actual, ['menuColor', 'menuFontColor', 'menuBorderColor', 'menuOrderNum', 'menuNameMultilang']);
+        }
+        return { workflowId: w, before, after, verified: true };
+    }
+}
+//# sourceMappingURL=workflow-opinion-settings.js.map

package/dist/services/workflow-opinion-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-opinion-settings.js","sourceRoot":"","sources":["../../src/services/workflow-opinion-settings.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weaver-e10-builder",
-  "version": "1.5.9",
+  "version": "1.5.11",
   "description": "Eteams/Ebuilder CLI — 泛微 OA 命令行工具",
   "type": "module",
   "files": [

package/skill-docs/SKILL.md

@@ -2,11 +2,11 @@
 name: weaver-e10-builder
 display_name: 泛微E10智能搭建Skill
 display_name_en: E10 Builder
-description: 泛微E10智能搭建skill v2（通用版），辅助编写泛微Ebuilder自定义应用，对应CLI版本1.5.9
-description_zh: 泛微Ebuilder低代码应用智能搭建工具 v2（通用版），辅助编写自定义应用（表单/流程/列表/动作流/权限/分组/编号等），与 e10-cli 配套使用，当前对应 CLI 版本 1.5.9。
-description_en: E10 Ebuilder low-code app builder skill v2 (general) — helps build Weaver E10 custom apps (forms/workflows/lists/actionflows/permissions/groups/numbering) via e10-cli, currently paired with CLI 1.5.9.
+description: 泛微E10智能搭建skill v2（通用版），辅助编写泛微Ebuilder自定义应用，对应CLI版本1.5.11
+description_zh: 泛微Ebuilder低代码应用智能搭建工具 v2（通用版），辅助编写自定义应用（表单/流程/列表/动作流/权限/分组/编号等），与 e10-cli 配套使用，当前对应 CLI 版本 1.5.11。
+description_en: E10 Ebuilder low-code app builder skill v2 (general) — helps build Weaver E10 custom apps (forms/workflows/lists/actionflows/permissions/groups/numbering) via e10-cli, currently paired with CLI 1.5.11.
 category: coding
-version: 1.5.9
+version: 1.5.11
 author: 泛微网络科技股份有限公司
 auto: true
 ---
@@ -15,7 +15,7 @@ auto: true
 
 ## 安装与升级
 
-本 skill 需与 CLI **版本匹配**（当前对应 CLI `1.5.9`）。版本不一致时命令/文档/选项可能对不上——升级前先对齐：
+本 skill 需与 CLI **版本匹配**（当前对应 CLI `1.5.11`）。版本不一致时命令/文档/选项可能对不上——升级前先对齐：
 
 ```shell
 e10-cli --version          # 查 CLI 版本，应与上方 description 标注一致

package/skill-docs/_catalog.md

@@ -25,8 +25,12 @@
 | 分类搜索、分类筛选、list-search-group、选项配置、日期粒度、选项排序 | `references/common/ref-cli-commands.md` |
 | 表单消息提醒、数据变动提醒、form message、提醒对象、推送渠道、IM提醒 | `references/form/guide-form-message.md` |
 | 表单数据读写、form data、写入数据、查询数据、删除数据 | `references/form/guide-form-data.md` |
+| 关联页签、关联视图、数据关联、association、页签显示布局、关联数据筛选、删除关联页签 | `references/form/guide-form-association.md` |
+| 流程归档权限、归档查看/编辑/删除、归档附件权限、form permission archive、创建人相关、字段相关、矩阵相关、归档卡片 | `references/form/guide-form-archive-permission.md` |
 | 列表自定义文本列、富文本列、列里插入字段、form nlist、列表式视图 | `references/form/guide-list-custom-text.md` |
 | 流程、审批、workflow、提交流程、flowpage、预填、URL传参、节点、操作者、审批人、连线 | `references/workflow/guide-workflow.md` |
+| 撤回管理、加审管理、减审管理、接收人范围、指定流转接收人范围、转发传阅抄送收回、功能管理 | `references/workflow/guide-function-management.md` |
+| 拟签意见、draft-opinion、节点转发、forward-setting、节点签字意见、必须签批签名、隐藏意见输入框、意见显示类型 | `references/workflow/guide-opinion-settings.md` |
 | 流程绑的表、流程关联表单、workflow info、workflowId 查表单、formId 不是 objId | `references/common/ref-cli-commands.md`（`workflow info` 一行） |
 | 权责表、权责矩阵、权责表方式流程、分支场景、变量映射 | `references/workflow/guide-workflow-auth-resp.md` + `references/workflow/guide-workflow-condition.md` |
 | 公文流程、公文审批、收文、发文、公文设置、正文设置 | `references/workflow/guide-workflow-odoc.md` + `references/workflow/guide-workflow.md` |
@@ -55,7 +59,7 @@
 | 应用发布、启用应用、停用应用、发布到前台、取消发布、应用发布信息、前台入口、应用名多语言、app enable/disable/publish/unpublish/publish-info、app lang | `references/app/guide-app-publish.md` |
 | 完整实施方案、规划能力地图、资源依赖、需求映射、plan 前预检 | `references/common/map.md`，随后使用 `references/common/guide-plan-template.md` |
 | 接口文档导入、Postman、系统接口、连接器接口、createSystemInterfaceByAi、接口批量创建 | `references/esb-interface/guide-import.md` |
-| 系统菜单、内置菜单、挂系统页面到菜单、menuUrl、pageType、工作流菜单、独立页面菜单、菜单改名、menu rename、重命名菜单、找不到菜单 | `references/menu/system-menus.md` |
+| 系统菜单、内置菜单、挂系统页面到菜单、menuUrl、pageType、工作流菜单、独立页面菜单、菜单改名、menu rename、重命名菜单、找不到菜单、二级菜单、子菜单、父菜单、菜单层级、menu add-table --parent、menu add-start --parent | `references/menu/system-menus.md` + `references/common/ref-cli-commands.md` |
 | 编译、语法、报错、不支持、babel、打包、var、const、let、es2015、stage-2 | `references/coding/ref-compile-rules.md`（前端代码） |
 
 ## Components（组件文档）

package/skill-docs/actionflows/SKILL.md

@@ -49,6 +49,7 @@ description: "将业务需求编译为 Weaver ESB 动作流，或读取已有动
 2. 只传 `component-describe` 声明的参数；固定值与动态值根据业务需求选择，不能为了动态而动态。
 3. 语义 plan 的节点配置统一放在 `params`：`event.params`、`actions[*].params` 以及条件/循环内部节点的 `params`。`data` 仅属于平台回读/更新 DTO，不能出现在 `generate` 语义计划中；CLI 会在调用任何平台接口前拒绝该结构，并提示具体路径。
 4. 中文 plan 写入当前工作区 `.actionflow-plans/`，以 `planFile` 传给 CLI；不在 Skill 目录写临时文件。CLI 不会自动删除 plan；确认 `valid=true`、`saved=true`、`readBackVerified=true` 后才允许手工清理。
+4.1. 命名遵循“展示中文、机器字段 code 化”：动作流名称、节点显示名称、参数 `showName`/`label`、说明文字等面向用户的展示字段可以使用中文；`paramName`、`paramKey`、变量/常量引用名、请求编码、Topic/队列名、字段路径、公式引用键以及其他机器可读标识默认使用英文字母、数字和下划线，优先 lowerCamelCase 或 snake_case，不使用中文、空格或特殊字符。`type`、`kind`、`paramType`、枚举值等必须沿用组件契约中的 code；已从平台真实对象取得的 ID、名称、原生 DTO 字段和固定资源值不得擅自改写，只对 AI 新建的语义标识执行该规则。
 5. 不把 `Output` 写入 `actions`。需要配置终止状态、提示或页面动作时使用顶层 `finalOutput.params`；提醒内容使用前端富文本组件对应的 `reminderContent`（`ContestSettingDTO`，动态片段放在 `formulaBeans`），不要使用旧的 `reminderMsgFormula`。流程触发（`ApproveTrigger`）只支持提醒，不支持页面交互、页面动作或跳转地址；页面动作仅可用于 `EventButton`。平台内部 FormulaBean 由 CLI 生成，只有组件契约明确要求前端原对象时才传原生 DTO。
 5.1. 所有 CLI 生成或继续编译的 FormulaBean，只要包含 `frontId`，允许使用空串；非空时必须使用平台真实字段 ID 的纯数字字符串。`field_<数字>` 仅可在生成时规范化为 `<数字>`。禁止把字段名、paramKey 尾段、临时公式 ID 或其他包含字母/符号的值写入 `frontId`；非空值无法解析为纯数字时必须直接报错。
 6. 定时组件优先使用平台原生频率：`rate=1` 一次、`2` 按小时、`3` 按日、`4` 按周、`5` 按月，并按需提供 `cycle`、`hour`、`day`、`week`、`atWeek`、`atWeekDetail` 或 `lastWeek`；只有明确选择 `rate=6` 时才传 `cornString`。图形化频率必须提供 `startTime`。

package/skill-docs/actionflows/references/components/calendar/MeetingCreate.md

@@ -12,6 +12,8 @@
 
 会议标题、密级等普通字段支持固定值和动态赋值；创建人、召集人、联系人支持固定人员对象和动态人员公式。会议类型、会议室、附件、关联流程等设计期资源仍必须使用当前租户真实选择器对象，不能把上下文强行当作资源 ID。
 
+也可以直接传入前端 `MeetingPendingCreateEntity` 结构：使用 `type`、`setting` 和 `formSetting`。`setting` 的字段名应来自 `getMeetingField`；其中原生 FormulaBean 会原样保留，语义动态值会编译为 FormulaBean。
+
 ## 最小计划
 
 `operators`、`meetingType`，以及需求涉及的会议字段。

package/skill-docs/actionflows/references/components/logic/Output.md

@@ -10,7 +10,7 @@
 
 ## 不可猜测
 
-不要把 `Output` 写入 `actions`。提醒内容必须使用前端富文本组件对应的 `ContestSettingDTO`，字段名是 `reminderContent`，不能再使用旧的 `reminderMsgFormula`。流程触发（`ApproveTrigger`）只支持提醒配置，不支持页面交互、页面动作或跳转地址；页面动作仅可用于 `EventButton`。`basisValue` 仍支持固定值、上下文、系统变量、变量、常量、查询结果和函数/公式；`jumpUrl` 在前端只允许固定文本。`fixedData`、`customOutputData` 属于平台原生高级输出结构，必须使用真实回读结构，不能猜测。
+不要把 `Output` 写入 `actions`。提醒内容必须使用前端富文本组件对应的 `ContestSettingDTO`，字段名是 `reminderContent`，不能再使用旧的 `reminderMsgFormula`。流程触发（`ApproveTrigger`）只支持提醒配置，不支持页面交互、页面动作或跳转地址；页面动作仅可用于 `EventButton`。`basisValue` 与 `jumpUrl` 支持固定值、上下文、系统变量、变量、常量、查询结果和函数/公式；其中 `jumpUrl` 仅在 `pageAction=3` 时生效。`fixedData`、`customOutputData` 属于平台原生高级输出结构，必须使用真实回读结构，不能猜测。
 
 `reminderContent` 支持两种输入：一是前端原生对象 `{id, content, formulaBeans, langSet}`；二是 CLI 语义模板 `{parts:[{type:"text",value:"..."},{type:"context",paramKey:"..."},{type:"system_variable",key:"{date}"},{type:"variable",id:"..."},{type:"constant",id:"..."}]}`。编译器会生成 Base64 内容和 `#{paramN}` 占位符，并将每个动态片段保存为 `formulaBeans[].value`。
 

package/skill-docs/actionflows/references/components/workflow/ApproveDelete.md

@@ -2,7 +2,7 @@
 
 ## 何时使用
 
-将指定流程实例移入回收站。单个动态“数据 ID”可直接作为 `requestId`，CLI 会按平台协议封装成数组公式。
+将指定流程实例移入回收站。`requestId` 会按前端协议生成一个 `type=8` 的 `multipleSelect` JSON FormulaBean 容器，容器子项可以是固定流程实例或动态公式。
 
 当前平台只注册此删除组件；**不支持“彻底删除流程”**。不得生成或使用 `ApproveCompletelyDelete`，否则设计器保存会报组件内部异常。
 

package/skill-docs/actionflows/references/dynamic_capability_matrix.md

@@ -15,9 +15,9 @@
 | 消息模板 | `SendMessage.msgTitlev/msgContentv/picLink/msgPcLink/msgMobileLink` | 上下文、系统变量、变量、常量、函数/公式、查询结果 | 五个消息文本/链接字段统一保存为 `ContestSettingDTO`；正文占位符与独立绑定；接收人上下文仍保留为动态人员 FormulaBean |
 | 消息接收人 | `SendMessage.receiver` | 当前用户、上游人员上下文、固定人员 | 动态人员使用真实上下文 `paramKey`，固定人员使用当前租户 Browser 对象 |
 | 人员参数 | 表单数据动作、流程动作、文档动作、`HrmEmployeeUpdate`、`PersonnelOnboarding`、`AlterPersonStatus`、会议/日程中的人员属性 | 当前用户、上游人员上下文、动作流变量/常量/函数 | 不再强制走固定人员查询；动态引用保持人员 FormulaBean，固定人员仍要求真实 Browser 对象 |
-| 会议和日程运行时字段 | `MeetingCreate` 的标题/密级/人员，`ScheduleCreate` 的标题/时间/内容/其他地点/人员 | 上下文、系统变量、变量、常量、函数/公式 | 普通字段生成对应 FormulaBean；人员使用人员 FormulaBean；会议室、日程类型、关联流程等设计期资源仍保持 Browser 对象 |
+| 会议和日程运行时字段 | `MeetingCreate` 的标题/密级/人员/关联标识，`ScheduleCreate` 的标题/时间/内容/其他地点/人员/日程类型/会议室 | 上下文、系统变量、变量、常量、函数/公式 | 后端 DTO 中的 FormulaBean 字段统一支持动态赋值；固定会议/日程资源仍保留 Browser 对象兼容 |
 | 流程和文档运行时字段 | 流程实例 ID、标题、意见、公文正文 ID、关联数据 ID、时间、文档/附件 ID、布尔开关等 `formula_or_reference` 属性 | 固定值、上下文、系统变量、变量、常量、查询结果、函数/公式 | 统一经共享公式编译器生成 FormulaBean；固定流程定义、节点、目录 DTO 不在此列 |
-| 循环参数 | `MultipleExecution.cycleTimes`、列表/明细来源 | 上下文、变量、常量、当前循环上下文 | 按循环模式生成对应 `CycleParams`/FormulaBean |
+| 循环参数 | `MultipleExecution.cycleTimes`、`batchSizeData`、`pageCycleData`、列表/明细来源 | 上下文、变量、常量、当前循环上下文 | 后端 FormulaBean 字段统一支持动态赋值；固定批量大小继续校验 2-1000，分页标志继续校验布尔类型 |
 | 条件右值 | `Condition` | 固定值、上下文、系统变量、变量、常量、函数 | 右值保留为公式树，不把动态字段名转成固定字符串 |
 | 终止节点动态输出 | `finalOutput.params.reminderContent`、`basisValue` | 富文本 `ContestSettingDTO`；提醒内容支持文本、上下文、系统变量、变量、常量、查询结果、函数/公式 | 自动补充的 `Output` 节点保留高级设置，无需在 `actions` 中手写终止节点；旧 `reminderMsgFormula` 不再用于新生成 |
 
@@ -27,7 +27,7 @@
 
 - 流程定义/流程节点/退回节点/干预节点：通常需要当前租户真实流程 Browser 对象或节点对象；只有 `requestId`、标题、意见等字段类属性按组件契约支持动态。
 - 文档、目录、附件、共享权限、按钮、规则：固定对象需要当前租户真实 Browser/权限对象；如果组件说明或回读结构提供动态公式入口，必须单独实现该属性的编译器和回读校验。
-- 会议、日程、HRM 选择器的结构化对象：人员属性与会议/日程资源属性分开判断。`MeetingCreate.flag`、日程类型、会议室和 `Output.jumpUrl` 均只接受前端允许的固定选择/固定文本，不能因为底层存储字段是 FormulaBean 就推导其支持动态。
+- 会议、日程、HRM 选择器的结构化对象：固定值仍以各自前端 Browser 契约为准；只要后端字段声明为 `FormulaBean`，同时支持动态引用。`Output.jumpUrl` 的后端 DTO 是 `FormulaBean`，支持固定值和动态引用，且仅在 `pageAction=3` 时生效。
 - 触发器配置、接口定义、连接器/资源/接口选择：这些是设计期平台资源，默认必须实时发现真实对象，不能把运行时上下文当成连接器或接口定义。
 
 ## 处理规则