zhuth 6 years ago
parent
commit
15e55053b2

+ 1 - 3
src/components/chart/list.jsx

@@ -8,7 +8,6 @@ import ChooseDataSourceBox from './chooseDataSourceBox'
 import GroupManagementBox from '../common/groupManageMentBox/box'
 import EmptyContent from '../common/emptyContent/index'
 import moment from 'moment'
-import Ellipsis from 'ant-design-pro/lib/Ellipsis'
 import 'ant-design-pro/dist/ant-design-pro.css'
 import GroupSelector from '../common/groupSelector/popover'
 import Thumbnail from './thumbnail'
@@ -325,8 +324,7 @@ class ChartList extends React.Component {
                                 </div> : (!l.access ? <div className='deny-body'>
                                     <div className='deny-tip'>无数据权限</div>
                                 </div> : null)}
-                                <img className="chart-area" src="https://www.echartsjs.com/examples/data/thumb/line-pen.png" style={{width: '100%', display: 'inline'}} />
-                                {/* <Thumbnail style={{ opacity: (l.access && l.database) ? 1 : 0.3 }} type={l.type} code={l.code} option={l.chartOption}/> */}
+                                <Thumbnail key={l.code} style={{ opacity: (l.access && l.database) ? 1 : 0.3 }} type={l.type} code={l.code} option={l.chartOption}/>
                             </Row>
                             <Row className='footer' type='flex' justify='end' align='bottom'>
                                 <Col style={{ textAlign: 'left', lineHeight: '28px' }} span={21}>

+ 1 - 6
src/components/chartDesigner/sections/toolbar.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Tag, Icon, Button } from 'antd'
+import { Tag, Icon } from 'antd'
 import FilterBox from '../../common/filterBox/filterBox'
 import { connect } from 'dva'
 import moment from 'moment'
@@ -133,11 +133,6 @@ class Toolbar extends React.Component {
                     }}>
                         <CusIcon type='bi-view-columns'/>查看列
                     </span>
-                    {/* <Button className='tools-button' size='small' onClick={() => {
-                        this.setState({
-                            visibleDataPreviewBox: true
-                        })
-                    }}>查看列</Button> */}
                 </div>
                 {visibleFilterBox && <FilterBox code={code} columns={columns} filterData={filters} visibleFilterBox={visibleFilterBox} showFilterBox={this.showFilterBox} hideFilterBox={this.hideFilterBox} createFilters={this.createFilters} />}
                 {visibleDataPreviewBox && <DataPreview

+ 2 - 2
src/components/common/cusIcon/index.jsx

@@ -2,6 +2,6 @@ import { Icon } from 'antd'
 import scriptUrl from '../../../../static/iconfont/iconfont.js'
  
 export default Icon.createFromIconfontCN({
-    scriptUrl: '//at.alicdn.com/t/font_755957_8duvb0svgqb.js'
-    // scriptUrl
+    // scriptUrl: '//at.alicdn.com/t/font_755957_8duvb0svgqb.js'
+    scriptUrl
 });

+ 1 - 1
src/models/EChartsMedia.js

@@ -28,7 +28,7 @@ export default function(chartType, legendVisible, dataZoomVisible) {
         }, {
             query: { maxWidth: 1000, maxHeight: 1000 }, // E
             option: !dataZoomVisible ? { legend: { type: 'scroll', right: 'center', bottom: 50, orient: 'horizontal', width: '90%' }, } :
-                { legend: { type: 'scroll', right: 'center', top: 50, orient: 'horizontal', width: '90%' }, }
+                { legend: { type: 'scroll', right: 'center', top: 50, orient: 'horizontal', width: '90%' }, grid: { top: 100 } }
         }, {
             query: { maxWidth: 500, maxHeight: 1000 }, // D
             option: !dataZoomVisible ? { legend: { type: 'scroll', right: 'center', bottom: 0, orient: 'horizontal', width: '90%' }, } :

File diff suppressed because it is too large
+ 0 - 0
static/iconfont/iconfont.js


Some files were not shown because too many files changed in this diff