e10-ebuilder-prototype 0.5.0 → 0.5.2

package/README.md

@@ -1,7 +1,7 @@
 # e10-ebuilder-prototype
 
 根据 E10 **应用 ID 或后台应用地址生成应用原型，包含已发布菜单中的页面、建模列表和流程页面**。
-当前版本 0.5.0。保持我们的 TypeScript CLI 为主：CLI 管登录、菜单发现、配置采集、截图、任务队列、校验、恢复与打包；宿主 AI 根据完整截图或建模配置生成独立 HTML。CLI 不调用 LLM，不要求额外模型 API Key，也不调用 ui-code-agent 生成。
+当前版本 0.5.2。保持我们的 TypeScript CLI 为主：CLI 管登录、菜单发现、配置采集、截图、任务队列、校验、恢复与打包；宿主 AI 根据完整截图或建模配置生成独立 HTML。CLI 不调用 LLM，不要求额外模型 API Key，也不调用 ui-code-agent 生成。
 
 ## 范围与交付
 
@@ -31,7 +31,7 @@ ZIP 名为 `应用页面-<appId>.zip`，位于任务目录 artifacts/；本地
 需要 Node >=22.5、npm 和已安装 Google Chrome，playwright-core 固定 1.62.1，不下载浏览器。
 
 ```sh
-npm install -g e10-ebuilder-prototype@0.5.0 --registry=https://registry.npmjs.org/
+npm install -g e10-ebuilder-prototype@0.5.2 --registry=https://registry.npmjs.org/
 e10-ebuilder-prototype auth set --base-url https://your-e10.example.com --eteamsid-stdin
 e10-ebuilder-prototype run --app-id 1234567890123456789 --dir ./work/app-demo --json
 # 或使用后台应用地址：
@@ -56,6 +56,16 @@ e10-ebuilder-prototype pack --dir ./work/app-demo --json
 
 生成文件为真实 DOM、内联 CSS/JS/SVG，无外部资源或后台调用。页面忠实还原视觉结构，空数据用一致 Mock 内容填充。表单按当前模式/字段/选项/按钮及布局依据生成，固定种子约 20 条主记录、明细每条 2–5 行；所有统计由数据推导。完整规范随 CLI 打包，不能用“能打开表格”代替验收。
 
+## 独立部署检测兼容（0.5.1）
+
+isIndependentDeploy 请求失败时，默认按非独立部署继续采集，并记录兼容提示。需要部署路由的接口使用 `/api/ebuilder/form/`；检测成功返回 true 时使用 `/api/ebuilder{appId}/form/`。后续配置接口的真实错误照常报告，采集未成功不会标为完成。
+
+## 传统列表配置（0.5.2）
+
+基础设置、显示列、搜索、统计和固定条件统一使用 `/api/bs/ebuilder/form/` 接口，URL 在原参数基础上增加小写 `appid`。这些接口固定走后台路径，需要账号具备应用后台访问权限，不受独立部署检测结果影响。列表初始化、排序、按钮等接口沿用各自路径。
+
+固定条件接口成功但未返回 `data` 时按未配置条件处理；权限、HTTP 和业务错误仍明确报错。已有失败任务可在升级后执行 `retry --dir <原任务目录>`。
+
 ## 参考布局与临时记录
 
 默认只读业务记录：先读取至多一条现有记录，若可用则请求导出 HTML 作为私有布局参考；没有参考时根据全部自定义字段生成布局，报告缺项。导出可能在源站生成参考文件。

package/dist/api.d.ts

@@ -1,7 +1,9 @@
 import type { E10AuthContext } from './vendor/environment-auth.js';
 /** Preserve integer identifiers before JSON.parse can round them. */
 export declare function parseApiJson(text: string): unknown;
-export declare function apiData(payload: unknown, label: string): any;
+export declare function apiData(payload: unknown, label: string, options?: {
+    allowMissingData?: boolean;
+}): any;
 export declare class E10Client {
     private auth;
     constructor(auth: E10AuthContext);

package/dist/api.js

@@ -10,7 +10,7 @@ export function parseApiJson(text) {
     });
     return JSON.parse(quoted);
 }
-export function apiData(payload, label) {
+export function apiData(payload, label, options = {}) {
     const p = payload;
     if (p && ['401', '403'].includes(String(p.code)))
         throw new CaptureError('E10_LOGIN_REQUIRED', '登录或权限已失效，请重新执行 auth set');
@@ -22,7 +22,7 @@ export function apiData(payload, label) {
         p.fail === true ||
         (typeof p.message === 'object' && p.message && String(p.message.code ?? '0') !== '0') ||
         (p.data?.datajson && p.data.datajson.status !== true) ||
-        !('data' in p))
+        (!('data' in p) && (!options.allowMissingData || !['0', '200'].includes(String(p.code)))))
         throw new CaptureError('API_RESPONSE_INVALID', `${label} 返回结构或业务状态异常`);
     return p.data;
 }

package/dist/common.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "0.5.0";
+export declare const VERSION = "0.5.2";
 export declare class CaptureError extends Error {
     code: string;
     details?: unknown | undefined;

package/dist/common.js

@@ -3,7 +3,7 @@ import { renameWithRetry } from './runtime-support.mjs';
 import { createReadStream } from 'node:fs';
 import path from 'node:path';
 import { createHash, randomUUID } from 'node:crypto';
-export const VERSION = '0.5.0';
+export const VERSION = '0.5.2';
 export class CaptureError extends Error {
     code;
     details;

package/dist/forms.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { atomicJson, CaptureError, errorInfo, fileDigest, mapLimit } from './common.js';
-import { E10Client, parseApiJson } from './api.js';
+import { E10Client, apiData, parseApiJson } from './api.js';
 import { recoverTemporaryRecords, withTemporaryRecord, SeedUnavailable, temporarySummary, } from './temporary-records.js';
 import { navigationKey } from './menus.js';
 import { APPROVAL_PATH, normalizeWorkflows, workflowPreset, workflowType } from './workflows.js';
@@ -45,6 +45,30 @@ export function configObject(value) {
         throw new CaptureError('FORM_CONFIG_INVALID', '表单配置不是对象');
     return result;
 }
+function listConditions(conditionId, raw) {
+    let rootData = typeof raw === 'string'
+        ? raw
+        : raw && Object.hasOwn(raw, 'rootdata')
+            ? raw.rootdata
+            : raw?.rootData;
+    if (typeof rootData === 'string' && rootData.trim()) {
+        try {
+            rootData = parseApiJson(rootData);
+        }
+        catch {
+            // Preserve unrecognized condition text for the host, as the source collector does.
+        }
+    }
+    const configured = rootData != null &&
+        rootData !== '' &&
+        !(typeof rootData === 'object' && Object.keys(rootData).length === 0);
+    return {
+        conditionId: conditionId == null ? '' : String(conditionId),
+        configured,
+        rootData: configured ? rootData : {},
+        raw: raw ?? {},
+    };
+}
 const systems = new Set([
     '1:name',
     '2:creator',
@@ -189,7 +213,13 @@ export async function collectForms(store, state, auth, retryFailed = false) {
     }
     if (!jobs.length && !(await temporarySummary(store)).pending)
         return;
-    const independent = await client.request('GET', `/api/ebuilder/form/app/isIndependentDeploy?appId=${state.appId}`);
+    const deploymentWarnings = [];
+    const independent = await client
+        .request('GET', `/api/ebuilder/form/app/isIndependentDeploy?appId=${state.appId}`)
+        .catch(() => {
+        deploymentWarnings.push('isIndependentDeploy 请求失败，已默认按非独立部署应用采集');
+        return false;
+    });
     if (typeof independent !== 'boolean')
         throw new CaptureError('DEPLOYMENT_INVALID', '独立部署状态不是布尔值');
     const prefix = '/api/ebuilder' + (independent ? state.appId : '');
@@ -395,6 +425,7 @@ export async function collectForms(store, state, auth, retryFailed = false) {
             status: 'running',
             attempt: (previous?.attempt || 0) + 1,
             updatedAt: new Date().toISOString(),
+            ...(deploymentWarnings.length ? { warnings: [...deploymentWarnings] } : {}),
         };
         await atomicJson(collectionPath(store, item.id), receipt);
         try {
@@ -443,7 +474,9 @@ export async function collectForms(store, state, auth, retryFailed = false) {
                 };
                 for (const button of buttons.items)
                     button.pageButtonRef = JSON.stringify([item.id, button.buttonRef]);
-                const warnings = [...new Set(forms.flatMap((f) => f.warnings))];
+                const warnings = [
+                    ...new Set([...deploymentWarnings, ...forms.flatMap((f) => f.warnings)]),
+                ];
                 if (catalog.skipped.length)
                     warnings.push(`流程目录跳过 ${catalog.skipped.length} 个非 EB 或归属/配置无效的流程；详见私有 workflowCatalog.skipped`);
                 if (!catalog.templates.length)
@@ -498,19 +531,26 @@ export async function collectForms(store, state, auth, retryFailed = false) {
                     throw new CaptureError('FORM_ID_MISMATCH', '菜单与列表表单不匹配');
                 objId = resolved;
                 const query = `apid=${state.appId}&tpaid=${item.viewId}&objId=${objId}`;
+                const bs = '/api/bs/ebuilder/form';
+                const bsQuery = `${query}&appid=${state.appId}`;
                 const routes = {
-                    basicSettings: `/list/getBaseInfo/${item.viewId}?${query}`,
-                    displayColumns: `/list/getListFields/${item.viewId}?${query}&isVirtualForm=false&clientType=PC`,
-                    sorting: `/viewlist/getViewOrder?${query}&viewType=tableView&viewId=${item.viewId}&isVirtualForm=false`,
-                    search: `/listFilter/getSearchFilters/${item.viewId}?${query}&isVirtualForm=false&viewType=tableView`,
-                    statistics: `/listStatistics/getStatisticsList/${item.viewId}?${query}&isVirtualForm=false`,
-                    buttons: `/list/getListButtons/${item.viewId}?passid=${objId}`,
+                    basicSettings: `${bs}/list/getBaseInfo/${item.viewId}?${bsQuery}`,
+                    displayColumns: `${bs}/list/getListFields/${item.viewId}?${bsQuery}&isVirtualForm=false&clientType=PC`,
+                    sorting: `${prefix}/form/viewlist/getViewOrder?${query}&viewType=tableView&viewId=${item.viewId}&isVirtualForm=false`,
+                    search: `${bs}/listFilter/getSearchFilters/${item.viewId}?${bsQuery}&isVirtualForm=false&viewType=tableView`,
+                    statistics: `${bs}/listStatistics/getStatisticsList/${item.viewId}?${bsQuery}&isVirtualForm=false`,
+                    buttons: `${prefix}/form/list/getListButtons/${item.viewId}?passid=${objId}`,
                 };
                 if (context.conditionId && String(context.conditionId) !== '0')
-                    routes.conditions = `/plugin/conditionEditor/getById?apid=${state.appId}&id=${decimal(context.conditionId, '条件')}&type=search&objId=${objId}`;
+                    routes.conditions = `${bs}/plugin/conditionEditor/getById?apid=${state.appId}&id=${decimal(context.conditionId, '条件')}&type=search&objId=${objId}&appid=${state.appId}`;
                 const responses = await Promise.allSettled(Object.entries(routes).map(async ([key, route]) => [
                     key,
-                    await cached(route, () => get(route)),
+                    await cached(route, async () => {
+                        if (key !== 'conditions')
+                            return client.request('GET', route);
+                        const payload = await client.request('GET', route, undefined, false, true);
+                        return apiData(payload, route.split('?')[0], { allowMissingData: true });
+                    }),
                 ]));
                 for (const result of responses)
                     if (result.status === 'rejected')
@@ -518,6 +558,7 @@ export async function collectForms(store, state, auth, retryFailed = false) {
                 const config = Object.fromEntries(responses.map((r) => r.value));
                 listButtons = config.buttons;
                 delete config.buttons;
+                config.conditions = listConditions(context.conditionId, config.conditions);
                 list = { kind: 'list', listId: item.viewId, config };
             }
             if (!objId || !sourceForms.has(objId))
@@ -526,7 +567,7 @@ export async function collectForms(store, state, auth, retryFailed = false) {
             receipt.objId = objId;
             const formId = objId;
             const shared = await collectObject(formId, true);
-            const warnings = [...shared.warnings];
+            const warnings = [...deploymentWarnings, ...shared.warnings];
             const formButtons = structuredClone(shared.contexts[item.kind === 'layout' ? item.id : ''] || shared.contexts['']);
             if (formButtons.view.status !== 'ready' || formButtons.edit.status !== 'ready')
                 warnings.push('查看/编辑模式按钮缺少记录上下文，不能借用列表按钮');

package/dist/templates/form-guide.md

@@ -282,16 +282,16 @@ POST /api/ebuilder/form/list/listInit
 
 从 `data` 动态取得 `appId`、`objid`、`name`、`conditionId` 和 `viewType`，随后读取六类配置：
 
-这些配置统一通过前台登录态接口 `/api/ebuilder/form/...` 读取。
+基础设置、显示列、搜索、统计、条件固定通过后台接口 `/api/bs/ebuilder/form/...` 读取，URL 额外携带小写 `appid={appId}`，需要应用后台权限。排序沿用 `/api/ebuilder/form/...` 的部署路由。
 
-| 分类     | 接口                                                                | 有效数据                    |
-| -------- | ------------------------------------------------------------------- | --------------------------- |
-| 基础设置 | `GET /api/ebuilder/form/list/getBaseInfo/{tableId}`                 | `data`                      |
-| 显示列   | `GET /api/ebuilder/form/list/getListFields/{tableId}`               | `data.pc`、`data.mobile` 等 |
-| 排序     | `GET /api/ebuilder/form/viewlist/getViewOrder`                      | `data[]`                    |
-| 搜索     | `GET /api/ebuilder/form/listFilter/getSearchFilters/{tableId}`      | `data`                      |
-| 统计     | `GET /api/ebuilder/form/listStatistics/getStatisticsList/{tableId}` | `data`                      |
-| 条件     | `GET /api/ebuilder/form/plugin/conditionEditor/getById`             | `data.rootdata`             |
+| 分类     | 接口                                                                   | 有效数据                    |
+| -------- | ---------------------------------------------------------------------- | --------------------------- |
+| 基础设置 | `GET /api/bs/ebuilder/form/list/getBaseInfo/{tableId}`                 | `data`                      |
+| 显示列   | `GET /api/bs/ebuilder/form/list/getListFields/{tableId}`               | `data.pc`、`data.mobile` 等 |
+| 排序     | `GET /api/ebuilder/form/viewlist/getViewOrder`                         | `data[]`                    |
+| 搜索     | `GET /api/bs/ebuilder/form/listFilter/getSearchFilters/{tableId}`      | `data`                      |
+| 统计     | `GET /api/bs/ebuilder/form/listStatistics/getStatisticsList/{tableId}` | `data`                      |
+| 条件     | `GET /api/bs/ebuilder/form/plugin/conditionEditor/getById`             | `data.rootdata`             |
 
 配置接口的公共参数为 `apid={appId}`、`tpaid={tableId}`、`objId={objId}`。显示列还传 `clientType=PC`；显示列、排序、搜索、统计传 `isVirtualForm=false`；排序传 `viewType=tableView&viewId={tableId}`；搜索传 `viewType=tableView`；条件传 `id={conditionId}&type=search`。
 
@@ -376,6 +376,8 @@ POST /api/ebuilder/form/list/listInit
 - `config.conditions.configured=true`：`rootData` 是解析后的条件树。
 - `config.conditions.configured=false`：未配置固定条件，即使 `conditionId` 本身非空也不要误判。
 
+条件接口明确成功但没有 `data`，或 `data=null`，也按未配置条件处理。只有此接口允许成功响应缺少 `data`；权限或业务失败不能当作空条件。
+
 条件树保留服务端节点、逻辑关系、比较符和值，不擅自改写为搜索配置。
 
 # 验收与交付

package/docs/PROTOCOL.md

@@ -1,4 +1,4 @@
-# Contract v5 — e10-ebuilder-prototype 0.5.0
+# Contract v5 — e10-ebuilder-prototype 0.5.2
 
 Product, npm package, CLI and Skill share this name. Node >=22.5, TypeScript/ESM,
 pinned playwright-core and installed Chrome. No LLM calls in CLI: host AI generates
@@ -63,9 +63,28 @@ Collection uses E10Client with in-memory auth, same-origin requests, redirects d
 30s request deadlines and integer-safe JSON parsing. Form API independent deployment
 rewrites only /api/ebuilder{appId}/form routes. Common metadata and file routes retain
 original prefixes. Menu jobs use bounded concurrency and shared per-object metadata.
+If the isIndependentDeploy request fails (transport, HTTP, or API-response failure),
+default to non-independent deployment and record a fixed warning in affected inputs
+and receipts. This fallback applies only to that detection request, including an
+auth-related failure of the probe; subsequent authentication failures still abort
+collection. Successful boolean responses retain their routing; non-boolean data
+still fails validation. No fallback converts failed downstream collection to success.
 
 Traditional lists collect listInit, base info, columns, order, search, statistics,
 conditions where configured and list buttons. NList retains the exact component config.
+The five traditional-list configuration APIs (list/getBaseInfo, list/getListFields,
+listFilter/getSearchFilters, listStatistics/getStatisticsList, plugin/conditionEditor/getById)
+always use /api/bs/ebuilder/form and include lowercase appid=appId in addition to their
+existing query parameters. These fixed backend paths do not use independent-deployment
+rewriting or try the non-bs counterparts. They require application backend permissions.
+listInit, order, list buttons and other form APIs retain their existing routing.
+Traditional-list conditions retain conditionId and raw data, parse rootdata/rootData into
+rootData with integer-safe IDs, and expose configured=false for absent or empty conditions.
+Only the condition API may omit data in an explicitly successful response (code 0/200);
+authentication, HTTP, malformed JSON and unsuccessful envelopes remain errors. All other
+configuration responses still require data. Successful missing/null conditions normalize
+to configured=false, rootData={}, raw={}.
+This is the normalized condition structure required by the bundled generation guide.
 Fields preserve IDs, main/detail grouping, config and system/custom classification;
 select/radio/checkbox/cascader options are collected. Cascaders with only first-level
 options carry a warning. Unknown/malformed primary configs fail that menu.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "e10-ebuilder-prototype",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Generate offline E10 application prototypes from published page, modeling-list and workflow menus",
   "type": "module",
   "license": "UNLICENSED",