@baishuyun/chat-sdk 0.0.16 → 0.0.17

package/src/lib/parse-design-doc.ts

@@ -0,0 +1,60 @@
+interface FormParseResult {
+  formInfo: string;
+  fieldsListInfo: string;
+  designDescInfo: string;
+}
+
+/**
+ * 动态解析表单设计 Markdown，支持不完整文本
+ * 可处理以下不完整场景：
+ * 1. 仅包含表单基本信息（无字段清单标记）
+ * 2. 包含表单信息+部分字段（无设计说明）
+ * 3. 字段列表未完结（正在输入中）
+ * 4. 缺少结尾确认标记
+ */
+export function parseFormMarkdownDynamic(markdown: string): FormParseResult {
+  const text = markdown.trim();
+
+  // 定位关键标记位置（使用正则匹配中文冒号或英文冒号）
+  const fieldsMatch = text.match(/字段清单[：:]\s*/);
+  const designMatch = text.match(/设计说明[：:]\s*/);
+  const confirmMatch = text.match(/【确认搭建[：:][^】]*】\s*$/);
+
+  const fieldsIndex = fieldsMatch ? fieldsMatch.index! : -1;
+  const designIndex = designMatch ? designMatch.index! : -1;
+  const confirmIndex = confirmMatch ? confirmMatch.index! : text.length; // 默认到结尾
+
+  let formInfo = '';
+  let fieldsListInfo = '';
+  let designDescInfo = '';
+
+  // 1. 提取 formInfo：开头到"字段清单"之前（如果没有字段清单则取全部）
+  if (fieldsIndex !== -1) {
+    formInfo = text.substring(0, fieldsIndex);
+  } else {
+    formInfo = text; // 不完整场景：还没有输入字段清单
+  }
+  // 清理开头可能的标记文本
+  formInfo = formInfo.replace(/^待搭建表单信息\s*/, '').trim();
+
+  // 2. 提取 fieldsListInfo：字段清单标记后到设计说明之前（或结尾）
+  if (fieldsIndex !== -1) {
+    const start = fieldsIndex + fieldsMatch![0].length;
+    // 结束位置：如果有设计说明则从设计说明前结束，否则到确认标记前或文本结尾
+    const end = designIndex !== -1 ? designIndex : confirmMatch ? confirmIndex : text.length;
+    fieldsListInfo = text.substring(start, end).trim();
+  }
+
+  // 3. 提取 designDescInfo：设计说明标记后到确认标记前（或结尾）
+  if (designIndex !== -1) {
+    const start = designIndex + designMatch![0].length;
+    const end = confirmMatch ? confirmIndex : text.length;
+    designDescInfo = text.substring(start, end).trim();
+  }
+
+  return {
+    formInfo,
+    fieldsListInfo,
+    designDescInfo,
+  };
+}

package/src/lib/utils.ts

@@ -3,6 +3,7 @@ import { twMerge } from 'tailwind-merge';
 import { UIDataTypes, UIMessagePart, UITools } from 'ai';
 import { Field } from '@/plugins/form-builder-base-plugin/types';
 import { IQueryResult } from '@baishuyun/types';
+import { FORM_ICON_OPTIONS } from '@/const/ui';
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
@@ -307,3 +308,21 @@ export const mergeFileParts = (parts: Array<UIMessagePart<UIDataTypes, UITools>>
     2
   );
 };
+
+export const getIconValue = (iconCode?: string): number => {
+  if (!iconCode) {
+    return 33;
+  }
+
+  const options = FORM_ICON_OPTIONS;
+  const option = options.find((opt) => opt.code === iconCode);
+
+  return option ? option.value : 33;
+};
+
+export const getIconOption = (iconValue?: number) => {
+  const options = FORM_ICON_OPTIONS;
+  const option = options.find((opt) => opt.value === iconValue);
+
+  return option || options[8];
+};

package/src/plugins/form-builder-base-plugin/const.ts

@@ -19,6 +19,9 @@ export const EVENTS: Record<string, FormBuilderEventKey> = {
   // 字段被生成
   FIELD_CREATED: 'form-builder-FieldCreated',
 
+  // 字段被清空
+  FIELDS_CLEARED: 'form-builder-FieldsCleared',
+
   // fields created finish
   FIELDS_CREATED_FINISH: 'form-builder-FieldsCreatedFinish',
 

package/src/plugins/form-builder-plugin/components/create-form-confirm.tsx

@@ -8,10 +8,14 @@ import { useEvt } from '@/hooks/use-evt';
 import { parseFormDesignInfo } from '../utils';
 import { useEvtBus } from '@/hooks/use-evt-bus';
 import { PrimaryConfirmBtn } from '@/components/bs-ui/primary-confirm-btn';
-import FormInfoEditor, { FORM_ICON_OPTIONS } from '@/components/bs-ui/form-info-editor';
+import FormInfoEditor from '@/components/bs-ui/form-info-editor';
+import { FORM_ICON_OPTIONS } from '@/const/ui';
 import { FakeBotMessage } from '@/components/biz-comp/FakeBotMsg';
 import { GenerateAnimation } from '@/components/bs-ui/generate-animation';
 import { WarningMessage } from '@/components/bs-ui/warning-msg';
+import { usePluginCtx } from '@/hooks/use-plugin-ctx';
+import { FormInfo, McpFormBuilderPluginCtx } from '../types';
+import { getIconOption } from '@/lib/utils';
 
 export const CreateFormConfirm = memo(
   ({
@@ -23,6 +27,7 @@ export const CreateFormConfirm = memo(
     designDoc: string;
   }) => {
     const plugin = usePlugin(MCP_PLUGIN_NAME) as FormBuilderPlugin;
+    const ctx = usePluginCtx<McpFormBuilderPluginCtx, FormBuilderPlugin>(MCP_PLUGIN_NAME);
 
     const [confirm, setConfirm] = useState(false);
 
@@ -60,12 +65,17 @@ export const CreateFormConfirm = memo(
       <GenerateAnimation>创建中</GenerateAnimation>
     );
 
+    console.log('current working form', plugin?.getCurrentWorkingForm());
+
     const afterConfirm = (
       <FakeBotMessage>
         {success ? (
           <>
             <span className="text-[#4d609f]">已为你创建{designInfo.formName}</span>
             <FormInfoEditor
+              selectedIcon={getIconOption(
+                plugin.getCurrentWorkingForm()?.iconValue ?? ctx?.pickedIconValue
+              )}
               onConfirm={(name, icon) => {
                 if (!formRef.current) {
                   return;
@@ -134,6 +144,9 @@ export const CreateFormConfirm = memo(
             setConfirm(true);
           }}
         />
+        {confirm
+          ? null
+          : `如果您希望“${designInfo.formName}”更具体地应用于某个行业（如教育、金融）、某种视图类型（如仪表盘视图、报表视图）或特定的权限管理策略，请补充说明，我可以帮您进一步细化字段设计和关联管理。`}
         {confirm ? afterConfirm : null}
       </>
     );

package/src/plugins/form-builder-plugin/components/design-info.tsx

@@ -0,0 +1,47 @@
+import { MemoizedMarkdown } from '@/components/biz-comp/markdown';
+import { MessageContent } from '@/components/biz-comp/message-content';
+import { AnalysisIcon } from '@/components/bs-ui/bs-icons';
+import { CollapsibleTxtMsg } from '@/components/bs-ui/collapsible-txt-msg';
+import { cn, sanitizeText } from '@/lib/utils';
+import { parseRawFormText } from '../utils';
+import { FieldsDesignInfoTable } from '@/components/bs-ui/fields-design-info-table';
+import { parseFormMarkdownDynamic } from '@/lib/parse-design-doc';
+
+export const DesignInfo = ({
+  designMarkdown,
+  id,
+  children,
+}: {
+  designMarkdown: string;
+  id: string;
+  children?: React.ReactNode;
+}) => {
+  if (!designMarkdown) {
+    return null;
+  }
+
+  const parsed = parseFormMarkdownDynamic(designMarkdown);
+  const fields = parseRawFormText(parsed.fieldsListInfo);
+
+  return (
+    <MessageContent
+      className={cn('text-[14px]', {
+        // "w-fit wrap-break-words rounded-2 px-3 py-2 text-right text-white":
+        //   role === "user",
+        'bg-transparent px-0 py-0 text-left': true,
+      })}
+      data-testid="message-content"
+    >
+      <CollapsibleTxtMsg title={'表单设计'} icon={<AnalysisIcon />} defaultOpen>
+        <article className="prose" style={{ fontSize: 14 }}>
+          <MemoizedMarkdown id={id + 'pre'} content={sanitizeText(parsed.formInfo)} />
+        </article>
+        {fields.length ? <FieldsDesignInfoTable fields={fields} /> : null}
+        <article className="prose" style={{ fontSize: 14 }}>
+          <MemoizedMarkdown id={id + 'suff'} content={sanitizeText(parsed.designDescInfo)} />
+        </article>
+      </CollapsibleTxtMsg>
+      {children}
+    </MessageContent>
+  );
+};

package/src/plugins/form-builder-plugin/components/entry-btn.tsx

@@ -5,8 +5,16 @@ import { usePlugin } from '@/hooks/use-plugin';
 import { EntryButtonProps } from '@baishuyun/types';
 import { FormBuilderPlugin } from '..';
 import { MCP_PLUGIN_NAME } from '../const';
-export const EntryButton = ({ style, chatVisible, onClick, variant, client }: EntryButtonProps) => {
+export const EntryButton = ({
+  style,
+  chatStatus,
+  chatVisible,
+  onClick,
+  variant,
+  client,
+}: EntryButtonProps) => {
   const p = usePlugin<FormBuilderPlugin>(MCP_PLUGIN_NAME);
+  const minimal = chatStatus === 'dock';
 
   if (variant === 'build-fields') {
     return (
@@ -37,7 +45,7 @@ export const EntryButton = ({ style, chatVisible, onClick, variant, client }: En
   }
 
   return (
-    <PrimaryEntryBtn style={style} minimal={chatVisible} onClick={onClick}>
+    <PrimaryEntryBtn style={style} minimal={minimal} onClick={onClick}>
       AI表单搭建
     </PrimaryEntryBtn>
   );

package/src/plugins/form-builder-plugin/components/follow-up.tsx

@@ -1,15 +1,30 @@
-import LinearGradientBorderBtn from '@/components/bs-ui/linear-gradient-border-btn';
+import { BaseButton } from '@/components/bs-ui/base-button';
+import { FontIcon } from '@/components/bs-ui/font-icon';
 import { SuggestionCardProps } from '@baishuyun/types';
 
+const extractFontIconCodeFrom = (desc: string) => {
+  const match = desc.match(/&#x[a-fA-F0-9]+;/);
+  return match ? match[0] : '';
+};
+
 export const FollowUp = (props: SuggestionCardProps) => {
+  const code = extractFontIconCodeFrom(props.description);
+  const iconJsx = code ? <FontIcon code={code} className="text-[16px] text-[#999]" /> : null;
+  const descriptionWithoutIcon = code
+    ? props.description.replace(code, '').trim()
+    : props.description;
+
+  const titleWithoutIcon = code ? props.title.replace(code, '').trim() : props.title;
   return (
-    <LinearGradientBorderBtn
-      className="self-start"
+    <BaseButton
+      icon={iconJsx}
+      className="self-start w-full px-[10px]"
+      hoverTextCls="text-[#121111]"
       onClick={() => {
-        props.onSelect?.(props.title);
+        props.onSelect?.(titleWithoutIcon, code || '');
       }}
     >
-      {props.description}
-    </LinearGradientBorderBtn>
+      {descriptionWithoutIcon}
+    </BaseButton>
   );
 };

package/src/plugins/form-builder-plugin/components/msg-part.tsx

@@ -4,6 +4,7 @@ import { FollowUp } from './follow-up';
 
 import {
   GetFieldJsonInfo,
+  getIconValue,
   IsFieldsJsonPart,
   IsSuggesstionPart,
   NeedToAppendFieldsSaveConfirm,
@@ -17,13 +18,17 @@ import { MCP_PLUGIN_NAME } from '../const';
 import { FormBuilderPlugin } from '..';
 import { CreateFormConfirm } from './create-form-confirm';
 import { FakeBotMessage } from '@/components/biz-comp/FakeBotMsg';
-import { FieldCheckerListMsg } from '@/components/biz-comp/FieldCheckerListMsg';
+import {
+  FieldCheckerListMsg,
+  FieldCheckerListMsgRef,
+} from '@/components/biz-comp/FieldCheckerListMsg';
 import { PrimaryConfirmBtn } from '@/components/bs-ui/primary-confirm-btn';
 import { FieldIcon } from '../../../components/biz-comp/field-icon';
 import { CheckerIcon } from '@/components/bs-ui/bs-icons';
 import { usePluginCtx } from '@/hooks/use-plugin-ctx';
-import { FormBuilderContext } from '@baishuyun/agents/src/form-builder/types';
 import { McpFormBuilderPluginCtx } from '../types';
+import { DesignInfo } from './design-info';
+import { useRef } from 'react';
 
 export const McpMessagePart = (props: MsgPartCompProps) => {
   const { part: p, sendMessage, status } = props;
@@ -40,6 +45,8 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
 
   const plugin = usePlugin<FormBuilderPlugin>(MCP_PLUGIN_NAME);
 
+  const checkerRef = useRef<FieldCheckerListMsgRef>(null);
+
   const ctx = usePluginCtx<McpFormBuilderPluginCtx, FormBuilderPlugin>(MCP_PLUGIN_NAME);
 
   const fieldsParts = Array.isArray(part) && part.length ? part : isFieldsJson ? [part] : [];
@@ -60,6 +67,7 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
         },
         icon: <FieldIcon type={field.widget?.type} />,
         onChange: (check: boolean, field: any, parentFieldName?: string, index?: number) => {
+          console.log('field checked changed:', { check, field, parentFieldName, index });
           evtBus.emit('form-builder-FieldCheckedChanged', {
             field,
             checked: check,
@@ -79,6 +87,7 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
           {` 已生成${fieldPropsArray.length}个字段`}
         </div>
         <FieldCheckerListMsg
+          ref={checkerRef}
           fields={fieldPropsArray}
           streaming={status === 'streaming'}
           confirmed={fieldsConfirmed}
@@ -92,7 +101,6 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
                   'form-builder-FieldsConfirmed',
                   plugin?.getCurrentWorkingForm() as RealFormInfo
                 );
-
                 plugin.onAfterFieldsSave((processedInfo) => {
                   evtBus.emit('form-builder-FieldsConfirmed', processedInfo as RealFormInfo);
                 });
@@ -100,7 +108,8 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
             >
               {fieldsConfirmed ? (
                 <>
-                  <CheckerIcon className="text-[#0265ff]" /> 已保存
+                  <CheckerIcon className="text-[#0265ff]" /> 已保存{' '}
+                  {checkerRef.current?.getCheckedFieldsLength() ?? 0} 个字段
                 </>
               ) : (
                 '保存字段'
@@ -121,8 +130,15 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
       <FollowUp
         title={part.text}
         description={part.text}
-        onSelect={(title) => {
-          ctx?.workStage === 'design';
+        onSelect={(title, icon) => {
+          if (ctx) {
+            ctx.workStage === 'design';
+
+            console.log('follow up icon code', icon);
+            console.log('follow up icon value', getIconValue(icon));
+            ctx.pickedIconValue = getIconValue(icon);
+          }
+
           sendMessage(
             { text: title },
             {
@@ -148,11 +164,15 @@ export const McpMessagePart = (props: MsgPartCompProps) => {
     // TODO: 特殊文本解析在 node 端处理，前端只负责渲染
     part.text?.includes('【确认搭建');
 
-  return (
-    <MarkdownMsgpart {...props}>
+  const isDesignDoc = part.text?.startsWith('待搭建表单信息');
+
+  return isDesignDoc ? (
+    <DesignInfo designMarkdown={part.text} id={props.id}>
       {appendConfirmBtn ? (
         <CreateFormConfirm sendMessage={sendMessage} designDoc={part.text} />
       ) : null}
-    </MarkdownMsgpart>
+    </DesignInfo>
+  ) : (
+    <MarkdownMsgpart {...props}></MarkdownMsgpart>
   );
 };

package/src/plugins/form-builder-plugin/components/opening-lines.tsx

@@ -1,18 +1,23 @@
 import { Suggestions } from '@/components/biz-comp/suggestions';
-// import { usePluginCtx } from '@/hooks/use-plugin-ctx';
-// import { FormBuilderContext } from '@baishuyun/agents';
+import { usePluginCtx } from '@/hooks/use-plugin-ctx';
 import { OpeningLinesProps } from '@baishuyun/types';
-// import { FormBuilderPlugin } from '..';
-// import { MCP_PLUGIN_NAME } from '../const';
+import { FormBuilderPlugin } from '..';
+import { MCP_PLUGIN_NAME } from '../const';
+import { McpFormBuilderPluginCtx } from '../types';
+import { getIconValue } from '@/lib/utils';
 
 export const FormBuilderOpeningLines = ({ sendMessage, setMessages }: OpeningLinesProps) => {
-  //   const ctx = usePluginCtx<FormBuilderContext, FormBuilderPlugin>(MCP_PLUGIN_NAME);
+  const ctx = usePluginCtx<McpFormBuilderPluginCtx, FormBuilderPlugin>(MCP_PLUGIN_NAME);
 
   return (
     <>
       👋 你好，你想创建什么表单呢，不知道的话，可以试试下面的建议~
       <Suggestions
-        onSelect={(title) => {
+        onSelect={(title, iconCode) => {
+          if (ctx) {
+            ctx.pickedIconValue = getIconValue(iconCode);
+          }
+
           sendMessage(
             {
               text: title,

package/src/plugins/form-builder-plugin/index.ts

@@ -1,5 +1,6 @@
 import {
   FieldType,
+  IChatSDK,
   MsgPartCompProps,
   PluginCustomComponent,
   PluginHooks,
@@ -30,6 +31,12 @@ type part = ValueOf<Pick<MsgPartCompProps, 'part'>>;
 export class FormBuilderPlugin extends FormBuilderBasePlugin<McpFormBuilderPluginCtx> {
   public pluginName: string = MCP_PLUGIN_NAME;
 
+  public init?: ((sdk: IChatSDK) => void) | undefined = (sdk: IChatSDK) => {
+    this._chatInstance = sdk;
+  };
+
+  private _chatInstance: IChatSDK | null = null;
+
   private currentWorkingFormName: string = '';
 
   public customComponents?: Partial<PluginCustomComponent> | undefined = {
@@ -38,11 +45,54 @@ export class FormBuilderPlugin extends FormBuilderBasePlugin<McpFormBuilderPlugi
     OpeningLines: FormBuilderOpeningLines,
   };
 
+  // clear cwf(current working form) when workStage is build, which means rebuild fields from scratch.
+  //   1. clear fields.
+  //   2. clear fieldMap.
+  //   3. rebuild linkInfo based on rebuild fields?
+  private clearCurrentWorkingForm = () => {
+    if (this.Context.workStage !== 'build') {
+      // 仅在搭建阶段清空当前表单信息
+      return;
+    }
+
+    const cwf = this.getCurrentWorkingForm();
+    if (!cwf) {
+      return;
+    }
+
+    // 清空当前表单字段信息
+    cwf.fields = [];
+    cwf.fieldMap.clear();
+
+    // TODO: 清空当前表单关联信息
+    // cwf.designInfo.linkInfoMap.clear();
+
+    // 触发字段清空事件，通知更新状态
+    const evtBus = this._chatInstance?.eventBus;
+    if (evtBus) {
+      evtBus.emit<'form-builder-FieldsCleared'>(EVENTS.FIELDS_CLEARED, {});
+    }
+  };
+
   public lifecycleHooks?: Partial<PluginHooks> | undefined = {
+    onBeforeMessagesClear: (conversationId) => {
+      const req = async () => {
+        await fetch(`https://agent.online-office.net/web/api/form/conversation/clear`, {
+          method: 'POST',
+          body: JSON.stringify({ conversationId }),
+        });
+      };
+
+      req();
+
+      this.Context.workStage = 'design';
+    },
     onBeforeMessagePartsRender(parts: Array<part>) {
       return mergeConsecutiveTargets<part>(parts, IsFieldsJsonPart) as part[];
     },
     onBeforeMessageSend: ({ text }) => {
+      this.clearCurrentWorkingForm();
+
       return {
         text,
         options: {
@@ -60,6 +110,15 @@ export class FormBuilderPlugin extends FormBuilderBasePlugin<McpFormBuilderPlugi
       return {
         appendLoadingIndicator: true,
         placeholder: '描述你的需求，如：搭建一张供应商管理表',
+        acceptAttachmentFileType: [
+          '.csv',
+          'text/csv',
+          'text/plain',
+          '.txt',
+          'image/*',
+          '.xls',
+          '.xlsx',
+        ],
       };
     },
   };
@@ -153,7 +212,7 @@ export class FormBuilderPlugin extends FormBuilderBasePlugin<McpFormBuilderPlugi
   };
 
   // 记录表单设计信息
-  public onBeforeFormCreate(designInfo: DesignInfo) {
+  public onBeforeFormCreate = (designInfo: DesignInfo) => {
     const formName = designInfo.formName || 'Unnamed Form';
 
     console.log('表单设计信息提取完毕，结构化数据如下：', designInfo);
@@ -163,16 +222,17 @@ export class FormBuilderPlugin extends FormBuilderBasePlugin<McpFormBuilderPlugi
       this.Context.formMap.set(formName, {
         designInfo,
         fields: [],
+        iconValue: this.getPickedIconValue(),
         fieldMap: new Map(),
         formName,
       });
     }
 
     this.currentWorkingFormName = formName;
-  }
+  };
 
   // handleFormCreate
-  public onFormCreate(formInfo: RealFormInfo) {
+  public onFormCreate = (formInfo: RealFormInfo) => {
     // 更新表单信息
     const existingFormInfo = this.Context.formMap.get(formInfo.formName!);
 
@@ -184,11 +244,19 @@ export class FormBuilderPlugin extends FormBuilderBasePlugin<McpFormBuilderPlugi
     existingFormInfo.formId = formInfo.formId;
     existingFormInfo.appId = formInfo.appId;
 
+    this.resetPickedIconValue();
+
     // 进入搭建阶段
     this.Context.workStage = 'build';
+  };
 
-    // this.onAfterFieldsSave(() => {});
-  }
+  public getPickedIconValue = () => {
+    return this.Context.pickedIconValue;
+  };
+
+  public resetPickedIconValue = () => {
+    this.Context.pickedIconValue = 33;
+  };
 
   public onAfterFieldsSave(onFormProcessed: (processedForm: FormInfo) => void) {
     // 取当前正在处理的表单 current working form

package/src/plugins/form-builder-plugin/types.ts

@@ -8,6 +8,7 @@ export type Field = ValueOf<Pick<ToolUIPart<FieldsTools>, 'output'>>;
 export interface FormInfo {
   appId?: string;
   formId?: string;
+  iconValue?: number;
   formName?: string;
   fields: Field[];
 
@@ -20,4 +21,6 @@ export interface McpFormBuilderPluginCtx {
   formMap: Map<string, FormInfo>; // Keyed by formId
 
   workStage: FormBuilderWorkStage;
+
+  pickedIconValue?: number;
 }

package/src/plugins/form-builder-plugin/utils/index.ts

@@ -1,6 +1,6 @@
 import { extractFormName } from '@/lib/utils';
 import { Field, FormInfo } from '../types';
-import { FieldType } from '@baishuyun/types';
+import { FieldType, IFieldDesignInfo } from '@baishuyun/types';
 import { DEFAULT_DATA_LOAD_CONF } from '../const';
 
 export interface FormField {
@@ -55,14 +55,29 @@ function extraFormNameFromFieldDesc(desc?: string) {
   return '';
 }
 
-function parseRawFormText(rawText: string): FormField[] {
+export const parseDesc = (desc: string) => {
+  const splitDesc = desc.split('-');
+  if (splitDesc.length > 1) {
+    return {
+      isSubForm: splitDesc[0].trim().toLowerCase() === '子表单',
+      formName: splitDesc[1].trim(),
+    };
+  }
+
+  return {
+    isSubForm: false,
+    formName: '',
+  };
+};
+
+export function parseRawFormText(rawText: string): IFieldDesignInfo[] {
   // 按行分割原始文本
   const lines = rawText.split('\n').filter((line) => line.trim());
-  const fields: FormField[] = [];
+  const fields: IFieldDesignInfo[] = [];
 
   lines.forEach((line) => {
     // 分割字段名和属性（如：合同编号 | 类型：流水号 | 必填：是 | 说明：xxx）
-    const [fieldName, typePart, requiredPart, descPart, relationPart = ''] = line
+    let [fieldName, typePart, requiredPart, descPart, relationPart = ''] = line
       .split('|')
       .map((item) => item.trim());
 
@@ -86,19 +101,31 @@ function parseRawFormText(rawText: string): FormField[] {
     // 关系：（关联来源:供应商信息管理表，关联字段:供应商ID、供应商名称、联系人、联系方式）
     const relationDesc = getMatchResult(relationPart, /关系：(.+)/);
 
+    // 名称清理，去掉可能的序号（如"1. 合同编号" -> "合同编号"）
+    fieldName = fieldName.replace(/^\d+\.\s*/, '');
+
+    const parsedDesc = parseDesc(description);
+
+    const splitFieldName = fieldName.split('-');
+    const isFieldInSubForm = splitFieldName.length > 1 || parsedDesc.isSubForm;
+    const parentFormName = isFieldInSubForm ? splitFieldName[0] || parsedDesc.formName : undefined;
+
     fields.push({
-      fieldName,
+      fieldName: isFieldInSubForm ? splitFieldName[splitFieldName.length - 1] : fieldName,
       type,
       required,
       description,
       relationDesc,
+      isSubForm: type === '子表单' || parsedDesc.isSubForm,
+      isFieldInSubForm,
+      parentFormName,
     });
   });
 
   return fields;
 }
 
-function extractLinkInfo(fields: FormField[]): Map<string, LinkInfo> {
+function extractLinkInfo(fields: IFieldDesignInfo[]): Map<string, LinkInfo> {
   // 存储提取结果
   const linkInfoMap: Map<string, LinkInfo> = new Map();