This commit is contained in:
caishi 2023-03-14 10:22:43 +08:00
parent 6cd4b09954
commit bc9e353a45
5 changed files with 40 additions and 34 deletions

View File

@ -101,7 +101,7 @@ function ChooseMenu({
nameArrs.map((i,k)=>{
return(
<p style={{display:"flex",alignItems:"center"}} className={removeFlag?"removeFlag":''}>
{i.image_url && <img src={getImageUrl(i.image_url)} alt="" width="18px" height="18px" style={{borderRadius:"50%"}} className="mr5"/>}
{i.image_url && <img src={getImageUrl(i.image_url)} alt="" width="26px" height="26px" style={{borderRadius:"50%"}} className="mr5"/>}
{
colorFlag ?
(

View File

@ -31,17 +31,19 @@ function Drop({overlay , children , placement, overlayClassName},ref){
}
}
return(
<Dropdown
placement={placement}
visible={visible}
overlay={<div ref={refFa}>{overlay}</div>}
trigger={['click']}
overlayClassName={overlayClassName}
>
<li ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
{children}
</li>
</Dropdown>
<li>
<Dropdown
placement={placement}
visible={visible}
overlay={<div ref={refFa}>{overlay}</div>}
trigger={['click']}
overlayClassName={overlayClassName}
>
<span className="dropspan" ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
{children}
</span>
</Dropdown>
</li>
)
}
export default forwardRef(Drop);

View File

@ -132,7 +132,7 @@ function DropMenu({
nameArrs.map((i,k)=>{
return(
<p style={{display:"flex",alignItems:"center"}} className={removeFlag?"removeFlag":''}>
{i.image_url && <img src={getImageUrl(i.image_url)} alt="" width="18px" height="18px" style={{borderRadius:"50%"}} className="mr5"/>}
{i.image_url && <img src={getImageUrl(i.image_url)} alt="" width="26px" height="26px" style={{borderRadius:"50%"}} className="mr5"/>}
{
colorFlag ?
(

View File

@ -12,6 +12,8 @@ import cookie from 'react-cookies';
import emp from '../Img/emp.png';
import moment from 'moment';
const { RangePicker } = DatePicker;
const { Search } = Input;
const defaultLimit = 15;
@ -311,17 +313,12 @@ function List(props){
}
}
//
//
function changeBeginTime(data, value){
setPage(1);
setBegin(value);
setBegin(value[0] || undefined);
setEnd(value[1] || undefined);
}
//
function changeEndTime(data, value){
setPage(1);
setEnd(value);
}
return(
<div>
<DelBox visible={visible} onCancel={()=>setVisible(false)} onSuccess={onSuccess}/>
@ -351,6 +348,7 @@ function List(props){
}
</div>
<div>
<RangePicker onChange={changeBeginTime} style={{width:240,marginRight:20}}/>
{/* <DatePicker
value={begin_date ? moment(begin_date, 'YYYY-MM-DD') : ""}
style={{ marginRight: "20px",width:125 }}

View File

@ -190,12 +190,17 @@
li{
min-width: 106px;
display: flex;
align-items: center;
justify-content: flex-end;
&>span{
width: 80px;
display: block;
text-align: right;
cursor: default;
.dropspan{
display: flex;
align-items: center;
cursor: pointer;
&>span{
max-width: 80px;
display: inline-block;
text-align: right;
}
}
}
}
@ -498,9 +503,7 @@
font-size: 13px;
}
&>p{
margin-top: 8px!important;
height: 20px;
line-height: 20px;
margin-top: 5px!important;
position: relative;
padding-right: 15px;
&.removeFlag>span{
@ -658,8 +661,8 @@
}
.author{
img{
width: 22px;
height: 22px;
width: 26px;
height: 26px;
margin-right: 4px;
border-radius: 50%;
}
@ -790,6 +793,9 @@
overflow-y: auto;
&.piecemenu li{
width: auto;
&>span{
display: flex;
}
span.task-hide{
max-width: unset;
}
@ -820,8 +826,8 @@
margin:0px auto;
position: relative;
color:#3f455b;
max-width: 85px;
display: block;
max-width: 80px;
display: inline-block;
}
span{
position: relative;
@ -849,7 +855,7 @@
position: absolute;
right: -12px;
color: #fff;
top: 0px;
top: -16px;
}
}
&:nth-child(5n){