@jd-data-limited/easy-fm 3.0.0 → 3.0.2

package/package.json

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

package/src/index.js

@@ -1220,7 +1220,7 @@ export class Database extends EventEmitter {
             });
         });
     }
-    script(name, parameter) {
+    script(name, parameter = "") {
         return { name, parameter };
     }
     _tokenExpired() {
@@ -1384,6 +1384,7 @@ export class RecordBase extends EventEmitter {
         return !!this.fields.find(i => i.edited);
     }
     processPortalData(portalData) {
+        this.portals = [];
         for (let item of Object.keys(portalData)) {
             let _portal = new Portal(this, item);
             _portal.records = portalData[item].map(item => {
@@ -1457,21 +1458,32 @@ export class RecordBase extends EventEmitter {
             });
         }));
     }
-    commit(extraBody = {
-        fieldData: undefined
-    }) {
+    commit(extraBody) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             let data = this.toObject();
             delete data.recordId;
             delete data.modId;
+            if (extraBody.scripts.after) {
+                data["script"] = extraBody.scripts.after.name;
+                if (extraBody.scripts.after.parameter)
+                    data["param"] = extraBody.scripts.after.parameter;
+            }
+            if (extraBody.scripts.prerequest) {
+                data["script"] = extraBody.scripts.after.name;
+                if (extraBody.scripts.prerequest.parameter)
+                    data["param"] = extraBody.scripts.prerequest.parameter;
+            }
+            if (extraBody.scripts.presort) {
+                data["script"] = extraBody.scripts.presort.name;
+                if (extraBody.scripts.presort.parameter)
+                    data["param"] = extraBody.scripts.presort.parameter;
+            }
             if (this.recordId === -1) {
                 // This is a new LayoutRecord
-                for (let item of Object.keys(data))
-                    extraBody[item] = data[item];
                 this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
-                    body: JSON.stringify(extraBody)
+                    body: JSON.stringify(data)
                 })
                     .then(res => {
                     if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
@@ -1491,13 +1503,11 @@ export class RecordBase extends EventEmitter {
                 });
                 return;
             }
-            for (let item of Object.keys(data))
-                extraBody[item] = data[item];
-            console.log(extraBody.portalData);
+            // for (let item of Object.keys(data)) extraBody[item] = data[item]
             this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "PATCH",
-                body: JSON.stringify(extraBody)
+                body: JSON.stringify(data)
             })
                 .then(res => {
                 if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
@@ -1785,7 +1795,7 @@ export class PortalRecord extends RecordBase {
         super._onSave();
         this.portal.record._onSave();
     }
-    commit(extraBody = { fieldData: undefined }) {
+    commit(extraBody) {
         return this.portal.record.commit(extraBody);
     }
     toObject(fieldFilter) {
@@ -1868,18 +1878,18 @@ export class RecordGetRange extends RecordGetOperation {
         if (extraBody.scripts) {
             if (extraBody.scripts.prerequest) {
                 params.push("script.prerequest=" + extraBody.scripts.prerequest.name);
-                if (extraBody.scripts.prerequest.param)
-                    params.push("script.prerequest.param=" + extraBody.scripts.prerequest.param);
+                if (extraBody.scripts.prerequest.parameter)
+                    params.push("script.prerequest.param=" + extraBody.scripts.prerequest.parameter);
             }
             if (extraBody.scripts.presort) {
                 params.push("script.presort=" + extraBody.scripts.presort.name);
-                if (extraBody.scripts.presort.param)
-                    params.push("script.presort.param=" + extraBody.scripts.presort.param);
+                if (extraBody.scripts.presort.parameter)
+                    params.push("script.presort.param=" + extraBody.scripts.presort.parameter);
             }
             if (extraBody.scripts.after) {
                 params.push("script=" + extraBody.scripts.after.name);
-                if (extraBody.scripts.after.param)
-                    params.push("script.param=" + extraBody.scripts.after.param);
+                if (extraBody.scripts.after.parameter)
+                    params.push("script.param=" + extraBody.scripts.after.parameter);
             }
         }
         if (params.length === 0)

package/src/index.ts

@@ -1554,6 +1554,7 @@ export class RecordBase extends EventEmitter {
     }
 
     protected processPortalData(portalData): void {
+        this.portals = []
         for (let item of Object.keys(portalData)) {
             let _portal = new Portal(this, item)
             _portal.records = portalData[item].map(item => {
@@ -1678,7 +1679,6 @@ export class RecordBase extends EventEmitter {
             }
 
             // for (let item of Object.keys(data)) extraBody[item] = data[item]
-            console.log((extraBody as any).portalData)
             this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "PATCH",