Browse Source

首页收藏列表限制最大高度

zhuth 6 years ago
parent
commit
c22943abcd

+ 4 - 1
src/components/homePage/collection.less

@@ -16,7 +16,10 @@
         }
         &>.ant-collapse-content {
             &>.ant-collapse-content-box {
-                padding: 8px 27px 8px 16px;
+                max-height: 200px;
+                overflow: auto;
+                margin-right: 3px;
+                padding: 8px 24px 8px 16px;
                 &>.item {
                     // font-size: 16px;
                     user-select:none;

+ 0 - 68
src/data/charts/option/bar.json

@@ -1,68 +0,0 @@
-{
-    "tooltip" : {
-        "trigger": "axis",
-        "axisPointer": {
-            "type": "cross",
-            "label": {
-                "backgroundColor": "#6a7985"
-            }
-        }
-    },
-    "legend": {
-        "show": true
-    },
-    "toolbox": {
-        "feature": {
-            "saveAsImage": {}
-        }
-    },
-    "xAxis" : [
-        {
-            "type" : "category",
-            "data" : ["周一","周二","周三","周四","周五","周六","周日"]
-        }
-    ],
-    "yAxis" : [
-        {
-            "type" : "value"
-        }
-    ],
-    "series" : [
-        {
-            "name":"邮件营销",
-            "type":"bar",
-            "areaStyle": {"normal": {}},
-            "data":[120, 132, 101, 134, 90, 230, 210]
-        },
-        {
-            "name":"联盟广告",
-            "type":"bar",
-            "areaStyle": {"normal": {}},
-            "data":[220, 182, 191, 234, 290, 330, 310]
-        },
-        {
-            "name":"视频广告",
-            "type":"bar",
-            "areaStyle": {"normal": {}},
-            "data":[150, 232, 201, 154, 190, 330, 410]
-        },
-        {
-            "name":"直接访问",
-            "type":"bar",
-            "areaStyle": {"normal": {}},
-            "data":[320, 332, 301, 334, 390, 330, 320]
-        },
-        {
-            "name":"搜索引擎",
-            "type":"bar",
-            "label": {
-                "normal": {
-                    "show": true,
-                    "position": "top"
-                }
-            },
-            "areaStyle": {"normal": {}},
-            "data":[820, 932, 901, 934, 1290, 1330, 1111]
-        }
-    ]
-}

+ 0 - 83
src/data/charts/option/line.json

@@ -1,83 +0,0 @@
-{
-    "title": {
-        "text": "堆叠区域图"
-    },
-    "tooltip" : {
-        "trigger": "axis",
-        "axisPointer": {
-            "type": "cross",
-            "label": {
-                "backgroundColor": "#6a7985"
-            }
-        }
-    },
-    "legend": {
-        "data":["邮件营销","联盟广告","视频广告","直接访问","搜索引擎"]
-    },
-    "toolbox": {
-        "feature": {
-            "saveAsImage": {}
-        }
-    },
-    "grid": {
-        "left": "3%",
-        "right": "4%",
-        "bottom": "3%",
-        "containLabel": true
-    },
-    "xAxis" : [
-        {
-            "type" : "category",
-            "boundaryGap" : false,
-            "data" : ["周一","周二","周三","周四","周五","周六","周日"]
-        }
-    ],
-    "yAxis" : [
-        {
-            "type" : "value"
-        }
-    ],
-    "series" : [
-        {
-            "name":"邮件营销",
-            "type":"line",
-            "stack": "总量",
-            "areaStyle": {"normal": {}},
-            "data":[120, 132, 101, 134, 90, 230, 210]
-        },
-        {
-            "name":"联盟广告",
-            "type":"line",
-            "stack": "总量",
-            "areaStyle": {"normal": {}},
-            "data":[220, 182, 191, 234, 290, 330, 310]
-        },
-        {
-            "name":"视频广告",
-            "type":"line",
-            "stack": "总量",
-            "areaStyle": {"normal": {}},
-            "data":[150, 232, 201, 154, 190, 330, 410]
-        },
-        {
-            "name":"直接访问",
-            "type":"line",
-            "stack": "总量",
-            "areaStyle": {"normal": {}},
-            "data":[320, 332, 301, 334, 390, 330, 320]
-        },
-        {
-            "name":"搜索引擎",
-            "type":"line",
-            "stack": "总量",
-            "label": {
-                "normal": {
-                    "show": true,
-                    "position": "top"
-                }
-            },
-            "areaStyle": {"normal": {}},
-            "data":[820, 932, 901, 934, 1290, 1330, 1111]
-        }
-    ]
-}

+ 18 - 18
src/index.js

@@ -1,22 +1,22 @@
-import dva from 'dva'
-import indexRouter from './routes/router'
-import mainModel from './models/main'
-import homeModel from './models/home'
-import dataSource from './models/dataSource'
-import dataSourceDetail from './models/dataSourceDetail'
-import dataConnect from './models/dataConnect'
-import chart from './models/chart'
-import chartDesigner from './models/chartDesigner'
-import dashboard from './models/dashboard'
+import dva from 'dva';
+import indexRouter from './routes/router';
+import mainModel from './models/main';
+import homeModel from './models/home';
+import dataSource from './models/dataSource';
+import dataSourceDetail from './models/dataSourceDetail';
+import dataConnect from './models/dataConnect';
+import chart from './models/chart';
+import chartDesigner from './models/chartDesigner';
+import dashboard from './models/dashboard';
 import dashboardDesigner from './models/dashboardDesigner';
-import userGroup from './models/userGroup'
-import user from './models/user'
-import chartPolicy from './models/chartPolicy'
-import dataSourcePolicy from './models/dataSourcePolicy'
-import dataList from './models/dataList'
-import authority from './models/authority'
-import logs from './models/logs'
-import recent from './models/recent'
+import userGroup from './models/userGroup';
+import user from './models/user';
+import chartPolicy from './models/chartPolicy';
+import dataSourcePolicy from './models/dataSourcePolicy';
+import dataList from './models/dataList';
+import authority from './models/authority';
+import logs from './models/logs';
+import recent from './models/recent';
 import createLoading from 'dva-loading';
 import './utils/baseUtils';
 import './themes/default/index.less';