Merge branch 'fix/application_host_empty' into 'develop'

Merge of fix/application_host_empty to develop

See merge request o2oa/o2oa!753

o2web/source/x_component_Profile/$Main/default/view.html

@@ -169,4 +169,4 @@
             <!--<a class="o2_profile_ssoItemLink" target="_blank" href="../x_desktop/oauth.html?oauth=eachText{encodeURIComponent($.name)}&redirect=&method=oauthBind">{{$.displayName}}</a>-->
         </div>
     </div>
-</div>
+</div>

o2web/source/x_component_Profile/$Main/newVersion/style.css

@@ -334,6 +334,13 @@
     font-weight: bold;
     color: #666666;
 }
+.o2_profile_facesetButton {
+    padding: 20px;
+    font-size: 18px;
+    font-weight: bold;
+    color: #666666;
+    cursor: pointer;
+}
 .o2_profile_ssoConfigArea{
     padding: 10px 40px;
 }
@@ -603,4 +610,4 @@ label.o2_profile_empower_radio input[type=radio]{
 }
 .pagination>div{
     display: inline-block;
-}
+}

o2web/source/x_component_Profile/$Main/newVersion/view.html

@@ -162,4 +162,8 @@
             <!--<a class="o2_profile_ssoItemLink" target="_blank" href="../x_desktop/oauth.html?oauth=eachText{encodeURIComponent($.name)}&redirect=&method=oauthBind">{{$.displayName}}</a>-->
         </div>
     </div>
-</div>
+
+    <div class="o2_profile_configNode" data-o2-element="faceloginNode" title="{{$.lp.facelogin}}">
+        <div class="o2_profile_facesetButton" data-o2-element="faceloginbutton" data-o2-events="click:openFaceSet">{{ $.lp.openFaceSet }}</div>
+    </div>
+</div>

o2web/source/x_component_Profile/$Main/newVersion/viewBrowser.html

@@ -146,4 +146,8 @@
             <!--<a class="o2_profile_ssoItemLink" target="_blank" href="../x_desktop/oauth.html?oauth=eachText{encodeURIComponent($.name)}&redirect=&method=oauthBind">{{$.displayName}}</a>-->
         </div>
     </div>
-</div>
+
+    <div class="o2_profile_configNode" data-o2-element="faceloginNode" title="{{$.lp.facelogin}}">
+        <div class="o2_profile_facesetButton" data-o2-element="faceloginbutton" data-o2-events="click:openFaceSet">{{ $.lp.openFaceSet }}</div>
+    </div>
+</div>

o2web/source/x_component_Profile/Main.js

@@ -32,7 +32,7 @@ MWF.xApplication.Profile.Main = new Class({
             this.personData = json.data;
             this.personData.personIcon = this.action.getPersonIcon();
 
-            this.content.loadHtml(this.path+this.options.style+"/"+((this.inBrowser||layout.viewMode=="Default")? "viewBrowser": "view")+".html", {"bind": {"data": this.personData, "lp": this.lp}}, function(){
+            this.content.loadHtml(this.path+this.options.style+"/"+((this.inBrowser||layout.viewMode=="Default")? "viewBrowser": "view")+".html", {"bind": {"data": this.personData, "lp": this.lp}, "module": this}, function(){
                 this.loadContent()
             }.bind(this));
         }.bind(this));
@@ -44,6 +44,7 @@ MWF.xApplication.Profile.Main = new Class({
     },
 
     loadContent: function(){
+        debugger;
         var pageConfigNodes = this.content.getElements(".o2_profile_configNode");
 
         this.contentNode = this.content.getElement(".o2_profile_contentNode");
@@ -101,6 +102,9 @@ MWF.xApplication.Profile.Main = new Class({
 
         }.bind(this));
     },
+    openFaceSet: function(){
+        layout.openApplication(null, "FaceSet");
+    },
     loadInforConfigActions: function(){
         this.contentImgNode = this.content.getElement(".o2_profile_inforIconContentImg");
         this.content.getElement(".o2_profile_inforIconChange").addClass("mainColor_color mainColor_border").addEvent("click", function(){

o2web/source/x_component_Profile/lp/en.js

@@ -4,6 +4,8 @@ MWF.xApplication.Profile.LP = {
     "layoutConfig": "UI",
     "ideaConfig": "Opinion",
     "passwordConfig": "Password",
+    "facelogin": "Face Login",
+    "openFaceSet": "Open FaceSet",
 
     "clear": "清除界面数据",
     "setDefault": "设置为默认界面",
@@ -96,4 +98,4 @@ MWF.xApplication.Profile.LP = {
     "receiveEmPowerLog": "收到的待办",
     "ok":"保存",
     "cancel":"关闭"
-};
+};

o2web/source/x_component_Profile/lp/zh-cn.js

@@ -5,6 +5,8 @@ MWF.xApplication.Profile.LP = {
     "ideaConfig": "常用意见",
     "passwordConfig": "修改密码",
     "ssoConfig": "单点登录",
+    "facelogin": "人脸登录",
+    "openFaceSet": "打开人脸登录设置",
 
     "clear": "清除界面数据",
     "setDefault": "设置为默认界面",
@@ -98,4 +100,4 @@ MWF.xApplication.Profile.LP = {
     "receiveEmPowerLog": "收到的待办",
     "ok":"保存",
     "cancel":"关闭"
-};
+};