Commit e57a2c1f by zhangleyuan

feat:处理超出显示...

parent 52fc5092
...@@ -141,7 +141,7 @@ function EmployeeManage() { ...@@ -141,7 +141,7 @@ function EmployeeManage() {
const columns = [ const columns = [
{ {
title: "员工", title: "员工",
dataIndex: "nickName", dataIndex: "weChatAccount",
render: (val: string, record: RecordTypes) => { render: (val: string, record: RecordTypes) => {
return ( return (
<div className="employee-info"> <div className="employee-info">
......
...@@ -37,8 +37,8 @@ function DepartMentTabCon(props) { ...@@ -37,8 +37,8 @@ function DepartMentTabCon(props) {
return ( return (
<div> <div>
{item.sourceEnum === "WORK_WE_CHAT" ? {item.sourceEnum === "WORK_WE_CHAT" ?
<span> <WWOpenDataCom type="userName" openid={val}/></span>: <Tooltip title={<div><WWOpenDataCom type="userName" openid={val}/></div>}><span className="student-name"><WWOpenDataCom type="userName" openid={val}/></span></Tooltip>:
<span>{val}</span> <Tooltip title={val}><span className="student-name">{val}</span></Tooltip>
} }
<span <span
className="tag" className="tag"
......
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.student-name{
max-width: 120px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
vertical-align: middle;
}
.operate-area{ .operate-area{
margin-bottom:16px; margin-bottom:16px;
.add-user-btn{ .add-user-btn{
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-09-10 18:26:03 * @Date: 2019-09-10 18:26:03
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-04 15:56:16 * @LastEditTime: 2021-08-09 15:24:55
* @Description: * @Description:
*/ */
import React, { useRef, useContext, useEffect, useState } from 'react'; import React, { useRef, useContext, useEffect, useState } from 'react';
...@@ -76,8 +76,8 @@ function Header(props) { ...@@ -76,8 +76,8 @@ function Header(props) {
storeUserId: User.getStoreUserId(), storeUserId: User.getStoreUserId(),
}; };
BaseService.getStoreUser(param).then((res) => { BaseService.getStoreUser(param).then((res) => {
const { nickName, phone } = res.result; const { weChatAccount, phone } = res.result;
setNickName(nickName); setNickName(weChatAccount);
setPhone(phone); setPhone(phone);
setAvatar(res.result.avatar); setAvatar(res.result.avatar);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment