Browse Source

折线图x轴选择时间后允许设置为年、月、日等分析跨度

zhuth 6 years ago
parent
commit
a30caf44fb

+ 3 - 1
src/components/chartDesigner/sections/lineConfigForm.jsx

@@ -3,6 +3,7 @@ import { Form, Select, Tag, Cascader, Dropdown, Menu } from 'antd'
 import { connect } from 'dva'
 import '../../../models/chartDesigner'
 import GAUGE from './gauge.json'
+import GRANULARITY from './granularity.json'
 const FormItem = Form.Item
 const { Option } = Select
 const formItemLayout = {
@@ -45,7 +46,8 @@ const LineConfigForm = ({ autoRefresh, chartDesigner, dispatch }) => {
 						return {
 							type: c.type,
 							value: c.name,
-							label: c.label
+							label: c.label,
+							children: GRANULARITY[c.type]
 						}
 					})}
 					onChange={(value, items) => {

+ 2 - 1
src/models/chartDesigner.js

@@ -421,7 +421,8 @@ export default {
                     id: code,
                     xAxis: {
                         columnRename: lineConfig.xAxis.column.value,
-                        columnType: lineConfig.xAxis.column.type
+                        columnType: lineConfig.xAxis.column.type,
+                        showDataType: lineConfig.xAxis.granularity.value
                     },
                     yAxis: {
                         columnRename: lineConfig.yAxis.column.value,