@wavemaker/app-runtime-wm-build 11.4.0-rc.5343 → 11.4.0-rc.5344

app-runtime-wm-build/wmmobile/scripts/wm-libs.js

@@ -231265,6 +231265,8 @@ window.requestAnimationFrame = function() {
                 if (json) {
                     if (Object.keys(json).length === 0) {
                         json = null;
+                    } else if (lodash__WEBPACK_IMPORTED_MODULE_1___default().get(json, "html.body.parsererror")) {
+                        json = null;
                     } else {
                         json = lodash__WEBPACK_IMPORTED_MODULE_1___default().get(json, Object.keys(json)[0]);
                     }

app-runtime-wm-build/wmmobile/scripts/wm-libs.min.js

@@ -4587,7 +4587,7 @@ i.version="2.29.4",o(Zn),i.fn=lo,i.min=er,i.max=tr,i.now=nr,i.utc=m,i.unix=co,i.
 /*!***************************!*\
   !*** ./src/util/utils.ts ***!
   \***************************/
-(e,t,n)=>{"use strict";n.r(t),n.d(t,{DEFAULT_FORMATS:()=>l,DataType:()=>u,IDGenerator:()=>m,extractType:()=>w,findValueOf:()=>A,getBlob:()=>T,getClonedObject:()=>C,getValidJSON:()=>E,hasCordova:()=>v,isDateTimeType:()=>S,isDefined:()=>y,isNumberType:()=>b,isObject:()=>_,isPageable:()=>f,isValidWebURL:()=>h,noop:()=>p,removeExtraSlashes:()=>g,replace:()=>k,stringStartsWith:()=>D,triggerFn:()=>M,xmlToJson:()=>x});var r=n(/*! x2js */"./node_modules/x2js/x2js.js"),i=n.n(r),o=n(/*! lodash */"./node_modules/lodash/lodash.js"),a=n.n(o),s=function(e,t){var n,r,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(o){return function(s){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(i=2&o[0]?r.return:o[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return a.label++,{value:o[1],done:!1};case 5:a.label++,r=o[1],o=[0];continue;case 7:o=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1];break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o;break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o);break}i[2]&&a.ops.pop(),a.trys.pop();continue}o=t.call(e,a)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}},u={INTEGER:"integer",BIG_INTEGER:"big_integer",SHORT:"short",FLOAT:"float",BIG_DECIMAL:"big_decimal",DOUBLE:"double",LONG:"long",BYTE:"byte",STRING:"string",CHARACTER:"character",TEXT:"text",DATE:"date",TIME:"time",TIMESTAMP:"timestamp",DATETIME:"datetime",LOCALDATETIME:"localdatetime",BOOLEAN:"boolean",LIST:"list",CLOB:"clob",BLOB:"blob"},l={DATE:"yyyy-MM-dd",TIME:"HH:mm:ss",TIMESTAMP:"timestamp",DATETIME:"yyyy-MM-ddTHH:mm:ss",LOCALDATETIME:"yyyy-MM-ddTHH:mm:ss",DATETIME_ORACLE:"yyyy-MM-dd HH:mm:ss",DATE_TIME:"yyyy-MM-dd HH:mm:ss"},c={SNAKE_CASE:/[A-Z]/g,ANDROID:/Android/i,IPHONE:/iPhone/i,IPOD:/iPod/i,IPAD:/iPad/i,MAC:/Mac/i,ANDROID_TABLET:/android|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i,MOBILE:/Mobile/i,WINDOWS:/Windows Phone/i,SUPPORTED_IMAGE_FORMAT:/\.(bmp|gif|jpe|jpg|jpeg|tif|tiff|pbm|png|ico)$/i,SUPPORTED_FILE_FORMAT:/\.(txt|js|css|html|script|properties|json|java|xml|smd|xmi|sql|log|wsdl|vm|ftl|jrxml|yml|yaml|md|less|jsp)$/i,SUPPORTED_AUDIO_FORMAT:/\.(mp3|ogg|webm|wma|3gp|wav|m4a)$/i,SUPPORTED_VIDEO_FORMAT:/\.(mp4|ogg|webm|wmv|mpeg|mpg|avi|mov)$/i,PAGE_RESOURCE_PATH:/^\/pages\/.*\.(js|css|html|json)$/,MIN_PAGE_RESOURCE_PATH:/.*(page.min.html)$/,VALID_EMAIL:/^[a-zA-Z][\w.+]+@[a-zA-Z_]+?\.[a-zA-Z.]{1,4}[a-zA-Z]$/,VALID_WEB_URL:/^(http[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9=:?\/\.\-]+(\.[a-zA-Z]{2,5}[\.]{0,1})?/,VALID_WEBSOCKET_URL:/^(ws[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9=:?\/\.\-]+(\.[a-zA-Z]{2,5}[\.]{0,1})?/,VALID_RELATIVE_URL:/^(?!www\.|(?:http|ftp)s?:\/\/|[A-Za-z]:\\|\/\/).*/,REPLACE_PATTERN:/\$\{([^\}]+)\}/g,ZIP_FILE:/\.zip$/i,EXE_FILE:/\.exe$/i,NO_QUOTES_ALLOWED:/^[^'|"]*$/,NO_DOUBLE_QUOTES_ALLOWED:/^[^"]*$/,VALID_HTML:/<[a-z][\s\S]*>/i,VALID_PASSWORD:/^[0-9a-zA-Z-_.@&*!#$%]+$/,SPECIAL_CHARACTERS:/[^A-Z0-9a-z_]+/i,APP_SERVER_URL_FORMAT:/^(http[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9\.\-]+([:]?[0-9]{2,5}|\.[a-zA-Z]{2,5}[\.]{0,1})\/+[^?#&=]+$/,JSON_DATE_FORMAT:/\d{4}-[0-1]\d-[0-3]\d(T[0-2]\d:[0-5]\d:[0-5]\d.\d{1,3}Z$)?/,DATA_URL:/^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*)\s*$/i},d=["int",u.INTEGER,u.FLOAT,u.DOUBLE,u.LONG,u.SHORT,u.BYTE,u.BIG_INTEGER,u.BIG_DECIMAL],p=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]};var h=function(e){return c.VALID_WEB_URL.test(e)},f=function(e){var t=a().omit(e,"empty");return a().isEqual(a().keys({content:[],first:!0,last:!0,number:0,numberOfElements:10,size:20,sort:null,totalElements:10,totalPages:1}),a().keys(t).sort())},m=function(){function e(e){this.generator=function(e){var t;return s(this,(function(n){switch(n.label){case 0:t=1,n.label=1;case 1:return[4,""+e+t++];case 2:return n.sent(),[3,1];case 3:return[2]}}))}(e)}return e.prototype.nextUid=function(){return this.generator.next().value},e}(),v=function(){return!!window.cordova},g=function(e){if(a().isString(e))return a().startsWith(e,"file:///")||/^data:image\/([a-z]{2,});base64,/.test(e)?e:e.replace(new RegExp("([^:]/)(/)+","g"),"$1")},y=function(e){return void 0!==e},_=function(e){return null!==e&&"object"==typeof e},b=function(e){return-1!==d.indexOf(w(e).toLowerCase())},w=function(e){var t;return e?t=(t=(t=e&&e.substring(e.lastIndexOf(".")+1))&&t.toLowerCase())===u.LOCALDATETIME?u.DATETIME:t:u.STRING},S=function(e){return a().includes(e,".")&&(e=a().toLower(w(e))),a().includes([u.DATE,u.TIME,u.TIMESTAMP,u.DATETIME,u.LOCALDATETIME],e)},E=function(e){if(e)try{var t=parseInt(e,10);return _(e)||!isNaN(t)?e:JSON.parse(e)}catch(e){return}},x=function(e){var t=new(i())({emptyNodeForm:"content",attributePrefix:"",enableToStringFunc:!1}).xml2js(e);return t&&(t=0===Object.keys(t).length?null:a().get(t,Object.keys(t)[0])),t},k=function(e,t,n){var r=c.REPLACE_PATTERN;if(e)return n&&(r=/\{([^\}]+)\}/g),e.replace(r,(function(e,n){return a().get(t,n)}))},T=function(e,t){if(e instanceof Blob)return e;var n=E(e);return e=n&&n instanceof Object?new Blob([JSON.stringify(n)],{type:t||"application/json"}):new Blob([e],{type:t||"text/plain"})},C=function(e){return a().cloneDeep(e)},D=function(e,t,n){return!!e&&new RegExp("^"+t,n?"i":"").test(e)};function M(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];for(var r=1,i=arguments.length,o=new Array(i-r);r<i;r++)o[r-1]=arguments[r];if(a().isFunction(e))return e.apply(null,o)}var A=function(e,t,n){if(e&&t){if(!n)return a().get(e,t);var r,i=t.split("."),o=[];if(i.forEach((function(e){if(!i.length)return r=!0,!1;for(var t,n=e.match(/\w+/g);n.length;)t=n.shift(),o.push({key:t,value:n.length?[]:{}})})),!r)return o.forEach((function(t){var n=e[t.key];_(n)||(n=E(n))||(n=t.value),e[t.key]=n,e=n})),e}}},"./src/util/variable/live-variable.http.utils.ts":
+(e,t,n)=>{"use strict";n.r(t),n.d(t,{DEFAULT_FORMATS:()=>l,DataType:()=>u,IDGenerator:()=>m,extractType:()=>w,findValueOf:()=>A,getBlob:()=>T,getClonedObject:()=>C,getValidJSON:()=>E,hasCordova:()=>v,isDateTimeType:()=>S,isDefined:()=>y,isNumberType:()=>b,isObject:()=>_,isPageable:()=>f,isValidWebURL:()=>h,noop:()=>p,removeExtraSlashes:()=>g,replace:()=>k,stringStartsWith:()=>D,triggerFn:()=>M,xmlToJson:()=>x});var r=n(/*! x2js */"./node_modules/x2js/x2js.js"),i=n.n(r),o=n(/*! lodash */"./node_modules/lodash/lodash.js"),a=n.n(o),s=function(e,t){var n,r,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(o){return function(s){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(i=2&o[0]?r.return:o[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return a.label++,{value:o[1],done:!1};case 5:a.label++,r=o[1],o=[0];continue;case 7:o=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1];break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o;break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o);break}i[2]&&a.ops.pop(),a.trys.pop();continue}o=t.call(e,a)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}},u={INTEGER:"integer",BIG_INTEGER:"big_integer",SHORT:"short",FLOAT:"float",BIG_DECIMAL:"big_decimal",DOUBLE:"double",LONG:"long",BYTE:"byte",STRING:"string",CHARACTER:"character",TEXT:"text",DATE:"date",TIME:"time",TIMESTAMP:"timestamp",DATETIME:"datetime",LOCALDATETIME:"localdatetime",BOOLEAN:"boolean",LIST:"list",CLOB:"clob",BLOB:"blob"},l={DATE:"yyyy-MM-dd",TIME:"HH:mm:ss",TIMESTAMP:"timestamp",DATETIME:"yyyy-MM-ddTHH:mm:ss",LOCALDATETIME:"yyyy-MM-ddTHH:mm:ss",DATETIME_ORACLE:"yyyy-MM-dd HH:mm:ss",DATE_TIME:"yyyy-MM-dd HH:mm:ss"},c={SNAKE_CASE:/[A-Z]/g,ANDROID:/Android/i,IPHONE:/iPhone/i,IPOD:/iPod/i,IPAD:/iPad/i,MAC:/Mac/i,ANDROID_TABLET:/android|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i,MOBILE:/Mobile/i,WINDOWS:/Windows Phone/i,SUPPORTED_IMAGE_FORMAT:/\.(bmp|gif|jpe|jpg|jpeg|tif|tiff|pbm|png|ico)$/i,SUPPORTED_FILE_FORMAT:/\.(txt|js|css|html|script|properties|json|java|xml|smd|xmi|sql|log|wsdl|vm|ftl|jrxml|yml|yaml|md|less|jsp)$/i,SUPPORTED_AUDIO_FORMAT:/\.(mp3|ogg|webm|wma|3gp|wav|m4a)$/i,SUPPORTED_VIDEO_FORMAT:/\.(mp4|ogg|webm|wmv|mpeg|mpg|avi|mov)$/i,PAGE_RESOURCE_PATH:/^\/pages\/.*\.(js|css|html|json)$/,MIN_PAGE_RESOURCE_PATH:/.*(page.min.html)$/,VALID_EMAIL:/^[a-zA-Z][\w.+]+@[a-zA-Z_]+?\.[a-zA-Z.]{1,4}[a-zA-Z]$/,VALID_WEB_URL:/^(http[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9=:?\/\.\-]+(\.[a-zA-Z]{2,5}[\.]{0,1})?/,VALID_WEBSOCKET_URL:/^(ws[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9=:?\/\.\-]+(\.[a-zA-Z]{2,5}[\.]{0,1})?/,VALID_RELATIVE_URL:/^(?!www\.|(?:http|ftp)s?:\/\/|[A-Za-z]:\\|\/\/).*/,REPLACE_PATTERN:/\$\{([^\}]+)\}/g,ZIP_FILE:/\.zip$/i,EXE_FILE:/\.exe$/i,NO_QUOTES_ALLOWED:/^[^'|"]*$/,NO_DOUBLE_QUOTES_ALLOWED:/^[^"]*$/,VALID_HTML:/<[a-z][\s\S]*>/i,VALID_PASSWORD:/^[0-9a-zA-Z-_.@&*!#$%]+$/,SPECIAL_CHARACTERS:/[^A-Z0-9a-z_]+/i,APP_SERVER_URL_FORMAT:/^(http[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9\.\-]+([:]?[0-9]{2,5}|\.[a-zA-Z]{2,5}[\.]{0,1})\/+[^?#&=]+$/,JSON_DATE_FORMAT:/\d{4}-[0-1]\d-[0-3]\d(T[0-2]\d:[0-5]\d:[0-5]\d.\d{1,3}Z$)?/,DATA_URL:/^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*)\s*$/i},d=["int",u.INTEGER,u.FLOAT,u.DOUBLE,u.LONG,u.SHORT,u.BYTE,u.BIG_INTEGER,u.BIG_DECIMAL],p=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]};var h=function(e){return c.VALID_WEB_URL.test(e)},f=function(e){var t=a().omit(e,"empty");return a().isEqual(a().keys({content:[],first:!0,last:!0,number:0,numberOfElements:10,size:20,sort:null,totalElements:10,totalPages:1}),a().keys(t).sort())},m=function(){function e(e){this.generator=function(e){var t;return s(this,(function(n){switch(n.label){case 0:t=1,n.label=1;case 1:return[4,""+e+t++];case 2:return n.sent(),[3,1];case 3:return[2]}}))}(e)}return e.prototype.nextUid=function(){return this.generator.next().value},e}(),v=function(){return!!window.cordova},g=function(e){if(a().isString(e))return a().startsWith(e,"file:///")||/^data:image\/([a-z]{2,});base64,/.test(e)?e:e.replace(new RegExp("([^:]/)(/)+","g"),"$1")},y=function(e){return void 0!==e},_=function(e){return null!==e&&"object"==typeof e},b=function(e){return-1!==d.indexOf(w(e).toLowerCase())},w=function(e){var t;return e?t=(t=(t=e&&e.substring(e.lastIndexOf(".")+1))&&t.toLowerCase())===u.LOCALDATETIME?u.DATETIME:t:u.STRING},S=function(e){return a().includes(e,".")&&(e=a().toLower(w(e))),a().includes([u.DATE,u.TIME,u.TIMESTAMP,u.DATETIME,u.LOCALDATETIME],e)},E=function(e){if(e)try{var t=parseInt(e,10);return _(e)||!isNaN(t)?e:JSON.parse(e)}catch(e){return}},x=function(e){var t=new(i())({emptyNodeForm:"content",attributePrefix:"",enableToStringFunc:!1}).xml2js(e);return t&&(t=0===Object.keys(t).length||a().get(t,"html.body.parsererror")?null:a().get(t,Object.keys(t)[0])),t},k=function(e,t,n){var r=c.REPLACE_PATTERN;if(e)return n&&(r=/\{([^\}]+)\}/g),e.replace(r,(function(e,n){return a().get(t,n)}))},T=function(e,t){if(e instanceof Blob)return e;var n=E(e);return e=n&&n instanceof Object?new Blob([JSON.stringify(n)],{type:t||"application/json"}):new Blob([e],{type:t||"text/plain"})},C=function(e){return a().cloneDeep(e)},D=function(e,t,n){return!!e&&new RegExp("^"+t,n?"i":"").test(e)};function M(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];for(var r=1,i=arguments.length,o=new Array(i-r);r<i;r++)o[r-1]=arguments[r];if(a().isFunction(e))return e.apply(null,o)}var A=function(e,t,n){if(e&&t){if(!n)return a().get(e,t);var r,i=t.split("."),o=[];if(i.forEach((function(e){if(!i.length)return r=!0,!1;for(var t,n=e.match(/\w+/g);n.length;)t=n.shift(),o.push({key:t,value:n.length?[]:{}})})),!r)return o.forEach((function(t){var n=e[t.key];_(n)||(n=E(n))||(n=t.value),e[t.key]=n,e=n})),e}}},"./src/util/variable/live-variable.http.utils.ts":
 /*!*******************************************************!*\
   !*** ./src/util/variable/live-variable.http.utils.ts ***!
   \*******************************************************/

app-runtime-wm-build/wmmobile/scripts/wm-mobileloader.js

@@ -22781,10 +22781,10 @@
 }));
 
 (function(global, factory) {
-    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@angular/common"), require("@wm/components/base")) : typeof define === "function" && define.amd ? define("@wm/components/basic/tree", [ "exports", "@angular/core", "@angular/common", "@wm/components/base" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
+    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@angular/common"), require("@wm/components/base"), require("@wm/core")) : typeof define === "function" && define.amd ? define("@wm/components/basic/tree", [ "exports", "@angular/core", "@angular/common", "@wm/components/base", "@wm/core" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
     factory((global.wm = global.wm || {}, global.wm.components = global.wm.components || {}, 
-    global.wm.components.basic = global.wm.components.basic || {}, global.wm.components.basic.tree = {}), global.ng.core, global.ng.common, global.wm.components.base));
-})(this, (function(exports, core, common, base) {
+    global.wm.components.basic = global.wm.components.basic || {}, global.wm.components.basic.tree = {}), global.ng.core, global.ng.common, global.wm.components.base, global.wm.core));
+})(this, (function(exports, core$1, common, base, core) {
     "use strict";
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -23173,7 +23173,11 @@
             _this.setting = {
                 data: {
                     simpleData: {
-                        enable: true
+                        enable: false
+                    },
+                    key: {
+                        children: "children",
+                        name: "label"
                     }
                 },
                 view: {
@@ -23210,11 +23214,19 @@
                 break;
 
               case "nodelabel":
-                this.nodelabel = nv;
+                this.setting.data.key.name = this.labelKey;
+                this.renderTree();
                 break;
 
-              case "icon":
-                this.nodeicon = nv;
+              case "nodechildren":
+                this.setting.data.key.children = this.childrenKey;
+                this.renderTree();
+                break;
+
+              case "nodeicon":
+                this.nodeicon = this.iconKey;
+                this.renderTree();
+                break;
 
               case "orderby":
                 this.renderTree();
@@ -23232,9 +23244,10 @@
         TreeComponent.prototype.expandTree = function(level, node, childLevel) {
             var _this = this;
             node.map((function(childNode) {
-                if ("children" in childNode && !("open" in childNode) && childLevel < level) {
+                var children = _this.getChildren(childNode);
+                if (children && !("open" in childNode) && childLevel < level) {
                     childNode["open"] = true;
-                    _this.expandTree(level, childNode.children, childLevel + 1);
+                    _this.expandTree(level, children, childLevel + 1);
                 } else {
                     childLevel = 0;
                     return;
@@ -23283,8 +23296,9 @@
             var _this = this;
             if (depth === 0) {
                 nodes.map((function(node) {
-                    if (node.children) {
-                        _this.setNodeData(node.children, depth, level, parentNode, type);
+                    var children = _this.getChildren(node);
+                    if (children) {
+                        _this.setNodeData(children, depth, level, parentNode, type);
                     }
                     if (node.icon && _this.nodelabel == "icon") {
                         node[type] = node.icon;
@@ -23296,11 +23310,12 @@
                 }));
             } else {
                 nodes.map((function(node) {
-                    if (node.children && level > 1) {
+                    var children = _this.getChildren(node);
+                    if (children && level > 1) {
                         if (depth === level) {
                             parentNode = node;
                         }
-                        _this.setNodeData(node.children, depth, level - 1, parentNode, type);
+                        _this.setNodeData(children, depth, level - 1, parentNode, type);
                     }
                     if (level === 1 && (type === "name" ? _this.nodelabel.includes("label") || _this.nodelabel.includes("name") : _this.nodeicon.includes("label") || _this.nodeicon.includes("name"))) {
                         parentNode[type] = node.name || node.label;
@@ -23327,20 +23342,26 @@
         };
         TreeComponent.prototype.getPath = function(treeNode, path) {
             if (treeNode.getParentNode() === null) {
-                path = "/" + treeNode.name + path;
+                path = "/" + treeNode[this.labelKey] + path;
             } else {
-                path = this.getPath(treeNode.getParentNode(), path) + "/" + treeNode.name;
+                path = this.getPath(treeNode.getParentNode(), path) + "/" + treeNode[this.labelKey];
             }
             return path;
         };
         TreeComponent.prototype.onClick = function(event, treeId, treeNode, clickFlag) {
-            var treeObj = $.fn.zTree.getZTreeObj("" + this.name);
+            if (this.nodeclick === "expand") {
+                var nodes = this.treeObj.getSelectedNodes();
+                if (nodes.length > 0) {
+                    this.expandNode(nodes[0], !nodes[0].open, true);
+                }
+            }
             var path = this.getPath(treeNode, "");
             var eventParams = {
                 $event: event,
                 $item: treeNode,
                 $path: path
             };
+            this.setSelectedItem(treeNode);
             this.invokeEventCallback("select", eventParams);
         };
         TreeComponent.prototype.onExpand = function(event, treeId, treeNode) {
@@ -23352,7 +23373,8 @@
                 $path: path
             };
             this.invokeEventCallback("expand", eventParams);
-            treeNode.children ? treeNode.children.map((function(el) {
+            var children = this.getChildren(treeNode);
+            children === null || children === void 0 ? void 0 : children.map((function(el) {
                 if (el.isParent) {
                     var ele_1 = $("#" + el.tId + "_switch");
                     $(ele_1).addClass(self.treeicon || defaultTreeIconClass);
@@ -23362,7 +23384,7 @@
                         }), 0);
                     }));
                 }
-            })) : "";
+            }));
         };
         TreeComponent.prototype.onCollapse = function(event, treeId, treeNode) {
             var path = this.getPath(treeNode, "");
@@ -23373,20 +23395,52 @@
             };
             this.invokeEventCallback("collapse", eventParams);
         };
+        TreeComponent.prototype.getChildren = function(node) {
+            return node[this.childrenKey];
+        };
+        Object.defineProperty(TreeComponent.prototype, "childrenKey", {
+            get: function() {
+                var depth = this.countDepth(this.nodechildren);
+                return depth ? this.nodechildren.split(".").pop() : this.nodechildren || "children";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TreeComponent.prototype, "labelKey", {
+            get: function() {
+                var depth = this.countDepth(this.nodelabel);
+                return depth ? this.nodelabel.split(".").pop() : this.nodelabel || "label";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TreeComponent.prototype, "iconKey", {
+            get: function() {
+                var depth = this.countDepth(this.nodeicon);
+                return depth ? this.nodeicon.split(".").pop() : this.nodeicon || "icon";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TreeComponent.prototype, "treeObj", {
+            get: function() {
+                return $.fn.zTree.getZTreeObj("" + this.name);
+            },
+            enumerable: false,
+            configurable: true
+        });
         TreeComponent.prototype.modifyObjects = function(array) {
             var _this = this;
             array.forEach((function(obj) {
-                if (obj.label !== undefined) {
-                    obj.name = obj.label;
-                    delete obj.label;
-                }
-                if (obj.children !== undefined) {
-                    _this.modifyObjects(obj.children);
+                obj.icon = obj[_this.nodeicon];
+                var children = _this.getChildren(obj);
+                if (children === null || children === void 0 ? void 0 : children.length) {
+                    _this.modifyObjects(children);
                 }
             }));
-            return array;
         };
         TreeComponent.prototype.setNodeChildren = function(nodes, depth, level, parentNode) {
+            var _this = this;
             if (depth <= 0) {
                 return nodes;
             }
@@ -23395,17 +23449,17 @@
                 if (depth === level) {
                     parentNode = nodes[i];
                 }
-                if (node.children && node.children.length > 0) {
+                var children = this.getChildren(node);
+                if (children === null || children === void 0 ? void 0 : children.length) {
                     if (level === 1) {
-                        parentNode.children = node.children.map((function(child) {
-                            return {
-                                name: child.name,
-                                children: child === null || child === void 0 ? void 0 : child.children
-                            };
+                        parentNode[this.childrenKey] = children.map((function(child) {
+                            var _a;
+                            return _a = {}, _a[_this.labelKey] = child[_this.labelKey], _a[_this.childrenKey] = _this.getChildren(child), 
+                            _a.icon = child[_this.iconKey], _a;
                         }));
                         return;
                     } else {
-                        this.setNodeChildren(node.children, depth, level - 1, parentNode);
+                        this.setNodeChildren(children, depth, level - 1, parentNode);
                     }
                 }
             }
@@ -23436,10 +23490,11 @@
             return count;
         };
         TreeComponent.prototype.renderTree = function() {
-            console.log(this.nodes, "this.nodes");
             if (this.nodes) {
                 this.nativeElement.setAttribute("id", this.name);
-                this.nodes = this.modifyObjects(this.nodes);
+                if (this.nodeicon && this.nodeicon !== "icon") {
+                    this.modifyObjects(this.nodes);
+                }
                 this.setTreeTemplate(this.treeClass);
                 if (this.nodelabel) {
                     var depth = 0;
@@ -23469,27 +23524,58 @@
             var zTree = $.fn.zTree.init($('ul[name="' + this.name + '"]'), this.setting, this.nodes);
             $.fn.zTreeKeyboardNavigation(zTree, $('ul[name="' + this.name + '"]'), null, this.treeicon || defaultTreeIconClass);
         };
+        TreeComponent.prototype.setSelectedItem = function(treeNode) {
+            debugger;
+            this.selecteditem = core.getClonedObject(treeNode) || {};
+            this.selecteditem.path = this.getPath(treeNode, "");
+            var deSelectElm = $("li[treenode].selected");
+            deSelectElm.removeClass("selected");
+            var selectElm = $("#" + treeNode.tId + ":has(.curSelectedNode)");
+            selectElm.addClass("selected");
+        };
+        TreeComponent.prototype.expandNode = function(node, expand, eventFlag) {
+            this.treeObj.expandNode(node, expand, false, false, eventFlag);
+            var el = $("#" + node.tId + "_switch");
+            $(el).addClass(this.treeicon || defaultTreeIconClass);
+        };
         TreeComponent.prototype.ngAfterViewInit = function() {
             var _this = this;
             setTimeout((function() {
                 _this.changeTreeIcons(_this.treeicon || defaultTreeIconClass);
+                if (_this.datavalue) {
+                    var nodes = _this.treeObj.getNodes();
+                    var selectNode = void 0;
+                    if (_this.datavalue === "FirstNode") {
+                        if (nodes.length) {
+                            selectNode = nodes[0];
+                        }
+                    }
+                    if (_this.datavalue === "LastNode") {
+                        if (nodes.length) {
+                            selectNode = nodes[nodes.length - 1];
+                        }
+                    }
+                    _this.treeObj.selectNode(selectNode, false);
+                    _this.setSelectedItem(selectNode);
+                    _this.expandNode(selectNode, true, false);
+                }
             }), 200);
         };
         return TreeComponent;
     }(base.StylableComponent);
     TreeComponent.initializeProps = registerProps();
     TreeComponent.decorators = [ {
-        type: core.Component,
+        type: core$1.Component,
         args: [ {
             selector: "ul[wmTree]",
             template: '<ul #wmTree class="ztree" id="ztree"></ul>  ',
             providers: [ base.provideAsWidgetRef(TreeComponent) ],
-            encapsulation: core.ViewEncapsulation.None
+            encapsulation: core$1.ViewEncapsulation.None
         } ]
     } ];
     TreeComponent.ctorParameters = function() {
         return [ {
-            type: core.Injector
+            type: core$1.Injector
         } ];
     };
     var components = [ TreeComponent ];
@@ -23498,7 +23584,7 @@
         return TreeModule;
     }();
     TreeModule.decorators = [ {
-        type: core.NgModule,
+        type: core$1.NgModule,
         args: [ {
             imports: [ common.CommonModule, base.WmComponentsModule ],
             declarations: __spreadArray([], __read(components)),
@@ -71581,30 +71667,37 @@
                 toaster.onHidden.subscribe(this.onToasterHide.bind(this, variable));
             }
         };
+        NotificationActionManager.prototype.getDialogConfig = function(variable, options, dialogId, closeCallBackFn) {
+            return {
+                title: options.title || variable.dataBinding.title,
+                text: options.message || variable.dataBinding.text,
+                okButtonText: options.okButtonText || variable.dataBinding.okButtonText || "OK",
+                cancelButtonText: options.cancelButtonText || variable.dataBinding.cancelButtonText || "CANCEL",
+                alerttype: options.alerttype || variable.dataBinding.alerttype || "information",
+                onOk: function() {
+                    exports.dialogService.close(dialogId, undefined, closeCallBackFn);
+                },
+                onCancel: function() {
+                    initiateCallback("onCancel", variable, options.data);
+                    exports.dialogService.close(dialogId, undefined);
+                },
+                onClose: function() {
+                    initiateCallback("onClose", variable, options.data);
+                }
+            };
+        };
         NotificationActionManager.prototype.notifyViaDialog = function(variable, options) {
-            var commonPageDialogId = "Common" + _.capitalize(variable.operation) + "Dialog", dialogId = commonPageDialogId;
+            var isPrefabType = core.getWmProjectProperties().type === "PREFAB";
+            var dialogPrefix = isPrefabType ? "Prefab" : "Common";
+            var dialogId = dialogPrefix + _.capitalize(variable.operation) + "Dialog";
             var closeCallBackFn = function() {
                 return initiateCallback("onOk", variable, options.data);
             };
-            exports.dialogService.open(dialogId, undefined, {
-                notification: {
-                    title: options.title || variable.dataBinding.title,
-                    text: options.message || variable.dataBinding.text,
-                    okButtonText: options.okButtonText || variable.dataBinding.okButtonText || "OK",
-                    cancelButtonText: options.cancelButtonText || variable.dataBinding.cancelButtonText || "CANCEL",
-                    alerttype: options.alerttype || variable.dataBinding.alerttype || "information",
-                    onOk: function() {
-                        exports.dialogService.close(dialogId, undefined, closeCallBackFn);
-                    },
-                    onCancel: function() {
-                        initiateCallback("onCancel", variable, options.data);
-                        exports.dialogService.close(dialogId, undefined);
-                    },
-                    onClose: function() {
-                        initiateCallback("onClose", variable, options.data);
-                    }
-                }
-            });
+            var dialogConfig = this.getDialogConfig(variable, options, dialogId, closeCallBackFn);
+            dialogConfig = isPrefabType ? dialogConfig : {
+                notification: dialogConfig
+            };
+            exports.dialogService.open(dialogId, undefined, dialogConfig);
         };
         NotificationActionManager.prototype.notify = function(variable, options, success, error) {
             var operation = variable.operation;
@@ -83747,7 +83840,7 @@
         type: i0.Component,
         args: [ {
             selector: "app-root",
-            template: '<ng-container *ngIf="startApp">\n    <router-outlet></router-outlet>\n    <div wmContainer partialContainer content="Common" hidden class="ng-hide" *ngIf="isApplicationType"></div>\n    <app-spinner name="globalspinner" classname="global-spinner" role="alert" aria-live="assertive" [attr.aria-label]="spinner.arialabel || \'Loading\'" [show]="spinner.show" [spinnermessages]="spinner.messages"></app-spinner>\n    <div wmDialog name="oAuthLoginDialog" title="Application is requesting you to sign in with"\n         close.event="closeOAuthDialog()">\n        <ng-template #dialogBody>\n            <ul class="list-items">\n                <li class="list-item" *ngFor="let provider of providersConfig">\n                    <button class="btn" (click)="provider.invoke()">{{provider.name}}</button>\n                </li>\n            </ul>\n        </ng-template>\n    </div>\n    <div wmConfirmDialog name="_app-confirm-dialog" title.bind="title" message.bind="message" oktext.bind="oktext"\n         canceltext.bind="canceltext" closable="false" iconclass.bind="iconclass"\n         escape.event="onEscape()" ok.event="onOk()" cancel.event="onCancel()" close.event="onClose()" opened.event="onOpen()"></div>\n    <div wmAppExt></div>\n    <i id="wm-mobile-display"></i>\n</ng-container>\n\x3c!--Dummy container to create the component dynamically--\x3e\n<ng-container #dynamicComponent></ng-container>\n',
+            template: '<ng-container *ngIf="startApp">\n    <router-outlet></router-outlet>\n    <div wmContainer partialContainer content="Common" hidden class="ng-hide" *ngIf="isApplicationType"></div>\n    <app-spinner name="globalspinner" classname="global-spinner" role="alert" aria-live="assertive" [attr.aria-label]="spinner.arialabel || \'Loading\'" [show]="spinner.show" [spinnermessages]="spinner.messages"></app-spinner>\n    <div wmDialog name="oAuthLoginDialog" title="Application is requesting you to sign in with"\n         close.event="closeOAuthDialog()">\n        <ng-template #dialogBody>\n            <ul class="list-items">\n                <li class="list-item" *ngFor="let provider of providersConfig">\n                    <button class="btn" (click)="provider.invoke()">{{provider.name}}</button>\n                </li>\n            </ul>\n        </ng-template>\n    </div>\n    <div wmConfirmDialog name="_app-confirm-dialog" title.bind="title" message.bind="message" oktext.bind="oktext"\n         canceltext.bind="canceltext" closable="false" iconclass.bind="iconclass"\n         escape.event="onEscape()" ok.event="onOk()" cancel.event="onCancel()" close.event="onClose()" opened.event="onOpen()"></div>\n    <div  *ngIf="!isApplicationType" wmConfirmDialog name="PrefabConfirmDialog" title.bind="title" message.bind="text" oktext.bind="okButtonText"\n         canceltext.bind="cancelButtonText" closable="false" iconclass.bind="iconclass"\n         escape.event="onEscape()" ok.event="onOk()" cancel.event="onCancel()" close.event="onClose()" opened.event="onOpen()"></div>\n    <div  *ngIf="!isApplicationType" wmAlertDialog name="PrefabAlertDialog" title.bind="title" message.bind="text" oktext.bind="okButtonText"\n         canceltext.bind="cancelButtonText" closable="false" iconclass.bind="iconclass"\n         escape.event="onEscape()" ok.event="onOk()" cancel.event="onCancel()" close.event="onClose()" opened.event="onOpen()"></div>\n    <div wmAppExt></div>\n    <i id="wm-mobile-display"></i>\n</ng-container>\n\x3c!--Dummy container to create the component dynamically--\x3e\n<ng-container #dynamicComponent></ng-container>\n',
             encapsulation: i0.ViewEncapsulation.None
         } ]
     } ];