[BUG]首页tableView切换pageSize计算错误问/部分样式微调

src/components/chartDesigner/charts/tableView.jsx

@@ -33,7 +33,7 @@ class TableView extends React.Component {
         const containerHeight = bodyRef.offsetHeight;
         const tableEl = bodyRef.getElementsByClassName('table-view')[0];
         let obj = {};
-        if(tableEl) {
+        if(tableEl && containerHeight > 0 ) {
             let tableScrollHeight = containerHeight - 40 - 24 - 8 * 2;
             let pageSize = ~~(tableScrollHeight/38) + 1;
             obj = {

src/components/dashboardDesigner/content.jsx

@@ -123,7 +123,7 @@ class DashboardDesignerContent extends React.Component {
                         这里直接用main标签而不用antd的Header组件是为了让ref能够定位到对应的dom元素
                     */}
                     <main ref={this.contentRef} className='viewlayout ant-layout-content'>
-                        <Header>
+                        {filters && filters.length > 0 && <Header>
                             {/* <div className='toggle'><Icon type="caret-up" /></div> */}
                             <div className={`filters${closeFilters ? ' closed': ''}`}>
                                 <div className='content'>
@@ -150,7 +150,7 @@ class DashboardDesignerContent extends React.Component {
                                 </div>
                             </div>
                             {visibleFilterBox && <FilterBox key={Math.random()} dataSources={dataSources} relationColumns={relationColumns} filterData={filters} visibleFilterBox={visibleFilterBox} showFilterBox={this.showFilterBox} hideFilterBox={this.hideFilterBox} createFilters={this.createFilters} />}
-                        </Header>
+                        </Header>}
                         <ViewLayout isOwner={isOwner} isShareView={isShareView} isShareKeyView={isShareKeyView} isViewMode={isViewMode} contentSize={contentSize} lastContentSize={lastContentSize} editMode={editMode}/>
                     </main>
                 </Layout>

src/components/dashboardDesigner/viewLayout.jsx

@@ -44,7 +44,7 @@ class ViewLayout extends React.PureComponent {
         const { dispatch, main, dashboardDesigner } = this.props;
         const { editingKey, richTextReadOnly } = this.state;
         const { currentUser } = main;
-        const { editMode, minLayoutHeight } = dashboardDesigner;
+        const { dashboardDesignerCode, editMode, minLayoutHeight } = dashboardDesigner;
         const { code, name, viewType, layout, chartCode, chartOption } = item;
         const iconCls = editMode ? 'visible-icon' : '';
 
@@ -99,7 +99,7 @@ class ViewLayout extends React.PureComponent {
                         {isPreview && <Icon className={iconCls} type="close" onClick={this.hidePreviewBox}/>}
                     </div>
                 </div>
-                <ChartView chartRef={'chartRef-' + code} minLayoutHeight={minLayoutHeight} readOnly={richTextReadOnly} editMode={isPreview ? false : editMode} item={{...item}} reload={reload}/>
+                <ChartView chartRef={`chartRef-${dashboardDesignerCode}-${code}`} minLayoutHeight={minLayoutHeight} readOnly={richTextReadOnly} editMode={isPreview ? false : editMode} item={{...item}} reload={reload}/>
             </div>
         )
     }

src/components/homePage/toolbar.less

@@ -2,8 +2,10 @@
     display: flex;
     justify-content: flex-end;
     width: 100%;
-    border-top: 1px solid @border-color-base;
-    border-bottom: 1px solid @border-color-base;
+    padding: 8px;
+    border-width: 0.5px 0 0.5px 0;
+    border-style: solid;
+    border-color: @border-color-base;
     &>.toos {
         display: flex;
         margin-right: 16px;

src/themes/default/home.less

@@ -99,13 +99,6 @@
                     }
                 }
             }
-            &>.ant-tabs-content {
-                .dashboardview-toolbar {
-                    padding: 8px;
-                    border-width: 0.5px;
-                    // background: @content-background-color;
-                }
-            }
         }
     }
 }