Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/tpm/shixuns/ShixunSearchBar.js

@@ -239,7 +239,7 @@ render() {
 													{
 														shixunhoverData.map((item,key)=>{
 															return(
-																	<Dropdown overlay={overlaymenu(item.sub_repertoires,item.id)} key={key} >
+																	<Dropdown overlay={overlaymenu(item.sub_repertoires,item.id)} key={key} placement=	{item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
 																		<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={this.shixunsearchAll}>
 																			{item.name}
 																		</li>