Merge branch 'dev' of ssh://10.10.100.21/source/uas-office-integration

uas-office-web/uas-mobile/src/components/common/bizgoblin/CommonCharts.jsx

@@ -64,7 +64,7 @@ export default class CommonCharts extends Component {
       <div className='common-charts' style={{ marginBottom: '8px' }}>
         <LazyLoad
           once
-          height={150}
+          height={100}
           resize={true}
           overflow={setOverflow}
         >

uas-office-web/uas-mobile/src/components/common/bizgoblin/TableChart.jsx

@@ -39,7 +39,13 @@ export default class TableChart extends Component {
       columns = obj.columns
       data = obj.data
     }
-    let height = detailData.length * 65 + 'px'
+
+    let height = ''
+    if (detailData.length == 0) {
+      height = '320px'
+    } else {
+      height = detailData.length * 65 + 'px'
+    }
 
     return (
       <div className='table-charts' style={{ width: '100%', overflowY: 'auto' }}>