Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2712

o2web/source/o2_core/o2/xDesktop/Default.js

@@ -1,10 +1,10 @@
-
-
 // o2.require("o2.widget.Common", null, false);
 // o2.require("o2.xDesktop.Common", null, false);
 // o2.require("o2.xDesktop.Actions.RestActions", null, false);
 // o2.require("o2.xDesktop.Authentication", null, false);
 
+o2.require("o2.widget.PinYin", null, false);
+
 o2.xDesktop.Default = new Class({
     Implements: [Options, Events],
     options: {
@@ -992,7 +992,7 @@ o2.xDesktop.Default.StartMenu = new Class({
     },
     searchQuerys: function(value){
         if (this.queryJson && this.queryJson.length) this.queryJson.each(function(v){
-            if ((v.appName.toPYFirst().toLowerCase().indexOf(value)!==-1) || (v.appName.toPY().toLowerCase().indexOf(value)!==-1) || (v.appName.indexOf(value)!==-1)){
+            if ((v.name.toPYFirst().toLowerCase().indexOf(value)!==-1) || (v.name.toPY().toLowerCase().indexOf(value)!==-1) || (v.name.indexOf(value)!==-1)){
                 this.createQueryMenuItem(v);
             }
         }.bind(this));

o2web/source/x_component_portal_Portal/Main.js

@@ -154,7 +154,8 @@ MWF.xApplication.portal.Portal.Main = new Class({
         }
     },
     openPage: function(pageJson, par, callback){
-        this.setTitle((this.portal && this.portal.name) ? this.portal.name+"-"+pageJson.data.page.name : pageJson.data.page.name);
+        var pageName = pageJson.data.page ? pageJson.data.page.name : pageJson.data.name;
+        this.setTitle((this.portal && this.portal.name) ? this.portal.name+"-"+pageName : pageName);
         if (pageJson.data.page){
             this.page = (pageJson.data.page.data) ? JSON.decode(MWF.decodeJsonString(pageJson.data.page.data)): null;
             this.relatedFormMap = pageJson.data.relatedWidgetMap;
@@ -205,7 +206,10 @@ MWF.xApplication.portal.Portal.Main = new Class({
         }
         this.action.getApplication(this.options.portalId, function(json){
             this.portal = json.data;
-            if (this.pageJson) this.setTitle(this.portal.name+"-"+this.pageJson.data.page.name);
+            if (this.pageJson){
+                var pageName = this.pageJson.data.page ? this.pageJson.data.page.name : this.pageJson.data.name;
+                this.setTitle(this.portal.name+"-"+pageName);
+            }
 
             if (this.portal.icon){
                 if (this.taskitem){