Merge branch 'dev/byll' of http://192.168.2.236:10080/zhouna/newICSS into dev/byll

src/common/components/InspectCommon/index.less

@@ -6,7 +6,7 @@
     background-color: #fff;
     padding:28px 8px 8px 8px;
     min-width: 300px;
-    max-width: 600px;
+    max-width: 680px;
     box-sizing: border-box;
     margin-bottom: 80px;
     .llStyle;

src/components/AddInspect/index.less

@@ -125,7 +125,7 @@
     // line-height: 28px;
     overflow: hidden;
     padding-top: 0 !important;
-    width: 290px;
+    width: 330px;
     float: left;
     padding: 0 15px;
     box-sizing: border-box;
@@ -149,9 +149,14 @@
         input {
             width: 40px;
             text-align: center;
+            float: left;
         }
         .unit {
             display: inline-block;
+            max-width: 70px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
         }
     }
 }

src/components/MultSpread/index.jsx

@@ -66,6 +66,7 @@ class MultSpread extends Component{
                             hideTag={true}></RadioDrop>;
         case +it.controlType===2:
           const dataList = it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList:it.questionMapping;
+          console.log(it.name,'zhizhizhi')
           return <Multiple data={dataList}
                            ikey={inx}
                            placeholder={it.name}

src/components/Multiple/index.jsx

@@ -197,7 +197,14 @@ class Multiple extends react.Component{
       },this);
     }
   }
-
+  getStyle(){
+    const {left,top,show} = this.props;
+    return {
+      left:left?left+'px':'0',
+      top:top?top+'px':'0',
+      display:show?'table':'none'        //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
+    }
+  }
   render(){
     const {placeholder,value,show,data} = this.props;
     console.log(placeholder,'name')
@@ -212,7 +219,7 @@ class Multiple extends react.Component{
       onBlur={this.handleBlur}
       onInput={this.onChange}
       onkeydown={handleEnter}
-      contentEditable={editable}>ssss{value||placeholder}</div>
+      contentEditable={editable}>{value||placeholder}</div>
       <div className={this.getListClass()} style={{top:boxTop,left:boxLeft}} contentEditable="false">
         <ul>
           {data&&data.map((it)=>{