项目初始化

datax-ui/src/utils/visual-chart.js

@@ -165,17 +165,6 @@ export const chartTypes = [
   //   }
   // },
   // {
-  //   name: '环形图', value: 'donut', icon: 'chart_donut',
-  //   status: false,
-  //   component: 'ChartDonut',
-  //   rule: {
-  //     text: '0 行维;0 列维;0 指标',
-  //     check(rows, columns, measures) {
-  //       return rows.length === 0 && columns.length === 0 && measures.length === 0
-  //     }
-  //   }
-  // },
-  // {
   //   name: '旭日图', value: 'sunburst', icon: 'chart_sunburst',
   //   status: false,
   //   component: 'ChartSunburst',
@@ -275,6 +264,11 @@ export const chartSeriesTypes = {
     { name: '基础雷达图', value: 'radar' },
     { name: '区域雷达图', value: 'arearadar' }
   ],
+  'funnel': [
+    { name: '基础漏斗图', value: 'funnel' },
+    { name: '金字塔漏斗图', value: 'pyramidfunnel' },
+    { name: '对比漏斗图', value: 'contrastfunnel' }
+  ],
   'liquidFill': [
     { name: '圆形', value: 'circle' },
     { name: '矩形', value: 'rect' },

datax-ui/src/views/visual/datachart/components/ChartPanel.vue

@@ -30,7 +30,6 @@ import ChartLiquidFill from './widgets/ChartLiquidFill'
 import ChartSankey from './widgets/ChartSankey'
 import ChartGeo from './widgets/ChartGeo'
 import ChartTree from './widgets/ChartTree'
-import ChartDonut from './widgets/ChartDonut'
 import ChartSunburst from './widgets/ChartSunburst'
 import ChartPolar from './widgets/ChartPolar'
 
@@ -40,8 +39,7 @@ export default {
     ChartTable, ChartLine, ChartBar, ChartPie,
     ChartKpi, ChartRadar, ChartFunnel, ChartScatter,
     ChartGauge, ChartTreemap, ChartWordCloud, ChartLiquidFill,
-    ChartSankey, ChartGeo, ChartTree, ChartDonut,
-    ChartSunburst, ChartPolar
+    ChartSankey, ChartGeo, ChartTree, ChartSunburst, ChartPolar
   },
   props: {
     chartSchema: {

datax-ui/src/views/visual/datachart/components/widgets/ChartDonut.vue

-<template>
-  <div ref="chart" :style="chartStyle">ChartDonut</div>
-</template>
-
-<script>
-export default {
-  name: 'ChartDonut',
-  props: {
-    data: {
-      type: Array,
-      required: true,
-      default: () => []
-    },
-    rows: {
-      type: Array,
-      required: true,
-      default: () => []
-    },
-    columns: {
-      type: Array,
-      required: true,
-      default: () => []
-    },
-    values: {
-      type: Array,
-      required: true,
-      default: () => []
-    },
-    chartType: {
-      type: String,
-      required: true
-    },
-    chartTheme: {
-      type: String,
-      require: true
-    },
-    chartOption: {
-      type: Object,
-      require: false,
-      default: () => ({})
-    },
-    chartStyle: {
-      type: Object,
-      require: false,
-      default: () => {
-        return {
-          height: '200px'
-        }
-      }
-    }
-  },
-  created() {
-    console.log(this.data)
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

datax-ui/src/views/visual/datachart/components/widgets/ChartWordCloud.vue

@@ -36,7 +36,8 @@ export default {
     },
     chartTheme: {
       type: String,
-      require: true
+      require: true,
+      default: 'default'
     },
     chartOption: {
       type: Object,