@azrico/webobject 1.3.6 → 1.3.8

package/dist/src/WebObjects/WebObject.d.ts

@@ -69,6 +69,7 @@ export declare class WebObject extends SimpleObject {
     static get_webname(): string | undefined;
     get manager(): WebObjectManager<any> | null;
     get_managerClass: () => WebObjectManager<any> | null;
+    onDelete(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;
     onSave(...p: any): Promise<any>;
     onNew(...p: any): Promise<any>;

package/dist/src/WebObjects/WebObject.js

@@ -344,9 +344,9 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
       return this.get_managerClass();
     }
   }, {
-    key: "onLoad",
+    key: "onDelete",
     value: /* -------------------------------------------------------------------------- */function () {
-      var _onLoad = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _onDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         var _this$manager;
         var _len,
           p,
@@ -355,19 +355,51 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
+              this.isDeleted = true;
               for (_len = _args6.length, p = new Array(_len), _key = 0; _key < _len; _key++) {
                 p[_key] = _args6[_key];
               }
-              _context6.next = 3;
-              return (_this$manager = this.manager) === null || _this$manager === void 0 ? void 0 : _this$manager.onLoad.apply(_this$manager, p);
-            case 3:
-              return _context6.abrupt("return", _context6.sent);
+              _context6.next = 4;
+              return (_this$manager = this.manager) === null || _this$manager === void 0 ? void 0 : _this$manager.onDelete.apply(_this$manager, p);
             case 4:
+              return _context6.abrupt("return", _context6.sent);
+            case 5:
             case "end":
               return _context6.stop();
           }
         }, _callee6, this);
       }));
+      function onDelete() {
+        return _onDelete.apply(this, arguments);
+      }
+      return onDelete;
+    }()
+  }, {
+    key: "onLoad",
+    value: function () {
+      var _onLoad = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        var _this$manager2;
+        var _len2,
+          p,
+          _key2,
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              this.isDeleted = false;
+              for (_len2 = _args7.length, p = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                p[_key2] = _args7[_key2];
+              }
+              _context7.next = 4;
+              return (_this$manager2 = this.manager) === null || _this$manager2 === void 0 ? void 0 : _this$manager2.onLoad.apply(_this$manager2, p);
+            case 4:
+              return _context7.abrupt("return", _context7.sent);
+            case 5:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
       function onLoad() {
         return _onLoad.apply(this, arguments);
       }
@@ -376,17 +408,17 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "onSave",
     value: function () {
-      var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this3 = this,
-          _this$manager2;
+          _this$manager3;
         var srObject,
           actual_sr,
-          _len2,
+          _len3,
           p,
-          _key2,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+          _key3,
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (this.isSaved) {
                 this.apply_changes();
@@ -410,18 +442,18 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
                   }
                 }
               }
-              for (_len2 = _args7.length, p = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                p[_key2] = _args7[_key2];
+              for (_len3 = _args8.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+                p[_key3] = _args8[_key3];
               }
-              _context7.next = 4;
-              return (_this$manager2 = this.manager) === null || _this$manager2 === void 0 ? void 0 : _this$manager2.onSave.apply(_this$manager2, p);
+              _context8.next = 4;
+              return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.onSave.apply(_this$manager3, p);
             case 4:
-              return _context7.abrupt("return", _context7.sent);
+              return _context8.abrupt("return", _context8.sent);
             case 5:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function onSave() {
         return _onSave.apply(this, arguments);
@@ -431,27 +463,27 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "onNew",
     value: function () {
-      var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this$manager3;
-        var _len3,
+      var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var _this$manager4;
+        var _len4,
           p,
-          _key3,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+          _key4,
+          _args9 = arguments;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              for (_len3 = _args8.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-                p[_key3] = _args8[_key3];
+              for (_len4 = _args9.length, p = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+                p[_key4] = _args9[_key4];
               }
-              _context8.next = 3;
-              return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.onNew.apply(_this$manager3, p);
+              _context9.next = 3;
+              return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onNew.apply(_this$manager4, p);
             case 3:
-              return _context8.abrupt("return", _context8.sent);
+              return _context9.abrupt("return", _context9.sent);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
       function onNew() {
         return _onNew.apply(this, arguments);
@@ -503,64 +535,64 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "get_single",
     value: function () {
-      var _get_single = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var _len4,
+      var _get_single = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+        var _len5,
           p,
-          _key4,
+          _key5,
           search,
           readonly,
           fetchID,
           res,
           params,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              for (_len4 = _args9.length, p = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-                p[_key4] = _args9[_key4];
+              for (_len5 = _args10.length, p = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+                p[_key5] = _args10[_key5];
               }
               search = p.shift();
               readonly = p.shift();
               fetchID = p.shift();
               if (!(0, _object.object_isEmpty)(search)) {
-                _context9.next = 6;
+                _context10.next = 6;
                 break;
               }
-              return _context9.abrupt("return", undefined);
+              return _context10.abrupt("return", undefined);
             case 6:
               params = {};
               params.context = readonly ? "view" : "edit";
-              _context9.t0 = _typeof(search);
-              _context9.next = _context9.t0 === "string" ? 11 : _context9.t0 === "number" ? 11 : _context9.t0 === "object" ? 19 : 19;
+              _context10.t0 = _typeof(search);
+              _context10.next = _context10.t0 === "string" ? 11 : _context10.t0 === "number" ? 11 : _context10.t0 === "object" ? 19 : 19;
               break;
             case 11:
               search = String(search);
-              _context9.t1 = this;
-              _context9.t2 = this;
-              _context9.next = 16;
+              _context10.t1 = this;
+              _context10.t2 = this;
+              _context10.next = 16;
               return _global.gfunc.run_action("get", this.__web_path + "/" + search, params, {
                 fetchID: fetchID
               });
             case 16:
-              _context9.t3 = _context9.sent;
-              res = _context9.t1.ensure.call(_context9.t1, _context9.t2, _context9.t3);
-              return _context9.abrupt("break", 25);
+              _context10.t3 = _context10.sent;
+              res = _context10.t1.ensure.call(_context10.t1, _context10.t2, _context10.t3);
+              return _context10.abrupt("break", 25);
             case 19:
-              _context9.t4 = _object.object_first;
-              _context9.next = 22;
+              _context10.t4 = _object.object_first;
+              _context10.next = 22;
               return this.get_list(search, readonly, fetchID);
             case 22:
-              _context9.t5 = _context9.sent;
-              res = (0, _context9.t4)(_context9.t5);
-              return _context9.abrupt("break", 25);
+              _context10.t5 = _context10.sent;
+              res = (0, _context10.t4)(_context10.t5);
+              return _context10.abrupt("break", 25);
             case 25:
               WebObject.setReadonly(res, readonly);
-              return _context9.abrupt("return", res);
+              return _context10.abrupt("return", res);
             case 27:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
       function get_single() {
         return _get_single.apply(this, arguments);
@@ -574,42 +606,42 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "get_list",
     value: function () {
-      var _get_list = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        var _len5,
+      var _get_list = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        var _len6,
           p,
-          _key5,
+          _key6,
           search,
           readonly,
           fetchID,
           result_items,
           selftype,
           res,
-          _args10 = arguments;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              for (_len5 = _args10.length, p = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-                p[_key5] = _args10[_key5];
+              for (_len6 = _args11.length, p = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+                p[_key6] = _args11[_key6];
               }
               search = p.shift();
               readonly = p.shift();
               fetchID = p.shift();
               if (!search) search = {};
-              _context10.next = 7;
+              _context11.next = 7;
               return _global.gfunc.run_action("get", this.__web_path, search, {
                 fetchID: fetchID
               });
             case 7:
-              result_items = _context10.sent;
+              result_items = _context11.sent;
               selftype = this.prototype;
               res = WebObject.map_rowindex(WebObject.mapto(selftype, result_items, readonly));
               WebObject.setReadonly(res, readonly);
-              return _context10.abrupt("return", res);
+              return _context11.abrupt("return", res);
             case 12:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function get_list() {
         return _get_list.apply(this, arguments);

package/dist/src/WebObjects/WebObjectManager.d.ts

@@ -32,6 +32,12 @@ export declare class WebObjectManager<T extends WebObject> extends ObjectManager
      * @returns
      */
     onNew(...p: any): Promise<any>;
+    /**
+     * Use this when you delete Object
+     * @param p
+     * @returns
+     */
+    onDelete(...p: any): Promise<any>;
     /**
      * Use this when you load data to the object
      * @param p

package/dist/src/WebObjects/WebObjectManager.js

@@ -254,39 +254,75 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
       return onNew;
     }()
     /**
-     * Use this when you load data to the object
+     * Use this when you delete Object
      * @param p
      * @returns
      */
   }, {
-    key: "onLoad",
+    key: "onDelete",
     value: function () {
-      var _onLoad = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _this$obj9;
+      var _onDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              if (this.canModify) {
-                (_this$obj9 = this.obj) === null || _this$obj9 === void 0 ? void 0 : _this$obj9.setOriginal();
+              if (this.obj) {
+                this.obj.isDeleted = true;
               }
               _context6.next = 3;
-              return this.event_run("on_load");
+              return this.event_run("on_delete");
             case 3:
               _context6.next = 5;
-              return this.event_run("on_change", true);
+              return this.event_run("on_after_delete");
             case 5:
               _context6.next = 7;
+              return Promise.resolve(true);
+            case 7:
+              return _context6.abrupt("return", _context6.sent);
+            case 8:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function onDelete() {
+        return _onDelete.apply(this, arguments);
+      }
+      return onDelete;
+    }()
+    /**
+     * Use this when you load data to the object
+     * @param p
+     * @returns
+     */
+  }, {
+    key: "onLoad",
+    value: function () {
+      var _onLoad = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              if (this.canModify && this.obj) {
+                this.obj.isDeleted = false;
+                this.obj.setOriginal();
+              }
+              _context7.next = 3;
+              return this.event_run("on_load");
+            case 3:
+              _context7.next = 5;
+              return this.event_run("on_change", true);
+            case 5:
+              _context7.next = 7;
               return this.event_run("on_after_load");
             case 7:
-              _context6.next = 9;
+              _context7.next = 9;
               return Promise.resolve(true);
             case 9:
-              return _context6.abrupt("return", _context6.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function onLoad() {
         return _onLoad.apply(this, arguments);
@@ -301,28 +337,28 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
   }, {
     key: "onSave",
     value: function () {
-      var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _context8.next = 2;
               return this.event_run("on_save");
             case 2:
-              _context7.next = 4;
+              _context8.next = 4;
               return this.event_run("on_change", true);
             case 4:
-              _context7.next = 6;
+              _context8.next = 6;
               return this.event_run("on_after_save");
             case 6:
-              _context7.next = 8;
+              _context8.next = 8;
               return Promise.resolve(true);
             case 8:
-              return _context7.abrupt("return", _context7.sent);
+              return _context8.abrupt("return", _context8.sent);
             case 9:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function onSave() {
         return _onSave.apply(this, arguments);

package/dist/src/structs/SimpleObject.d.ts

@@ -21,6 +21,7 @@ export declare class SimpleObject extends MapableObject {
     __lastChanged: string;
     __is_readonly: boolean;
     __throw_errors: boolean;
+    __deleted: boolean;
     __errors?: any[];
     __showErrors?: boolean;
     __saveResultObject?: any;
@@ -73,6 +74,7 @@ export declare class SimpleObject extends MapableObject {
     static setThrowErrors(objs?: SimpleObject[] | SimpleObject, throwErr?: boolean): void;
     get isChanged(): boolean;
     get isDeleted(): boolean;
+    set isDeleted(v: boolean);
     get d(): Partial<this>;
     get allproperties(): this & Partial<this>;
     get canModify(): boolean;

package/dist/src/structs/SimpleObject.js

@@ -68,6 +68,7 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
     _defineProperty(_assertThisInitialized(_this), "__lastChanged", "");
     _defineProperty(_assertThisInitialized(_this), "__is_readonly", void 0);
     _defineProperty(_assertThisInitialized(_this), "__throw_errors", void 0);
+    _defineProperty(_assertThisInitialized(_this), "__deleted", void 0);
     //errors
     _defineProperty(_assertThisInitialized(_this), "__errors", void 0);
     _defineProperty(_assertThisInitialized(_this), "__showErrors", void 0);
@@ -88,6 +89,7 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
     _defineProperty(_assertThisInitialized(_this), "get_managerClass", function () {
       return null;
     });
+    _this.__deleted = false;
     _this.__delta = {};
     _this.__temp = {};
     _this.__is_readonly = is_readonly;
@@ -435,7 +437,10 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
   }, {
     key: "isDeleted",
     get: function get() {
-      return false;
+      return this.__deleted || false;
+    },
+    set: function set(v) {
+      this.__deleted = v;
     }
   }, {
     key: "d",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.3.6",
+    "version": "1.3.8",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",