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

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 record(this, -1, 0, fields));
             }).catch(e => {
                 reject(e);
             });
@@ -337,12 +337,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 portalItem(this, _portal, item.recordId, item.modId, fieldData);
+            });
+            this.portals.push();
         }
     }
     processFieldData(fieldData) {
@@ -599,7 +601,7 @@ class field {
             };
         }
         if (this.record instanceof portalItem) {
-            return this.record.layout.metadata.portalMetaData.find(i => i.name === this.id) || {
+            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,24 +674,19 @@ 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 = {}) {
+    constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
         super(record.layout, recordId, modId, fieldData);
+        this.portal = portal;
         record.on("saved", () => {
             this.emit("saved");
         });
     }
-    attachPortal(portal) {
-        this.portal = portal;
-    }
     commit(extraBody = { fieldData: undefined }) {
         return this.portal.record.commit(extraBody);
     }

package/index.ts

@@ -475,12 +475,14 @@ class record extends EventEmitter {
 
     private 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 portalItem(this, _portal, item.recordId, item.modId, fieldData);
+            })
+            this.portals.push();
         }
     }
 
@@ -755,7 +757,7 @@ class field {
             } as fieldMetaData
         }
         if (this.record instanceof portalItem) {
-            return this.record.layout.metadata.portalMetaData.find(i => i.name === this.id) as fieldMetaData || {
+            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',
@@ -834,28 +836,23 @@ class portal {
     readonly name: string;
     public records: portalItem[];
 
-    constructor(record: record, name: string, records: portalItem[] = []) {
+    constructor(record: record, 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;
+    readonly portal: portal;
 
-    constructor(record, recordId, modId = recordId, fieldData = {}) {
+    constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
         super(record.layout, recordId, modId, fieldData);
+        this.portal = portal
         record.on("saved", () => {
             this.emit("saved")
         })
     }
 
-    attachPortal(portal) {
-        this.portal = portal
-    }
-
     commit(extraBody = {fieldData: undefined}) {
         return this.portal.record.commit(extraBody)
     }

package/package.json

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