hqchart 1.1.13381 → 1.1.13389

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -6632,6 +6632,8 @@ var JSCHART_MENU_ID=
 
     CMD_CHANGE_BASELINE_ID:35,          //分时图切换基准线
     CMD_ADD_OVERLAY_INDEX_ID:36,        //添加叠加指标
+
+    CMD_CHANGE_LANGUAGE_ID:37,          //语言切换
 }
 
 
@@ -7305,6 +7307,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (this.TryClickButton(x,y,e))
         {
+            this.IsOnTouch=false;
             return;
         }
 
@@ -7337,11 +7340,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (this.TryClickCrossCursor(x,y, e))
         {
+            this.IsOnTouch=false;
             return;
         }
 
         if (this.TryClickChartTooltipData && this.TryClickChartTooltipData(x,y,e))  //预留给外部点击图标什么用的
         {
+            this.IsOnTouch=false;
             return;
         }
 
@@ -11728,6 +11733,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (this.Frame && this.Frame.SetLanguage) this.Frame.SetLanguage(this.LanguageID);
 
+        //this.Frame.ClearYCoordinateMaxMin();
+        this.ResetFrameXYSplit();
         this.Frame.SetSizeChage(true);
         this.Draw();
     }
@@ -13417,6 +13424,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 obj.WindowIndex=param;
                 this.AddOverlayIndex(obj);
                 break;
+
+            case JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID:
+                if (srcParam) this.SetLanguage(srcParam);
+                break;
         }
     }
 
@@ -27409,6 +27420,7 @@ function ChartKLine()
                         // 15=HLC Area 
                         // 16=kagi
                         // 17=订单流样式4
+                        // 18=订单流样式5
 
     this.CloseLineColor=g_JSChartResource.CloseLineColor;
     this.CloseLineAreaColor=g_JSChartResource.CloseLineAreaColor;
@@ -29071,200 +29083,7 @@ function ChartKLine()
         }
     }
 
-    /*
-    this.DrawKBarV2=function(data, colorData, dataWidth, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen)
-    {
-        var isDrawBorder=false;
-        var isEmptyBar=false;
-        if (colorData.border) isDrawBorder=true;
-        if (colorData.Type===0) isEmptyBar=true;
-
-        if (dataWidth>=4)
-        {
-            if (isDrawBorder)
-            {
-                if ((dataWidth%2)!=0) dataWidth-=1;
-            }
-
-            if (data.High>data.Close)   //上影线
-            {
-                if (colorData.Line)
-                {
-                    this.Canvas.strokeStyle=colorData.Line.Color;
-                    this.Canvas.beginPath();
-                    if (isHScreen)
-                    {
-                        this.Canvas.moveTo(ToFixedPoint(y),ToFixedPoint(x));
-                        this.Canvas.lineTo(ToFixedPoint(Math.max(yClose,yOpen)),ToFixedPoint(x));
-                    }
-                    else
-                    {
-                        if (isDrawBorder)
-                        {
-                            var xFixed=left+dataWidth/2;
-                            this.Canvas.moveTo(ToFixedPoint(xFixed),ToFixedPoint(y));
-                            this.Canvas.lineTo(ToFixedPoint(xFixed),ToFixedPoint(Math.min(yClose,yOpen)));
-                        }
-                        else
-                        {
-                            this.Canvas.moveTo(ToFixedPoint(x),ToFixedPoint(y));
-                            this.Canvas.lineTo(ToFixedPoint(x),ToFixedPoint(Math.min(yClose,yOpen)));
-                        }
-                    }
-                    this.Canvas.stroke();
-                }
-                
-                y=yClose;
-            }
-            else
-            {
-                y=yClose;
-            }
-
-            if (isHScreen)
-            {
-                //实心
-                if (!isEmptyBar && colorData.BarColor)
-                {
-                    this.Canvas.fillStyle=colorData.BarColor;
-                    if (Math.abs(yOpen-y)<1)  
-                    {
-                        this.Canvas.fillRect(ToFixedRect(y),ToFixedRect(left),1,ToFixedRect(dataWidth));    //高度小于1,统一使用高度1
-                    }
-                    else
-                    {
-                        this.Canvas.fillRect(ToFixedRect(y),ToFixedRect(left),ToFixedRect(yOpen-y),ToFixedRect(dataWidth));
-                    }
-                }
-
-                if (colorData.Border) //空心
-                {
-                    if (Math.abs(yOpen-y)<1)  
-                    {
-                        this.Canvas.fillStyle=colorData.Border.Color;
-                        this.Canvas.fillRect(ToFixedRect(y),ToFixedRect(left),1,ToFixedRect(dataWidth));    //高度小于1,统一使用高度1
-                    }
-                    else
-                    {
-                        this.Canvas.strokeStyle=colorData.Border.Color;
-                        this.Canvas.beginPath();
-                        this.Canvas.rect(ToFixedPoint(y),ToFixedPoint(left),ToFixedRect(yOpen-y),ToFixedRect(dataWidth));
-                        this.Canvas.stroke();
-                    }
-                }
-            }
-            else
-            {
-                
-                //实心
-                if (!isEmptyBar && colorData.BarColor)
-                {
-                    this.Canvas.fillStyle=colorData.BarColor;
-                    if (Math.abs(yOpen-y)<1)  
-                    {
-                        this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(y),ToFixedRect(dataWidth),1);    //高度小于1,统一使用高度1
-                    }
-                    else
-                    {
-                        this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,yOpen)),ToFixedRect(dataWidth),ToFixedRect(Math.abs(yOpen-y)));
-                    }
-                }
-
-                if (colorData.Border) //空心
-                {
-                    if (Math.abs(yOpen-y)<1)  
-                    {
-                        this.Canvas.fillStyle=colorData.Border.Color;
-                        this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(y),ToFixedRect(dataWidth),1);    //高度小于1,统一使用高度1
-                    }
-                    else 
-                    {
-                        this.Canvas.strokeStyle=colorData.Border.Color;
-                        this.Canvas.beginPath();
-                        this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(y),ToFixedRect(dataWidth),ToFixedRect(yOpen-y));
-                        this.Canvas.stroke();
-                    }
-                }
-            }
-
-            if (data.Open>data.Low) //下影线
-            {
-                if (colorData.Line)
-                {
-                    this.Canvas.strokeStyle=colorData.Line.Color;
-                    this.Canvas.beginPath();
-                    if (isHScreen)
-                    {
-                        this.Canvas.moveTo(ToFixedPoint(Math.min(yClose,yOpen)),ToFixedPoint(x));
-                        this.Canvas.lineTo(ToFixedPoint(yLow),ToFixedPoint(x));
-                    }
-                    else
-                    {
-                        if (isDrawBorder)
-                        {
-                            var xFixed=left+dataWidth/2;
-                            this.Canvas.moveTo(ToFixedPoint(xFixed),ToFixedPoint(Math.max(yClose,yOpen)));
-                            this.Canvas.lineTo(ToFixedPoint(xFixed),ToFixedPoint(yLow));
-                        }
-                        else
-                        {
-                            this.Canvas.moveTo(ToFixedPoint(x),ToFixedPoint(Math.max(yClose,yOpen)));
-                            this.Canvas.lineTo(ToFixedPoint(x),ToFixedPoint(yLow));
-                        }
-                    }
-                    this.Canvas.stroke();
-                }
-            }
-        }
-        else
-        {
-            var lineColor;
-            if (isEmptyBar && colorData.Border)
-            {
-                lineColor=colorData.Border.Color;
-            }
-            else if (!isEmptyBar && colorData.BarColor)
-            {
-                lineColor=colorData.BarColor;
-            }
-
-            if (lineColor)
-            {
-                this.Canvas.strokeStyle=lineColor;
-                this.Canvas.beginPath();
-                if (isHScreen)
-                {
-                    if (data.High==data.Low)
-                    {
-                        this.Canvas.moveTo(yHigh,ToFixedPoint(x));
-                        this.Canvas.lineTo(yLow-1,ToFixedPoint(x));
-                    }
-                    else
-                    {
-                        this.Canvas.moveTo(yHigh,ToFixedPoint(x));
-                        this.Canvas.lineTo(yLow,ToFixedPoint(x));
-                    }
-                }
-                else
-                {
-                    if (data.High==data.Low)
-                    {
-                        this.Canvas.moveTo(ToFixedPoint(x),yHigh);
-                        this.Canvas.lineTo(ToFixedPoint(x),yLow+1);
-                    }
-                    else
-                    {
-                        this.Canvas.moveTo(ToFixedPoint(x),yHigh);
-                        this.Canvas.lineTo(ToFixedPoint(x),yLow);
-                    }
-                    
-                }
-                this.Canvas.stroke();
-            }
-        }
-    }
-    */
-
+    
     this.DrawVirtualBar=function(data, dataWidth, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen)
     {
         var yTop=Math.min(yHigh,yLow), yBottom=Math.max(yHigh,yLow);
@@ -30220,6 +30039,10 @@ function ChartKLine()
         {
             this.DrawOrderFlow_Style4();
         }
+        else if (this.DrawType==18)
+        {
+            this.DrawOrderFlow_Style5();
+        }
         else
         {
             this.DrawKBar();
@@ -31899,6 +31722,13 @@ function ChartKLine()
         }
     }
 
+    ////////////////////////////////////////////////////////////////////////////////
+    //订单流样式5
+    this.DrawOrderFlow_Style5=function()
+    {
+
+    }
+
     //////////////////////////////////////////////////////////////
     // high low bar
     //
@@ -73638,7 +73468,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             var frame=g_ChartFrameFactory.Create("KLineFrame", { ID:i });
             frame.Canvas=this.Canvas;
-            frame.GetExtraCanvas=(name)=>{ this.GetExtraCanvas(name); };
+            frame.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); };
             frame.ChartBorder=border;
             frame.Identify=i;                           //窗口序号
             frame.RightSpaceCount=this.RightSpaceCount; //右边
@@ -73724,7 +73554,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var frame=g_ChartFrameFactory.Create(frameClassName, { ID:id });
         
         frame.Canvas=this.Canvas;
-        frame.GetExtraCanvas=(name)=>{ this.GetExtraCanvas(name); };
+        frame.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); };
         frame.ChartBorder=border;
         frame.Identify=id;                   //窗口序号
         frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
@@ -78312,7 +78142,16 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                             { Name:"默认", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID, Args:["default"]}, Checked:this.DefaultCursor=="default" },
                             { Name:"十字线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID, Args:["crosshair"]}, Checked:this.DefaultCursor=="crosshair" },
                         ]
-                    }
+                    },
+                    { 
+                        Name:"语言设置", 
+                        SubMenu:
+                        [
+                            { Name:"中文", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["CN"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID  },
+                            { Name:"英语", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["EN"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID },
+                            { Name:"繁体", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["TC"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID },
+                        ]
+                    },
                 ]
             }
         ];
@@ -87662,7 +87501,7 @@ function KLineChartHScreenContainer(uielement)
 
             var frame=g_ChartFrameFactory.Create("KLineHScreenFrame", { ID:i });
             frame.Canvas=this.Canvas;
-            frame.GetExtraCanvas=(name)=>{ this.GetExtraCanvas(name); };
+            frame.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); };
             frame.ChartBorder=border;
             frame.Identify=i;                   //窗口序号
             frame.RightSpaceCount=this.RightSpaceCount; //右边
@@ -137552,7 +137391,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13380";
+var HQCHART_VERSION="1.1.13388";
 
 function PrintHQChartVersion()
 {