【bug】报表中数据视图不能自动进行首次加载数据

src/components/chartDesigner/charts/echartsView.jsx

@@ -14,7 +14,6 @@ class EchartsView extends Component {
         if(!chartOption || ((!chartOption.series || chartOption.series.length === 0 || !chartOption.series[0].data || chartOption.series[0].data.length === 0) && (!chartOption.baseOption || !chartOption.baseOption.series || chartOption.baseOption.series.length === 0 || !chartOption.baseOption.series[0].data || chartOption.baseOption.series[0].data.length === 0))) {
             return <EmptyContent />
         }else {
-            console.log(chartOption);
             const { baseOption } = chartOption;
             const { name } = baseOption;//主题
             //drillDown 钻取层级数组

src/components/chartDesigner/charts/tableView.jsx

@@ -36,7 +36,7 @@ class TableView extends React.Component {
         if(containerHeight > 0 ) {
             let newtableScrollHeight = containerHeight - 40 - 24 - 8 * 2;
             if(newtableScrollHeight !== tableScrollHeight) {
-                let pageSize = Math.max(~~(newtableScrollHeight/38) + 1, 10);
+                let pageSize = ~~(newtableScrollHeight/38) + 1;
                 if(typeof onPageSizeChange === 'function' && pageSize !== chartOption.pageSize && refreshable) {
                     // 在报表中的dataView第一次数据请求在此发起
                     onPageSizeChange(1, pageSize)

src/models/dashboardDesigner.js

@@ -282,7 +282,7 @@ export default {
                     if(items[i].chartOption) {
                         items[i].chartOption = { ...items[i].chartOption,
                             page: 1,
-                            pageSize: Math.max((~~((layout[i][ly[3]] * minLayoutHeight + (layout[i][ly[3]] - 1) * 12 - 20 - 40 - 24 - 8 * 2)/38) + 1), 10)
+                            pageSize: ~~((layout[i][ly[3]] * minLayoutHeight + (layout[i][ly[3]] - 1) * 12 - 20 - 40 - 24 - 8 * 2)/38) + 1
                         }
                     }
                 }else { // 删除引起
@@ -396,7 +396,7 @@ export default {
                 if(item.viewType === 'chart') {
                     let page = item.chartOption ? item.chartOption.page : 1;
                     let pageSize = item.chartOption ? item.chartOption.pageSize : (~~((item.layout.h * minLayoutHeight + (item.layout.h - 1) * 12 - 20 - 40 - 24 - 8 * 2)/38) + 1)
-                    yield put({ type:'fetchChartData', item: items[i], mandatory: true, page, pageSize: Math.max(pageSize, 10) });
+                    yield put({ type:'fetchChartData', item: items[i], mandatory: true, page, pageSize: pageSize });
                 }
             }
         },
@@ -455,7 +455,7 @@ export default {
                 for(let i = 0; i < items.length; i++) {
                     let page = items[i].chartOption ? items[i].chartOption.page : 1;
                     let pageSize = items[i].chartOption ? items[i].chartOption.pageSize : (~~((items[i].layout.h * minLayoutHeight + (items[i].layout.h - 1) * 12 - 20 - 40 - 24 - 8 * 2)/38) + 1)
-                    yield put({ type:'fetchChartData', item: items[i], mandatory: true, page, pageSize: Math.max(pageSize, 10) });
+                    yield put({ type:'fetchChartData', item: items[i], mandatory: true, page, pageSize });
                 }
             }catch(e) {
                 message.error('更改过滤条件失败: ' + e.message);
@@ -492,7 +492,7 @@ export default {
             for(let i = 0; i < targetItems.length; i++) {
                 let page = targetItems[i].chartOption ? targetItems[i].chartOption.page : 1;
                 let pageSize = targetItems[i].chartOption ? targetItems[i].chartOption.pageSize : (~~((targetItems[i].layout.h * minLayoutHeight + (targetItems[i].layout.h - 1) * 12 - 20 - 40 - 24 - 8 * 2)/38) + 1)
-                yield put({ type:'fetchChartData', item: targetItems[i], mandatory: true, page, pageSize: Math.max(pageSize, 10) });
+                yield put({ type:'fetchChartData', item: targetItems[i], mandatory: true, page, pageSize });
             }
         },
         *fetchChartData(action, { put, call, select }) {
@@ -630,7 +630,7 @@ export default {
             for(let i = 0; i < targetItems.length; i++) {
                 let page = 1;
                 let pageSize = targetItems[i].chartOption ? targetItems[i].chartOption.pageSize : (~~((targetItems[i].layout.h * minLayoutHeight + (targetItems[i].layout.h - 1) * 12 - 20 - 40 - 24 - 8 * 2)/38) + 1)
-                yield put({ type:'fetchChartData', item: targetItems[i], mandatory: true, page, pageSize: Math.max(pageSize, 10) });
+                yield put({ type:'fetchChartData', item: targetItems[i], mandatory: true, page, pageSize });
             }
         },
         *modifyItem(action, { select, call, put }) {