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

package/package.json

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

package/src/index.ts

@@ -67,18 +67,9 @@ interface limitPortalsInterface {
 
 interface extraBodyOptions {
     scripts?: {
-        prerequest?: {
-            name: string,
-            param?: string
-        },
-        presort?: {
-            name: string,
-            param?: string
-        },
-        after?: {
-            name: string,
-            param?: string
-        },
+        prerequest?: Script,
+        presort?: Script,
+        after?: Script,
     }
 }
 
@@ -1367,7 +1358,7 @@ export class Database extends EventEmitter {
         })
     }
 
-    script(name, parameter): Script {
+    script(name, parameter = ""): Script {
         return ({name, parameter} as Script)
     }
 
@@ -1639,22 +1630,32 @@ export class RecordBase extends EventEmitter {
         })
     }
 
-    commit(extraBody = {
-        fieldData: undefined
-    }): Promise<RecordBase | FMError> {
+    commit(extraBody: extraBodyOptions): Promise<RecordBase | FMError> {
         return new Promise(async (resolve, reject) => {
             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') {
@@ -1676,12 +1677,12 @@ export class RecordBase extends EventEmitter {
                 return
             }
 
-            for (let item of Object.keys(data)) extraBody[item] = data[item]
+            // 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",
-                body: JSON.stringify(extraBody)
+                body: JSON.stringify(data)
             })
                 .then(res => {
                     if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
@@ -2013,7 +2014,7 @@ export class PortalRecord extends RecordBase {
         this.portal.record._onSave()
     }
 
-    commit(extraBody = {fieldData: undefined}) {
+    commit(extraBody: extraBodyOptions) {
         return this.portal.record.commit(extraBody)
     }
 
@@ -2100,15 +2101,15 @@ 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)
             }
         }