npm - weaver-e10-builder - Versions diffs - 1.5.5 → 1.5.7 - Mend

weaver-e10-builder 1.5.5 → 1.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

package/dist/services/form-view.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { randomUUID } from 'node:crypto';
 import { excelSheetOf, fillCells } from './form-layout-grid.js';
 import { resolveFormId } from './form-id.js';
+import { buildFieldComps, compFieldIdOf, diffExistingComps, excelCellEntries, nextExcelRow, selectMissingFieldIds, } from './form-view-populate.js';
 export const FORM_VIEW_TYPES = [
     'formView',
     'kanbanView',
@@ -209,6 +209,10 @@ function fieldIds(components) {
         .filter((id) => id !== undefined && id !== null && String(id))
         .map(String);
 }
+/** 提示文案里列 id —— 最多列 3 个，多的收成「…」。 */
+function listIds(ids) {
+    return ids.slice(0, 3).join('、') + (ids.length > 3 ? '…' : '');
+}
 /**
  * Build field components for an additional formView using the target layout type.
  *
@@ -258,8 +262,8 @@ export async function populateFormViewFields(client, baseUrl, appId, objId, targ
     if (!Array.isArray(fields) || !fields.length)
         throw new Error('表单没有可填充的业务字段');
     const expectedFieldIds = fields.map((field) => String(field.fieldId ?? field.id ?? '')).filter(Boolean);
-    const alreadyPopulated = expectedFieldIds.every((id) => targetFieldIds.has(id));
-    if (alreadyPopulated) {
+    const missing = selectMissingFieldIds(targetComponents, expectedFieldIds);
+    if (missing.length === 0) {
         // 已有完整字段布局时**不重写**（视图可能被人在设计器里手工调过，重写就是覆盖别人的活）。
         // 但「组件齐、网格缺格」这种半坏状态要说出来 —— 否则重跑本命令只会回一句
         // 「已有完整字段布局」，看着像没事，实际设计器画不出来。
@@ -282,96 +286,34 @@ export async function populateFormViewFields(client, baseUrl, appId, objId, targ
             warnings,
         };
     }
-    if (targetComponents.length) {
-        throw new Error('目标 formView 已有部分组件，拒绝覆盖');
-    }
     const pages = Array.isArray(targetLayout.pageLayouts) ? targetLayout.pageLayouts : [];
     if (!pages.length)
         throw new Error('目标 formView 的 pageLayouts 为空');
-    const layoutType = pages[0].layoutType ?? 'FLOW';
-    pages[0].comps = fields.map((field, index) => {
-        const id = String(field.fieldId ?? field.id);
-        const type = field.type ?? field.componentKey ?? 'Text';
-        const title = field.title ?? field.fieldName ?? '';
-        const nodeId = `NODE_${randomUUID().replaceAll('-', '').slice(0, 8)}`;
-        const sourceComponent = sourceByFieldId.get(id);
-        const config = structuredClone(sourceComponent?.config ?? {
-            compPackage: '@weapp/ebdfpage',
-            fieldId: id,
-            fieldKey: type,
-            formId,
-            layout: { selected: false },
-            name: title,
-            title,
-            type,
-            permission: {},
-            size: 'large',
-            showOrder: index,
-            disableEdit: false,
-            display: true,
-            singleRow: false,
-            readOnly: false,
-            required: false,
-            associatedId: id,
-        });
-        delete config.excel;
-        delete config.flow;
-        Object.assign(config, {
-            fieldId: id,
-            formId,
-            name: title,
-            title,
-            type,
-            showOrder: index,
-            associatedId: id,
-            // readOnly/required are user-selectable at init time; explicitly override any
-            // value inherited from the source layout's comps so the new view starts clean.
-            readOnly,
-            required,
-            flow: {
-                parent: 'ROOT',
-                nodes: [],
-                isCanvas: false,
-                linkedNodes: {},
-                nodeId,
-            },
-        });
-        if (layoutType === 'EXCEL') {
-            config.excel = { row: index, col: 0, parent: 'ROOT', nodeId };
-        }
-        return {
-            ...(sourceComponent ? structuredClone(sourceComponent) : {}),
-            id: randomUUID().replaceAll('-', ''),
-            refCompId: '',
-            type,
-            category: '',
-            refModule: '',
-            styleCategoryCompKey: '',
-            styleCategoryPackage: '',
-            applyStyle: '',
-            isCover: 0,
-            prop: 'EB',
-            config,
-            package: '@weapp/ebdfpage',
-        };
+    // 追加落在「已经有字段组件的那一页」；空视图找不到（findIndex = -1）→ 退回 pages[0]，与旧行为一致。
+    const pageIndex = pages.findIndex((page) => layoutComponents(page?.comps || []).some((comp) => compFieldIdOf(comp)));
+    const page = pages[Math.max(0, pageIndex)];
+    const layoutType = page.layoutType ?? 'FLOW';
+    const existingComps = Array.isArray(page.comps) ? page.comps : [];
+    const missingSet = new Set(missing);
+    const newComps = buildFieldComps(fields.filter((field) => missingSet.has(String(field.fieldId ?? field.id ?? ''))), {
+        sourceByFieldId,
+        formId,
+        layoutType,
+        startShowOrder: existingComps.length,
+        startRow: layoutType === 'EXCEL' ? nextExcelRow(existingComps) : 0,
+        readOnly,
+        required,
     });
+    // **只追加**：已有 comp 以引用直搬，不重建、不改属性 —— 这是「不动别人手工调过的排版」的保证。
+    page.comps = [...existingComps, ...newComps];
     // EXCEL 视图的位置同样有**两份副本**：`comps[].config.excel`（上面刚写的）与
-    // `config.workbook.Sheet1.cells`（设计器的渲染源）。新建视图自己的网格**是空的**
-    // （实测 `cells: []`），所以模板格要从**源布局**借同一个字段那一格 ——
-    // 借不到（比如新加的字段，源布局里还没有）就造一格最小格：视图总得画得出来，
-    // 宁可样式素一点也不能缺格。FLOW 没有网格，整段跳过。
+    // `config.workbook.Sheet1.cells`（设计器的渲染源）。**只给新补的 comp 补格子** ——
+    // 已有格子一个不碰（`fillCells` 本身也只 push，不改别人的格）。模板格从**源布局**借
+    // 同一个字段那一格；借不到（比如新加的字段，源布局里还没有）就造一格最小格：
+    // 视图总得画得出来，宁可样式素一点也不能缺格。FLOW 没有网格，整段跳过。
     let cellWarnings = [];
     if (layoutType === 'EXCEL') {
-        const filled = fillCells(pages[0], pages[0].comps.map((comp) => {
-            const source = sourceByFieldId.get(String(comp.config?.fieldId ?? ''));
-            return {
-                compId: String(comp.id),
-                type: String(comp.type),
-                row: Number(comp.config?.excel?.row) || 0,
-                col: Number(comp.config?.excel?.col) || 0,
-                templateCompId: source ? String(source.id) : '',
-            };
-        }), {
+        const filled = fillCells(page, excelCellEntries(newComps, sourceByFieldId), {
             templateCellOf: (e) => (e.templateCompId ? sourceCellByCompId.get(e.templateCompId) || null : null),
             synthesizeWhenMissing: true,
         });
@@ -383,7 +325,11 @@ export async function populateFormViewFields(client, baseUrl, appId, objId, targ
         ...(targetLayout.formStyle ?? {}),
         formId,
         layoutId: targetLayout.id,
-        layoutStyle: JSON.stringify({ cellStyle: '', componentStyle: '' }),
+        // 追加到**已有内容**的视图时，已有的表单级样式要保住 —— 无条件盖成空模板会抹掉
+        // 别人在设计器里调过的样式。空视图（existingComps 为空）仍走旧常量，行为不变。
+        layoutStyle: existingComps.length
+            ? targetLayout.formStyle?.layoutStyle ?? JSON.stringify({ cellStyle: '', componentStyle: '' })
+            : JSON.stringify({ cellStyle: '', componentStyle: '' }),
     };
     requireSuccess(await client.post(`${baseUrl}${SAVE_LAYOUT_PATH}`, {
         module: 'ebuilder',
@@ -396,9 +342,20 @@ export async function populateFormViewFields(client, baseUrl, appId, objId, targ
     const verifiedData = await getFormLayout(client, baseUrl, formId, targetViewId);
     const verifiedComponents = layoutComponents(verifiedData.formLayout);
     const verifiedFieldIds = new Set(fieldIds(verifiedComponents));
-    const missing = expectedFieldIds.filter((id) => !verifiedFieldIds.has(id));
-    if (missing.length) {
-        throw new Error(`布局保存后回读缺少 ${missing.length} 个字段组件`);
+    const stillMissing = expectedFieldIds.filter((id) => !verifiedFieldIds.has(id));
+    if (stillMissing.length) {
+        throw new Error(`布局保存后回读缺少 ${stillMissing.length} 个字段组件`);
+    }
+    // 安全网：这次是**追加**，已有组件本该原封不动。回读比对一下，被删/被挪位就点出来
+    // （只告警不阻断 —— 平台保存时可能对 comp 做归一化，严格比对会误报）。
+    if (existingComps.length) {
+        const diff = diffExistingComps(existingComps, verifiedComponents);
+        if (diff.missingIds.length) {
+            cellWarnings.push(`回读发现 ${diff.missingIds.length} 个原有组件消失（${listIds(diff.missingIds)}）—— 请到设计器确认`);
+        }
+        if (diff.movedIds.length) {
+            cellWarnings.push(`回读发现 ${diff.movedIds.length} 个原有组件位置被改动（${listIds(diff.movedIds)}）—— 多半是平台保存时重排，请到设计器确认`);
+        }
     }
     // 回读不只查「组件在不在」——还要查**网格里有没有它的格子**。少了这一步，
     // 一个「组件全在、格子全缺、设计器画不出来」的布局照样会报成功（离线前就是这么静默的）。
@@ -417,6 +374,8 @@ export async function populateFormViewFields(client, baseUrl, appId, objId, targ
         componentCount: verifiedComponents.length,
         fieldComponentCount: verifiedFieldIds.size,
         alreadyPopulated: false,
+        addedFieldIds: missing,
+        addedComponentCount: newComps.length,
         warnings: cellWarnings,
     };
 }

package/dist/services/form-view.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-view.js","sourceRoot":"","sources":["../../src/services/form-view.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"form-view.js","sourceRoot":"","sources":["../../src/services/form-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,UAAU;IACV,YAAY;IACZ,cAAc;IACd,aAAa;IACb,WAAW;CACH,CAAC;AAoCX,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AACrE,MAAM,sBAAsB,GAAG,4CAA4C,CAAC;AAC5E,MAAM,cAAc,GAAG,4CAA4C,CAAC;AACpE,MAAM,eAAe,GAAG,+CAA+C,CAAC;AACxE,MAAM,gBAAgB,GAAG,mDAAmD,CAAC;AAC7E,MAAM,gBAAgB,GAAG,uDAAuD,CAAC;AAEjF,SAAS,cAAc,CAAC,QAAa,EAAE,SAAiB;IACtD,IAAI,QAAQ,EAAE,IAAI,KAAK,GAAG,IAAI,QAAQ,EAAE,MAAM,KAAK,KAAK,IAAI,QAAQ,EAAE,OAAO,KAAK,KAAK,IAAI,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;QACnH,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,GAAG,IAAI,GAAG,SAAS,QAAQ,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,MAAM,CAAC,KAAa;IAC3B,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,MAAM,CAAC,IAAyB;IACvC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,cAAc,CAAC,QAAa;IACnC,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,CAAC;IAC5B,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1G,OAAO,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,eAAe,CAAC,KAAU,EAAE,YAAoB;IACvD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,qBAAqB,CAAC,IAAS;IAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACjD,OAAO;QACL,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC;QACjE,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC;QACrD,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC;QACvD,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC;QACnE,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC;QACvE,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC;QACrE,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC;QACjE,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC;QACnE,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC;KAClE,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAyB,EAAE,KAAa,EAAE,QAAyC;IACzG,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;IAC7C,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;WACxB,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,IAAI;WAC/B,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,QAAQ,CAAC,QAAQ,CAAC;WAC/D,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,KAAK,CAAC,CACnD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,IAAI,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAqB,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,kBAAkB,CAAC,CAAC;AAClG,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAa;IACpD,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,mBAAmB,CAAC,CAAC;AACpG,CAAC;AAED,oHAAoH;AACpH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAsB,EACtB,OAAe,EACf,KAAa,EACb,MAAc,EACd,SAAiB;IAEjB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,yCAAyC,EAAE;QACjF,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG;KACtD,CAAC,CAAC;IACH,MAAM,YAAY,GAAU,GAAG,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;IAC1D,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,CAAC;QACpC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,IAAI,EAAE;QACpC,+EAA+E;QAC/E,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC;KACnE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAwB,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAsB,EACtB,OAAe,EACf,KAAa,EACb,KAAa;IAEb,MAAM,QAAQ,GAAG,cAAc,CAC7B,MAAM,MAAM,CAAC,GAAG,CACd,GAAG,OAAO,GAAG,cAAc,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,EAAE,EACpE,EAAE,YAAY,EAAE,KAAK,EAAE,CACxB,EACD,WAAW,CACZ,CAAC;IACF,MAAM,KAAK,GAAG,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC1E,iFAAiF;IACjF,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,KAAK;QAAG,CAAS,CAAC,QAAQ,GAAG,MAAM,CAAC;IACpD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,0DAA0D;AAC1D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAAsB,EACtB,OAAe,EACf,KAAa,EACb,KAAa,EACb,YAAoB,EACpB,IAAY;IAEZ,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,EAAE,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC1C,IAAI,OAAO,KAAK,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC3F,cAAc,CAAC,MAAM,MAAM,CAAC,IAAI,CAC9B,GAAG,OAAO,GAAG,sBAAsB,SAAS,MAAM,CAAC,KAAK,CAAC,UAAU,MAAM,CAAC,YAAY,CAAC,UAAU,MAAM,CAAC,KAAK,CAAC,EAAE,EAChH,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG;QAC7F,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EACtD,EAAE,YAAY,EAAE,KAAK,EAAE,CACxB,EAAE,QAAQ,CAAC,CAAC;IACb,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAAsB,EACtB,OAAe,EACf,KAAa,EACb,KAAa,EACb,OAA8B;IAE9B,MAAM,QAAQ,GAAoC;QAChD,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;QACzB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,UAAU;QAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;QAClC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,MAAM;QACxC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;QAChC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE;KACnC,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAChD,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC1C,wBAAwB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE9C,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC;IAC9C,8FAA8F;IAC9F,MAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACjD,MAAM,QAAQ,GAAG,cAAc,CAC7B,MAAM,MAAM,CAAC,IAAI,CACf,GAAG,OAAO,GAAG,gBAAgB,SAAS,MAAM,CAAC,KAAK,CAAC,UAAU,MAAM,CAAC,KAAK,CAAC,EAAE,EAC5E;QACE,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,KAAK;QACL,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,8FAA8F;QAC9F,GAAG,CAAC,OAAO;YACT,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE;YAC7F,CAAC,CAAC;gBACE,YAAY,EAAE,QAAQ,CAAC,QAAQ;gBAC/B,UAAU,EAAE,YAAY;gBACxB,cAAc,EAAE,QAAQ,CAAC,UAAU;aACpC,CAAC;QACN,QAAQ,EAAE,QAAQ,CAAC,QAAQ;KAC5B,EACD,EAAE,YAAY,EAAE,KAAK,EAAE,CACxB,EACD,aAAa,CACd,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtF,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAC;QACzF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrE,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,UAAU,CAAC,MAAM,KAAK,CAAC;YACrB,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,aAAa,UAAU,CAAC,MAAM,eAAe,CAClD,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC/C,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,MAAsB,EACtB,OAAe,EACf,MAAc,EACd,aAAqB;IAErB,MAAM,QAAQ,GAAG,cAAc,CAC7B,MAAM,MAAM,CAAC,IAAI,CACf,GAAG,OAAO,GAAG,eAAe,EAAE,EAC9B;QACE,MAAM,EAAE,UAAU;QAClB,MAAM;QACN,QAAQ,EAAE,EAAE;QACZ,aAAa;QACb,WAAW,EAAE,EAAE;QACf,aAAa,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;QACpC,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;QACpB,KAAK,EAAE,IAAI;KACZ,EACD,EAAE,YAAY,EAAE,MAAM,EAAE,CACzB,EACD,eAAe,CAChB,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAW;IACnC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAsB,EACtB,OAAe,EACf,MAAc,EACd,aAAqB;IAErB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACzE,OAAO,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC,CAAC,CAAC,wDAAwD;IACrE,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,UAAiB;IACjC,OAAO,UAAU;SACd,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC;SAC9C,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;SAC7D,GAAG,CAAC,MAAM,CAAC,CAAC;AACjB,CAAC;AAED,oCAAoC;AACpC,SAAS,OAAO,CAAC,GAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAsB,EACtB,OAAe,EACf,KAAa,EACb,KAAa,EACb,YAAoB,EACpB,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK;IAEhB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IAEzD,wDAAwD;IACxD,gDAAgD;IAChD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAClE,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,KAAK,aAAa,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,YAAY,EAAE,CAAC,CAAC;IAClE,IAAI,UAAU,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,UAAU,YAAY,cAAc,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,IAAI,UAAU,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,gBAAgB;SACb,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC;SACjD,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC,CACrE,CAAC;IACF,gDAAgD;IAChD,iDAAiD;IACjD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;SACzF,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC;SACnE,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC;SACnD,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAkB,CAAC,CAClF,CAAC;IACF,MAAM,YAAY,GAAG,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAE3D,MAAM,aAAa,GAAG,cAAc,CAClC,MAAM,MAAM,CAAC,IAAI,CACf,GAAG,OAAO,GAAG,gBAAgB,SAAS,MAAM,CAAC,KAAK,CAAC,EAAE,EACrD;QACE,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,GAAG;QACb,MAAM,EAAE,cAAc;QACtB,qBAAqB,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;KACjE,EACD,EAAE,YAAY,EAAE,MAAM,EAAE,CACzB,EACD,aAAa,CACd,CAAC;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC;IACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7G,MAAM,OAAO,GAAG,qBAAqB,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;IAC1E,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,gDAAgD;QAChD,wCAAwC;QACxC,8BAA8B;QAC9B,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACnG,CAAC;YACF,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1F,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;gBACvB,QAAQ,CAAC,IAAI,CAAC,kBAAkB,WAAW,CAAC,MAAM,qCAAqC,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,MAAM;YACN,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC;YAC7C,cAAc,EAAE,gBAAgB,CAAC,MAAM;YACvC,mBAAmB,EAAE,cAAc,CAAC,IAAI;YACxC,gBAAgB,EAAE,IAAI;YACtB,QAAQ;SACT,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACnE,gEAAgE;IAChE,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAS,EAAE,EAAE,CAC9C,gBAAgB,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC;IAC7C,MAAM,aAAa,GAAU,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACzE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,eAAe,CAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EACtF;QACE,eAAe;QACf,MAAM;QACN,UAAU;QACV,cAAc,EAAE,aAAa,CAAC,MAAM;QACpC,QAAQ,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,QAAQ;QACR,QAAQ;KACT,CACF,CAAC;IACF,wDAAwD;IACxD,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,QAAQ,CAAC,CAAC;IAC7C,wDAAwD;IACxD,gEAAgE;IAChE,sDAAsD;IACtD,wCAAwC;IACxC,wCAAwC;IACxC,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE;YAC1E,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YACnG,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;QACH,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;IAC7B,YAAY,CAAC,WAAW,GAAG,KAAK,CAAC;IACjC,YAAY,CAAC,SAAS,GAAG;QACvB,GAAG,CAAC,YAAY,CAAC,SAAS,IAAI,EAAE,CAAC;QACjC,MAAM;QACN,QAAQ,EAAE,YAAY,CAAC,EAAE;QACzB,6CAA6C;QAC7C,gDAAgD;QAChD,WAAW,EAAE,aAAa,CAAC,MAAM;YAC/B,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,WAAW,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;YAC9F,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;KAC1D,CAAC;IAEF,cAAc,CACZ,MAAM,MAAM,CAAC,IAAI,CACf,GAAG,OAAO,GAAG,gBAAgB,EAAE,EAC/B;QACE,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;QACpC,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,YAAY;KAC5B,EACD,EAAE,YAAY,EAAE,MAAM,EAAE,CACzB,EACD,mBAAmB,CACpB,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAChF,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACxF,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,aAAa,YAAY,CAAC,MAAM,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,6CAA6C;IAC7C,0CAA0C;IAC1C,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,iBAAiB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;QAClE,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,MAAM,YAAY,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACrG,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACzB,YAAY,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,eAAe,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC/G,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,8CAA8C;IAC9C,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpG,CAAC;QACF,MAAM,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5F,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,YAAY,CAAC,IAAI,CAAC,QAAQ,WAAW,CAAC,MAAM,2CAA2C,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,YAAY;QACpB,MAAM;QACN,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC;QACxD,cAAc,EAAE,kBAAkB,CAAC,MAAM;QACzC,mBAAmB,EAAE,gBAAgB,CAAC,IAAI;QAC1C,gBAAgB,EAAE,KAAK;QACvB,aAAa,EAAE,OAAO;QACtB,mBAAmB,EAAE,QAAQ,CAAC,MAAM;QACpC,QAAQ,EAAE,YAAY;KACvB,CAAC;AACJ,CAAC"}

package/dist/services/org-department.d.ts CHANGED Viewed

@@ -1,22 +1,35 @@
 /**
- * 组织架构 — 部门的新建与删除。
+ * 组织架构 — **部门与分部**的新建与删除。两者是同一套接口、同一个报文，只差类型值。
  *
- * 新建部门是**四步链**，每一步的产出喂给下一步，缺一不可：
+ * 新建是**两步**：
  *
- *   ① GET  `/api/bs/hrm/organization/getForm`      取**保存报文模板**（含现生成的 targetId）
- *   ② POST `/api/hrm/form/core/getFormLayout`      取 `formLayout.id` 与 `formLayoutMultiple.id`
- *   ③ POST `/api/hrm/form/core/saveFormData`       落表单数据，回吐 `recordId`
- *   ④ POST `/api/bs/hrm/organization/saveForm`     部门落进组织树
+ *   ① GET  `/api/bs/hrm/organization/getForm?parentId=<父>&flag=<department|subcompany>`
+ *      取**保存报文模板**（含平台为新节点现生成的 `targetId`）
+ *   ② POST `/api/hrm/organization/saveForm`        节点落进组织树
  *
- * ⚠ **① 给的模板不能直接当 ④ 的报文发** —— 形状对不上：
- *   ① 的 `data.parent` 是 `[]`、`data.subcompany` 是**对象数组**，
- *   而 ④ 要的是 `parent: ""`（或父部门 id 字符串）与 `subcompany: "<机构id>"`。
+ * ⚠ **① 给的模板不能直接当 ② 的报文发** —— 形状对不上：
+ *   `data.parent` 是**数组**（顶层是 `[]`）、`data.subcompany` 是**对象数组**，
+ *   而 ② 要的是 `parent` / `subcompany` 的 **id 字符串**。
  *   转换集中在 `buildSaveFormPayload`，别在命令层现拼。
  *
- * 删除是单步：`POST /api/bs/hrm/department/delete`。
+ * ⚠ **曾经是四步**（② `getFormLayout` → ③ `saveFormData` 落表单记录 → ④ saveForm），
+ * 保存报文里带一层 `formdata:{formId,versionId}` 包裹。那层是多余的：**平台在建组织节点时
+ * 自己会补背后的表单记录**（建完 `getForm?id=` 读回，`formdata` 里 `formId`/`versionId` 齐全），
+ * 而它对环境有要求 —— `eteams` 类环境 `getForm` 根本不返回 `formId`，整条链在那里一步都走不动。
+ * 改用扁平报文后，两边都通，还少两次往返。对照验证见 CHANGELOG。
+ *
+ * 删除是单步：`POST /api/bs/hrm/department/delete`（分部同一个端点）。
  */
 /** 保存报文里的组织类型。建部门固定 `department`。 */
 export declare const ORG_TYPE_DEPARTMENT = "department";
+/**
+ * 保存报文里的「分部」类型。
+ *
+ * 分部与部门**是同一套接口、同一个报文形状**，只差两个值：
+ * `getForm` 的 `flag`（`department` / `subcompany`）与保存报文的 `type`。
+ * 差别在父级栏位怎么填 —— 见 {@link buildSaveFormPayload}。
+ */
+export declare const ORG_TYPE_SUBCOMPANY = "subcompany";
 /**
  * 解析当前登录用户所在机构 ID。
  *
@@ -47,14 +60,12 @@ export interface OrgFormTemplate {
 /**
  * 从 ① `getForm` 的返回里抽出模板。
  *
- * 抽不出来就抛 —— **不编默认值**：这四个 id 全是平台现生成的，
- * 硬凑一个只会让后面的步骤以看不懂的方式失败。
+ * **只有 `targetId` 是硬要求**（它是平台为这个新节点现生成的 id，必须原样带回去）。
+ * `formId` / `versionId` 只是有些环境会给，**不是必须** —— 早先保存报文要拿它们拼一层
+ * `formdata` 包裹，现在走扁平报文（见 {@link buildSaveFormPayload}），没它们照样能建。
+ * 此前正是在这里硬要 `formId`，把 eteams 那类「不给 formId」的环境整条链挡在门外。
  */
 export declare function extractOrgFormTemplate(response: any): OrgFormTemplate;
-/** ③ `saveFormData` 的报文。`presetDataId` 就是模板里的 `targetId`。 */
-export declare function buildSaveFormDataPayload(tpl: Pick<OrgFormTemplate, 'targetId' | 'formId'>, formLayoutId: string, multipleLayoutId: string): Record<string, unknown>;
-/** ③ 的返回里取 `recordId`（④ 要用）。取不到就抛，不编。 */
-export declare function extractRecordId(response: any): string;
 export interface CreateDepartmentInput {
     name: string;
     /** 部门编号。不传就沿用模板里的值（或空）。 */
@@ -67,7 +78,9 @@ export interface CreateDepartmentInput {
     supDepartment?: string;
     /** 部门全称。不传用 name。 */
     fullname?: string;
-    recordId: string;
+    /** 组织类型：默认 `department`；建分部传 `subcompany`。 */
+    type?: string;
+    recordId?: string;
 }
 /**
  * ④ `organization/saveForm` 的报文 —— 把 ① 的模板**转成**平台实际收的形状。

package/dist/services/org-department.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"org-department.d.ts","sourceRoot":"","sources":["../../src/services/org-department.ts"],"names":[],"mappings":"AAAA~~;;;;;;;;;;;;;;;;GAgBG~~;AAEH,qCAAqC;AACrC,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;;GAOG;AACH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGrG;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAStF;AAED,2BAA2B;AAC3B,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED~~;;;;;GAKG~~;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,GAAG,GAAG,eAAe,~~CAyBrE~~;AAED,~~6DAA6D;AAC7D,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,UAAU,GAAG,QAAQ,CAAC,EACjD,YAAY,EAAE,~~MAAM,~~EACpB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAezB;AAED,yCAAyC;AACzC,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAKrD;AAED,MAAM,~~WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;~~CAClB~~;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,~~CAiChH~~;AAED,gDAAgD;AAChD,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEhG;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,MAAM,WAAW,mBAAmB;IAClC,kBAAkB;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoC7G"}
1	+ {"version":3,"file":"org-department.d.ts","sourceRoot":"","sources":["../../src/services/org-department.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,qCAAqC;AACrC,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;;GAOG;AACH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGrG;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAStF;AAED,2BAA2B;AAC3B,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,GAAG,GAAG,eAAe,CAkBrE;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kCAAkC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA4BhH;AAED,gDAAgD;AAChD,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEhG;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,MAAM,WAAW,mBAAmB;IAClC,kBAAkB;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoC7G"}

package/dist/services/org-department.js CHANGED Viewed

@@ -1,22 +1,35 @@
 /**
- * 组织架构 — 部门的新建与删除。
+ * 组织架构 — **部门与分部**的新建与删除。两者是同一套接口、同一个报文，只差类型值。
  *
- * 新建部门是**四步链**，每一步的产出喂给下一步，缺一不可：
+ * 新建是**两步**：
  *
- *   ① GET  `/api/bs/hrm/organization/getForm`      取**保存报文模板**（含现生成的 targetId）
- *   ② POST `/api/hrm/form/core/getFormLayout`      取 `formLayout.id` 与 `formLayoutMultiple.id`
- *   ③ POST `/api/hrm/form/core/saveFormData`       落表单数据，回吐 `recordId`
- *   ④ POST `/api/bs/hrm/organization/saveForm`     部门落进组织树
+ *   ① GET  `/api/bs/hrm/organization/getForm?parentId=<父>&flag=<department|subcompany>`
+ *      取**保存报文模板**（含平台为新节点现生成的 `targetId`）
+ *   ② POST `/api/hrm/organization/saveForm`        节点落进组织树
  *
- * ⚠ **① 给的模板不能直接当 ④ 的报文发** —— 形状对不上：
- *   ① 的 `data.parent` 是 `[]`、`data.subcompany` 是**对象数组**，
- *   而 ④ 要的是 `parent: ""`（或父部门 id 字符串）与 `subcompany: "<机构id>"`。
+ * ⚠ **① 给的模板不能直接当 ② 的报文发** —— 形状对不上：
+ *   `data.parent` 是**数组**（顶层是 `[]`）、`data.subcompany` 是**对象数组**，
+ *   而 ② 要的是 `parent` / `subcompany` 的 **id 字符串**。
  *   转换集中在 `buildSaveFormPayload`，别在命令层现拼。
  *
- * 删除是单步：`POST /api/bs/hrm/department/delete`。
+ * ⚠ **曾经是四步**（② `getFormLayout` → ③ `saveFormData` 落表单记录 → ④ saveForm），
+ * 保存报文里带一层 `formdata:{formId,versionId}` 包裹。那层是多余的：**平台在建组织节点时
+ * 自己会补背后的表单记录**（建完 `getForm?id=` 读回，`formdata` 里 `formId`/`versionId` 齐全），
+ * 而它对环境有要求 —— `eteams` 类环境 `getForm` 根本不返回 `formId`，整条链在那里一步都走不动。
+ * 改用扁平报文后，两边都通，还少两次往返。对照验证见 CHANGELOG。
+ *
+ * 删除是单步：`POST /api/bs/hrm/department/delete`（分部同一个端点）。
  */
 /** 保存报文里的组织类型。建部门固定 `department`。 */
 export const ORG_TYPE_DEPARTMENT = 'department';
+/**
+ * 保存报文里的「分部」类型。
+ *
+ * 分部与部门**是同一套接口、同一个报文形状**，只差两个值：
+ * `getForm` 的 `flag`（`department` / `subcompany`）与保存报文的 `type`。
+ * 差别在父级栏位怎么填 —— 见 {@link buildSaveFormPayload}。
+ */
+export const ORG_TYPE_SUBCOMPANY = 'subcompany';
 /**
  * 解析当前登录用户所在机构 ID。
  *
@@ -48,27 +61,24 @@ export async function fetchCurrentUser(baseUrl, eteamsId) {
 /**
  * 从 ① `getForm` 的返回里抽出模板。
  *
- * 抽不出来就抛 —— **不编默认值**：这四个 id 全是平台现生成的，
- * 硬凑一个只会让后面的步骤以看不懂的方式失败。
+ * **只有 `targetId` 是硬要求**（它是平台为这个新节点现生成的 id，必须原样带回去）。
+ * `formId` / `versionId` 只是有些环境会给，**不是必须** —— 早先保存报文要拿它们拼一层
+ * `formdata` 包裹，现在走扁平报文（见 {@link buildSaveFormPayload}），没它们照样能建。
+ * 此前正是在这里硬要 `formId`，把 eteams 那类「不给 formId」的环境整条链挡在门外。
  */
 export function extractOrgFormTemplate(response) {
     const d = response?.data?.data ?? response?.data;
     if (!d || typeof d !== 'object')
         throw new Error('getForm 返回结构异常（拿不到模板）');
     const targetId = String(d.targetId ?? '');
-    const formId = String(d.formdata?.formId ?? d.formId ?? '');
-    const versionId = String(d.formdata?.versionId ?? d.versionId ?? '');
-    const subcompanyId = String(d.subcompany?.[0]?.id ?? d.subcompany ?? '');
-    if (!targetId || !formId) {
-        // 实测：mulinquan 的 data 里带 `formdata`（含 formId/versionId），eteams 的**不带** ——
-        // 同一端点、同样的参数，差别在租户的部门表单配置。缺 formId 就没法走 ③④，直接说清。
-        throw new Error(`getForm 模板缺少关键 id（targetId=${targetId || '空'} formId=${formId || '空'}）：`
-            + '该环境未返回部门表单配置（formdata.formId），当前无法在该环境建部门');
+    if (!targetId) {
+        throw new Error('getForm 模板缺少 targetId —— 这是平台为新节点现生成的 id，缺了就无法继续');
     }
+    const subcompanyId = String(d.subcompany?.[0]?.id ?? d.subcompany ?? '');
     return {
         targetId,
-        formId,
-        versionId,
+        formId: String(d.formdata?.formId ?? d.formId ?? ''),
+        versionId: String(d.formdata?.versionId ?? d.versionId ?? ''),
         subcompanyId,
         rightList: Array.isArray(d.rightList) ? d.rightList.map(String) : [],
         hideFieldList: Array.isArray(d.hideFieldList) ? d.hideFieldList.map(String) : [],
@@ -76,31 +86,6 @@ export function extractOrgFormTemplate(response) {
         virtualid: String(d.virtualid ?? '1'),
     };
 }
-/** ③ `saveFormData` 的报文。`presetDataId` 就是模板里的 `targetId`。 */
-export function buildSaveFormDataPayload(tpl, formLayoutId, multipleLayoutId) {
-    return {
-        module: 'hrm',
-        formData: {
-            module: 'hrm',
-            presetDataId: tpl.targetId,
-            dataDetails: [],
-            asyncTableData: false,
-            client: 'pc',
-            dataStatus: 'submit',
-            form: { id: tpl.formId },
-            formLayout: { id: formLayoutId },
-            multipleLayoutId,
-        },
-    };
-}
-/** ③ 的返回里取 `recordId`（④ 要用）。取不到就抛，不编。 */
-export function extractRecordId(response) {
-    const d = response?.data ?? {};
-    const id = d.recordId ?? d.dataId ?? d.id ?? d.formDataId ?? '';
-    if (!id)
-        throw new Error('saveFormData 未返回 recordId（部门树那步会缺参数）');
-    return String(id);
-}
 /**
  * ④ `organization/saveForm` 的报文 —— 把 ① 的模板**转成**平台实际收的形状。
  *
@@ -114,34 +99,29 @@ export function buildSaveFormPayload(tpl, input) {
     // 建子部门时 parentId 是父部门 id，拿它当 subcompany 会把子部门挂到错误的机构下。
     const subcompanyId = input.subcompanyId || tpl.subcompanyId;
     const isTopLevel = !input.parentId || input.parentId === subcompanyId;
-    return {
-        // 顶层部门时 parent 是空串（不是机构 id）；挂在某个部门下时才写该部门 id
-        parent: isTopLevel ? '' : input.parentId,
-        subcompany: subcompanyId,
+    const type = input.type ?? ORG_TYPE_DEPARTMENT;
+    const isSubcompany = type === ORG_TYPE_SUBCOMPANY;
+    const payload = {
+        // 顶层部门时 parent 是空串；建分部时 parent 是**父分部 id**（分部一定挂在某个分部下）
+        parent: isSubcompany ? (input.parentId || '') : (isTopLevel ? '' : input.parentId),
         targetId: tpl.targetId,
-        advanceForm: true,
+        advanceForm: false,
         hideFieldList: tpl.hideFieldList,
         virtualid: tpl.virtualid,
-        formdata: {
-            objectId: tpl.targetId,
-            formId: tpl.formId,
-            isEditable: true,
-            module: 'hrm',
-            versionId: tpl.versionId,
-            advanceForm: true,
-        },
-        type: ORG_TYPE_DEPARTMENT,
+        type,
         disporder: tpl.disporder,
         rightList: tpl.rightList,
         coadjutant: '',
         code: input.code ?? '',
         name: input.name,
-        ...(input.supDepartment ? { supDepartment: input.supDepartment } : {}),
-        ...(input.fullname ? { fullname: input.fullname } : {}),
-        formdataId: tpl.targetId,
-        recordId: input.recordId,
+        fullname: input.fullname || input.name,
         isMobile: false,
     };
+    // ⚠ 建**分部**时**不发 `subcompany`**：模板里它本来就是 `undefined`（分部的归属由 `parent` 表达）。
+    // 建部门时才是「所属分部」——这两者正是「上级与所属至少填一个」里的两半。
+    if (!isSubcompany)
+        payload.subcompany = subcompanyId;
+    return payload;
 }
 /** 删除部门的报文。`parent` 是它的**父**（顶层部门的父就是机构 id）。 */
 export function buildDeleteDepartmentPayload(id, parent) {

package/dist/services/org-department.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"org-department.js","sourceRoot":"","sources":["../../src/services/org-department.ts"],"names":[],"mappings":"AAAA~~;;;;;;;;;;;;;;;;GAgBG~~;AAEH,qCAAqC;AACrC,MAAM,CAAC,MAAM,mBAAmB,GAAG,YAAY,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,OAAe,EAAE,QAAgB;IAClF,MAAM,GAAG,GAAG,CAAC,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC;IACpE,OAAO,MAAM,CAAC,GAAG,EAAE,YAAY,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAe,EAAE,QAAgB;IACtE,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CACtB,GAAG,OAAO,oFAAoF,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAC3H,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CACpH,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAS,CAAC;QACtC,OAAO,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AACxB,CAAC;AAcD~~;;;;;GAKG~~;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAa;IAClD,MAAM,CAAC,GAAG,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,QAAQ,EAAE,IAAI,CAAC;IACjD,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAC1C,~~MAAM~~,~~MAAM,GAAG,MAAM,~~CAAC,~~CAAC,CAAC,~~QAAQ,EAAE,~~MAAM,IAAI,~~CAAC,~~CAAC,~~MAAM,IAAI,~~EAAE~~,CAAC,~~CAAC;IAC5D~~,~~MAAM,SAAS,GAAG,MAAM,~~CAAC,CAAC,CAAC~~,QAAQ,EAAE,SAAS,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC~~;~~IACrE~~,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IACzE,~~IAAI~~,~~CAAC,~~QAAQ,~~IAAI~~,~~CAAC~~,MAAM,~~EAAE~~,CAAC~~;QACzB~~,~~0EAA0E;QAC1E~~,~~iDAAiD;QACjD~~,MAAM,IAAI,~~KAAK~~,~~CACb~~,~~8BAA8B~~,~~QAAQ,~~IAAI,~~GAAG~~,~~WAAW~~,MAAM,~~IAAI~~,~~GAAG~~,~~IAAI;cACvE~~,~~2CAA2C~~,~~CAC9C~~,CAAC~~;IACJ~~,CAAC~~;IACD~~,~~OAAO;QACL~~,~~QAAQ;QACR~~,~~MAAM;QACN~~,~~SAAS~~;~~QACT~~,YAAY;QACZ,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;QACpE,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;QAChF,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC;QACnC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC;KACtC,CAAC;AACJ,CAAC;~~AAED,6DAA6D~~;~~AAC7D~~,MAAM,UAAU,~~wBAAwB~~,~~CACtC~~,~~GAAiD~~,~~EACjD~~,~~YAAoB,EACpB,gBAAwB~~;~~IAExB~~,~~OAAO~~;~~QACL~~,~~MAAM,EAAE,KAAK~~;~~QACb~~,~~QAAQ,EAAE;YACR,~~MAAM,~~EAAE,KAAK;YACb,~~YAAY,~~EAAE,~~GAAG,~~CAAC,QAAQ;YAC1B,WAAW,EAAE,EAAE;YACf,cAAc,EAAE,~~KAAK~~;YACrB~~,~~MAAM~~,~~EAAE~~,IAAI~~;YACZ~~,~~UAAU,EAAE,QAAQ;YACpB,IAAI,EAAE,EAAE,EAAE,EAAE,~~GAAG,CAAC,~~MAAM,EAAE;YACxB,UAAU,EAAE,EAAE,EAAE,EAAE,~~YAAY,~~EAAE;YAChC,gBAAgB;SACjB;KACF,~~CAAC;~~AACJ~~,~~CAAC;AAED,yCAAyC;AACzC,~~MAAM,UAAU,~~eAAe~~,CAAC,~~QAAa;IAC3C~~,~~MAAM,~~CAAC,~~GAAG,~~QAAQ,~~EAAE,~~IAAI,~~IAAI~~,~~EAAE,~~CAAC~~;IAC/B~~,~~MAAM,EAAE,GAAG,CAAC,CAAC,~~QAAQ,~~IAAI~~,~~CAAC~~,CAAC,MAAM,IAAI,~~CAAC~~,CAAC,~~EAAE,~~IAAI,~~CAAC,CAAC,UAAU,~~IAAI,~~EAAE~~,CAAC;~~IAChE~~,~~IAAI~~,~~CAAC~~,~~EAAE;QAAE~~,~~MAAM,~~IAAI,KAAK,~~CAAC~~,~~sCAAsC,~~CAAC~~,CAAC~~;~~IACjE~~,~~OAAO,~~MAAM,~~CAAC~~,~~EAAE,CAAC,CAAC~~;~~AACpB~~,~~CAAC~~;~~AAiBD;;;;;;;GAOG;AACH~~,MAAM,~~UAAU,oBAAoB,CAAC,GAAoB,~~EAAE,~~KAA4B;IACrF,0CAA0C;IAC1C,uDAAuD;IACvD,MAAM,~~YAAY,~~GAAG,KAAK,~~CAAC,~~YAAY,IAAI,GAAG,~~CAAC,~~YAAY,~~CAAC~~;IAC5D~~,~~MAAM,UAAU,GAAG,~~CAAC,KAAK,CAAC,QAAQ,IAAI,~~KAAK~~,CAAC,~~QAAQ~~,~~KAAK~~,~~YAAY~~,CAAC~~;IACtE~~,~~OAAO;QACL,6CAA6C;QAC7C,MAAM,EAAE,~~UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ~~;QACxC~~,~~UAAU,EAAE,YAAY~~;~~QACxB~~,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,WAAW,EAAE,~~IAAI~~;~~QACjB~~,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,~~QAAQ,EAAE;YACR,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,UAAU,EAAE,~~IAAI;~~YAChB~~,~~MAAM,EAAE,KAAK;YACb,~~SAAS,EAAE,GAAG,CAAC,SAAS;~~YACxB,WAAW,EAAE,IAAI;SAClB;QACD,IAAI,EAAE,mBAAmB;QACzB,SAAS,EAAE,GAAG,CAAC,SAAS;~~QACxB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,~~GAAG~~,~~CAAC~~,KAAK,CAAC,~~aAAa~~,~~CAAC~~,~~CAAC,CAAC,EAAE,aAAa,EAAE,~~KAAK,CAAC,~~aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC~~;~~QACtE~~,~~GAAG,CAAC,KAAK,CAAC,~~QAAQ,~~CAAC,CAAC,CAAC,~~EAAE,~~QAAQ,EAAE,~~KAAK,CAAC,~~QAAQ~~,~~EAAE~~,~~CAAC~~,CAAC,~~CAAC~~,~~EAAE~~,CAAC~~;QACvD~~,UAAU,~~EAAE,~~GAAG,~~CAAC~~,~~QAAQ;QACxB,QAAQ,EAAE,KAAK,~~CAAC~~,QAAQ~~;~~QACxB~~,~~QAAQ~~,~~EAAE~~,~~KAAK;KAChB,~~CAAC;~~AACJ~~,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,4BAA4B,CAAC,EAAU,EAAE,MAAc;IACrE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AACzD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAU;IACzC,OAAO,uCAAuC,kBAAkB,CAAC,EAAE,CAAC,6CAA6C,CAAC;AACpH,CAAC;AAYD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAAW,EAAE,KAA0B;IAClF,MAAM,CAAC,GAAG,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC;IACvD,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,uCAAuC;IACvC,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,IAAI,CAAC,gBAAgB,IAAI,YAAY,CAAC,CAAC;IAEpE,MAAM,OAAO,GAA4B;QACvC,MAAM;QACN,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QACxC,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;QAClC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;QACnE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC;QACrC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC;QAC9C,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,YAAY;QACZ,WAAW,EAAE,KAAK;QAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC7B,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,EAAE;QACpC,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;QAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QACvB,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QACxC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC;QACpD,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC"}
1	+ {"version":3,"file":"org-department.js","sourceRoot":"","sources":["../../src/services/org-department.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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