Merge branch 'master' into lanyi-expanded-agent-paper-main

1 files changed, 2 insertions, 4 deletions

diff --git a/src/fields/ObjectField.ts b/src/fields/ObjectField.ts
index c533cb596..1e1dbcd62 100644
--- a/src/fields/ObjectField.ts
+++ b/src/fields/ObjectField.ts
@@ -3,10 +3,10 @@ import { Copy, FieldChanged, Parent, ToJavascriptString, ToScriptString, ToStrin
 import { RefField } from './RefField';
 
 export type serializedFieldType = { fieldId: string; heading?: string; __type: string };
-export type serializedFieldsType = { [key: string]: { fields: serializedFieldType[] } };
+export type serializedFieldsType = { [key: string]: { fields: serializedFieldType[] } | string };
 export interface serializedDoctype {
     readonly id: string;
-    readonly fields?: serializedFieldsType;
+    readonly fields?: serializedFieldsType | serializedFieldType;
 }
 
 export type serverOpType = {
@@ -18,12 +18,10 @@ export type serverOpType = {
 export abstract class ObjectField {
     // prettier-ignore
     public [FieldChanged]?: (diff?: { op: '$addToSet' | '$remFromSet' | '$set'; 
-                             // eslint-disable-next-line no-use-before-define
                              items: FieldType[] | undefined; 
                              length: number | undefined; 
                              hint?: { deleteCount: number, start: number} }, 
                              serverOp?: serverOpType) => void;
-    // eslint-disable-next-line no-use-before-define
     public [Parent]?: RefField | ObjectField;
     abstract [Copy](): ObjectField;