Merge remote-tracking branch 'origin/dev5.3.4' into dev5.3.4

src/common/components/ItemBox/index.jsx

@@ -58,12 +58,19 @@ componentWillReceiveProps(nextP){
         that.context.scrollArea&&that.context.scrollArea.refresh();
       });
     }
+}
+setFontColorSize(){
+  const {data,saveText} = this.props;
+  if(data&&data.length==0&&saveText&&saveText[0]){
+    return setFontColorSize(2,7)
+  }
+  return setFontColorSize(2,6)
 }
   render(){
     const {title,children,editable,className,handleFocus,fuzhen,border,handleBlur,titleTop,backgroundColor,boxId} = this.props;
     return <div className={style["box"]+" "+"clearfix"}>
       <div className={`${style["title"]} ${setFontColorSize(2,4)}` + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
-      <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:'' } ${setFontColorSize(2,5)}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={editable?handleFocus:null} 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"]:'' } ${this.setFontColorSize()}`} 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>

src/common/components/Textarea/index.less

@@ -17,7 +17,7 @@
   .content{
     // height:120px;
     min-height: 38px;
-    line-height: 22px;
+    line-height: 24px;
     margin-left: 60px;
     position: relative;
     padding:5px;
@@ -25,6 +25,7 @@
     border-bottom:1px @part-border-color dashed;
     margin-right: 470px;
     word-break: break-all;
+    font-weight: bold;
     textarea{
       width: 100%;
     }

src/common/less/base.less

@@ -116,6 +116,7 @@ html,body {
 }
 :global(.titleWidth){
     width: 78px !important;
+    margin-top: 8px !important;
     #mainSuit {
         margin-left: 78px;
     }
@@ -126,4 +127,7 @@ html,body {
 :global(.specialpaceSize){
     margin-left: 74px !important;
 }
+:global(.fontWeight){
+    font-weight: bold !important;
+}
 

src/components/MainSuit/index.jsx

@@ -293,6 +293,7 @@ class MainSuit extends Component{
       handleClick={this.handleClick} 
       handleBlur={this.handleBlur}
       data={datas}
+      saveText={saveText}
       boxId="mainSuit">
         {''}{datas.length>0?<div style={{display:'inline-block'}}>{this.getInlineTag()}</div>:(saveText[0]?saveText[0]:'')}
       </ItemBox>

src/utils/tools.js

@@ -1383,6 +1383,8 @@ const setFontColorSize = (flg,pacs) => {
           classStr = `largeFontSize specialSize`
         }else if(pacs == 6){
           classStr = `largeFontSize selectColor`
+        }else if(pacs == 7){
+          classStr = `largeFontSize fontWeight`
         }else{
           classStr = `largeFontSize`
         }
@@ -1395,6 +1397,8 @@ const setFontColorSize = (flg,pacs) => {
       if(flg == 2){
         if(pacs == 6){
           classStr = `simpleFontSize selectColor`
+        }else if(pacs == 7){
+          classStr = `simpleFontSize fontWeight`
         }else{
           classStr = `simpleFontSize`
         }
@@ -1415,6 +1419,8 @@ const setFontColorSize = (flg,pacs) => {
           classStr = `largeFontSize titleWidth`
         }else if(pacs == 5){
           classStr = `largeFontSize specialSize`
+        }else if(pacs == 7){
+          classStr = `largeFontSize fontWeight`
         }else{
           classStr = `largeFontSize`
         }
@@ -1426,6 +1432,8 @@ const setFontColorSize = (flg,pacs) => {
     }else{//都是标准的
       if(flg == 2){
         classStr = `simpleFontSize`
+      }else if(pacs == 7){
+        classStr = `simpleFontSize fontWeight`
       }else if(flg == 1){
         classStr = `simpleLightColor simpleFontSize`
       }else{