Merge branch 'dev5.3.4' into dev/new1

src/components/NumberDrop/index.jsx

@@ -204,14 +204,14 @@ class NumberDrop extends Component{
     const orgBorder = isImports&&!(val&&val!=placeholder)?style['orange-border']:'';
     const ext = isExtBlue?style['ext']:'';
     const noTag = hideTag?style['no-tag']:'';
-    return className(isSelected,noTag,orgBorder,ext,setFontColorSize(val||isSelectAll?'2,6':isExtBlue?2:1),'prefixUnset');
+    return className(isSelected,noTag,orgBorder,ext,setFontColorSize(val||isSelectAll?'2,6':isExtBlue?2:1));
   }
   getSpanClass(nospecial){       //将被替换的文字选中状态显示
-    const {isSelectAll,isExtBlue} = this.props;
+    const {isSelectAll,isExtBlue,show} = this.props;
     const val = this.state.value;
     const cls = this.props.show?style['blued']:style['nol'];
-    return cls+' '+setFontColorSize(nospecial?'':2);
-    return className(cls,setFontColorSize(val?'2,6':isSelectAll?'2,6':isExtBlue?2:1))
+    // return cls+' '+setFontColorSize(nospecial?'':2);
+    return className(show?style['blued']:(style['nol'],setFontColorSize(val?'2,6':isSelectAll?'2,6':isExtBlue?2:1)))
   }
   stopBubble(e){
     e.stopPropagation();
@@ -262,7 +262,7 @@ class NumberDrop extends Component{
             onkeyup={this.handleKeyDowm}
             onBlur={this.numInpBlur}
             onInput={this.handleSpanInp}
-            className={`${this.getSpanClass(nospecial)} 'prefixUnset'`}
+            className={`${this.getSpanClass(nospecial)}`}
             >&nbsp;{val||placeholder}</span>
       <span className={`${setFontColorSize(val?'':isSelectAll?2:isExtBlue?2:1)} prefixUnset`}>{suffix}</span>
       <NumberPan handleSelect={this.select.bind(this)}

src/components/NumberDrop/index.less

@@ -29,6 +29,7 @@
   .blued{
     background: @blue;
     color: #fff;
+    font-size: unset;
   }
   .nol {
     color: unset;