weaver-e10-builder 1.2.5 → 1.5.2

package/dist/services/role-member.js

@@ -0,0 +1,206 @@
+/**
+ * 角色成员：人员 / 部门 / 分部。
+ *
+ * 三类走**同一个**保存端点 `/api/bs/auth/role/{roleId}/member/save-or-update`，
+ * 靠 `objType` 选各自的数组键：
+ *
+ *   resource   → obj_resource[]     人员
+ *   department → obj_department[]   部门
+ *   subcompany → obj_subcompany[]   分部
+ *
+ * 成员项**不是「只给 id」** —— 平台要的是「搜索接口返回的那个对象」按各自形状再加工：
+ * 人员带 avatar（来自 `hrmAvatarInfos`，不是搜索结果里那个只有 showName 的 avatar）、
+ * 工号（`jobNum` → `number`）、姓名首字母（`logogram` 首字母大写 → `indexType`）；
+ * 部门/分部带 `icon`、`title`（部门是「部门名|上级路径」）。
+ *
+ * 搜索那一步不在这里 —— 人员走 `getEmployeeByKeyWords`、部门/分部走
+ * `browser/data/{department,subcompany}`，各自形状不同，由调用方负责。
+ */
+export const MEMBER_KINDS = [
+    'resource', 'department', 'subcompany', 'position', 'channel',
+];
+/** 类型的中文名（错误信息与命令输出用）。 */
+export const MEMBER_KIND_LABEL = {
+    resource: '人员',
+    department: '部门',
+    subcompany: '分部',
+    position: '岗位',
+    channel: '渠道',
+};
+/** 判定用户输入的形状是不是合法成员类型（CLI 侧收窄，比平台报错早）。 */
+export function isMemberKind(v) {
+    return MEMBER_KINDS.includes(v);
+}
+/** 成员类型 → 保存报文里的数组键（`resource` → `obj_resource`）。 */
+export function memberArrayKey(kind) {
+    return `obj_${kind}`;
+}
+/**
+ * 组织类成员的缺省图标（搜索接口没给 icon 时兜底）。
+ *
+ * `department` / `subcompany` / `position` 三个是实测到的真实值；
+ * `channel` 一栏没数据可验（两个环境都是 total=0），按同类命名规律填，**未经真机确认**。
+ */
+const DEFAULT_ICON = {
+    department: 'Icon-department03',
+    subcompany: 'Icon-headquarters02',
+    position: 'Icon-post02',
+    channel: 'Icon-channel01',
+};
+/** 姓名首字母：`logogram`（如 `rly`）首字母大写 → `R`。取不到就留空，不编。 */
+function indexTypeOf(emp) {
+    const logogram = String(emp?.logogram ?? '').trim();
+    return logogram ? logogram[0].toUpperCase() : '';
+}
+/**
+ * 人员：`getEmployeeByKeyWords` 的返回项 → `obj_resource[]` 的一项。
+ *
+ * 几处**不能想当然**的地方：
+ * - `avatar` 要用 `hrmAvatarInfos`；搜索结果里那个 `avatar` 只有 `{showName}`，结构不对。
+ * - `title` 是**纯名字** —— 早期 CLI 自己拼过「名字|部门」，与平台实际存的不符。
+ * - `department` 留空（平台存的是空串，机构信息另有 `departmentId`）。
+ * - `number`（工号）**不是人人都有**，没有就不发这个键。
+ * - `userid`：搜索接口不返回它，用 `id` 顶上 —— 实测平台落库取的正是 `id`
+ *   （读回 `member/list` 里 `userId === id`）。
+ */
+export function buildPersonEntry(emp) {
+    const id = String(emp?.id ?? '');
+    const name = String(emp?.name ?? '');
+    const entry = {
+        id,
+        cid: String(emp?.imCid ?? emp?.cid ?? ''),
+        userid: String(emp?.userid ?? emp?.userId ?? id),
+        name,
+        statusCode: String(emp?.status ?? 'normal'),
+        content: name,
+        title: name,
+        contentDesc: name,
+        department: '',
+        avatar: emp?.hrmAvatarInfos ?? {
+            previewPath: '/api/file/preview?type=redirect&imgFormat=small&fileId=',
+            appPreviewPath: '/api/app/file/preview?type=redirect&imgFormat=small&fileId=',
+            name,
+            userId: id,
+        },
+        indexType: indexTypeOf(emp),
+        isLeaf: true,
+        templateType: 'default',
+        originTargetType: 'user',
+        pid: '',
+        richContent: name,
+        departmentId: String(emp?.departmentId ?? ''),
+        mainId: id,
+        stopDepartment: false,
+        leaf: true,
+    };
+    const jobNum = String(emp?.jobNum ?? '').trim();
+    if (jobNum)
+        entry.number = jobNum;
+    return entry;
+}
+/**
+ * 部门 / 分部：浏览接口（`browser/data/{department,subcompany}`）的返回项 → `obj_department[]` / `obj_subcompany[]` 的一项。
+ *
+ * 两个返回项字段一致（`id`/`name`/`content`/`title`/`icon`），只有缺省图标不同，
+ * 所以共用一份构造。
+ */
+export function buildOrgEntry(raw, kind) {
+    const name = String(raw?.name ?? raw?.content ?? '');
+    return {
+        id: String(raw?.id ?? ''),
+        name,
+        content: String(raw?.content ?? name),
+        // 部门是「部门名|上级路径」，直接沿用搜索结果的 title；没有就用名字兜底
+        title: String(raw?.title ?? name),
+        isLeaf: true,
+        icon: String(raw?.icon ?? DEFAULT_ICON[kind]),
+        stopDepartment: false,
+        leaf: true,
+    };
+}
+/** 按类型分发到对应的构造器。 */
+export function buildMemberEntry(kind, raw) {
+    return kind === 'resource' ? buildPersonEntry(raw) : buildOrgEntry(raw, kind);
+}
+/**
+ * 从搜索结果里挑出目标对象：**精确同名优先**；只有一条结果时用它；否则报错。
+ *
+ * 不取首条 —— 同名或模糊命中时取首条会**静默加错人**，事后只能去角色里一条条翻。
+ */
+export function pickExact(list, keyword, label, nameOf) {
+    const rows = Array.isArray(list) ? list : [];
+    const name = (x) => String(nameOf(x) ?? '');
+    const exact = rows.filter((x) => name(x) === keyword);
+    if (exact.length === 1)
+        return exact[0];
+    if (exact.length > 1) {
+        throw new Error(`${label}「${keyword}」匹配到 ${exact.length} 条同名记录，无法确定是哪一个`);
+    }
+    if (rows.length === 0)
+        throw new Error(`未找到${label}「${keyword}」`);
+    if (rows.length === 1)
+        return rows[0];
+    throw new Error(`${label}「${keyword}」匹配到 ${rows.length} 条但没有同名项：`
+        + `${rows.slice(0, 5).map(name).join('、')}${rows.length > 5 ? ' …' : ''}`);
+}
+/**
+ * 组装 `member/save-or-update` 的报文。
+ *
+ * `objectTypeFilter` 与 `org_permission` 等取平台界面上的固定值；
+ * `objType` 决定哪个数组承载成员。
+ */
+export function buildMemberSavePayload(kind, entries, opts = {}) {
+    return {
+        objType: kind,
+        obj_level: '1',
+        seclevel: { max: opts.secMax ?? 100, min: opts.secMin ?? 0 },
+        org_permission: 'ALL_SCOPE',
+        position_level: '1',
+        isOpenSubcompany: true,
+        isSeclevel: Boolean(opts.isSeclevel),
+        includeFlag: false,
+        isAll: false,
+        appDetach: false,
+        objectTypeFilter: [
+            'resource', 'department', 'subcompany', 'channel',
+            'position', 'all', 'external', 'allExternal',
+        ],
+        isRoleMaintainer: false,
+        expireType: 'UNLIMITED',
+        detach: true,
+        // 部门/分部才有这个键：人员那条抓包里没有它
+        ...(kind === 'resource' ? {} : { department_attribute: opts.departmentAttribute ?? [] }),
+        [memberArrayKey(kind)]: entries,
+    };
+}
+/** `member/list` 的请求体（分页与筛选都留空 = 取全部）。 */
+export function buildMemberListBody() {
+    return {
+        memberLevel: '', orgSubcompany: '', subcompany: '', channel: '',
+        orgDepartment: '', position: '', employee: '', department: '', expire: false,
+    };
+}
+/**
+ * 从 `member/list` 的返回里抽出成员行。
+ *
+ * 返回体里除 `data` 外还夹着表格列定义、按钮权限等一堆东西，**只认 `data` 数组**，
+ * 别去猜别的键（`displayData` 是同一份内容的副本）。
+ */
+export function extractMemberRows(response) {
+    // 成员行在 **`response.data.data`**：外层 `data` 是分页包装（还带 columns / operates /
+    // checkBoxPermission 等表格元数据）。直接取 `response.data` 会拿到对象、被 `Array.isArray`
+    // 判假而返回空 —— 于是「读不到」被误报成「没有成员」。
+    const payload = response?.data;
+    const rows = Array.isArray(payload) ? payload : payload?.data;
+    if (!Array.isArray(rows))
+        return [];
+    return rows.map((r) => ({
+        id: String(r?.id ?? ''),
+        object: String(r?.object ?? r?.memberName ?? ''),
+        resourceType: String(r?.resourceType ?? ''),
+        memberLevel: String(r?.memberLevel ?? ''),
+        orgPermission: String(r?.orgPermission ?? ''),
+        userId: String(r?.userId ?? ''),
+    }));
+}
+//# sourceMappingURL=role-member.js.map

package/dist/services/role-member.js.map

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

package/dist/services/workflow-info.d.ts

@@ -0,0 +1,83 @@
+import type { ApiClient } from '../core/client.js';
+/**
+ * 由 workflowId 读流程的基础信息与**它关联的表单**。
+ *
+ * ## 为什么值得单独做
+ *
+ * 流程列表（`workflow search` / `workflow list`）回的字段很薄：只有 id、名称、类型名、
+ * 描述、关联类型等。**「这个流程绑的是哪张表」不在里面** —— 那要另调接口。
+ *
+ * ## 三条接口各给什么
+ *
+ * | 接口 | 给什么 | 可靠性 |
+ * |---|---|---|
+ * | `baseSet/getBaseInfoList` | 流程自身的名称 / 类型名 / 描述 | 稳，按 id 检索 |
+ * | `baseSet/getRelateForm` | `{formId}` —— **关联表单的 id** | 稳，这是通用路径 |
+ * | `baseSet/getChangeRelateForm` | `data.ebFormId[0]`：表单的 name / state / module | **只在带变更单的流程上有值**，普通流程回空数组 |
+ *
+ * `getRelateForm` 是唯一稳定的「流程 → 表单」入口。`getChangeRelateForm` 只当**补充信息源**：
+ * 有值就顺带拿表单名与启用状态，没有也不影响 formId 到手。
+ *
+ * ## 两个容易踩的点
+ *
+ * - **`formId` 不是 `objId`**。平台自己也是拿 formId 直接开设计器的，定位表单 formId 就够；
+ *   但要让其它命令（表单布局、字段管理那些）用上，得先换成 objId，而**没有直通的
+ *   formId → objId 接口** —— 只能先知道在哪个应用，再按 formId 匹配。
+ * - **所属应用不在任何一条返回里**。别指望 `customParameters.ebAppId` 之类：那个键是空的。
+ */
+export interface WorkflowFormRef {
+    formId: string;
+    /** 表单名。仅当 `getChangeRelateForm` 有值时才有，否则空串。 */
+    name: string;
+    /** 启用状态原文（如「启用」）。同上，可能为空。 */
+    state: string;
+    /**
+     * 是不是 eb 表（`module === 'ebuilder'`）。
+     * **`null` 表示判断不了** —— 补充信息源没值时无从得知，不要当成「不是」。
+     */
+    isEb: boolean | null;
+}
+export interface WorkflowInfo {
+    workflowId: string;
+    name: string;
+    typeName: string;
+    desc: string;
+    /** 关联表单。查不到时为 `null`（该流程可能没绑表，或接口没返回）。 */
+    form: WorkflowFormRef | null;
+}
+/**
+ * 把三条接口的结果并成一份。**纯函数**，便于覆盖「补充源缺失」这类分支。
+ *
+ * 名称取 `baseRow` 优先 —— 它来自流程自身的列表接口，比变更关联那份更权威；
+ * 两者都没有时退回空串，不编。
+ */
+export declare function mergeWorkflowInfo(workflowId: string, baseRow: Record<string, any> | undefined, relateForm: Record<string, any> | undefined, ebForm: Record<string, any> | undefined): WorkflowInfo;
+/**
+ * 判定 `baseSet/deletePath` 的结果。**纯函数**。
+ *
+ * 这个接口会「成功但没删」：顶层 `code/status` 只表示**请求被处理了**，删除的**真实结果**
+ * 在 `data.data.status` 里。平台拒绝删除时返回的是
+ * `{code:200, status:true, data:{status:false, msg:'…'}}` —— 只看顶层就会把没删成的
+ * 报成「流程已删除」。前端的判断也是 `result.data.status`。
+ *
+ * `data.data` 缺失时（不同环境/版本可能不带）不硬判失败，交给调用方回读确认 ——
+ * 宁可多查一次，也不要在拿不到结果时假装成功或假装失败。
+ */
+export declare function judgeDeletePathResponse(res: any): {
+    ok: boolean;
+    reason: string;
+    inconclusive: boolean;
+};
+/**
+ * 按 **id 精确** 找一条流程。找不到返回 `undefined`。
+ *
+ * **只认 id 完全相等**，不做兜底取首条 —— 这个函数是「删除前先确认存在」的依据，
+ * 取首条会让一个不存在的 id 因为搜索的模糊匹配而「被找到」。
+ *
+ * 两个 belongType 都查：团队流程与个人流程是分开的列表，只查一个会把另一边的
+ * 正常流程误判成「不存在」。
+ */
+export declare function findWorkflowRow(client: ApiClient, baseUrl: string, workflowId: string): Promise<Record<string, any> | undefined>;
+/** 读一条流程的信息。三条调用里只有 `getBaseInfoList` 失败会抛出，另两条缺了不算错。 */
+export declare function fetchWorkflowInfo(client: ApiClient, baseUrl: string, workflowId: string): Promise<WorkflowInfo>;
+//# sourceMappingURL=workflow-info.d.ts.map

package/dist/services/workflow-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-info.d.ts","sourceRoot":"","sources":["../../src/services/workflow-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACxC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAC3C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GACtC,YAAY,CAkBd;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAWxG;AAKD;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,CAsB1C;AAED,yDAAyD;AACzD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC,CAavB"}

package/dist/services/workflow-info.js

@@ -0,0 +1,97 @@
+/**
+ * 把三条接口的结果并成一份。**纯函数**，便于覆盖「补充源缺失」这类分支。
+ *
+ * 名称取 `baseRow` 优先 —— 它来自流程自身的列表接口，比变更关联那份更权威；
+ * 两者都没有时退回空串，不编。
+ */
+export function mergeWorkflowInfo(workflowId, baseRow, relateForm, ebForm) {
+    const formId = String(relateForm?.formId || '');
+    const module = String(ebForm?.module || '');
+    return {
+        workflowId: String(workflowId),
+        name: String(baseRow?.workflowName || ebForm?.name || ''),
+        typeName: String(baseRow?.typeName || ''),
+        desc: String(baseRow?.workflowDesc || ''),
+        form: formId
+            ? {
+                formId,
+                name: String(ebForm?.name || ''),
+                state: String(ebForm?.state || ''),
+                // 只有拿到 module 才敢下结论；缺了就如实说「不知道」
+                isEb: module ? module === 'ebuilder' : null,
+            }
+            : null,
+    };
+}
+/**
+ * 判定 `baseSet/deletePath` 的结果。**纯函数**。
+ *
+ * 这个接口会「成功但没删」：顶层 `code/status` 只表示**请求被处理了**，删除的**真实结果**
+ * 在 `data.data.status` 里。平台拒绝删除时返回的是
+ * `{code:200, status:true, data:{status:false, msg:'…'}}` —— 只看顶层就会把没删成的
+ * 报成「流程已删除」。前端的判断也是 `result.data.status`。
+ *
+ * `data.data` 缺失时（不同环境/版本可能不带）不硬判失败，交给调用方回读确认 ——
+ * 宁可多查一次，也不要在拿不到结果时假装成功或假装失败。
+ */
+export function judgeDeletePathResponse(res) {
+    if (res?.code !== 200 || !res?.status) {
+        return { ok: false, reason: res?.msg || '未知错误', inconclusive: false };
+    }
+    const inner = res?.data;
+    if (inner && typeof inner === 'object' && inner.status !== undefined) {
+        return inner.status === true
+            ? { ok: true, reason: '', inconclusive: false }
+            : { ok: false, reason: inner.msg || '平台未说明原因', inconclusive: false };
+    }
+    return { ok: true, reason: '', inconclusive: true };
+}
+/** 团队流程 / 个人流程。按 id 找一条流程时两个作用域都要看。 */
+const BELONG_TYPES = [1, 0];
+/**
+ * 按 **id 精确** 找一条流程。找不到返回 `undefined`。
+ *
+ * **只认 id 完全相等**，不做兜底取首条 —— 这个函数是「删除前先确认存在」的依据，
+ * 取首条会让一个不存在的 id 因为搜索的模糊匹配而「被找到」。
+ *
+ * 两个 belongType 都查：团队流程与个人流程是分开的列表，只查一个会把另一边的
+ * 正常流程误判成「不存在」。
+ */
+export async function findWorkflowRow(client, baseUrl, workflowId) {
+    const wanted = String(workflowId);
+    let anySucceeded = false;
+    let lastError = '';
+    for (const belongType of BELONG_TYPES) {
+        const list = await client.post(`${baseUrl}/api/bs/workflow/pathdef/baseSet/getBaseInfoList`, {
+            isTemplate: 0, belongType, current: 1, pageSize: 50,
+            searchParams: {
+                searchDatas: { type: 'and', status: '0', formType: 'all' },
+                quickSearchDatas: {},
+                otherSearchDatas: { workflowId: wanted },
+            },
+        });
+        if (list?.code !== 200 || !list?.status) {
+            lastError = list?.msg || '未知错误';
+            continue;
+        }
+        anySucceeded = true;
+        const hit = (list?.data?.data || []).find((r) => String(r.id) === wanted);
+        if (hit)
+            return hit;
+    }
+    // 一次都没查成 → 是接口的问题，不能当成「不存在」——
+    // 那会让「删除前的存在性检查」在接口抽风时把正常流程挡下来。
+    if (!anySucceeded)
+        throw new Error(`查询流程失败: ${lastError}`);
+    return undefined;
+}
+/** 读一条流程的信息。三条调用里只有 `getBaseInfoList` 失败会抛出，另两条缺了不算错。 */
+export async function fetchWorkflowInfo(client, baseUrl, workflowId) {
+    const baseRow = await findWorkflowRow(client, baseUrl, workflowId);
+    const relate = await client.get(`${baseUrl}/api/bs/workflow/pathdef/baseSet/getRelateForm?workflowId=${workflowId}`);
+    // 补充信息源：普通流程这里就是空数组，不当错误处理
+    const change = await client.get(`${baseUrl}/api/bs/workflow/pathdef/baseSet/getChangeRelateForm?workflowId=${workflowId}`);
+    const ebForm = (change?.data?.data?.ebFormId || [])[0];
+    return mergeWorkflowInfo(workflowId, baseRow, relate?.data, ebForm);
+}
+//# sourceMappingURL=workflow-info.js.map

package/dist/services/workflow-info.js.map

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

package/dist/services/workflow-odoc-setting.d.ts

@@ -24,7 +24,7 @@ export declare const NESTED_GROUPS: Set<string>;
 /** 分组数据本身是数组，写入时换个名字 */
 export declare const ARRAY_GROUPS: Record<string, string>;
 /** 回读值 → 写入值。 */
-export declare function toWriteValue(value: any): any;
+export declare function toWriteValue(value: any, key?: string): any;
 /** GET 响应的 settingList → 按 settingKey 分组的数据。 */
 export declare function readGroups(root: any): Record<string, any>;
 /** 分组数据 → 可提交报文。 */

package/dist/services/workflow-odoc-setting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-odoc-setting.d.ts","sourceRoot":"","sources":["../../src/services/workflow-odoc-setting.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,mBAAmB;AACnB,eAAO,MAAM,aAAa,aAA4C,CAAC;AAEvE,wBAAwB;AACxB,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAgC,CAAC;AAEjF,iBAAiB;AACjB,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAW5C;AAED,gDAAgD;AAChD,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOzD;AAED,oBAAoB;AACpB,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAYjG;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CAgB7F;AAED,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAG7E;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAK9D"}
+{"version":3,"file":"workflow-odoc-setting.d.ts","sourceRoot":"","sources":["../../src/services/workflow-odoc-setting.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,mBAAmB;AACnB,eAAO,MAAM,aAAa,aAA4C,CAAC;AAEvE,wBAAwB;AACxB,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAgC,CAAC;AASjF,iBAAiB;AACjB,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAc1D;AAED,gDAAgD;AAChD,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOzD;AAED,oBAAoB;AACpB,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAYjG;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CAgB7F;AAED,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAG7E;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAK9D"}

package/dist/services/workflow-odoc-setting.js

@@ -23,13 +23,22 @@
 export const NESTED_GROUPS = new Set(['odocNumber', 'odocAttachArea']);
 /** 分组数据本身是数组，写入时换个名字 */
 export const ARRAY_GROUPS = { signNode: 'signNodeList' };
+/** 浏览器读回为 [{name,id}]，保存时需要逗号分隔的节点 ID。 */
+const NODE_LIST_KEYS = new Set([
+    'openTextDefaultNode', 'editTextNode', 'openTextInFormNode', 'reUploadNode',
+    'cleanCopyNodes', 'printNodes', 'downloadNodes', 'syncTitleNodes',
+    'useClientNodes', 'editNumberNode', 'attachOpenNode', 'archivesNode',
+]);
 /** 回读值 → 写入值。 */
-export function toWriteValue(value) {
+export function toWriteValue(value, key) {
     if (typeof value === 'boolean')
         return value ? '1' : '0';
     if (Array.isArray(value)) {
+        if (key && NODE_LIST_KEYS.has(key)) {
+            return value.map((row) => String(row?.id ?? row)).join(',');
+        }
         if (value.length && typeof value[0] === 'object') {
-            return value.map((row) => Object.fromEntries(Object.entries(row || {}).map(([k, v]) => [k, toWriteValue(v)])));
+            return value.map((row) => Object.fromEntries(Object.entries(row || {}).map(([k, v]) => [k, toWriteValue(v, k)])));
         }
         return value.join(',');
     }
@@ -50,14 +59,14 @@ export function buildPayload(groups, workflowId) {
     const out = { workflowId };
     for (const [groupKey, data] of Object.entries(groups)) {
         if (NESTED_GROUPS.has(groupKey)) {
-            out[groupKey] = Object.fromEntries(Object.entries(data).map(([k, v]) => [k, toWriteValue(v)]));
+            out[groupKey] = Object.fromEntries(Object.entries(data).map(([k, v]) => [k, toWriteValue(v, k)]));
         }
         else if (ARRAY_GROUPS[groupKey]) {
             out[ARRAY_GROUPS[groupKey]] = toWriteValue(data);
         }
         else {
             for (const [k, v] of Object.entries(data))
-                out[k] = toWriteValue(v);
+                out[k] = toWriteValue(v, k);
         }
     }
     return out;
@@ -72,13 +81,13 @@ export function applyPatch(payload, patch) {
         if (NESTED_GROUPS.has(key) && value && typeof value === 'object' && !Array.isArray(value)) {
             const nested = { ...(payload[key] || {}) };
             for (const [k, v] of Object.entries(value)) {
-                nested[k] = toWriteValue(v);
+                nested[k] = toWriteValue(v, k);
                 touched.push(`${key}.${k}`);
             }
             payload[key] = nested;
             continue;
         }
-        payload[key] = toWriteValue(value);
+        payload[key] = toWriteValue(value, key);
         touched.push(key);
     }
     return touched;

package/dist/services/workflow-odoc-setting.js.map

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

package/dist/utils/column-name.d.ts

@@ -4,6 +4,30 @@ export declare function pinyinInitials(name: string): string;
  *  same initials recur in the same table (0 → bare initials, 1 → initials+'1', …).
  *  Caller tracks recurrence via pinyinInitials() and passes the dupIndex. */
 export declare function toColumnName(fieldName: string, dupIndex?: number): string;
+/** 字段的两个"名字"。 */
+export interface FieldKeys {
+    /** 字段编码。 */
+    dataKey: string;
+    /** 数据库列名。 */
+    columnName: string;
+    /** 用户是否**显式指定**了 columnName —— 决定要不要把它下发给平台。 */
+    explicitColumnName: boolean;
+}
+/**
+ * 解析字段的 `dataKey`（字段编码）与 `columnName`（数据库列名）。
+ *
+ * **两者是独立的东西**，平台允许不同（设计器里可分别填）。默认同值，有指定才分开：
+ * - 都不给 → 都取拼音首字母
+ * - 只给 dataKey → 列名跟随（**历史行为**，`--data-key` 一直如此）
+ * - 只给 columnName → 列名用它，dataKey 走默认
+ * - 两个都给 → 各用各的
+ *
+ * `explicitColumnName` 为假时**不发 columnName**，交给平台按 dataKey 推导 —— 老路径不受影响。
+ */
+export declare function resolveFieldKeys(fieldName: string, spec?: {
+    dataKey?: string | null;
+    columnName?: string | null;
+}, dupIndex?: number): FieldKeys;
 /** Generate a table name suffix: pinyin initials + 4 random digits */
 export declare function toTableName(formName: string): string;
 /** 明细表子表物理表名：pinyin initials + 随机后缀。

package/dist/utils/column-name.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"column-name.d.ts","sourceRoot":"","sources":["../../src/utils/column-name.ts"],"names":[],"mappings":"AASA,gEAAgE;AAChE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAanD;AAED;;6EAE6E;AAC7E,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAGpE;AAED,sEAAsE;AACtE,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED;;8DAE8D;AAC9D,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAG5E"}
+{"version":3,"file":"column-name.d.ts","sourceRoot":"","sources":["../../src/utils/column-name.ts"],"names":[],"mappings":"AASA,gEAAgE;AAChE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAanD;AAED;;6EAE6E;AAC7E,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAGpE;AAED,iBAAiB;AACjB,MAAM,WAAW,SAAS;IACxB,YAAY;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,EAClE,QAAQ,SAAI,GACX,SAAS,CAIX;AAED,sEAAsE;AACtE,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED;;8DAE8D;AAC9D,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAG5E"}

package/dist/utils/column-name.js

@@ -30,6 +30,22 @@ export function toColumnName(fieldName, dupIndex = 0) {
     const base = pinyinInitials(fieldName);
     return dupIndex > 0 ? `${base}${dupIndex}` : base;
 }
+/**
+ * 解析字段的 `dataKey`（字段编码）与 `columnName`（数据库列名）。
+ *
+ * **两者是独立的东西**，平台允许不同（设计器里可分别填）。默认同值，有指定才分开：
+ * - 都不给 → 都取拼音首字母
+ * - 只给 dataKey → 列名跟随（**历史行为**，`--data-key` 一直如此）
+ * - 只给 columnName → 列名用它，dataKey 走默认
+ * - 两个都给 → 各用各的
+ *
+ * `explicitColumnName` 为假时**不发 columnName**，交给平台按 dataKey 推导 —— 老路径不受影响。
+ */
+export function resolveFieldKeys(fieldName, spec = {}, dupIndex = 0) {
+    const dataKey = String(spec.dataKey ?? '').trim() || toColumnName(fieldName, dupIndex);
+    const explicit = String(spec.columnName ?? '').trim();
+    return { dataKey, columnName: explicit || dataKey, explicitColumnName: Boolean(explicit) };
+}
 /** Generate a table name suffix: pinyin initials + 4 random digits */
 export function toTableName(formName) {
     const suffix = String(randomInt(1000, 9999));

package/dist/utils/column-name.js.map

@@ -1 +1 @@
-{"version":3,"file":"column-name.js","sourceRoot":"","sources":["../../src/utils/column-name.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,gEAAgE;AAChE,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACvG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;aAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAChD,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QACzC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,IAAI,GAAG,KAAK,CAAC;IACnD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;6EAE6E;AAC7E,MAAM,UAAU,YAAY,CAAC,SAAiB,EAAE,QAAQ,GAAG,CAAC;IAC1D,MAAM,IAAI,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IACvC,OAAO,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACpD,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,WAAW,CAAC,QAAgB;IAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;AACjD,CAAC;AAED;;8DAE8D;AAC9D,MAAM,UAAU,cAAc,CAAC,eAAuB,EAAE,QAAQ,GAAG,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,OAAO,MAAM,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;AACnE,CAAC"}
+{"version":3,"file":"column-name.js","sourceRoot":"","sources":["../../src/utils/column-name.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,gEAAgE;AAChE,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACvG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;aAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAChD,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QACzC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,IAAI,GAAG,KAAK,CAAC;IACnD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;6EAE6E;AAC7E,MAAM,UAAU,YAAY,CAAC,SAAiB,EAAE,QAAQ,GAAG,CAAC;IAC1D,MAAM,IAAI,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IACvC,OAAO,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACpD,CAAC;AAYD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAC9B,SAAiB,EACjB,OAAgE,EAAE,EAClE,QAAQ,GAAG,CAAC;IAEZ,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,YAAY,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,IAAI,OAAO,EAAE,kBAAkB,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC7F,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,WAAW,CAAC,QAAgB;IAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;AACjD,CAAC;AAED;;8DAE8D;AAC9D,MAAM,UAAU,cAAc,CAAC,eAAuB,EAAE,QAAQ,GAAG,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,OAAO,MAAM,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;AACnE,CAAC"}

package/ecodecmd/package.json

@@ -18,8 +18,7 @@
     "debug": "^4.3.4",
     "fs-extra": "^10.1.0",
     "js-base64": "^3.7.2",
-    "minimist": "^1.2.6",
-    "request": "^2.88.2"
+    "minimist": "^1.2.6"
   },
   "devDependencies": {
     "nodemon": "^2.0.20"

package/ecodecmd/src/loaddep.js

@@ -6,22 +6,32 @@ const path = require('path');
 const os = require('os');
 const fs = require('fs');
 const axios = require('axios');
-const request = require('request')
 
 const cacheJarDir = path.join(os.homedir(), '.ecode_ide_plugin/cache');
 
 const download = (url, filepath) => {
   return new Promise((resolve, reject) => {
     const stream = fs.createWriteStream(filepath);
+    // 下载失败时别把半个文件留在缓存目录里
+    const fail = (err) => {
+      stream.destroy();
+      fs.rmSync(filepath, { force: true });
+      reject(err);
+    };
     // 添加useragent
-    const pipe = request(url, { headers: { 'User-Agent': 'ecodecmd' } }).pipe(stream);
-    pipe.on('close', (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve('');
-      }
-    });
+    // 用 axios 而不是 request：request 已停止维护，且非 2xx 会被 axios 默认 reject，
+    // 不会再把错误页当 jar 写进缓存目录（旧写法用 pipe 的 close 事件判完成，判不出来）
+    axios({
+      url,
+      method: 'get',
+      responseType: 'stream',
+      headers: { 'User-Agent': 'ecodecmd' },
+    }).then((res) => {
+      res.data.pipe(stream);
+      stream.on('finish', () => resolve(''));
+      stream.on('error', fail);
+      res.data.on('error', fail);
+    }).catch(fail);
   })
 }