ver 10308

10307 修正ChartStickLine在分时图显示太粗了。
jones2000 · Aug 31, 2021 · 489f236 · 489f236
1 parent d16a83a
commit 489f236
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 10 deletions.
diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js
@@ -11305,7 +11305,7 @@ function MinuteFrame()
     this.DrawToolbar=function()
     {
         if (typeof($)=="undefined") return;
-        
+
         if (this.Identify<2) return;
         if (!this.ChartBorder.UIElement) return;
 
@@ -22540,12 +22540,20 @@ function ChartStickLine()
         var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
         if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;
 
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         var bFillBar=false;
         var bFillKLine=false;
         var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
 
-        if(this.Width==0)
+        if (isMinute)
+        {
+            if (this.Width>1) this.Canvas.lineWidth=2*GetDevicePixelRatio();
+            else this.Canvas.lineWidth=GetDevicePixelRatio();
+            this.Canvas.strokeStyle=this.Color;
+        }
+        else if(this.Width==0)
         {
             this.SetEmptyBar();
         }

diff --git a/vuehqchart/src/jscommon/umychart.js b/vuehqchart/src/jscommon/umychart.js
@@ -7339,7 +7339,7 @@ function MinuteFrame()
     this.DrawToolbar=function()
     {
         if (typeof($)=="undefined") return;
-        
+
         if (this.Identify<2) return;
         if (!this.ChartBorder.UIElement) return;
 
@@ -18574,12 +18574,20 @@ function ChartStickLine()
         var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
         if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;
 
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         var bFillBar=false;
         var bFillKLine=false;
         var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
 
-        if(this.Width==0)
+        if (isMinute)
+        {
+            if (this.Width>1) this.Canvas.lineWidth=2*GetDevicePixelRatio();
+            else this.Canvas.lineWidth=GetDevicePixelRatio();
+            this.Canvas.strokeStyle=this.Color;
+        }
+        else if(this.Width==0)
         {
             this.SetEmptyBar();
         }

diff --git a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
@@ -11349,7 +11349,7 @@ function MinuteFrame()
     this.DrawToolbar=function()
     {
         if (typeof($)=="undefined") return;
-        
+
         if (this.Identify<2) return;
         if (!this.ChartBorder.UIElement) return;
 
@@ -22584,12 +22584,20 @@ function ChartStickLine()
         var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
         if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;
 
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         var bFillBar=false;
         var bFillKLine=false;
         var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
 
-        if(this.Width==0)
+        if (isMinute)
+        {
+            if (this.Width>1) this.Canvas.lineWidth=2*GetDevicePixelRatio();
+            else this.Canvas.lineWidth=GetDevicePixelRatio();
+            this.Canvas.strokeStyle=this.Color;
+        }
+        else if(this.Width==0)
         {
             this.SetEmptyBar();
         }

diff --git a/webhqchart.demo/jscommon/umychart.js b/webhqchart.demo/jscommon/umychart.js
@@ -7339,7 +7339,7 @@ function MinuteFrame()
     this.DrawToolbar=function()
     {
         if (typeof($)=="undefined") return;
-        
+
         if (this.Identify<2) return;
         if (!this.ChartBorder.UIElement) return;
 
@@ -18574,12 +18574,20 @@ function ChartStickLine()
         var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
         if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;
 
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         var bFillBar=false;
         var bFillKLine=false;
         var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
 
-        if(this.Width==0)
+        if (isMinute)
+        {
+            if (this.Width>1) this.Canvas.lineWidth=2*GetDevicePixelRatio();
+            else this.Canvas.lineWidth=GetDevicePixelRatio();
+            this.Canvas.strokeStyle=this.Color;
+        }
+        else if(this.Width==0)
         {
             this.SetEmptyBar();
         }

diff --git a/webhqchart/umychart.js b/webhqchart/umychart.js
@@ -7339,7 +7339,7 @@ function MinuteFrame()
     this.DrawToolbar=function()
     {
         if (typeof($)=="undefined") return;
-        
+
         if (this.Identify<2) return;
         if (!this.ChartBorder.UIElement) return;
 
@@ -18574,12 +18574,20 @@ function ChartStickLine()
         var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;
         if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;
 
+        var isMinute=this.IsMinuteFrame();
+
         this.Canvas.save();
         var bFillBar=false;
         var bFillKLine=false;
         var emptyBGColor=g_JSChartResource.EmptyBarBGColor;
 
-        if(this.Width==0)
+        if (isMinute)
+        {
+            if (this.Width>1) this.Canvas.lineWidth=2*GetDevicePixelRatio();
+            else this.Canvas.lineWidth=GetDevicePixelRatio();
+            this.Canvas.strokeStyle=this.Color;
+        }
+        else if(this.Width==0)
         {
             this.SetEmptyBar();
         }