@jd-data-limited/easy-fm 1.2.0-alpha1 → 1.2.2-alpha3

package/index.js

@@ -284,7 +284,7 @@ class layoutRecordManager {
                 for (let _field of this.layout.metadata.fieldMetaData) {
                     fields[_field.name] = "";
                 }
-                resolve(new record(this.layout, -1, 0, fields));
+                resolve(new LayoutRecord(this, -1, 0, fields));
             }).catch(e => {
                 reject(e);
             });
@@ -295,7 +295,7 @@ class layoutRecordManager {
             let record;
             this.layout.getLayoutMeta()
                 .then(layout => {
-                record = new record(this.layout, recordId);
+                record = new LayoutRecord(this.layout, recordId);
                 return record.get();
             })
                 .then(() => {
@@ -313,21 +313,13 @@ class layoutRecordManager {
         return new find(this.layout);
     }
 }
-class record extends EventEmitter {
-    constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
+class RecordBase extends EventEmitter {
+    constructor(layout, recordId, modId = recordId) {
         super();
+        this.portals = [];
         this.layout = layout;
         this.recordId = recordId;
         this.modId = modId;
-        this.fields = this.processFieldData(fieldData);
-        this.portals = [];
-        if (portalData) {
-            this.processPortalData(portalData);
-        }
-        this.on("saved", () => {
-            for (let field of this.fields)
-                field.edited = false;
-        });
     }
     get endpoint() {
         return `${this.layout.endpoint}/records/${this.recordId}`;
@@ -337,12 +329,14 @@ class record extends EventEmitter {
     }
     processPortalData(portalData) {
         for (let item of Object.keys(portalData)) {
-            this.portals.push(new portal(this, item, portalData[item].map(item => {
+            let _portal = new portal(this, item);
+            _portal.records = portalData[item].map(item => {
                 let fieldData = item;
                 delete fieldData.recordId;
                 delete fieldData.modId;
-                return new portalItem(this, item.recordId, item.modId, fieldData);
-            })));
+                return new PortalRecord(this, _portal, item.recordId, item.modId, fieldData);
+            });
+            this.portals.push(_portal);
         }
     }
     processFieldData(fieldData) {
@@ -379,7 +373,7 @@ class record extends EventEmitter {
     }
     get() {
         if (this.recordId === -1) {
-            throw "Cannot get this record until a commit() is done.";
+            throw "Cannot get this RecordBase until a commit() is done.";
         }
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             if (!this.layout.metadata)
@@ -415,7 +409,7 @@ class record extends EventEmitter {
             delete data.recordId;
             delete data.modId;
             if (this.recordId === -1) {
-                // This is a new record
+                // This is a new LayoutRecord
                 extraBody.fieldData = data.fieldData;
                 this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
@@ -453,7 +447,7 @@ class record extends EventEmitter {
                 }
                 else if (res.messages[0].code === "0") {
                     this.modId = res.response.modId;
-                    this.emit("saved");
+                    this._onSave();
                     resolve(this);
                 }
                 else {
@@ -465,6 +459,11 @@ class record extends EventEmitter {
             });
         }));
     }
+    _onSave() {
+        this.emit("saved");
+        for (let field of this.fields)
+            field.edited = false;
+    }
     getField(field) {
         return this.fields.find(_field => _field.id === field);
     }
@@ -506,7 +505,7 @@ class record extends EventEmitter {
                 }
                 else if (res.messages[0].code === "0") {
                     let data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false);
-                    let _res = new record(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData);
+                    let _res = new LayoutRecord(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData);
                     this.emit("duplicated");
                     resolve(_res);
                 }
@@ -559,6 +558,16 @@ class record extends EventEmitter {
         return obj;
     }
 }
+class LayoutRecord extends RecordBase {
+    constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
+        super(layout, recordId, modId);
+        this.fields = this.processFieldData(fieldData);
+        this.portals = [];
+        if (portalData) {
+            this.processPortalData(portalData);
+        }
+    }
+}
 class field {
     constructor(record, id, contents) {
         this.record = record;
@@ -598,8 +607,8 @@ class field {
                 repetitionEnd: 1
             };
         }
-        if (this.record instanceof portalItem) {
-            return this.record.layout.metadata.portalMetaData.find(i => i.name === this.id) || {
+        if (this.record instanceof PortalRecord) {
+            return this.record.layout.metadata.portalMetaData[this.record.portal.name || "portal not attached"].find(i => i.name === this.id) || {
                 name: this.id.toString(),
                 type: 'normal',
                 displayType: 'editText',
@@ -672,23 +681,20 @@ class field {
     }
 }
 class portal {
-    constructor(record, name, records = []) {
+    constructor(record, name) {
         this.record = record;
         this.name = name;
-        this.records = records;
-        for (let item of this.records)
-            item.attachPortal(this);
     }
 }
-class portalItem extends record {
-    constructor(record, recordId, modId = recordId, fieldData = {}) {
-        super(record.layout, recordId, modId, fieldData);
-        record.on("saved", () => {
-            this.emit("saved");
-        });
-    }
-    attachPortal(portal) {
+class PortalRecord extends RecordBase {
+    constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
+        super(record.layout, recordId, modId);
         this.portal = portal;
+        this.fields = this.processFieldData(fieldData);
+    }
+    _onSave() {
+        super._onSave();
+        this.portal.record._onSave();
     }
     commit(extraBody = { fieldData: undefined }) {
         return this.portal.record.commit(extraBody);
@@ -781,7 +787,7 @@ class recordGetRange extends recordGetOperation {
                     if (!this.layout.metadata)
                         yield this.layout.getLayoutMeta();
                     let data = res.response.data.map(item => {
-                        return new record(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
+                        return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
                     });
                     resolve(data);
                 }
@@ -850,7 +856,7 @@ class find extends recordGetOperation {
                     if (!this.layout.metadata)
                         yield this.layout.getLayoutMeta();
                     let data = res.response.data.map(item => {
-                        return new record(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
+                        return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData);
                     });
                     resolve(data);
                 }

package/index.ts

@@ -338,14 +338,14 @@ class layout {
     /**
      * @deprecated use layout.records.create() instead
      */
-    createRecord(): Promise<record | Error | void> {
+    createRecord(): Promise<RecordBase | Error | void> {
         return this.records.create()
     }
 
     /**
      * @deprecated use layout.records.get() instead
      */
-    getRecord(recordId): Promise<record> {
+    getRecord(recordId): Promise<RecordBase> {
         return this.records.get(recordId)
     }
 
@@ -401,7 +401,7 @@ class layoutRecordManager {
         this.layout = layout
     }
 
-    create(): Promise<record | Error | void> {
+    create(): Promise<RecordBase | Error | void> {
         return new Promise((resolve, reject) => {
             // Get the layout's metadata
             this.layout.getLayoutMeta().then(layout => {
@@ -409,19 +409,19 @@ class layoutRecordManager {
                 for (let _field of this.layout.metadata.fieldMetaData) {
                     fields[_field.name] = ""
                 }
-                resolve(new record(this, -1, 0, fields))
+                resolve(new LayoutRecord(this, -1, 0, fields))
             }).catch(e => {
                 reject(e)
             })
         })
     }
 
-    get(recordId): Promise<record> {
+    get(recordId): Promise<RecordBase> {
         return new Promise((resolve, reject) => {
             let record
             this.layout.getLayoutMeta()
                 .then(layout => {
-                    record = new record(this.layout, recordId)
+                    record = new LayoutRecord(this.layout, recordId)
                     return record.get()
                 })
                 .then(() => {
@@ -442,27 +442,19 @@ class layoutRecordManager {
     }
 }
 
-class record extends EventEmitter {
+class RecordBase extends EventEmitter {
     readonly layout: layout;
     public recordId: number;
     modId: number;
     fields: field[];
-    readonly portals: portal[];
-    private portalData: any[];
+    portals: portal[] = [];
+    protected portalData: any[];
 
-    constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
+    constructor(layout, recordId, modId = recordId) {
         super();
         this.layout = layout
         this.recordId = recordId
         this.modId = modId
-        this.fields = this.processFieldData(fieldData)
-        this.portals = []
-        if (portalData) {
-            this.processPortalData(portalData)
-        }
-        this.on("saved", () => {
-            for (let field of this.fields) field.edited = false
-        })
     }
 
     get endpoint(): string {
@@ -473,14 +465,16 @@ class record extends EventEmitter {
         return !!this.fields.find(i => i.edited)
     }
 
-    private processPortalData(portalData): void {
+    protected processPortalData(portalData): void {
         for (let item of Object.keys(portalData)) {
-            this.portals.push(new portal(this, item, portalData[item].map(item => {
-                let fieldData = item
-                delete fieldData.recordId
-                delete fieldData.modId
-                return new portalItem(this, item.recordId, item.modId, fieldData)
-            })))
+            let _portal = new portal(this, item)
+            _portal.records = portalData[item].map(item => {
+                let fieldData = item;
+                delete fieldData.recordId;
+                delete fieldData.modId;
+                return new PortalRecord(this, _portal, item.recordId, item.modId, fieldData);
+            })
+            this.portals.push(_portal);
         }
     }
 
@@ -518,7 +512,7 @@ class record extends EventEmitter {
 
     get() {
         if (this.recordId === -1) {
-            throw "Cannot get this record until a commit() is done."
+            throw "Cannot get this RecordBase until a commit() is done."
         }
         return new Promise(async (resolve, reject) => {
             if (!this.layout.metadata) await this.layout.getLayoutMeta()
@@ -547,14 +541,14 @@ class record extends EventEmitter {
 
     commit(extraBody = {
         fieldData: undefined
-    }): Promise<record | FMError> {
+    }): Promise<RecordBase | FMError> {
         return new Promise(async (resolve, reject) => {
             let data = this.toObject()
             delete data.recordId
             delete data.modId
 
             if (this.recordId === -1) {
-                // This is a new record
+                // This is a new LayoutRecord
                 extraBody.fieldData = data.fieldData
 
                 this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
@@ -591,7 +585,7 @@ class record extends EventEmitter {
                         reject(new FMError(res.response.scriptError, res.status, res))
                     } else if (res.messages[0].code === "0") {
                         this.modId = res.response.modId
-                        this.emit("saved")
+                        this._onSave()
                         resolve(this)
                     } else {
                         reject(new FMError(res.messages[0].code, res.status, res))
@@ -602,6 +596,11 @@ class record extends EventEmitter {
                 })
         })
     }
+    
+    _onSave() {
+        this.emit("saved")
+        for (let field of this.fields) field.edited = false
+    }
 
     getField(field) {
         return this.fields.find(_field => _field.id === field)
@@ -633,7 +632,7 @@ class record extends EventEmitter {
         })
     }
 
-    duplicate(): Promise<record> {
+    duplicate(): Promise<RecordBase> {
         return new Promise(async (resolve, reject) => {
             this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
@@ -644,7 +643,7 @@ class record extends EventEmitter {
                         reject(new FMError(res.response.scriptError, res.status, res))
                     } else if (res.messages[0].code === "0") {
                         let data = this.toObject((a) => true, (a) => true, (a) => false, (a) => false)
-                        let _res = new record(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData)
+                        let _res = new LayoutRecord(this.layout, res.response.recordId, res.response.modId, data.fieldData, data.portalData)
 
                         this.emit("duplicated")
                         resolve(_res)
@@ -706,9 +705,21 @@ class record extends EventEmitter {
         return obj
     }
 }
+class LayoutRecord extends RecordBase {
+    portals: portal[];
+
+    constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
+        super(layout, recordId, modId);
+        this.fields = this.processFieldData(fieldData)
+        this.portals = []
+        if (portalData) {
+            this.processPortalData(portalData)
+        }
+    }
+}
 
 class field {
-    record: record;
+    record: RecordBase;
     id: number;
     private _value: string | number | Date;
     edited: boolean;
@@ -754,8 +765,8 @@ class field {
                 repetitionEnd: 1
             } as fieldMetaData
         }
-        if (this.record instanceof portalItem) {
-            return this.record.layout.metadata.portalMetaData.find(i => i.name === this.id) as fieldMetaData || {
+        if (this.record instanceof PortalRecord) {
+            return this.record.layout.metadata.portalMetaData[this.record.portal.name || "portal not attached"].find(i => i.name === this.id) as fieldMetaData || {
                 name: this.id.toString(),
                 type: 'normal',
                 displayType: 'editText',
@@ -830,30 +841,29 @@ class field {
 }
 
 class portal {
-    readonly record: record;
+    readonly record: RecordBase;
     readonly name: string;
-    public records: portalItem[];
+    public records: PortalRecord[];
 
-    constructor(record: record, name: string, records: portalItem[] = []) {
+    constructor(record: RecordBase, name: string) {
         this.record = record
         this.name = name
-        this.records = records
-        for (let item of this.records) item.attachPortal(this)
     }
 }
 
-class portalItem extends record {
-    protected portal: portal;
+class PortalRecord extends RecordBase {
+    readonly portal: portal;
 
-    constructor(record, recordId, modId = recordId, fieldData = {}) {
-        super(record.layout, recordId, modId, fieldData);
-        record.on("saved", () => {
-            this.emit("saved")
-        })
-    }
+    constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
+        super(record.layout, recordId, modId);
 
-    attachPortal(portal) {
         this.portal = portal
+        this.fields = this.processFieldData(fieldData)
+    }
+
+    _onSave() {
+        super._onSave();
+        this.portal.record._onSave()
     }
 
     commit(extraBody = {fieldData: undefined}) {
@@ -936,7 +946,7 @@ class recordGetRange extends recordGetOperation {
         return "?" + params.join("&")
     }
 
-    run(): Promise<record[]> {
+    run(): Promise<RecordBase[]> {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta().then(() => {
@@ -950,7 +960,7 @@ class recordGetRange extends recordGetOperation {
                         // console.log("RESOLVING")
                         if (!this.layout.metadata) await this.layout.getLayoutMeta()
                         let data = res.response.data.map(item => {
-                            return new record(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
+                            return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
                         })
                         resolve(data)
                     } else {
@@ -1005,7 +1015,7 @@ class find extends recordGetOperation {
         return this.run()
     }
 
-    run(): Promise<record[]> {
+    run(): Promise<RecordBase[]> {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta()
@@ -1022,7 +1032,7 @@ class find extends recordGetOperation {
                         // console.log("RESOLVING")
                         if (!this.layout.metadata) await this.layout.getLayoutMeta()
                         let data = res.response.data.map(item => {
-                            return new record(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
+                            return new LayoutRecord(this.layout, item.recordId, item.modId, item.fieldData, item.portalData)
                         })
                         resolve(data)
                     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "1.2.0alpha1",
+  "version": "1.2.2alpha3",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",