@jd-data-limited/easy-fm 0.0.11 → 0.0.12

package/index.js

@@ -147,11 +147,12 @@ class layout {
     createRecord() {
         return new Promise((resolve, reject) => {
             // Get the layout's metadata
-            this.conn.apiRequest(`${this.endpoint}`).then(res => {
+            this.getLayoutMeta().then(layout => {
                 let fields = {};
-                for (let _field of res.response.fieldMetaData) {
+                for (let _field of this.metadata.fieldMetaData) {
                     fields[_field.name] = "";
                 }
+                console.log(fields);
                 resolve(new record(this, -1, 0, fields));
             });
         });
@@ -262,19 +263,20 @@ class record extends EventEmitter {
             });
         }));
     }
-    commit(extraBody = {}) {
+    commit(extraBody = {
+        fieldData: undefined
+    }) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             let data = this.toObject();
             delete data.recordId;
             delete data.modId;
             if (this.recordId === -1) {
                 // This is a new record
+                extraBody.fieldData = data.fieldData;
                 this.layout.conn.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
-                    body: JSON.stringify({
-                        fieldData: data.fieldData
-                    })
+                    body: JSON.stringify(extraBody)
                 })
                     .then(res => {
                     if (res.messages[0].code === "0") {
@@ -416,7 +418,7 @@ class portalItem extends record {
     attachPortal(portal) {
         this.portal = portal;
     }
-    commit(extraBody = {}) {
+    commit(extraBody = { fieldData: undefined }) {
         return this.portal.record.commit(extraBody);
     }
     toObject(fieldFilter) {
@@ -498,6 +500,7 @@ export class FMError extends Error {
         super(errs.find(err => err.e === code).d || "Unknown error");
         this.httpStatus = httpStatus;
         this.res = res;
+        this.messages = res.messages;
         this.code = typeof code === "string" ? parseInt(code) : code;
         Error.captureStackTrace(this, FMError);
     }

package/index.ts

@@ -181,11 +181,12 @@ class layout {
     createRecord(): Promise<record | Error | void> {
         return new Promise((resolve, reject) => {
             // Get the layout's metadata
-            this.conn.apiRequest(`${this.endpoint}`).then(res => {
+            this.getLayoutMeta().then(layout => {
                 let fields = {}
-                for (let _field of res.response.fieldMetaData) {
+                for (let _field of this.metadata.fieldMetaData) {
                     fields[_field.name] = ""
                 }
+                console.log(fields)
                 resolve(new record(this, -1, 0, fields))
             })
         })
@@ -307,7 +308,9 @@ class record extends EventEmitter {
         })
     }
 
-    commit(extraBody = {}): Promise<record | FMError> {
+    commit(extraBody = {
+        fieldData: undefined
+    }): Promise<record | FMError> {
         return new Promise(async (resolve, reject) => {
             let data = this.toObject()
             delete data.recordId
@@ -315,12 +318,12 @@ class record extends EventEmitter {
 
             if (this.recordId === -1) {
                 // This is a new record
+                extraBody.fieldData = data.fieldData
+
                 this.layout.conn.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
-                    body: JSON.stringify({
-                        fieldData: data.fieldData
-                    })
+                    body: JSON.stringify(extraBody)
                 })
                     .then(res => {
                         if (res.messages[0].code === "0") {
@@ -482,7 +485,7 @@ class portalItem extends record {
         this.portal = portal
     }
 
-    commit(extraBody = {}) {
+    commit(extraBody = {fieldData: undefined}) {
         return this.portal.record.commit(extraBody)
     }
 
@@ -570,12 +573,14 @@ export class FMError extends Error {
     readonly res: any
     readonly code: number
     readonly message: string
+    readonly messages: string
 
     constructor(code, httpStatus, res) {
         if (typeof code === "string") code = parseInt(code)
         super(errs.find(err => err.e === code).d || "Unknown error");
         this.httpStatus = httpStatus
         this.res = res
+        this.messages = res.messages
         this.code = typeof code === "string" ? parseInt(code) : code
         Error.captureStackTrace(this, FMError)
     }

package/package.json

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