diff options
Diffstat (limited to 'src/fields')
| -rw-r--r-- | src/fields/Document.ts | 95 | ||||
| -rw-r--r-- | src/fields/Field.ts | 4 |
2 files changed, 79 insertions, 20 deletions
diff --git a/src/fields/Document.ts b/src/fields/Document.ts index ef759615b..0356959a5 100644 --- a/src/fields/Document.ts +++ b/src/fields/Document.ts @@ -1,30 +1,61 @@ -import { Field, Cast, Opt } from "./Field" +import { Field, Cast, Opt, Waiting, WAITING } from "./Field" import { Key, KeyStore } from "./Key" import { NumberField } from "./NumberField"; -import { ObservableMap, computed } from "mobx"; +import { ObservableMap, computed, action, observable } from "mobx"; import { TextField } from "./TextField"; import { ListField } from "./ListField"; export class Document extends Field { - private fields: ObservableMap<Key, Field> = new ObservableMap(); + private fields: ObservableMap<Key, Opt<Field>> = new ObservableMap(); + private _sfields: ObservableMap<Key, Field> = new ObservableMap(); static _untitledDocName = "<untitled>"; @computed public get Title() { return this.GetFieldValue(KeyStore.Title, TextField, Document._untitledDocName); } + @action + DeferredSetField(key: Key) { + var sfield = this._sfields.get(key); + if (sfield != undefined) + this.fields.set(key, sfield); + } + + @observable GetField(key: Key, ignoreProto: boolean = false): Opt<Field> { + if (KeyStore.X == key) { + console.log(""); + } let field: Opt<Field>; if (ignoreProto) { if (this.fields.has(key)) { + if (KeyStore.X == key) { + console.log(""); + } field = this.fields.get(key); + } else { + field = WAITING; + var me = this; + setTimeout(function () { + me.DeferredSetField(key); + }, 100) } } else { let doc: Opt<Document> = this; - while (doc && !(doc.fields.has(key))) { - doc = doc.GetPrototype(); + while (doc && doc != WAITING) { + if (!(doc.fields.has(key))) { + var me = this; + setTimeout(function () { + me.DeferredSetField(key); + }, 1000) + doc = doc.GetPrototype(); + } else + break; } - if (doc) { + if (doc && doc != WAITING) { + if (KeyStore.X == key) { + console.log(""); + } field = doc.fields.get(key); } } @@ -32,13 +63,19 @@ export class Document extends Field { return field; } + @observable GetFieldT<T extends Field = Field>(key: Key, ctor: { new(...args: any[]): T }, ignoreProto: boolean = false): Opt<T> { - return Cast(this.GetField(key, ignoreProto), ctor); + var getfield = this.GetField(key, ignoreProto); + if (getfield != WAITING) { + return Cast(this.GetField(key, ignoreProto), ctor); + } + return WAITING; } + @observable GetFieldOrCreate<T extends Field>(key: Key, ctor: { new(): T }, ignoreProto: boolean = false): T { const field = this.GetFieldT(key, ctor, ignoreProto); - if (field) { + if (field && field != WAITING) { return field; } const newField = new ctor(); @@ -46,26 +83,33 @@ export class Document extends Field { return newField; } + @observable GetFieldValue<T, U extends { Data: T }>(key: Key, ctor: { new(): U }, defaultVal: T): T { let val = this.GetField(key); let vval = (val && val instanceof ctor) ? val.Data : defaultVal; return vval; } + @observable GetNumberField(key: Key, defaultVal: number): number { return this.GetFieldValue(key, NumberField, defaultVal); } + @observable GetTextField(key: Key, defaultVal: string): string { return this.GetFieldValue(key, TextField, defaultVal); } + @observable GetListField<T extends Field>(key: Key, defaultVal: T[]): T[] { return this.GetFieldValue<T[], ListField<T>>(key, ListField, defaultVal) } SetField(key: Key, field: Field | undefined): void { if (field) { + if (KeyStore.X == key) { + console.log(""); + } this.fields.set(key, field); } else { this.fields.delete(key); @@ -73,18 +117,31 @@ export class Document extends Field { } SetFieldValue<T extends Field>(key: Key, value: any, ctor: { new(): T }): boolean { - let field = this.GetField(key, true); - if (field != null) { - return field.TrySetValue(value); + if (KeyStore.X == key) { + console.log(""); + } + let field = new ctor(); + if (field.TrySetValue(value)) { + this._sfields.set(key, field); + return true; } else { - field = new ctor(); - if (field.TrySetValue(value)) { - this.SetField(key, field); - return true; - } else { - return false; - } + return false; } + + // let field = this.GetField(key, true); + // if (field == WAITING) + // return true; + // if (field != null) { + // return field.TrySetValue(value); + // } else { + // field = new ctor(); + // if (field.TrySetValue(value)) { + // this.SetField(key, field); + // return true; + // } else { + // return false; + // } + // } } GetPrototype(): Opt<Document> { @@ -94,7 +151,7 @@ export class Document extends Field { GetAllPrototypes(): Document[] { let protos: Document[] = []; let doc: Opt<Document> = this; - while (doc != null) { + while (doc && doc != WAITING) { protos.push(doc); doc = doc.GetPrototype(); } diff --git a/src/fields/Field.ts b/src/fields/Field.ts index 1453e52a4..7f057afa8 100644 --- a/src/fields/Field.ts +++ b/src/fields/Field.ts @@ -10,7 +10,9 @@ export function Cast<T extends Field>(field: Opt<Field>, ctor: { new(): T }): Op return undefined; } -export type Opt<T> = T | undefined; +export type Waiting = "<Waiting>"; +export type Opt<T> = T | undefined | Waiting; +export let WAITING: Waiting = "<Waiting>"; export abstract class Field { //FieldUpdated: TypedEvent<Opt<FieldUpdatedArgs>> = new TypedEvent<Opt<FieldUpdatedArgs>>(); |