删除绘图工具方法

JCCDex · Nov 8, 2019 · a201167 · a201167
1 parent 932449c
commit a201167
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 258 deletions.
diff --git a/index.js b/index.js
@@ -1,12 +1,10 @@
-import { Chart, MobileKline, FSMobileKLine, MobileChart, Toolbar } from './src/index'
+import { Chart, FSMobileKLine, MobileChart } from './src/index'
 
 const kline = {
   install: function (Vue) {
     Vue.component('jKline', Chart);
-    // Vue.component('mKline', MobileKline);
     Vue.component('fsmKline', FSMobileKLine);
     Vue.component('mKline', MobileChart);
-    Vue.component('toolbar', Toolbar)
   }
 };
 if (typeof window !== 'undefined' && window.Vue) {

diff --git a/src/components/toolbar.vue b/src/components/toolbar.vue
diff --git a/src/index.js b/src/index.js
@@ -2,13 +2,11 @@ import MobileKline from './components/mobileKline.vue';
 import FSMobileKLine from './components/fullScreenMobileKline.vue';
 import Chart from './components/klineChart.vue';
 import MobileChart from './components/mobileChart.vue';
-import Toolbar from './components/toolbar.vue';
 
 
 export {
     MobileKline,
     FSMobileKLine,
     Chart,
-    MobileChart,
-    Toolbar
+    MobileChart
 };
diff --git a/src/js/DrawToolbar.js b/src/js/DrawToolbar.js
diff --git a/test/unit/specs/DrawToolbar.spec.js b/test/unit/specs/DrawToolbar.spec.js
diff --git a/test/unit/specs/SetVolumeChart.spec.js b/test/unit/specs/SetVolumeChart.spec.js
@@ -6,6 +6,7 @@ volumeOption.platform = 'pc'
 volumeOption.chartType = 'volume'
 volumeOption.defaultSize = true
 let data = testData.candleData
+const element = document.createElement('div');
 
 describe('test SetVolumeChart', () => {
 
@@ -25,48 +26,45 @@ describe('test SetVolumeChart', () => {
     })
 
     it('test initVolumeECharts', () => {
-        const element = document.createElement('div');
         let volume = new SetVolumeChart(volumeOption);
         volume.initVolumeECharts(element)
         volume.initVolumeECharts(element, true)
         expect(volume).not.toBeNull();
     })
 
     it('test showLoading', () => {
-        const element = document.createElement('div');
         let volume = new SetVolumeChart(volumeOption);
         volume.initVolumeECharts(element)
         volume.showLoading()
         expect(volume).not.toBeNull();
     })
 
     it('test setVolumeOption', () => {
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
-        volumeChart.setVolumeOption(data, 'hour')
+        data.volume = data.volumes.slice(0, 90)
+        volumeChart.setVolumeOption(data, 'minute')
         expect(volumeChart.volume.getOption()).not.toBeNull();
     })
 
     it('test setVolumeOption if data is null', () => {
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.setVolumeOption(null, 'hour')
         expect(volumeChart.volume.getOption()).not.toBeNull();
     })
 
     it('test updateVolumeOption', () => {
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
+        data.volume = data.volumes.slice(0, 50)
         volumeChart.setVolumeOption(data, 'day')
         volumeChart.updateVolumeOption(data, 'day')
         expect(volumeChart.volume.getOption()).not.toBeNull();
     })
 
     it('test resizeECharts', () => {
-        const element = document.createElement('div');
+        volumeOption.platform = 'mobile'
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.setVolumeOption(data, 'week')
@@ -80,7 +78,6 @@ describe('test SetVolumeChart', () => {
             width: 600,
             height: 560
         }
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.setVolumeOption(data, 'month')
@@ -90,7 +87,6 @@ describe('test SetVolumeChart', () => {
 
     it('test resizeECharts if not DOM', () => {
         volumeOption.defaultSize = true
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.setVolumeOption(data, '')
@@ -99,7 +95,6 @@ describe('test SetVolumeChart', () => {
     })
 
     it('test disposeVolumeEChart', () => {
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.setVolumeOption(data, 'hour')
@@ -108,25 +103,23 @@ describe('test SetVolumeChart', () => {
     })
 
     it('test disposeVolumeEChart if volume is null', () => {
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
-        volumeChart.setVolumeOption(data, 'hour')
+        volumeChart.setVolumeOption(data, 'week')
         volumeChart.volume = null;
         volumeChart.disposeVolumeEChart()
         expect(volumeChart.volume).toBeNull();
     })
 
     it('test updateVolumeOption if volume getOption is null', () => {
-        const element = document.createElement('div');
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.updateVolumeOption(data, 'day')
         expect(volumeChart).not.toBeNull();
     })
 
     it('test changeDataZoom', () => {
-        const element = document.createElement('div');
+        volumeOption.platform = 'pc'
         let volumeChart = new SetVolumeChart(volumeOption);
         volumeChart.initVolumeECharts(element)
         volumeChart.setVolumeOption(data, 'hour')
@@ -147,6 +140,5 @@ describe('test SetVolumeChart', () => {
         expect(volumeChart.volume.getOption().dataZoom[0].end).toBe(100)
         volumeChart.changeDataZoom('test')
         expect(volumeChart.volume.getOption().dataZoom[0].start).toBe(40)
-      })
-
+    })
 })