message提示框添加边框/图表缩略图组件仅在图表界面添加/报表自定义过滤字段使用拷贝而非引用

src/components/chartDesigner/charts/echartsView.jsx

@@ -2,27 +2,16 @@ import React from 'react'
 import Echarts from '../../common/echarts/index'
 import { hashcode } from '../../../utils/baseUtils'
 import EmptyContent from '../../common/emptyContent'
-import Thumbnail from '../../common/echarts/thumbnail'
 
 const EchartsView = ({ chartOption }) => {
-    let children;
     if(!chartOption || ((!chartOption.series || chartOption.series.length === 0) && (!chartOption.baseOption || !chartOption.baseOption.series || chartOption.baseOption.series.length === 0))) {
-        children = <EmptyContent />
+        return <EmptyContent />
     }else {
-        children =  <Echarts
+        return <Echarts
             key={hashcode(chartOption)}
             option={chartOption}
         />
     }
-    return <div style={{ background: '#fff', width: '100%', height: '100%' }}>
-        {/* 创建一个隐藏echarts容器用于截缩略图 */}
-        <Thumbnail
-            style={{ position: 'absolute', display: 'none', top: 0, left: 0 }}
-            key={`thumbnail-${hashcode(chartOption)}`}
-            option={chartOption}
-        />
-        {children}
-    </div>
 }
 
 export default EchartsView;

src/components/chartDesigner/content.jsx

@@ -15,6 +15,8 @@ import AggregateTableView from './charts/aggregateTableView'
 import ToolBar from './sections/toolbar'
 import { connect } from 'dva'
 import EmptyContent from '../common/emptyContent/index'
+import Thumbnail from '../common/echarts/thumbnail'
+import { hashcode } from '../../utils/baseUtils'
 import './content.less'
 const { Header, Sider, Content, Footer } = Layout
 const { TabPane } = Tabs
@@ -146,6 +148,12 @@ class ChartDesignerContent extends React.Component {
                             <ToolBar className='header-toolbar' autoRefresh={autoRefresh} isOwner={isOwner}/>
                         </Header>
                         <Content className='content-body' >
+                            {/* 创建一个隐藏echarts容器用于截缩略图 */}
+                            <Thumbnail
+                                style={{ position: 'absolute', display: 'none', top: 0, left: 0 }}
+                                key={`thumbnail-${hashcode(chartOption)}`}
+                                option={chartOption}
+                            />
                             { chartView }
                         </Content>
                     </Layout>

src/components/dashboardDesigner/cusFilterBox.jsx

@@ -8,7 +8,7 @@ class CusFilterBox extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            relationColumns: props.dashboardDesigner.relationColumns || []
+            relationColumns: [].concat(props.dashboardDesigner.relationColumns || [])
         };
     }
 

src/themes/default/base.less

@@ -170,6 +170,12 @@
     color: #cccccc;
 }
 
+.ant-message {
+    .ant-message-notice-content {
+        border: 1px solid @border-color-base;
+    }
+}
+
 
 // 滚动条
 *::-webkit-scrollbar {