فهرست منبع

ff26添加症状搜索关标bug修改2447

zhouna 5 سال پیش
والد
کامیت
12934005d5

+ 1 - 1
src/common/components/ItemBox/index.jsx

@@ -61,7 +61,7 @@ componentWillReceiveProps(nextP){
     const {title,children,editable,className,handleFocus,fuzhen,border,handleBlur,titleTop,backgroundColor,boxId} = this.props;
     return <div className={style["box"]+" "+"clearfix"} >
       <div className={style["title"] + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
-      <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur} id={boxId} onkeydown={handleEnter}>
+      <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={editable?handleFocus:null} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur} id={boxId} onkeydown={handleEnter}>
         {fuzhen?children||fuzhen:children}
       </div>
     </div>

+ 1 - 1
src/common/components/SearchBox/index.jsx

@@ -70,7 +70,7 @@ class SearchBox extends React.Component {
         });
     }
     handleFocus(e){//聚焦时边框变蓝色
-      e.stopPropagation();
+      //e.stopPropagation();
       e.preventDefault();
       this.setState({border:true})
     }

+ 1 - 2
src/components/ListItems/index.jsx

@@ -72,8 +72,7 @@ class ListItems extends Component{
       {noPush?'':<p className={style['orderTips']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>}
       {this.getLabels()}
       {noSearch && <div className="search">
-        <input type="text"/>
-        {/*<SearchBox show={show} pushIds={this.getPushItemIds(pushList)} onSelect={this.searchSelect.bind(this)} onRef={(child)=>{this.child = child;}}/>*/}
+        <SearchBox show={show} pushIds={this.getPushItemIds(pushList)} onSelect={this.searchSelect.bind(this)} onRef={(child)=>{this.child = child;}}/>
       </div>}
       <div className="oper clearfix">
         <span className={style['clear']} onClick={handleClear}>清空选项</span>

+ 1 - 1
src/components/SpreadDrop/index.jsx

@@ -366,7 +366,7 @@ class SpreadDrop extends Component{
     }
     const {editable} = this.state;
     return  <div className={style['container']}
-              onFocus={(e)=>e.stopPropagation()}
+              /*onFocus={(e)=>e.stopPropagation()}*/
               onBlur={(e)=>e.stopPropagation()}
               onInput={(e)=>e.stopPropagation()}>
         <div