Merge remote-tracking branch 'origin/pro_zn' into dev/new1

src/components/SpreadDrop/index.jsx

@@ -501,7 +501,7 @@ class ListItem extends Component{
       width:'6px',
       background:'#f1f1f1'};
     const barStyle={background:'#777',width:'100%'};
-    if(datas.length>11){
+    if(datas&&datas.length>11){
       return <ScrollArea speed={0.8}
                     horizontal={false}
                     stopScrollPropagation={true}

src/store/actions/checkBody.js

@@ -90,7 +90,7 @@ export function setNumberValue(state,action){
       if(it.value){     //至少有一个子值才黑显
         hasValue = true;
       }
-      if(it.tagType===8){
+      if(it.tagType===8&&!config.punctuationReg.test(it.name)){
         return it.name;
       }else{
         return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');