Forráskód Böngészése

标点灰显bug修改,下拉对应标签高亮颜色修改

zhouna 6 éve
szülő
commit
816fa09299

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

@@ -176,12 +176,6 @@ class EditableSpan extends Component{
       }
     }
   }
-  /*shouldComponentUpdate(next){
-    if(JSON.stringify(next) == JSON.stringify(this.props)){
-      return false;
-    }
-    return true;
-  }*/
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;
     if(next.isRead != isRead){
@@ -205,7 +199,7 @@ class EditableSpan extends Component{
     const preSelected = saveText[i-1];
     const isFull = full?' '+style['full']:'';       //是否宽度设为整行宽度
     //有标点符号之外的字符或者前一个标签有选中值时,显示为黑色,否则灰显
-    const unselect = config.punctuationReg.test(value)||preSelected?'':style['unselect'];
+    const unselect = value.match(config.punctuationReg)||preSelected?'':style['unselect'];
     return classNames(style['editable-span'],isFull,unselect);
   }
 

+ 1 - 1
src/common/less/variables.less

@@ -164,5 +164,5 @@
 }
 
 .borderd{
-   border:1px #3B9ED0 solid;
+   border:1px #000 solid;
  }

+ 1 - 1
src/containers/eleType.js

@@ -124,7 +124,7 @@ export default function(params){
     case 8:
       // return <EditableSpan {...params} value={data.value||data.name} update={Math.random()}/>;
       // 删除后value为空,应展示空而不是name
-      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} full={data.full} update={Math.random()}/>;
+      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} full={data.full}/>;
     case 11://推送类型
       return multCheckLabels(params,data.tagType);
     default: