From 27a770ee863356d2ef120970723bb048c510d9aa Mon Sep 17 00:00:00 2001
From: renxxing <74659302+renxxing@users.noreply.github.com>
Date: Mon, 14 Dec 2020 17:15:31 +0800
Subject: [PATCH] fix(fix #290): userinfo

User information takes effect
---
 src/config.js               |  3 ++-
 src/controllers/constant.js |  7 +++++--
 src/css/luckysheet-core.css | 17 ++++++++++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/config.js b/src/config.js
index 7b53de0ce..8f94e1cb0 100644
--- a/src/config.js
+++ b/src/config.js
@@ -16,7 +16,8 @@ export default {
     // menu: "undo|redo|freezenrow|freezencolumn|download|share|chart|pivot",
     data: [{ "name": "Sheet1", color: "", "status": "1", "order": "0", "data": [], "config": {}, "index":0 }, { "name": "Sheet2", color: "", "status": "0", "order": "1", "data": [], "config": {}, "index":1  }, { "name": "Sheet3", color: "", "status": "0", "order": "2", "data": [], "config": {}, "index":2  }], //客户端sheet数据[shee1, sheet2, sheet3]
     title: "Luckysheet Demo", //表格的名称
-    userInfo: '<i style="font-size:16px;color:#ff6a00;" class="fa fa-taxi" aria-hidden="true"></i> rabbit', //右上角的用户信息展示样式
+    // userInfo: '<i style="font-size:16px;color:#ff6a00;" class="fa fa-taxi" aria-hidden="true"></i> rabbit'
+    userInfo:{imgurl:'https://dss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1490464830,1853038030&fm=26&gp=0.jpg',username:'lucky'}, //右上角的用户信息展示样式
     userMenuItem: [{url:"www.baidu.com", "icon":'<i class="fa fa-folder" aria-hidden="true"></i>', "name":"我的表格"}, {url:"www.baidu.com", "icon":'<i class="fa fa-sign-out" aria-hidden="true"></i>', "name":"退出登陆"}], //点击右上角的用户信息弹出的菜单
     myFolderUrl: "www.baidu.com", //左上角<返回按钮的链接
     config: {}, //表格行高、列宽、合并单元格、公式等设置
diff --git a/src/controllers/constant.js b/src/controllers/constant.js
index 904c2d5a3..01a5df8df 100644
--- a/src/controllers/constant.js
+++ b/src/controllers/constant.js
@@ -1,7 +1,7 @@
 import locale from '../locale/locale';
 import Store from '../store';
 import luckysheetConfigsetting from './luckysheetConfigsetting';
-
+import config from '../config'
 //dom variable
 const gridHTML = function(){ 
     const _locale = locale();
@@ -21,7 +21,10 @@ const gridHTML = function(){
                             </div> 
                             <div id="luckysheet_info_detail_update" class="luckysheet_info_detail_update"> ${locale_info.detailUpdate} </div> 
                             <div id="luckysheet_info_detail_save" class="luckysheet_info_detail_save"> ${locale_info.wait} </div> 
-                            <div class="luckysheet_info_detail_user"> \${functionButton} <span id="luckysheet_info_detail_user"></span> </div> 
+                            <div class="luckysheet_info_detail_user" style="display:${config.userInfo.imgurl.length > 0 ? 'block' : 'none'};"> \${functionButton} 
+                                <img src="${config.userInfo.imgurl}" id="luckysheet_info_detail_user_img">
+                                <span id="luckysheet_info_detail_user">${config.userInfo.username}</span> 
+                            </div>
                         </div> 
                         <div id="luckysheet-wa-editor" class="luckysheet-wa-editor toolbar"> \${menu} </div> 
                         <div id="luckysheet-wa-calculate" class="luckysheet-wa-calculate"> 
diff --git a/src/css/luckysheet-core.css b/src/css/luckysheet-core.css
index 3ac9459ba..a08c1324c 100644
--- a/src/css/luckysheet-core.css
+++ b/src/css/luckysheet-core.css
@@ -106,12 +106,19 @@
 }
 
 .luckysheet_info_detail_user {
-    right: 20px;
-    font-size: 12px;
-    cursor: pointer;
-    position: absolute;
+	/* right: 20px; */
+	font-size: 12px;
+	cursor: pointer;
+	margin-left: 10px;
+	/* position: absolute; */
+}
+#luckysheet_info_detail_user_img {
+    vertical-align: middle;
+    height: 30px;
+    line-height: 30px;
+    border-radius: 50%;
+    object-fit: cover;
 }
-
 .luckysheet_info_detail_save {
     color: #828282;
     font-size: 12px;