weaver-e10-builder 1.5.13 → 1.5.14

package/dist/services/form-code.js

@@ -0,0 +1,370 @@
+import { createRequire } from 'node:module';
+import { lzwCompress, lzwDecompress } from '../core/lzw.js';
+import { losslessReviver } from '../core/client.js';
+const require = createRequire(import.meta.url);
+const { compileJsE10 } = require('../../ecodecmd/src/lib/exec.js');
+export function decodeLayoutCode(encoded) {
+    if (!encoded)
+        return { js: { content: '', compiledContent: '' }, css: { content: '', compiledContent: '' } };
+    const value = JSON.parse(decodeURIComponent(encoded), losslessReviver);
+    return {
+        js: { content: '', compiledContent: '', ...(value.js || {}) },
+        css: { content: '', compiledContent: '', ...(value.css || {}) },
+    };
+}
+export function decodeFormEcode(encoded) {
+    if (!encoded)
+        return decodeLayoutCode(undefined);
+    const value = JSON.parse(lzwDecompress(encoded), losslessReviver);
+    return {
+        js: { content: '', compiledContent: '', ...(value.js || {}) },
+        css: { content: '', compiledContent: '', ...(value.css || {}) },
+    };
+}
+function transpile(source) {
+    if (!source.trim())
+        return '';
+    const result = compileJsE10(source, 'index.js');
+    if (result === false)
+        throw new Error('JavaScript 编译失败，未保存配置');
+    return result;
+}
+/**
+ * 布局源码的 `compiledContent` 与设计器保存的产物同构：
+ * 外壳（jsonp 导出 + load(pageId) + ebSdk/pageSdk/formSdk）和用户源码一起交给 Babel，
+ * 而不是先编译用户代码再手工套壳 —— 后者会留下 `try/catch`、额外 `"use strict"`
+ * 以及未转译的可选链，和设计器写出的代码不一致。
+ *
+ * 对照样本：设计器保存 `saveFormAndLayout` 时 formLayout.pageLayoutEncodes 内
+ * `sourceCode.ecode` 的 `js.compiledContent`。
+ */
+function compileLayoutJs(source) {
+    const compiled = transpile(`(function () {
+  "use strict";
+  window.weappEcodesdk.jsonp.export("\${appId}", "index.js", function () {
+    var exports = {};
+    var require = window.weappEcodesdk.jsonp.require.bind(null, "\${appId}", "index.js");
+
+    Object.defineProperty(exports, "__esModule", { value: true });
+
+    exports.load = void 0;
+
+    var load = function(pageId) {
+      var ebSdk = window.ebuilderSDK; //全局SDK
+      var pageSdk = window.ebuilderSDK?.getPageSDK?.(pageId); //当前页面SDK
+
+      var formSdk = arguments[0];
+${source}
+    };
+
+    exports.load = load;
+
+    return exports;
+  })
+})();`);
+    // Babel 会在 IIFE 外补一条 "use strict"；设计器产物里只有外壳内部那一条。
+    // 同时去掉 Babel 的函数名推断（function load），保持与设计器一致的外壳形态。
+    return compiled
+        .replace(/^"use strict";\s*/, '')
+        .replace('var load = function load(pageId)', 'var load = function(pageId)');
+}
+function wrapJs(source, layer) {
+    if (!source.trim())
+        return '';
+    if (layer === 'layout')
+        return compileLayoutJs(source);
+    // 表单级 ecode 仍沿用原有外壳（本次抓包只覆盖布局源码，不做无依据改动）。
+    const body = transpile(source);
+    return `(function () {\n  "use strict";\n  window.weappEcodesdk.jsonp.export("\${appId}", "index.js", function () {\n    var exports = {};\n    var require = window.weappEcodesdk.jsonp.require.bind(null, "\${appId}", "index.js");\n    Object.defineProperty(exports, "__esModule", { value: true });\n    exports.load = void 0;\n    var load = function(formSdk) {\n      try {\n${body}\n      } catch(e) {\n        window.weappUtils?.handleEcodeErrorData?.(e);\n        console?.error?.(e);\n      }\n    };\n    exports.load = load;\n    return exports;\n  });\n})();`;
+}
+/**
+ * CSS 里需要继续作用域到子规则的 at-rule。
+ * 其余 at-rule（@keyframes/@font-face/@import…）整块原样保留，不能把 at-rule 前导当成选择器。
+ */
+const NESTED_AT_RULES = new Set(['media', 'supports', 'container', 'layer', 'document', 'scope', 'starting-style']);
+/** 跳过块注释，返回注释后的下标；未闭合则到结尾。 */
+function skipComment(source, start) {
+    const end = source.indexOf('*/', start + 2);
+    return end < 0 ? source.length : end + 2;
+}
+/** 跳过引号字符串（含转义），返回字符串后的下标；未闭合则到结尾。 */
+function skipString(source, start) {
+    const quote = source[start];
+    let i = start + 1;
+    while (i < source.length) {
+        if (source[i] === '\\') {
+            i += 2;
+            continue;
+        }
+        if (source[i] === quote)
+            return i + 1;
+        i += 1;
+    }
+    return source.length;
+}
+/** 找规则前导的结束位置：顶层 `{`（块）或 `;`（at-rule 语句）。 */
+function scanPreludeEnd(source, start) {
+    let i = start;
+    let paren = 0;
+    let bracket = 0;
+    while (i < source.length) {
+        const c = source[i];
+        if (c === '/' && source[i + 1] === '*') {
+            i = skipComment(source, i);
+            continue;
+        }
+        if (c === '"' || c === "'") {
+            i = skipString(source, i);
+            continue;
+        }
+        if (c === '(')
+            paren += 1;
+        else if (c === ')')
+            paren = Math.max(0, paren - 1);
+        else if (c === '[')
+            bracket += 1;
+        else if (c === ']')
+            bracket = Math.max(0, bracket - 1);
+        else if (c === '{' && paren === 0 && bracket === 0)
+            return { end: i, kind: 'block' };
+        else if (c === ';' && paren === 0 && bracket === 0)
+            return { end: i, kind: 'semicolon' };
+        i += 1;
+    }
+    return { end: source.length, kind: 'eof' };
+}
+/** 从 `{` 开始找配对的 `}`，跳过注释、字符串和嵌套块。 */
+function findMatchingBrace(source, open) {
+    let i = open + 1;
+    let depth = 1;
+    while (i < source.length) {
+        const c = source[i];
+        if (c === '/' && source[i + 1] === '*') {
+            i = skipComment(source, i);
+            continue;
+        }
+        if (c === '"' || c === "'") {
+            i = skipString(source, i);
+            continue;
+        }
+        if (c === '{')
+            depth += 1;
+        else if (c === '}') {
+            depth -= 1;
+            if (depth === 0)
+                return i;
+        }
+        i += 1;
+    }
+    return -1;
+}
+/** 按顶层逗号拆选择器（跳过 `:is(...)`、属性选择器里的逗号）。 */
+function splitSelectors(selector) {
+    const parts = [];
+    let start = 0;
+    let paren = 0;
+    let bracket = 0;
+    for (let i = 0; i < selector.length; i += 1) {
+        const c = selector[i];
+        if (c === '/' && selector[i + 1] === '*') {
+            i = skipComment(selector, i) - 1;
+            continue;
+        }
+        if (c === '"' || c === "'") {
+            i = skipString(selector, i) - 1;
+            continue;
+        }
+        if (c === '(')
+            paren += 1;
+        else if (c === ')')
+            paren = Math.max(0, paren - 1);
+        else if (c === '[')
+            bracket += 1;
+        else if (c === ']')
+            bracket = Math.max(0, bracket - 1);
+        else if (c === ',' && paren === 0 && bracket === 0) {
+            parts.push(selector.slice(start, i));
+            start = i + 1;
+        }
+    }
+    parts.push(selector.slice(start));
+    return parts;
+}
+function applyRule(prelude, inner, prefix) {
+    const trimmed = prelude.trim();
+    if (!trimmed)
+        return `${prelude}{${inner}}`;
+    if (trimmed.startsWith('@')) {
+        const name = (trimmed.match(/^@([\w-]+)/)?.[1] || '').toLowerCase();
+        // 容器型 at-rule 递归作用域；keyframes/font-face/import 等整块保留。
+        return NESTED_AT_RULES.has(name)
+            ? `${prelude}{${scopeCssInternal(inner, prefix)}}`
+            : `${prelude}{${inner}}`;
+    }
+    const selectors = splitSelectors(prelude)
+        .map((part) => part.trim())
+        .filter(Boolean)
+        .map((part) => `${prefix} ${part}`)
+        .join(',');
+    return `${selectors}{${inner}}`;
+}
+/** 递归作用域实现；尾部空白由导出的 `scopeCss` 在最外层统一裁掉。 */
+function scopeCssInternal(source, prefix) {
+    if (!source.trim())
+        return '';
+    const out = [];
+    let i = 0;
+    while (i < source.length) {
+        const triviaStart = i;
+        // 规则之间的空白和注释原样保留。
+        while (i < source.length) {
+            if (source[i] === '/' && source[i + 1] === '*') {
+                i = skipComment(source, i);
+                continue;
+            }
+            if (/\s/.test(source[i])) {
+                i += 1;
+                continue;
+            }
+            break;
+        }
+        out.push(source.slice(triviaStart, i));
+        if (i >= source.length)
+            break;
+        const { end, kind } = scanPreludeEnd(source, i);
+        if (kind === 'eof') {
+            out.push(source.slice(i));
+            break;
+        }
+        if (kind === 'semicolon') {
+            out.push(source.slice(i, end + 1));
+            i = end + 1;
+            continue;
+        }
+        const close = findMatchingBrace(source, end);
+        if (close < 0) {
+            out.push(source.slice(i));
+            break;
+        }
+        out.push(applyRule(source.slice(i, end), source.slice(end + 1, close), prefix));
+        i = close + 1;
+    }
+    return out.join('');
+}
+/**
+ * 与表单源码编辑器一致：普通规则逐条加作用域前缀。
+ * 支持 @media/@supports 等容器 at-rule 递归处理，@keyframes 等整块保留；
+ * 注释、字符串和嵌套括号不会被误拆。
+ */
+export function scopeCss(source, prefix) {
+    // 只在最外层去掉尾部空白（设计器编译产物没有尾随换行）；
+    // 递归进 @media 时不能裁，否则会吃掉右花括号前的换行。
+    return scopeCssInternal(source, prefix).replace(/\s+$/, '');
+}
+export function updateCode(previous, change, layer, scopeId) {
+    if (layer === 'layout' && !scopeId)
+        throw new Error('布局源码缺少 pageId');
+    const next = {
+        js: { ...previous.js }, css: { ...previous.css },
+    };
+    if (change.js !== undefined) {
+        next.js.content = change.js;
+        next.js.compiledContent = wrapJs(change.js, layer);
+        if (layer === 'layout')
+            next.js.pageId = `if (${scopeId} == String(props.pageId))`;
+        next.js.name = 'index';
+        next.js.state = 'n';
+    }
+    if (change.css !== undefined) {
+        next.css.content = change.css;
+        next.css.compiledContent = scopeCss(change.css, layer === 'layout' ? `#ebpage_${scopeId}` : `#form_${scopeId}`);
+        next.css.name = 'index';
+        next.css.state = 'n';
+    }
+    return next;
+}
+/**
+ * 构造布局源码的保存报文。设计器真实入参是 pageLayoutEncodes/formStyleEncodes，
+ * 不是裸 pageLayouts/formStyle；后者会被服务端重新序列化并丢失 sourceCode 的附加字段。
+ */
+export function buildLayoutSaveRequest(snapshot, target, formId, layoutId) {
+    const pageLayouts = snapshot?.formLayout?.pageLayouts;
+    if (!Array.isArray(pageLayouts))
+        throw new Error('布局快照缺少 pageLayouts');
+    const formLayout = {
+        ...snapshot.formLayout,
+        formId,
+        pageLayoutEncodes: lzwCompress(JSON.stringify(pageLayouts)),
+        formStyleEncodes: lzwCompress(JSON.stringify(snapshot.formLayout.formStyle || {})),
+    };
+    delete formLayout.pageLayouts;
+    delete formLayout.formStyle;
+    return {
+        module: target,
+        customParam: target === 'workflow'
+            ? { workflowId: '-1', layoutMultiId: layoutId }
+            : { terminal: '', objId: formId },
+        designerParam: { onlyLayout: false, convert: false },
+        form: snapshot.form,
+        formLayout,
+    };
+}
+const normalizeText = (value) => String(value ?? '').replace(/\r\n?/g, '\n');
+/**
+ * 保存后的独立回读校验。设计器抓包确认服务端会原样保留 content/compiledContent/pageId，
+ * 所以按“发送值 vs 回读值”比较；换行差异归一化，其余差异视为失败。
+ */
+export function assertLayoutReadback(expected, readback, pageId, changed) {
+    if (changed.js) {
+        if (normalizeText(readback.js.content) !== normalizeText(expected.js.content)) {
+            throw new Error('保存后布局 JS 源码读回不一致');
+        }
+        if (readback.js.pageId !== `if (${pageId} == String(props.pageId))`) {
+            throw new Error('保存后布局 JS 生效条件读回不一致');
+        }
+        if (normalizeText(readback.js.compiledContent) !== normalizeText(expected.js.compiledContent)) {
+            throw new Error('保存后布局 JS 编译结果读回不一致');
+        }
+    }
+    if (changed.css) {
+        if (normalizeText(readback.css.content) !== normalizeText(expected.css.content)) {
+            throw new Error('保存后布局 CSS 源码读回不一致');
+        }
+        if (normalizeText(readback.css.compiledContent) !== normalizeText(expected.css.compiledContent)) {
+            throw new Error('保存后布局 CSS 编译结果读回不一致');
+        }
+    }
+}
+/**
+ * 设计器读取布局源码 ecode 的路径是 JSON.parse(decodeURI(ecode))。
+ * 写入前和回读后都按同一路径校验，避免 encodeURIComponent 等编码让
+ * 源码面板显示为空、预览失效。
+ */
+export function assertDesignerReadableLayoutCode(encoded) {
+    if (!encoded)
+        return;
+    let value;
+    try {
+        value = JSON.parse(decodeURI(encoded));
+    }
+    catch (error) {
+        throw new Error(`设计器无法解码布局源码：${error.message}`);
+    }
+    if (!value || typeof value !== 'object' || value.js == null || value.css == null) {
+        throw new Error('设计器无法解码布局源码：缺少 js/css 结构');
+    }
+}
+/**
+ * 布局源码 ecode 必须用 encodeURI，不能用 encodeURIComponent。
+ * 设计器读取时是 JSON.parse(decodeURI(ecode))；decodeURI 不会还原 `%3A`（冒号），
+ * 用 encodeURIComponent 写出的 `"js"%3A{...}` 会直接报
+ * `Expected ':' after property name in JSON`。
+ * encodeURI 保留冒号/逗号原样，decodeURI 和 decodeURIComponent 都能正确解析。
+ */
+export const encodeLayoutCode = (code) => {
+    const encoded = encodeURI(JSON.stringify(code));
+    assertDesignerReadableLayoutCode(encoded);
+    return encoded;
+};
+export const encodeFormEcode = (code) => lzwCompress(JSON.stringify(code));
+//# sourceMappingURL=form-code.js.map

package/dist/services/form-code.js.map

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

package/dist/services/form-create.d.ts

@@ -32,10 +32,16 @@ export interface InitialFieldDefinition {
     /** 多选：人员/部门/EBuilder/Browser 默认单选，multiple:true 改多选。
      *  Browser(RelateBrowser) 由 rich-types browserBuild 读 def.multiple 定 isSingle。 */
     multiple?: boolean;
+    /** 通用关联浏览：按浏览数据源名称精确检索，优先于 browserType。 */
+    browserName?: string;
+    browserType?: string | Record<string, unknown>;
+    browserFormSource?: string;
     /** 独占一行：该字段布局 singleRow:true（整行显示，其余字段仍两列）。
      *  对齐平台 layout config 的 singleRow 属性（明细表/落单字段/分组内字段本来就独占）。 */
     singleRow?: boolean;
     formFields?: InitialFieldDefinition[];
+    /** DetailTable 的描述（设计器里明细标题旁的说明）；**缺省为空**，不自动用明细名填充。 */
+    describe?: string;
     /** DetailTable 二级明细：关联同一主表下的另一张明细表及其字段。 */
     enableSubDetail?: boolean;
     defaultExpandRow?: boolean;
@@ -78,6 +84,20 @@ export declare function placeholderFromFormat(format: string): string;
  * 直接发给 initLayout 会被当作"隐藏且只读"而不生成列 → 明细表空。
  * 对齐浏览器 payload：子字段强制 可见 + 可编辑（保留 getConfig 原始 showOrder）。
  */
+/**
+ * 开关字段的固定默认选项：开启=1 / 关闭=0。
+ *
+ * 平台把 Switch 的取值语义放在 `options` 里（与 Select 同一套 `Option` 结构）；
+ * 不配时开关没有 1/0 映射，下游取值/条件容易对不上。所有创建入口都用这一份。
+ */
+export declare function defaultSwitchOptions(fieldId: string, selectionIds?: string[]): any[];
+/**
+ * 从 fields.json 的字段定义里收集**明细表内的 EBuilder 子字段**（带 `detailName` 标明属于哪张明细）。
+ *
+ * 明细子字段不在顶层 `fieldDefs` 里，建表时的 EBuilder 关联绑定如果只遍历顶层，
+ * 这些字段会建成 `isAddForRelation=false`、没有 `sformId`/`formName` 的裸关联字段。
+ */
+export declare function collectDetailEBuilderFields(defs: any[]): any[];
 export declare function normalizeDetailTableChildren(configs: any[]): any[];
 export declare function queryFormStorageSetting(client: FormCreateClient, baseUrl: string, appId: string): Promise<FormStorageSetting>;
 export declare function resolveCustomPhysicalTableName(requested: string, setting: FormStorageSetting): CustomPhysicalTableName;

package/dist/services/form-create.d.ts.map

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

package/dist/services/form-create.js

@@ -1,5 +1,7 @@
+import { randomUUID } from 'node:crypto';
 import { pinyinInitials, toSubTableName, resolveFieldKeys } from '../utils/column-name.js';
 import { getRichType, richIdUnits } from './rich-types.js';
+import { resolveBrowserByName } from './browser.js';
 // 路由切换（标准 bs / 专项 fs）。默认 bs —— 传 DEFAULT_EBUILDER_ROUTE 的调用方行为一字不变。
 import { ebuilderFormUrl, flattenFormList, DEFAULT_EBUILDER_ROUTE } from './special-route.js';
 import { FormSubDetailService } from './form-sub-detail.js';
@@ -23,6 +25,52 @@ export function placeholderFromFormat(format) {
  * 直接发给 initLayout 会被当作"隐藏且只读"而不生成列 → 明细表空。
  * 对齐浏览器 payload：子字段强制 可见 + 可编辑（保留 getConfig 原始 showOrder）。
  */
+/**
+ * 开关字段的固定默认选项：开启=1 / 关闭=0。
+ *
+ * 平台把 Switch 的取值语义放在 `options` 里（与 Select 同一套 `Option` 结构）；
+ * 不配时开关没有 1/0 映射，下游取值/条件容易对不上。所有创建入口都用这一份。
+ */
+export function defaultSwitchOptions(fieldId, selectionIds = []) {
+    return [
+        { name: '开启', valueKey: '1' },
+        { name: '关闭', valueKey: '0' },
+    ].map((o, i) => ({
+        other: false,
+        // `saveFormFieldNew` 不像批量建表那样替空 selectionId 发号，单字段入口要自己传。
+        selectionId: selectionIds[i] || '',
+        defOption: false,
+        styleConfig: {},
+        archive: false,
+        divisionBranch: false,
+        subCompanyCatalogues: [],
+        // 不带 dataCount：平台会据此触发「选项是否已被数据使用」的 uf_ 表校验，
+        // 新建字段时那条 SQL 会失败（缺租户 key），导致 options 保存不下去。
+        optionNum: '1000000',
+        score: '0',
+        uid: randomUUID(),
+        children: [],
+        name: o.name,
+        isLimit: false,
+        valueKey: o.valueKey,
+        componentKey: 'Option',
+        order: i,
+        fieldId,
+    }));
+}
+/**
+ * 从 fields.json 的字段定义里收集**明细表内的 EBuilder 子字段**（带 `detailName` 标明属于哪张明细）。
+ *
+ * 明细子字段不在顶层 `fieldDefs` 里，建表时的 EBuilder 关联绑定如果只遍历顶层，
+ * 这些字段会建成 `isAddForRelation=false`、没有 `sformId`/`formName` 的裸关联字段。
+ */
+export function collectDetailEBuilderFields(defs) {
+    return (defs || [])
+        .filter((d) => d?.componentKey === 'DetailTable')
+        .flatMap((dt) => (dt.formFields || [])
+        .filter((sf) => sf?.componentKey === 'EBuilder')
+        .map((sf) => ({ ...sf, detailName: dt.fieldName })));
+}
 export function normalizeDetailTableChildren(configs) {
     for (const c of configs) {
         if (String(c.type) === 'DetailTable' && Array.isArray(c.children)) {
@@ -299,11 +347,14 @@ export function toInitialFieldDefinitions(fieldDefs) {
         componentKey: f.componentKey, fieldName: f.fieldName,
         required: f.required, readOnly: f.readOnly, unique: f.unique,
         hidden: f.hidden, formFields: f.formFields,
+        // DetailTable 描述：不写时为空；写了才透传。
+        describe: f.describe,
         enableSubDetail: f.enableSubDetail, defaultExpandRow: f.defaultExpandRow,
         subDetailConfig: f.subDetailConfig,
         precision: f.precision, pointSize: f.pointSize,
         percent: f.percent, defaultValue: f.defaultValue,
         group: f.group, multiple: f.multiple,
+        browserName: f.browserName, browserType: f.browserType, browserFormSource: f.browserFormSource,
         singleRow: f.singleRow,
         // 文本最大长度（Text 缺省 100、TextArea 缺省 4000）+ 日期精度 format（Date/DateTime）需透传。
         maxLen: f.maxLen, format: f.format,
@@ -320,6 +371,14 @@ export function toInitialFieldDefinitions(fieldDefs) {
 export async function applyInitialFieldsToNewForm(client, baseUrl, appId, objId, formId, fieldDefs, opts = {}) {
     const log = opts.log ?? ((m) => console.error(m));
     const defs = toInitialFieldDefinitions(fieldDefs);
+    for (const def of defs) {
+        if (!def.browserName)
+            continue;
+        if (def.componentKey !== 'Browser' && def.componentKey !== 'RelateBrowser') {
+            throw new Error(`字段「${def.fieldName}」的 browserName 仅适用于 Browser/RelateBrowser`);
+        }
+        def.browserType = await resolveBrowserByName(client, baseUrl, def.browserName, { ebbusinessid: formId });
+    }
     const fieldResult = await addInitialFieldsToCustomPhysicalForm(client, baseUrl, appId, objId, formId, defs, opts.tenantKey ?? '', opts.layoutType, opts.systemOverrides ?? []);
     log(`  字段+布局已写入: ${defs.length} 个字段`);
     const detailTables = fieldResult.detailTables || [];
@@ -497,6 +556,12 @@ export async function addInitialFieldsToCustomPhysicalForm(client, baseUrl, appI
                 mode: 'region',
             });
         }
+        if (def.componentKey === 'Switch') {
+            Object.assign(baseField, {
+                switchType: 'switch', hasChild: false, childName: '',
+                options: defaultSwitchOptions(fieldId),
+            });
+        }
         mainFieldObjects.push(baseField);
     }
     // Date/DateTime 日期限制：minField 最早不得早于 / maxField 最晚不得晚于另一字段。
@@ -543,7 +608,8 @@ export async function addInitialFieldsToCustomPhysicalForm(client, baseUrl, appI
             id: subFormId,
             tableName: subTableName,
             name: dtDef.fieldName,
-            describe: dtDef.fieldName,
+            // 描述缺省为空：之前用明细名填充，设计器里每个明细都顶着一行和标题重复的说明。
+            describe: dtDef.describe ?? '',
             dataKey: subKeys.dataKey,
             ...(subKeys.explicitColumnName ? { columnName: subKeys.columnName } : {}),
             dataCount: 0,
@@ -600,6 +666,12 @@ export async function addInitialFieldsToCustomPhysicalForm(client, baseUrl, appI
                     dataKey: sfKeys.dataKey,
                     columnName: sfKeys.columnName,
                 };
+                if (sf.componentKey === 'Switch') {
+                    Object.assign(sfObj, {
+                        switchType: 'switch', hasChild: false, childName: '',
+                        options: defaultSwitchOptions(sfObj.fieldId),
+                    });
+                }
                 // Field-type-specific attributes (matching browser-observed payload)
                 if (sf.componentKey === 'Number') {
                     const sfDef = sf;