Browse Source

bug2719,2717,2716,2714

luolei 5 năm trước cách đây
mục cha
commit
954f8ad527

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

@@ -372,7 +372,7 @@ class EditableSpan extends Component{
     if(br&&$span&&!$span.innerText){
       this.$span.current.innerHTML=' ';
     }
-    return classNames(style['editable-span'],isFull,unselect,hasBr,setFontColorSize(2));
+    return classNames(style['editable-span'],isFull,unselect,hasBr,setFontColorSize(2,6));
   }
 
   render() {

+ 1 - 1
src/components/AddAssistCheck/Textarea/index.jsx

@@ -74,7 +74,7 @@ class Textarea extends Component {
     const {idx,disabled} = this.props;
     return (
       <div className={style.textWap}>
-        <div className={`${style.divTextarea} ${setFontColorSize(2,1)}`}
+        <div className={`${style.divTextarea} ${setFontColorSize(2)}`}
             contenteditable={disabled?false:true}
             ref={this.$dom}
             onInput={this.handleInput}

+ 2 - 2
src/components/AddAssistCheck/index.jsx

@@ -210,7 +210,7 @@ class AddAssistCheck extends React.Component {
                     </span>
                   </span> */}
                   <AssistName name={item.name} winWidth={winWidth} getInfomation={getInfomation}></AssistName>
-                  <div className={styles.textareaWrap}>
+                  <div className={`${styles.textareaWrap} ${setFontColorSize(2,1)}`}>
                     <ScrollArea speed={0.8}
                                 horizontal={false}
                                 stopScrollPropagation={showedBar?true:false}
@@ -264,7 +264,7 @@ class AddAssistCheck extends React.Component {
                 </span>
               </span> */}
               <AssistName name={item.name} winWidth={winWidth} getInfomation={getInfomation}></AssistName>
-              <div className={styles.textareaWrap}>
+              <div className={`${styles.textareaWrap} ${setFontColorSize(2,1)}`}>
                 <ScrollArea speed={0.8}
                             horizontal={false}
                             stopScrollPropagation={showedBar?true:false}

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

@@ -47,7 +47,7 @@ class RadioInpDrop extends Component{
       if(hideTag){
         return classNames(style['no-tag'],ext,setFontColorSize(2));
       }
-      return classNames(style['tag'],orgBorder,ext,setFontColorSize(2));
+      return classNames(style['tag'],orgBorder,ext,setFontColorSize(2,6));
     }
   }
   handleSelect(item){

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

@@ -355,7 +355,7 @@ class SpreadDrop extends Component{
       return classNames(style['selected-tag'],blueBorder,setFontColorSize());
     }
     if(!value){
-      return classNames(style['tag'],orgBorder,ext,setFontColorSize(2));
+      return classNames(style['tag'],orgBorder,ext,setFontColorSize(2,6));
     }
     return classNames(style['tag'],orgBorder,ext,setFontColorSize(1));
   }

+ 2 - 2
src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
-const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

+ 7 - 1
src/utils/tools.js

@@ -1355,6 +1355,8 @@ const setFontColorSize = (flg,pacs) => {
           classStr = `largeFontSize titleWidth`
         }else if(pacs == 5){
           classStr = `largeFontSize specialSize`
+        }else if(pacs == 6){
+          classStr = `largeFontSize selectColor`
         }else{
           classStr = `largeFontSize`
         }
@@ -1365,7 +1367,11 @@ const setFontColorSize = (flg,pacs) => {
       }
     }else if(font == 0&&colour == 1){//标准字体颜色加黑
       if(flg == 2){
-        classStr = `simpleFontSize`
+        if(pacs == 6){
+          classStr = `simpleFontSize selectColor`
+        }else{
+          classStr = `simpleFontSize`
+        }
       }else if(flg == 1){
         classStr = `selectColor simpleFontSize`
       }else{