Browse Source

图标本地化配置调整

zhuth 7 years ago
parent
commit
215cad2ad6

+ 1 - 1
.gitignore

@@ -1,7 +1,7 @@
 dist
 node_modules
 .DS_Store
-*.css
+src/**/*.css
 .scannerwork/.sonar_lock
 .scannerwork/report-task.txt
 src/demo.jsx

File diff suppressed because it is too large
+ 4 - 0
public/fonts/iconfont/custom/iconfont.css


File diff suppressed because it is too large
+ 4 - 0
public/fonts/iconfont/default/iconfont.css


File diff suppressed because it is too large
+ 0 - 0
public/fonts/iconfont/default/iconfont.js


BIN
public/images/chart-bar.png


BIN
public/images/chart-line.png


BIN
public/images/chart-pie.png


BIN
public/images/selected.png


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

@@ -121,8 +121,7 @@ class ChartList extends React.Component {
                                 dispatch({ type: 'chartDesigner/reset' });
                                 dispatch({ type: 'main/redirect', path: '/chart/' + l.code });
                             }}>
-                                {/* <img alt='' style={{ height: '100px', marginTop: '10%' }} src='https://test-feapp.oss-cn-beijing.aliyuncs.com/feapp/master_a_20180711/images/chart/empty_column_chart.svg'></img> */}
-                                <Thumbnail />
+                                <Thumbnail code={l.code} />
                             </Row>
                             <Row className='desc'>
                                 <Ellipsis tooltip={l.description.length > 16} lines={2}>{

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

@@ -50,11 +50,13 @@
 
             .ant-card-cover {
                 height: 200px;
-                cursor: pointer;
                 .cover-body {
                     padding: 10px;
                     .thumb {
                         height: 132px;
+                        canvas {
+                            cursor: pointer;
+                        }
                         div {
                             height: 100%;
                         }

+ 3 - 3
src/components/chart/thumbnail.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import Echarts from 'echarts-for-react'
 
-const Thumbnail = () => {
+const Thumbnail = ({ code }) => {
     let option1 = {
         xAxis: {
             type: 'category',
@@ -167,8 +167,8 @@ const Thumbnail = () => {
     return (
         <div style={{ width: '100%', height: '100%' }}>
             <Echarts
-                key={Math.random()}
-                option={option[Math.ceil(Math.random()*option.length)-1]}
+                key={code}
+                option={option[0]}
                 className='rc-echarts'
                 style={{height: '100%'}}
             />

+ 1 - 1
src/components/datasource/dataConnectConfig.jsx

@@ -65,7 +65,7 @@ class DataConnectConfig extends React.Component {
                     >
                         <div>
                             <Row>
-                                {`说明 :${l.description}`}
+                                {l.description}
                             </Row>
                             <Row type='flex' justify='space-between'>
                                 <Col>{l.dbType}</Col>

+ 1 - 1
src/custom.less

@@ -1,5 +1,5 @@
 @import "/fonts/iconfont/custom/iconfont.css"; // 引入自定义的 iconfont
-@icon-url: "/fonts/iconfont/default"; // 把默认的 iconfont 地址改到本地
+@import "/fonts/iconfont/default/iconfont.css"; // 引入默认的 iconfont
 
 :global(.anticon) {
     &:before {

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