fix

webapp/app/containers/Widget/components/Widget/index.tsx

@@ -73,6 +73,7 @@ export interface IWidgetProps {
   size?: IDataParamProperty
   xAxis?: IDataParamProperty
   tip?: IDataParamProperty
+  yAxis?: IDataParamProperty
   dimetionAxis?: DimetionType
   renderType?: RenderType
   orders: Array<{column: string, direction: string}>

webapp/app/containers/Widget/components/Workbench/ConfigSections/SpecSection.tsx

@@ -31,8 +31,9 @@ export interface ISpecConfig {
 }
 
 interface ISpecSectionProps {
-  isShowLines: boolean
+  name: string
   title: string
+  isShowLines: boolean
   config: ISpecConfig
   onChange: (prop: string, value: any) => void
 }
@@ -51,9 +52,11 @@ export class SpecSection extends React.PureComponent<ISpecSectionProps, {}> {
   }
 
   public render () {
-    const { title, config, isShowLines } = this.props
+    const { name, title, isShowLines, config } = this.props
 
     const {
+      smooth,
+      step,
       roseType,
       circle,
       sortMode,
@@ -88,8 +91,35 @@ export class SpecSection extends React.PureComponent<ISpecSectionProps, {}> {
       ))
 
     let renderHtml
-    switch (title) {
-      case '饼图':
+    switch (name) {
+      case 'line':
+        renderHtml = (
+          <div className={styles.paneBlock}>
+            <h4>{title}</h4>
+            <div className={styles.blockBody}>
+              <Row gutter={8} type="flex" align="middle" className={styles.blockRow}>
+                <Col span={10}>
+                  <Checkbox
+                    checked={smooth}
+                    onChange={this.checkboxChange('smooth')}
+                  >
+                    平滑
+                  </Checkbox>
+                </Col>
+                <Col span={12}>
+                  <Checkbox
+                    checked={step}
+                    onChange={this.checkboxChange('step')}
+                  >
+                    阶梯
+                  </Checkbox>
+                </Col>
+              </Row>
+            </div>
+          </div>
+        )
+        break
+      case 'pie':
         renderHtml = (
           <div className={styles.paneBlock}>
             <h4>{title}</h4>
@@ -116,7 +146,7 @@ export class SpecSection extends React.PureComponent<ISpecSectionProps, {}> {
           </div>
         )
         break
-      case '漏斗图':
+      case 'funnel':
         renderHtml = (
           <div className={styles.paneBlock}>
             <h4>{title}</h4>
@@ -161,7 +191,7 @@ export class SpecSection extends React.PureComponent<ISpecSectionProps, {}> {
           </div>
         )
         break
-      case '雷达图':
+      case 'radar':
         renderHtml = (
           <div className={styles.paneBlock}>
             <h4>{title}</h4>
@@ -184,7 +214,7 @@ export class SpecSection extends React.PureComponent<ISpecSectionProps, {}> {
           </div>
         )
         break
-      case '地图':
+      case 'map':
         renderHtml = (
           <div className={styles.paneBlock}>
             <h4>{title}</h4>

webapp/app/containers/Widget/components/Workbench/OperatingPanel.tsx

@@ -525,7 +525,7 @@ export class OperatingPanel extends React.Component<IOperatingPanelProps, IOpera
 
   private getVisualData = (commonParams, specificParams, styleParams, renderType?) => {
     const { cols, rows, metrics, filters } = commonParams
-    const { color, label, size, xAxis, tip } = specificParams
+    const { color, label, size, xAxis, tip, yAxis } = specificParams
     const { selectedView, onLoadData, onSetWidgetProps } = this.props
     const { mode, chartModeSelectedChart } = this.state
     let groups = cols.items.map((c) => c.name)
@@ -570,6 +570,13 @@ export class OperatingPanel extends React.Component<IOperatingPanelProps, IOpera
           func: l.agg
         })))
     }
+    if (yAxis) {
+      aggregators = aggregators.concat(yAxis.items
+        .map((l) => ({
+          column: decodeMetricName(l.name),
+          func: l.agg
+        })))
+    }
     groups.sort()
     aggregators.sort()
 
@@ -624,6 +631,7 @@ export class OperatingPanel extends React.Component<IOperatingPanelProps, IOpera
             ...size && {size},
             ...xAxis && {xAxis},
             ...tip && {tip},
+            ...yAxis && {yAxis},
             chartStyles: styleParams,
             selectedChart: mode === 'pivot' ? chartModeSelectedChart.id : selectedCharts[0].id,
             data,
@@ -666,6 +674,7 @@ export class OperatingPanel extends React.Component<IOperatingPanelProps, IOpera
         ...size && {size},
         ...xAxis && {xAxis},
         ...tip && {tip},
+        ...yAxis && {yAxis},
         chartStyles: styleParams,
         selectedChart: mode === 'pivot' ? chartModeSelectedChart.id : selectedCharts[0].id,
         dimetionAxis: this.getDimetionAxis(selectedCharts),
@@ -1132,8 +1141,9 @@ export class OperatingPanel extends React.Component<IOperatingPanelProps, IOpera
         tabPane = (
           <div className={styles.paramsPane}>
             {spec && <SpecSection
-              isShowLines={isShowLines}
+              name={chartModeSelectedChart.name}
               title={chartModeSelectedChart.title}
+              isShowLines={isShowLines}
               config={spec as ISpecConfig}
               onChange={this.styleChange('spec')}
             />}

webapp/app/containers/Widget/config/chart/bar.ts

@@ -28,7 +28,7 @@ const bar: IChartInfo = {
   },
   style: {
     spec: {
-
+      stack: false
     },
     label: {
       showLabel: false,

webapp/app/containers/Widget/config/chart/radar.ts

@@ -6,7 +6,7 @@ import {
 
 import { IChartInfo } from '../../../../containers/Widget/components/Widget'
 const radar: IChartInfo = {
-  id: 19,
+  id: 10,
   name: 'radar',
   title: '雷达图',
   icon: 'icon-radarchart',

webapp/app/containers/Widget/config/chart/sankey.ts

@@ -14,16 +14,7 @@ const sankey: IChartInfo = {
   requireDimetions: [2, 9999],
   requireMetrics: 1,
   dimetionAxis: 'col',
-  data: {
-    color: {
-      title: '颜色',
-      type: 'category'
-    }
-    // tip: {
-    //   title: '提示信息',
-    //   type: 'value'
-    // }
-  },
+  data: {},
   style: {
     label: {
       showLabel: true,

webapp/app/containers/Widget/render/chart/sankey.ts

@@ -43,7 +43,6 @@ export default function (chartProps: IChartProps) {
     cols,
     metrics,
     chartStyles,
-    color,
     tip
   } = chartProps
 
@@ -74,9 +73,6 @@ export default function (chartProps: IChartProps) {
   if (cols.length) {
     dimensions = dimensions.concat(cols)
   }
-  if (color.items.length) {
-    dimensions = dimensions.concat(color.items.map((c) => c.name))
-  }
 
   const metricsName = decodeMetricName(metrics[0].name)
   const agg = metrics[0].agg