update dist and lib

CHANGELOG.md

@@ -1,3 +1,33 @@
+# 2.7.4-alpha (2020-04-15)
+
+### Bug Fixes
+
+- **capsuleChart:** Calculate exception when min value is less 5 [(#59)](https://github.com/DataV-Team/DataV/pull/59).
+
+# 2.7.3-alpha (2020-01-16)
+
+### Bug Fixes
+
+- **activeRingChart:** `parseInt` precision lost.
+
+# 2.7.2-alpha (2020-01-10)
+
+### Perfect
+
+- **ativeRingChart:** Add digitalFlopToFixed configuration.
+
+# 2.7.1-alpha (2020-01-08)
+
+### Bug Fixes
+
+- **flylineChartEnhanced:** Exception when relative is false.
+
+# 2.7.0-alpha (2020-01-05)
+
+### New
+
+- **flylineChartEnhanced:** Enhanced flylineChart [(#12)](https://github.com/DataV-Team/DataV/issues/12).
+
 # 2.6.0-alpha (2019-12-25)
 
 ### Perfect

README.md

@@ -49,7 +49,6 @@ Vue.use(borderBox1)
 
 ### TODO
 
-* **飞线图**添加多中心点及反向飞线功能
 * **地图组件**
 * **TS**重构组件库底层依赖
 

README_EN.md

@@ -59,7 +59,6 @@ React version of the component library and feedback[Questionnaire](https://www.w
 
 ### TODO
 
-* **flylineChart**Add multi-center point and reverse fly line function.
 * **Map Component**
 * Refactor underlying dependencies using **TS**.
 

lib/components/activeRingChart/src/main.vue

@@ -78,6 +78,11 @@ export default {
           fontSize: 25,
           fill: '#fff'
         },
+        /**
+         * @description Digital flop toFixed
+         * @type {Number}
+         */
+        digitalFlopToFixed: 0,
         /**
          * @description CRender animationCurve
          * @type {String}
@@ -107,18 +112,19 @@ export default {
 
       if (!mergedConfig) return {}
 
-      const { digitalFlopStyle, data } = mergedConfig
+      const { digitalFlopStyle, digitalFlopToFixed, data } = mergedConfig
 
       const value = data.map(({ value }) => value)
 
       const sum = value.reduce((all, v) => all + v, 0)
 
-      const percent = parseInt(value[activeIndex] / sum * 100) || 0
+      const percent = parseFloat(value[activeIndex] / sum * 100) || 0
 
       return {
         content: '{nt}%',
         number: [percent],
-        style: digitalFlopStyle
+        style: digitalFlopStyle,
+        toFixed: digitalFlopToFixed
       }
     },
     ringName () {

lib/components/borderBox11/src/main.vue

@@ -237,7 +237,7 @@ export default {
     const timestamp = Date.now()
     return {
       ref: 'border-box-11',
-      filterId: `borderr-box-11-filterId-${timestamp}`,
+      filterId: `border-box-11-filterId-${timestamp}`,
 
       defaultColor: ['#8aaafb', '#1f33a2'],
 

lib/components/capsuleChart/src/main.vue

@@ -102,7 +102,7 @@ export default {
 
       const oneFifth = maxValue / 5
 
-      this.labelData = new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth))
+      this.labelData = new Set(new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth)))
     }
   },
   mounted () {

lib/components/flylineChartEnhanced/index.js

@@ -0,0 +1,6 @@
+import './src/main.css'
+import FlylineChartEnhanced from './src/main.vue'
+
+export default function (Vue) {
+  Vue.component(FlylineChartEnhanced.name, FlylineChartEnhanced)
+}

lib/components/flylineChartEnhanced/src/main.css

@@ -0,0 +1,9 @@
+.dv-flyline-chart-enhanced {
+  display: flex;
+  flex-direction: column;
+  background-size: 100% 100%;
+}
+.dv-flyline-chart-enhanced text {
+  text-anchor: middle;
+  dominant-baseline: middle;
+}

lib/components/flylineChartEnhanced/src/main.vue

@@ -0,0 +1,566 @@
+<template>
+  <div
+    class="dv-flyline-chart-enhanced"
+    :style="`background-image: url(${mergedConfig ? mergedConfig.bgImgSrc : ''})`"
+    :ref="ref"
+    @click="consoleClickPos"
+  >
+    <svg v-if="flylines.length" :width="width" :height="height">
+      <defs>
+        <radialGradient
+          :id="flylineGradientId"
+          cx="50%" cy="50%" r="50%"
+        >
+          <stop
+            offset="0%" stop-color="#fff"
+            stop-opacity="1"
+          />
+          <stop
+            offset="100%" stop-color="#fff"
+            stop-opacity="0"
+          />
+        </radialGradient>
+
+        <radialGradient
+          :id="haloGradientId"
+          cx="50%" cy="50%" r="50%"
+        >
+          <stop
+            offset="0%" stop-color="#fff"
+            stop-opacity="0"
+          />
+          <stop
+            offset="100%" stop-color="#fff"
+            stop-opacity="1"
+          />
+        </radialGradient>
+      </defs>
+
+      <!-- points -->
+      <g v-for="point in flylinePoints" :key="point.key + Math.random()">
+        <defs>
+          <circle
+            v-if="point.halo.show"
+            :id="`halo${unique}${point.key}`"
+            :cx="point.coordinate[0]"
+            :cy="point.coordinate[1]"
+          >
+            <animate
+              attributeName="r"
+              :values="`1;${point.halo.radius}`"
+              :dur="`${point.halo.time}s`"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="opacity"
+              values="1;0"
+              :dur="`${point.halo.time}s`"
+              repeatCount="indefinite"
+            />
+          </circle>
+        </defs>
+
+        <!-- halo gradient mask -->
+        <mask :id="`mask${unique}${point.key}`">
+          <use
+            v-if="point.halo.show"
+            :xlink:href="`#halo${unique}${point.key}`"
+            :fill="`url(#${haloGradientId})`"
+          />
+        </mask>
+
+        <!-- point halo -->
+        <use
+          v-if="point.halo.show"
+          :xlink:href="`#halo${unique}${point.key}`"
+          :fill="point.halo.color"
+          :mask="`url(#mask${unique}${point.key})`"
+        />
+
+        <!-- point icon -->
+        <image
+          v-if="point.icon.show"
+          :xlink:href="point.icon.src"
+          :width="point.icon.width"
+          :height="point.icon.height"
+          :x="point.icon.x"
+          :y="point.icon.y"
+        />
+
+        <!-- point text -->
+        <text
+          v-if="point.text.show"
+          :style="`fontSize:${point.text.fontSize}px;color:${point.text.color}`"
+          :fill="point.text.color"
+          :x="point.text.x"
+          :y="point.text.y"
+        >
+          {{ point.name }}
+        </text>
+      </g>
+
+      <!-- flylines -->
+      <g v-for="(line, i) in flylines" :key="line.key + Math.random()">
+        <defs>
+          <path
+            :id="line.key"
+            :ref="line.key"
+            :d="line.d"
+            fill="transparent"
+          />
+        </defs>
+
+        <!-- orbit line -->
+        <use
+          :xlink:href="`#${line.key}`"
+          :stroke-width="line.width"
+          :stroke="line.orbitColor"
+        />
+
+        <!-- fly line gradient mask -->
+        <mask :id="`mask${unique}${line.key}`">
+          <circle cx="0" cy="0" :r="line.radius" :fill="`url(#${flylineGradientId})`">
+            <animateMotion
+              :dur="line.time"
+              :path="line.d"
+              rotate="auto"
+              repeatCount="indefinite"
+            />
+          </circle>
+        </mask>
+
+        <!-- fly line -->
+        <use
+          v-if="flylineLengths[i]"
+          :xlink:href="`#${line.key}`"
+          :stroke-width="line.width"
+          :stroke="line.color"
+          :mask="`url(#mask${unique}${line.key})`"
+        >
+          <animate
+            attributeName="stroke-dasharray"
+            :from="`0, ${flylineLengths[i]}`"
+            :to="`${flylineLengths[i]}, 0`"
+            :dur="line.time"
+            repeatCount="indefinite"
+          />
+        </use>
+      </g>
+    </svg>
+  </div>
+</template>
+
+<script>
+import { deepMerge } from '@jiaminghi/charts/lib/util/index'
+
+import { deepClone } from '@jiaminghi/c-render/lib/plugin/util'
+
+import { randomExtend, getPointDistance } from '../../../util/index'
+
+import autoResize from '../../../mixin/autoResize'
+
+export default {
+  name: 'DvFlylineChartEnhanced',
+  mixins: [autoResize],
+  props: {
+    config: {
+      type: Object,
+      default: () => ({})
+    },
+    dev: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    const timestamp = Date.now()
+    return {
+      ref: 'dv-flyline-chart-enhanced',
+      unique: Math.random(),
+      flylineGradientId: `flyline-gradient-id-${timestamp}`,
+      haloGradientId: `halo-gradient-id-${timestamp}`,
+      /**
+       * @description Type Declaration
+       * 
+       * interface Halo {
+       *    show?: boolean
+       *    duration?: [number, number]
+       *    color?: string
+       *    radius?: number
+       * }
+       * 
+       * interface Text {
+       *    show?: boolean
+       *    offset?: [number, number]
+       *    color?: string
+       *    fontSize?: number
+       * }
+       * 
+       * interface Icon {
+       *    show?: boolean
+       *    src?: string
+       *    width?: number
+       *    height?: number
+       * }
+       * 
+       * interface Point {
+       *    name: string
+       *    coordinate: [number, number]
+       *    halo?: Halo
+       *    text?: Text
+       *    icon?: Icon
+       * }
+       * 
+       * interface Line {
+       *    width?: number
+       *    color?: string
+       *    orbitColor?: string
+       *    duration?: [number, number]
+       *    radius?: string
+       * }
+       * 
+       * interface Flyline extends Line {
+       *    source: string
+       *    target: string
+       * }
+       * 
+       * interface FlylineWithPath extends Flyline {
+       *    d: string
+       *    path: [[number, number], [number, number], [number, number]]
+       *    key: string
+       * }
+       */
+      defaultConfig: {
+        /**
+         * @description Flyline chart points
+         * @type {Point[]}
+         * @default points = []
+         */
+        points: [],
+        /**
+         * @description Lines
+         * @type {Flyline[]}
+         * @default lines = []
+         */
+        lines: [],
+        /**
+         * @description Global halo configuration
+         * @type {Halo}
+         */
+        halo: {
+          /**
+           * @description Whether to show halo
+           * @type {Boolean}
+           * @default show = false
+           */
+          show: false,
+          /**
+           * @description Halo animation duration (1s = 10)
+           * @type {[number, number]}
+           */
+          duration: [20, 30],
+          /**
+           * @description Halo color
+           * @type {String}
+           * @default color = '#fb7293'
+           */
+          color: '#fb7293',
+          /**
+           * @description Halo radius
+           * @type {Number}
+           * @default radius = 120
+           */
+          radius: 120
+        },
+        /**
+         * @description Global text configuration
+         * @type {Text}
+         */
+        text: {
+          /**
+           * @description Whether to show text
+           * @type {Boolean}
+           * @default show = false
+           */
+          show: false,
+          /**
+           * @description Text offset
+           * @type {[number, number]}
+           * @default offset = [0, 15]
+           */
+          offset: [0, 15],
+          /**
+           * @description Text color
+           * @type {String}
+           * @default color = '#ffdb5c'
+           */
+          color: '#ffdb5c',
+          /**
+           * @description Text font size
+           * @type {Number}
+           * @default fontSize = 12
+           */
+          fontSize: 12
+        },
+        /**
+         * @description Global icon configuration
+         * @type {Icon}
+         */
+        icon: {
+          /**
+           * @description Whether to show icon
+           * @type {Boolean}
+           * @default show = false
+           */
+          show: false,
+          /**
+           * @description Icon src
+           * @type {String}
+           * @default src = ''
+           */
+          src: '',
+          /**
+           * @description Icon width
+           * @type {Number}
+           * @default width = 15
+           */
+          width: 15,
+          /**
+           * @description Icon height
+           * @type {Number}
+           * @default width = 15
+           */
+          height: 15
+        },
+        /**
+         * @description Global line configuration
+         * @type {Line}
+         */
+        line: {
+          /**
+           * @description Line width
+           * @type {Number}
+           * @default width = 1
+           */
+          width: 1,
+          /**
+           * @description Flyline color
+           * @type {String}
+           * @default color = '#ffde93'
+           */
+          color: '#ffde93',
+          /**
+           * @description Orbit color
+           * @type {String}
+           * @default orbitColor = 'rgba(103, 224, 227, .2)'
+           */
+          orbitColor: 'rgba(103, 224, 227, .2)',
+          /**
+           * @description Flyline animation duration
+           * @type {[number, number]}
+           * @default duration = [20, 30]
+           */
+          duration: [20, 30],
+          /**
+           * @description Flyline radius
+           * @type {Number}
+           * @default radius = 100
+           */
+          radius: 100
+        },
+        /**
+         * @description Back ground image url
+         * @type {String}
+         * @default bgImgSrc = ''
+         */
+        bgImgSrc: '',
+        /**
+         * @description K value
+         * @type {Number}
+         * @default k = -0.5
+         * @example k = -1 ~ 1
+         */
+        k: -0.5,
+        /**
+         * @description Flyline curvature
+         * @type {Number}
+         * @default curvature = 5
+         */
+        curvature: 5,
+        /**
+         * @description Relative points position
+         * @type {Boolean}
+         * @default relative = true
+         */
+        relative: true
+      },
+      /**
+       * @description Fly line data
+       * @type {FlylineWithPath[]}
+       * @default flylines = []
+       */
+      flylines: [],
+      /**
+       * @description Fly line lengths
+       * @type {Number[]}
+       * @default flylineLengths = []
+       */
+      flylineLengths: [],
+      /**
+       * @description Fly line points
+       * @default flylinePoints = []
+       */
+      flylinePoints: [],
+
+      mergedConfig: null
+    }
+  },
+  watch: {
+    config () {
+      const { calcData } = this
+
+      calcData()
+    }
+  },
+  methods: {
+    afterAutoResizeMixinInit () {
+      const { calcData } = this
+
+      calcData()
+    },
+    onResize () {
+      const { calcData } = this
+
+      calcData()
+    },
+    async calcData () {
+      const { mergeConfig, calcflylinePoints, calcLinePaths } = this
+
+      mergeConfig()
+
+      calcflylinePoints()
+
+      calcLinePaths()
+
+      const { calcLineLengths } = this
+
+      await calcLineLengths()
+    },
+    mergeConfig () {
+      let { config, defaultConfig } = this
+
+      const mergedConfig = deepMerge(deepClone(defaultConfig, true), config || {})
+
+      const { points, lines, halo, text, icon, line } = mergedConfig
+
+      mergedConfig.points = points.map(item => {
+        item.halo = deepMerge(deepClone(halo, true), item.halo || {})
+        item.text = deepMerge(deepClone(text, true), item.text || {})
+        item.icon = deepMerge(deepClone(icon, true), item.icon || {})
+
+        return item
+      })
+
+      mergedConfig.lines = lines.map(item => {
+        return deepMerge(deepClone(line, true), item)
+      })
+
+      this.mergedConfig = mergedConfig
+    },
+    calcflylinePoints () {
+      const { mergedConfig, width, height } = this
+
+      const { relative, points } = mergedConfig
+
+      this.flylinePoints = points.map((item, i) => {
+        const { coordinate: [x, y], halo, icon, text } = item
+
+        if (relative) item.coordinate = [x * width, y * height]
+
+        item.halo.time = randomExtend(...halo.duration) / 10
+
+        const { width: iw, height: ih } = icon
+        item.icon.x = item.coordinate[0] - iw / 2
+        item.icon.y = item.coordinate[1] - ih / 2
+
+        const [ox, oy] = text.offset
+        item.text.x = item.coordinate[0] + ox
+        item.text.y = item.coordinate[1] + oy
+
+        item.key = `${item.coordinate.toString()}${i}`
+
+        return item
+      })
+    },
+    calcLinePaths () {
+      const { getPath, mergedConfig } = this
+
+      const { points, lines } = mergedConfig
+
+      this.flylines = lines.map(item => {
+        const { source, target, duration } = item
+
+        const sourcePoint = points.find(({ name }) => name === source).coordinate
+        const targetPoint = points.find(({ name }) => name === target).coordinate
+
+        const path = getPath(sourcePoint, targetPoint).map(item => item.map(v => parseFloat(v.toFixed(10))))
+        const d = `M${path[0].toString()} Q${path[1].toString()} ${path[2].toString()}`
+        const key = `path${path.toString()}`
+        const time = randomExtend(...duration) / 10
+
+        return { ...item, path, key, d, time }
+      })
+    },
+    getPath (start, end) {
+      const { getControlPoint } = this
+
+      const controlPoint = getControlPoint(start, end)
+
+      return [start, controlPoint, end]
+    },
+    getControlPoint ([sx, sy], [ex, ey]) {
+      const { getKLinePointByx, mergedConfig } = this
+
+      const { curvature, k } = mergedConfig
+
+      const [mx, my] = [(sx + ex) / 2, (sy + ey) / 2]
+
+      const distance = getPointDistance([sx, sy], [ex, ey])
+
+      const targetLength = distance / curvature
+      const disDived = targetLength / 2
+
+      let [dx, dy] = [mx, my]
+
+      do {
+        dx += disDived
+        dy = getKLinePointByx(k, [mx, my], dx)[1]
+      } while (getPointDistance([mx, my], [dx, dy]) < targetLength)
+
+      return [dx, dy]
+    },
+    getKLinePointByx (k, [lx, ly], x) {
+      const y = ly - k * lx + k * x
+
+      return [x, y]
+    },
+    async calcLineLengths () {
+      const { $nextTick, flylines, $refs } = this
+
+      await $nextTick()
+
+      this.flylineLengths = flylines.map(({ key }) => $refs[key][0].getTotalLength())
+    },
+    consoleClickPos ({ offsetX, offsetY }) {
+      const { width, height, dev } = this
+
+      if (!dev) return
+
+      const relativeX = (offsetX / width).toFixed(2)
+      const relativeY = (offsetY / height).toFixed(2)
+
+      console.warn(`dv-flyline-chart-enhanced DEV: \n Click Position is [${offsetX}, ${offsetY}] \n Relative Position is [${relativeX}, ${relativeY}]`)
+    }
+  }
+}
+</script>

lib/index.js

@@ -31,6 +31,7 @@ export { default as decoration8 } from './components/decoration8/index'
 export { default as decoration9 } from './components/decoration9/index'
 export { default as digitalFlop } from './components/digitalFlop/index'
 export { default as flylineChart } from './components/flylineChart/index'
+export { default as flylineChartEnhanced } from './components/flylineChartEnhanced/index'
 export { default as fullScreenContainer } from './components/fullScreenContainer/index'
 export { default as loading } from './components/loading/index'
 export { default as percentPond } from './components/percentPond/index'
@@ -79,6 +80,7 @@ import capsuleChart from './components/capsuleChart'
 import waterLevelPond from './components/waterLevelPond/index'
 import percentPond from './components/percentPond/index'
 import flylineChart from './components/flylineChart'
+import flylineChartEnhanced from './components/flylineChartEnhanced'
 import conicalColumnChart from './components/conicalColumnChart'
 import digitalFlop from './components/digitalFlop'
 import scrollBoard from './components/scrollBoard/index'
@@ -127,6 +129,7 @@ export default function (Vue) {
   Vue.use(waterLevelPond)
   Vue.use(percentPond)
   Vue.use(flylineChart)
+  Vue.use(flylineChartEnhanced)
   Vue.use(conicalColumnChart)
   Vue.use(digitalFlop)
   Vue.use(scrollBoard)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiaminghi/data-view",
-  "version": "2.6.0",
+  "version": "2.7.4",
   "author": "JiaMing <743192023@qq.com>",
   "description": "Vue Large screen data display component library",
   "main": "lib/index.js",

src/components/activeRingChart/src/main.vue

@@ -78,6 +78,11 @@ export default {
           fontSize: 25,
           fill: '#fff'
         },
+        /**
+         * @description Digital flop toFixed
+         * @type {Number}
+         */
+        digitalFlopToFixed: 0,
         /**
          * @description CRender animationCurve
          * @type {String}
@@ -107,18 +112,19 @@ export default {
 
       if (!mergedConfig) return {}
 
-      const { digitalFlopStyle, data } = mergedConfig
+      const { digitalFlopStyle, digitalFlopToFixed, data } = mergedConfig
 
       const value = data.map(({ value }) => value)
 
       const sum = value.reduce((all, v) => all + v, 0)
 
-      const percent = parseInt(value[activeIndex] / sum * 100) || 0
+      const percent = parseFloat(value[activeIndex] / sum * 100) || 0
 
       return {
         content: '{nt}%',
         number: [percent],
-        style: digitalFlopStyle
+        style: digitalFlopStyle,
+        toFixed: digitalFlopToFixed
       }
     },
     ringName () {

src/components/borderBox11/src/main.vue

@@ -237,7 +237,7 @@ export default {
     const timestamp = Date.now()
     return {
       ref: 'border-box-11',
-      filterId: `borderr-box-11-filterId-${timestamp}`,
+      filterId: `border-box-11-filterId-${timestamp}`,
 
       defaultColor: ['#8aaafb', '#1f33a2'],
 

src/components/capsuleChart/src/main.vue

@@ -102,7 +102,7 @@ export default {
 
       const oneFifth = maxValue / 5
 
-      this.labelData = new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth))
+      this.labelData = new Set(new Array(6).fill(0).map((v, i) => Math.ceil(i * oneFifth)))
     }
   },
   mounted () {

src/components/flylineChartEnhanced/index.js

@@ -0,0 +1,5 @@
+import FlylineChartEnhanced from './src/main.vue'
+
+export default function (Vue) {
+  Vue.component(FlylineChartEnhanced.name, FlylineChartEnhanced)
+}

src/components/flylineChartEnhanced/src/main.vue

@@ -0,0 +1,579 @@
+<template>
+  <div
+    class="dv-flyline-chart-enhanced"
+    :style="`background-image: url(${mergedConfig ? mergedConfig.bgImgSrc : ''})`"
+    :ref="ref"
+    @click="consoleClickPos"
+  >
+    <svg v-if="flylines.length" :width="width" :height="height">
+      <defs>
+        <radialGradient
+          :id="flylineGradientId"
+          cx="50%" cy="50%" r="50%"
+        >
+          <stop
+            offset="0%" stop-color="#fff"
+            stop-opacity="1"
+          />
+          <stop
+            offset="100%" stop-color="#fff"
+            stop-opacity="0"
+          />
+        </radialGradient>
+
+        <radialGradient
+          :id="haloGradientId"
+          cx="50%" cy="50%" r="50%"
+        >
+          <stop
+            offset="0%" stop-color="#fff"
+            stop-opacity="0"
+          />
+          <stop
+            offset="100%" stop-color="#fff"
+            stop-opacity="1"
+          />
+        </radialGradient>
+      </defs>
+
+      <!-- points -->
+      <g v-for="point in flylinePoints" :key="point.key + Math.random()">
+        <defs>
+          <circle
+            v-if="point.halo.show"
+            :id="`halo${unique}${point.key}`"
+            :cx="point.coordinate[0]"
+            :cy="point.coordinate[1]"
+          >
+            <animate
+              attributeName="r"
+              :values="`1;${point.halo.radius}`"
+              :dur="`${point.halo.time}s`"
+              repeatCount="indefinite"
+            />
+            <animate
+              attributeName="opacity"
+              values="1;0"
+              :dur="`${point.halo.time}s`"
+              repeatCount="indefinite"
+            />
+          </circle>
+        </defs>
+
+        <!-- halo gradient mask -->
+        <mask :id="`mask${unique}${point.key}`">
+          <use
+            v-if="point.halo.show"
+            :xlink:href="`#halo${unique}${point.key}`"
+            :fill="`url(#${haloGradientId})`"
+          />
+        </mask>
+
+        <!-- point halo -->
+        <use
+          v-if="point.halo.show"
+          :xlink:href="`#halo${unique}${point.key}`"
+          :fill="point.halo.color"
+          :mask="`url(#mask${unique}${point.key})`"
+        />
+
+        <!-- point icon -->
+        <image
+          v-if="point.icon.show"
+          :xlink:href="point.icon.src"
+          :width="point.icon.width"
+          :height="point.icon.height"
+          :x="point.icon.x"
+          :y="point.icon.y"
+        />
+
+        <!-- point text -->
+        <text
+          v-if="point.text.show"
+          :style="`fontSize:${point.text.fontSize}px;color:${point.text.color}`"
+          :fill="point.text.color"
+          :x="point.text.x"
+          :y="point.text.y"
+        >
+          {{ point.name }}
+        </text>
+      </g>
+
+      <!-- flylines -->
+      <g v-for="(line, i) in flylines" :key="line.key + Math.random()">
+        <defs>
+          <path
+            :id="line.key"
+            :ref="line.key"
+            :d="line.d"
+            fill="transparent"
+          />
+        </defs>
+
+        <!-- orbit line -->
+        <use
+          :xlink:href="`#${line.key}`"
+          :stroke-width="line.width"
+          :stroke="line.orbitColor"
+        />
+
+        <!-- fly line gradient mask -->
+        <mask :id="`mask${unique}${line.key}`">
+          <circle cx="0" cy="0" :r="line.radius" :fill="`url(#${flylineGradientId})`">
+            <animateMotion
+              :dur="line.time"
+              :path="line.d"
+              rotate="auto"
+              repeatCount="indefinite"
+            />
+          </circle>
+        </mask>
+
+        <!-- fly line -->
+        <use
+          v-if="flylineLengths[i]"
+          :xlink:href="`#${line.key}`"
+          :stroke-width="line.width"
+          :stroke="line.color"
+          :mask="`url(#mask${unique}${line.key})`"
+        >
+          <animate
+            attributeName="stroke-dasharray"
+            :from="`0, ${flylineLengths[i]}`"
+            :to="`${flylineLengths[i]}, 0`"
+            :dur="line.time"
+            repeatCount="indefinite"
+          />
+        </use>
+      </g>
+    </svg>
+  </div>
+</template>
+
+<script>
+import { deepMerge } from '@jiaminghi/charts/lib/util/index'
+
+import { deepClone } from '@jiaminghi/c-render/lib/plugin/util'
+
+import { randomExtend, getPointDistance } from '../../../util/index'
+
+import autoResize from '../../../mixin/autoResize'
+
+export default {
+  name: 'DvFlylineChartEnhanced',
+  mixins: [autoResize],
+  props: {
+    config: {
+      type: Object,
+      default: () => ({})
+    },
+    dev: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    const timestamp = Date.now()
+    return {
+      ref: 'dv-flyline-chart-enhanced',
+      unique: Math.random(),
+      flylineGradientId: `flyline-gradient-id-${timestamp}`,
+      haloGradientId: `halo-gradient-id-${timestamp}`,
+      /**
+       * @description Type Declaration
+       * 
+       * interface Halo {
+       *    show?: boolean
+       *    duration?: [number, number]
+       *    color?: string
+       *    radius?: number
+       * }
+       * 
+       * interface Text {
+       *    show?: boolean
+       *    offset?: [number, number]
+       *    color?: string
+       *    fontSize?: number
+       * }
+       * 
+       * interface Icon {
+       *    show?: boolean
+       *    src?: string
+       *    width?: number
+       *    height?: number
+       * }
+       * 
+       * interface Point {
+       *    name: string
+       *    coordinate: [number, number]
+       *    halo?: Halo
+       *    text?: Text
+       *    icon?: Icon
+       * }
+       * 
+       * interface Line {
+       *    width?: number
+       *    color?: string
+       *    orbitColor?: string
+       *    duration?: [number, number]
+       *    radius?: string
+       * }
+       * 
+       * interface Flyline extends Line {
+       *    source: string
+       *    target: string
+       * }
+       * 
+       * interface FlylineWithPath extends Flyline {
+       *    d: string
+       *    path: [[number, number], [number, number], [number, number]]
+       *    key: string
+       * }
+       */
+      defaultConfig: {
+        /**
+         * @description Flyline chart points
+         * @type {Point[]}
+         * @default points = []
+         */
+        points: [],
+        /**
+         * @description Lines
+         * @type {Flyline[]}
+         * @default lines = []
+         */
+        lines: [],
+        /**
+         * @description Global halo configuration
+         * @type {Halo}
+         */
+        halo: {
+          /**
+           * @description Whether to show halo
+           * @type {Boolean}
+           * @default show = false
+           */
+          show: false,
+          /**
+           * @description Halo animation duration (1s = 10)
+           * @type {[number, number]}
+           */
+          duration: [20, 30],
+          /**
+           * @description Halo color
+           * @type {String}
+           * @default color = '#fb7293'
+           */
+          color: '#fb7293',
+          /**
+           * @description Halo radius
+           * @type {Number}
+           * @default radius = 120
+           */
+          radius: 120
+        },
+        /**
+         * @description Global text configuration
+         * @type {Text}
+         */
+        text: {
+          /**
+           * @description Whether to show text
+           * @type {Boolean}
+           * @default show = false
+           */
+          show: false,
+          /**
+           * @description Text offset
+           * @type {[number, number]}
+           * @default offset = [0, 15]
+           */
+          offset: [0, 15],
+          /**
+           * @description Text color
+           * @type {String}
+           * @default color = '#ffdb5c'
+           */
+          color: '#ffdb5c',
+          /**
+           * @description Text font size
+           * @type {Number}
+           * @default fontSize = 12
+           */
+          fontSize: 12
+        },
+        /**
+         * @description Global icon configuration
+         * @type {Icon}
+         */
+        icon: {
+          /**
+           * @description Whether to show icon
+           * @type {Boolean}
+           * @default show = false
+           */
+          show: false,
+          /**
+           * @description Icon src
+           * @type {String}
+           * @default src = ''
+           */
+          src: '',
+          /**
+           * @description Icon width
+           * @type {Number}
+           * @default width = 15
+           */
+          width: 15,
+          /**
+           * @description Icon height
+           * @type {Number}
+           * @default width = 15
+           */
+          height: 15
+        },
+        /**
+         * @description Global line configuration
+         * @type {Line}
+         */
+        line: {
+          /**
+           * @description Line width
+           * @type {Number}
+           * @default width = 1
+           */
+          width: 1,
+          /**
+           * @description Flyline color
+           * @type {String}
+           * @default color = '#ffde93'
+           */
+          color: '#ffde93',
+          /**
+           * @description Orbit color
+           * @type {String}
+           * @default orbitColor = 'rgba(103, 224, 227, .2)'
+           */
+          orbitColor: 'rgba(103, 224, 227, .2)',
+          /**
+           * @description Flyline animation duration
+           * @type {[number, number]}
+           * @default duration = [20, 30]
+           */
+          duration: [20, 30],
+          /**
+           * @description Flyline radius
+           * @type {Number}
+           * @default radius = 100
+           */
+          radius: 100
+        },
+        /**
+         * @description Back ground image url
+         * @type {String}
+         * @default bgImgSrc = ''
+         */
+        bgImgSrc: '',
+        /**
+         * @description K value
+         * @type {Number}
+         * @default k = -0.5
+         * @example k = -1 ~ 1
+         */
+        k: -0.5,
+        /**
+         * @description Flyline curvature
+         * @type {Number}
+         * @default curvature = 5
+         */
+        curvature: 5,
+        /**
+         * @description Relative points position
+         * @type {Boolean}
+         * @default relative = true
+         */
+        relative: true
+      },
+      /**
+       * @description Fly line data
+       * @type {FlylineWithPath[]}
+       * @default flylines = []
+       */
+      flylines: [],
+      /**
+       * @description Fly line lengths
+       * @type {Number[]}
+       * @default flylineLengths = []
+       */
+      flylineLengths: [],
+      /**
+       * @description Fly line points
+       * @default flylinePoints = []
+       */
+      flylinePoints: [],
+
+      mergedConfig: null
+    }
+  },
+  watch: {
+    config () {
+      const { calcData } = this
+
+      calcData()
+    }
+  },
+  methods: {
+    afterAutoResizeMixinInit () {
+      const { calcData } = this
+
+      calcData()
+    },
+    onResize () {
+      const { calcData } = this
+
+      calcData()
+    },
+    async calcData () {
+      const { mergeConfig, calcflylinePoints, calcLinePaths } = this
+
+      mergeConfig()
+
+      calcflylinePoints()
+
+      calcLinePaths()
+
+      const { calcLineLengths } = this
+
+      await calcLineLengths()
+    },
+    mergeConfig () {
+      let { config, defaultConfig } = this
+
+      const mergedConfig = deepMerge(deepClone(defaultConfig, true), config || {})
+
+      const { points, lines, halo, text, icon, line } = mergedConfig
+
+      mergedConfig.points = points.map(item => {
+        item.halo = deepMerge(deepClone(halo, true), item.halo || {})
+        item.text = deepMerge(deepClone(text, true), item.text || {})
+        item.icon = deepMerge(deepClone(icon, true), item.icon || {})
+
+        return item
+      })
+
+      mergedConfig.lines = lines.map(item => {
+        return deepMerge(deepClone(line, true), item)
+      })
+
+      this.mergedConfig = mergedConfig
+    },
+    calcflylinePoints () {
+      const { mergedConfig, width, height } = this
+
+      const { relative, points } = mergedConfig
+
+      this.flylinePoints = points.map((item, i) => {
+        const { coordinate: [x, y], halo, icon, text } = item
+
+        if (relative) item.coordinate = [x * width, y * height]
+
+        item.halo.time = randomExtend(...halo.duration) / 10
+
+        const { width: iw, height: ih } = icon
+        item.icon.x = item.coordinate[0] - iw / 2
+        item.icon.y = item.coordinate[1] - ih / 2
+
+        const [ox, oy] = text.offset
+        item.text.x = item.coordinate[0] + ox
+        item.text.y = item.coordinate[1] + oy
+
+        item.key = `${item.coordinate.toString()}${i}`
+
+        return item
+      })
+    },
+    calcLinePaths () {
+      const { getPath, mergedConfig } = this
+
+      const { points, lines } = mergedConfig
+
+      this.flylines = lines.map(item => {
+        const { source, target, duration } = item
+
+        const sourcePoint = points.find(({ name }) => name === source).coordinate
+        const targetPoint = points.find(({ name }) => name === target).coordinate
+
+        const path = getPath(sourcePoint, targetPoint).map(item => item.map(v => parseFloat(v.toFixed(10))))
+        const d = `M${path[0].toString()} Q${path[1].toString()} ${path[2].toString()}`
+        const key = `path${path.toString()}`
+        const time = randomExtend(...duration) / 10
+
+        return { ...item, path, key, d, time }
+      })
+    },
+    getPath (start, end) {
+      const { getControlPoint } = this
+
+      const controlPoint = getControlPoint(start, end)
+
+      return [start, controlPoint, end]
+    },
+    getControlPoint ([sx, sy], [ex, ey]) {
+      const { getKLinePointByx, mergedConfig } = this
+
+      const { curvature, k } = mergedConfig
+
+      const [mx, my] = [(sx + ex) / 2, (sy + ey) / 2]
+
+      const distance = getPointDistance([sx, sy], [ex, ey])
+
+      const targetLength = distance / curvature
+      const disDived = targetLength / 2
+
+      let [dx, dy] = [mx, my]
+
+      do {
+        dx += disDived
+        dy = getKLinePointByx(k, [mx, my], dx)[1]
+      } while (getPointDistance([mx, my], [dx, dy]) < targetLength)
+
+      return [dx, dy]
+    },
+    getKLinePointByx (k, [lx, ly], x) {
+      const y = ly - k * lx + k * x
+
+      return [x, y]
+    },
+    async calcLineLengths () {
+      const { $nextTick, flylines, $refs } = this
+
+      await $nextTick()
+
+      this.flylineLengths = flylines.map(({ key }) => $refs[key][0].getTotalLength())
+    },
+    consoleClickPos ({ offsetX, offsetY }) {
+      const { width, height, dev } = this
+
+      if (!dev) return
+
+      const relativeX = (offsetX / width).toFixed(2)
+      const relativeY = (offsetY / height).toFixed(2)
+
+      console.warn(`dv-flyline-chart-enhanced DEV: \n Click Position is [${offsetX}, ${offsetY}] \n Relative Position is [${relativeX}, ${relativeY}]`)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.dv-flyline-chart-enhanced {
+  display: flex;
+  flex-direction: column;
+  background-size: 100% 100%;
+
+  text {
+    text-anchor: middle;
+    dominant-baseline: middle;
+  }
+}
+</style>

src/index.js

@@ -40,6 +40,7 @@ import capsuleChart from './components/capsuleChart'
 import waterLevelPond from './components/waterLevelPond/index'
 import percentPond from './components/percentPond/index'
 import flylineChart from './components/flylineChart'
+import flylineChartEnhanced from './components/flylineChartEnhanced'
 import conicalColumnChart from './components/conicalColumnChart'
 import digitalFlop from './components/digitalFlop'
 import scrollBoard from './components/scrollBoard/index'
@@ -88,6 +89,7 @@ export default function (Vue) {
   Vue.use(waterLevelPond)
   Vue.use(percentPond)
   Vue.use(flylineChart)
+  Vue.use(flylineChartEnhanced)
   Vue.use(conicalColumnChart)
   Vue.use(digitalFlop)
   Vue.use(scrollBoard)