代码合并

JCCDex · Feb 26, 2019 · 6f051ed · 6f051ed
2 parents eebd2b5 + d450a19
commit 6f051ed
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 24 deletions.
diff --git a/src/components/fullScreenMobileKline.vue b/src/components/fullScreenMobileKline.vue
@@ -101,13 +101,12 @@ export default {
        if (this.klineDataObj.cycle !== "everyhour" && mobileKlineData.values !== null && mobileKlineData.volumes !== null && mobileKlineData.categoryData !== null) {
           this.toolTipData = this.kline.updateMobileOption(mobileKlineData);
         }
-        if (this.klineDataObj.cycle === "everyhour") {
+        if (this.klineDataObj.cycle === "everyhour" && this.klineDataObj.timeDivisionData) {
           let timeDivisionData = this.klineDataObj.timeDivisionData
-          timeDivisionData.precision = precision
           let divisionData = handleDivisionData(timeDivisionData)
           this.divisionTime = divisionData.divisionTime
           if (timeDivisionData !== null && divisionData.times !== null && divisionData.averages !== null && divisionData.prices !== null && divisionData.volumes !== null) {
-            this.timeDivisionTipData = this.kline.updateTimeDivisionOption(timeDivisionData, divisionData);
+            this.timeDivisionTipData = this.kline.updateTimeDivisionOption(timeDivisionData, divisionData, precision);
           }
         }
       }

diff --git a/src/components/marketDepth.vue b/src/components/marketDepth.vue
@@ -40,17 +40,20 @@ export default {
           price: this.klineDataObj.pricePrecision,
           amount: this.klineDataObj.amountPrecision
         }
-        let depthData = getDepthData(this.klineDataObj.depthData, this.klineDataObj.coinType, precision);
-        depthData.precision = precision;
-        if (depthData) {
-          if(JSON.stringify(this.coinType) !== JSON.stringify(this.klineDataObj.coinType)) {
-            this.clearChart();
-            this.depth.setDepthOption(depthData)
-            this.coinType = this.klineDataObj.coinType
-          }else {
-            this.depth.updateDepthOption(depthData)
+        if (this.klineDataObj.depthData) {
+          let depthData = getDepthData(this.klineDataObj.depthData, this.klineDataObj.coinType, precision);
+          depthData.precision = precision;
+          if (depthData) {
+            if(JSON.stringify(this.coinType) !== JSON.stringify(this.klineDataObj.coinType)) {
+              this.clearChart();
+              this.depth.setDepthOption(depthData)
+              this.coinType = this.klineDataObj.coinType
+            }else {
+              this.depth.updateDepthOption(depthData)
+            }
           }
         }
+        
       }
     },
     klineConfig() {

diff --git a/src/components/mobileKline.vue b/src/components/mobileKline.vue
@@ -104,13 +104,12 @@ export default {
         if (this.klineDataObj.cycle !== "everyhour" && mobileKlineData.values !== null && mobileKlineData.volumes !== null && mobileKlineData.categoryData !== null) {
           this.toolTipData = this.kline.updateMobileOption(mobileKlineData);
         }
-        if (this.klineDataObj.cycle === "everyhour") {
+        if (this.klineDataObj.cycle === "everyhour" && this.klineDataObj.timeDivisionData) {
           let timeDivisionData = this.klineDataObj.timeDivisionData
-          timeDivisionData.precision = precision
           let divisionData = handleDivisionData(timeDivisionData)
           this.divisionTime = divisionData.divisionTime
           if (timeDivisionData !== null && divisionData.times !== null && divisionData.averages !== null && divisionData.prices !== null && divisionData.volumes !== null) {
-            this.timeDivisionTipData = this.kline.updateTimeDivisionOption(timeDivisionData, divisionData);
+            this.timeDivisionTipData = this.kline.updateTimeDivisionOption(timeDivisionData, divisionData, precision);
           }
         }
       }

diff --git a/src/js/KLine.js b/src/js/KLine.js
@@ -80,8 +80,8 @@ class KLineController {
         return this.setMobileKLineChart.updateOption(data);
     }
 
-    updateTimeDivisionOption(timeDivisionData, divisionData) {
-        return this.setMobileKLineChart.updateTimeDivisionOption(timeDivisionData, divisionData);
+    updateTimeDivisionOption(timeDivisionData, divisionData, precision) {
+        return this.setMobileKLineChart.updateTimeDivisionOption(timeDivisionData, divisionData, precision);
     }
 
     changeMobileDataZoom(type) {

diff --git a/src/js/KLineMobileSetChart.js b/src/js/KLineMobileSetChart.js
@@ -208,9 +208,9 @@ class KLineMobileSetChartController {
         return toolTipData;
     }
 
-    updateTimeDivisionOption(timeDivisionData, data) {
-        pricePrecision = !isNaN(timeDivisionData.precision.price) ? timeDivisionData.precision.price : pricePrecision;
-        amountsPrecision = !isNaN(timeDivisionData.precision.amount) ? timeDivisionData.precision.amount : amountsPrecision;
+    updateTimeDivisionOption(timeDivisionData, data, precision) {
+        pricePrecision = !isNaN(precision.price) ? precision.price : pricePrecision;
+        amountsPrecision = !isNaN(precision.amount) ? precision.amount : amountsPrecision;
         let { times, averages, prices, volumes } = data;
         let length = timeDivisionData.length - 1;
         if (!toolTipData) {

diff --git a/src/js/utils.js b/src/js/utils.js
@@ -12,7 +12,7 @@ export const getClientHeight = () => {
 
 export const formatDecimal = function (f, n, sep) {
     // var num = parseFloat(f);
-    n = parseInt(n)
+    n = parseInt(n);
     if (isNaN(f)) {
         return f;
     }

diff --git a/test/unit/specs/KLine.spec.js b/test/unit/specs/KLine.spec.js
@@ -163,7 +163,7 @@ describe('test KLine', () => {
     const element = document.createElement('div');
     mobileKline.initMobileChart(element)
     mobileKline.setTimeDivisionsOption(size)
-    mobileKline.updateTimeDivisionOption(timeDivisionData, divisionData)
+    mobileKline.updateTimeDivisionOption(timeDivisionData, divisionData, precision)
     expect(mobileKline.setMobileKLineChart.kline.getOption()).not.toBeNull()
   })
 

diff --git a/test/unit/specs/KLineMobileSetChart.spec.js b/test/unit/specs/KLineMobileSetChart.spec.js
@@ -131,7 +131,7 @@ describe('test KLineMobileSetChart', () => {
     let mobileKline = new klineMobileSetChart(mobileOption);
     mobileKline.initMobileECharts(element)
     mobileKline.setTimeDivisionsOption(size)
-    mobileKline.updateTimeDivisionOption(timeDivisionData, divisionData)
+    mobileKline.updateTimeDivisionOption(timeDivisionData, divisionData, precision)
     expect(mobileKline.kline.getOption()).not.toBeNull();
   })
 
@@ -169,7 +169,7 @@ describe('test KLineMobileSetChart', () => {
     let mobileKline = new klineMobileSetChart(mobileOption);
     mobileKline.initMobileECharts(element)
     mobileKline.setTimeDivisionsOption(size)
-    mobileKline.updateTimeDivisionOption(timeDivisionData, divisionData)
+    mobileKline.updateTimeDivisionOption(timeDivisionData, divisionData, precision)
     mobileKline.changeDataZoom('enlarge')
     expect(mobileKline.kline.getOption().dataZoom[0].start).toBe(65);
     expect(mobileKline.kline.getOption().dataZoom[0].end).toBe(100);