|
@@ -180,6 +180,16 @@ class AddAssistCheck extends React.Component {
|
|
|
getAssistLabel() {
|
|
|
const { assistLabel,checkedListImport, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth,getInfomation,assistList } = this.props;
|
|
|
const { visible,activeName,id,date } = this.state;
|
|
|
+ //出现滚动条时阻止滚动冒泡,未出现时不阻止,否则外部滚动条滚不动
|
|
|
+ const showedBar = $("#datePick .scrollbar-container").length===1;
|
|
|
+ const contStyle={
|
|
|
+ opacity:'0.4',
|
|
|
+ right:'0',
|
|
|
+ top:'1px',
|
|
|
+ zIndex:'15',
|
|
|
+ width:'8px',
|
|
|
+ background:'#f1f1f1'};
|
|
|
+ const barStyle={background:'#777',width:'100%'};
|
|
|
return <React.Fragment>
|
|
|
{
|
|
|
checkedListImport.map((part,index)=>{
|
|
@@ -194,7 +204,16 @@ class AddAssistCheck extends React.Component {
|
|
|
</span>
|
|
|
</span>
|
|
|
<div className={styles.textareaWrap}>
|
|
|
- <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
|
|
|
+ <ScrollArea speed={0.8}
|
|
|
+ horizontal={false}
|
|
|
+ stopScrollPropagation={showedBar?true:false}
|
|
|
+ style={{maxHeight:'100px'}}
|
|
|
+ className={styles["area"]}
|
|
|
+ verticalContainerStyle={contStyle}
|
|
|
+ verticalScrollbarStyle={barStyle}
|
|
|
+ contentClassName="content">
|
|
|
+ <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
|
|
|
+ </ScrollArea>
|
|
|
</div>
|
|
|
<div className={styles.pointerFinger}>
|
|
|
<p>报告日期:<span>{item.time || this.state.dateTime}</span></p>
|
|
@@ -237,7 +256,16 @@ class AddAssistCheck extends React.Component {
|
|
|
</span>
|
|
|
</span>
|
|
|
<div className={styles.textareaWrap}>
|
|
|
+ <ScrollArea speed={0.8}
|
|
|
+ horizontal={false}
|
|
|
+ stopScrollPropagation={showedBar?true:false}
|
|
|
+ style={{maxHeight:'100px'}}
|
|
|
+ className={styles["area"]}
|
|
|
+ verticalContainerStyle={contStyle}
|
|
|
+ verticalScrollbarStyle={barStyle}
|
|
|
+ contentClassName="content">
|
|
|
<Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
|
|
|
+ </ScrollArea>
|
|
|
</div>
|
|
|
<div className={styles.pointerFinger}>
|
|
|
<p onClick={() => this.handleShowDate(idx)}>报告日期:<span>{item.time || this.state.dateTime}</span></p>
|