uas手机版

图表优化

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

@@ -34,7 +34,7 @@ export default class CommonCharts extends Component {
 
   render () {
     //BarGraph柱状 LineChart折线 PieChart圆饼 TableChart表格
-    let { chartData: { TYPE_ }, setOverflow } = this.props
+    let { chartData: { TYPE_ }, setOverflow, needSum } = this.props
     let chartItem = null
     switch (TYPE_) {
       case 'column':
@@ -50,7 +50,11 @@ export default class CommonCharts extends Component {
         chartItem = <TableChart chartData={this.props.chartData}/>
         break
       case 'sum':
-        chartItem = <SumChart chartData={this.props.chartData}/>
+        if (needSum) {
+          chartItem = <SumChart chartData={this.props.chartData}/>
+        } else {
+          chartItem = null
+        }
         break
       default:
         chartItem = null

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

@@ -17,6 +17,7 @@ export default class TableChart extends Component {
     this.state = {
       detailData: [],
       detailColumn: [],
+      loading: true,
     }
   }
 
@@ -32,7 +33,7 @@ export default class TableChart extends Component {
     let { chartData: { SONTITLE_ } } = this.props
     let data = []
     let columns = []
-    let { detailData, detailColumn } = this.state
+    let { detailData, detailColumn, loading } = this.state
     if (!isObjEmpty(detailData) || !isObjEmpty(detailColumn)) {
       let obj = this.formatData(detailData, detailColumn)
       columns = obj.columns
@@ -52,6 +53,7 @@ export default class TableChart extends Component {
           size="small"
           tableLayout='fixed'
           sticky={true}  //固定表头
+          loading={loading}
         />
       </div>
     )
@@ -84,6 +86,7 @@ export default class TableChart extends Component {
       this.setState({
         detailData: response.data.list[0].DATA_,
         detailColumn: response.data.list[0].formulaDets,
+        loading: false,
       })
     }).catch(error => {
       if (typeof error === 'string') {

uas-office-web/uas-mobile/src/components/private/kanban/KanBan.jsx

@@ -38,7 +38,7 @@ class KanBan extends Component {
     subsData.forEach((item, index) => {
       if (!isObjEmpty(item)) {
         chartItem.push(
-          <CommonCharts chartData={item} key={index} setOverflow={true}/>,
+          <CommonCharts chartData={item} key={index} setOverflow={true} needSum={false}/>,
         )
       }
     })

uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeChart.jsx

@@ -36,7 +36,7 @@ class SubscribeChart extends Component {
     subsData.forEach((item, index) => {
       if (!isObjEmpty(item)) {
         chartItem.push(
-          <CommonCharts chartData={item} key={index} setOverflow={false}/>,
+          <CommonCharts chartData={item} key={index} setOverflow={false} needSum={true}/>,
         )
       }
     })