Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

src/components/ScaleTable/index.jsx

@@ -186,15 +186,20 @@ class ScaleTable extends React.Component{
     const {tableId,getResult,parentId,parentIndex,scaleInfo} = this.props; 
     const {valueData,scaleResult1} = this.state; 
     // 替换表格内容
-    let allDatas = JSON.parse(JSON.stringify(scaleInfo[tableId])) ;
-     allDatas[1].content = JSON.stringify(valueData);
-    const params = {
-      type:1,
-      data:scaleResult1,
-      id:tableId,
-      pIndex:parentIndex
+    let allDatas = scaleInfo[tableId]?JSON.parse(JSON.stringify(scaleInfo[tableId])):'' ;
+    if(allDatas){
+      allDatas[1].content = JSON.stringify(valueData);
     }
-    getResult&&getResult({params,allDatas});
+     
+     if(scaleResult1){
+      const params = {
+        type:1,
+        data:scaleResult1,
+        id:tableId,
+        pIndex:parentIndex
+      }
+      getResult&&getResult({params,allDatas});
+     }  
   }
   getContent(){ 
     let {selecteds,valueData,start,scaleResult1} = this.state;
@@ -274,7 +279,7 @@ class ScaleTable extends React.Component{
               {this.getContent()}
               {datas&&datas.noCalc==0?<div className={style['total']}>
                     <span>总分：</span>
-                    <span>{scaleResult&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value +' '+ scaleResult.calcalculate.result.text||''}</span>
+                    <span>{scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value +' '+ scaleResult.calcalculate.result.text||''}</span>
                     <span className={style['totalBtn']} onClick={this.handleFormula.bind(this)}>得分</span>
                   </div>:''}
             </div>