hqchart 1.1.13227 → 1.1.13238

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13227",
+  "version": "1.1.13238",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.complier.js

@@ -10388,6 +10388,11 @@ function JSDraw(errorHandler,symbolData)
         return offset;
     }
 
+    this.KLINETYPE=function(type)
+    {
+        return type;
+    }
+
     this.FIRSTDRAW=function(value)
     {
         return value;
@@ -17155,6 +17160,7 @@ function JSExecute(ast,option)
                 var vLineConfig=null;
                 var isFirstDraw=null;
                 let xOffset=null, yOffset=null;
+                var klineType=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
                     let itemExpression=item.Expression.Expression[j];
@@ -17312,6 +17318,10 @@ function JSExecute(ast,option)
                                 vLineConfig=itemExpression.Draw;
                                 varName=null;
                             }
+                            else if (itemExpression.Callee.Name=="KLINETYPE")
+                            {
+                                klineType=itemExpression.Out;
+                            }
                         }
                     }
                     else if (itemExpression.Type==Syntax.BinaryExpression)
@@ -17459,6 +17469,7 @@ function JSExecute(ast,option)
                     if (IFrameSplitOperator.IsNumber(xOffset)) outVar.XOffset=xOffset;
                     if (IFrameSplitOperator.IsNumber(yOffset)) outVar.YOffset=yOffset;
                     if (IFrameSplitOperator.IsBool(isFirstDraw)) outVar.IsFirstDraw=isFirstDraw;
+                    if (IFrameSplitOperator.IsNumber(klineType)) outVar.KLineType=klineType;
                     this.OutVarTable.push(outVar);
                 }
                 else if (varName)
@@ -17898,6 +17909,9 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.DRAWKLINE_IF(args[0],args[1],args[2],args[3],args[4]);
                 node.Out=[];
                 break;
+            case "KLINETYPE":   //K线类型 和DRAWKLINE连用
+                node.Out=this.Draw.KLINETYPE(args[0]);
+                break;
             case "DRAWOVERLAYKLINE":
                 node.Draw=this.Draw.DRAWOVERLAYKLINE(args[0],args[1],args[2],args[3]);
                 node.Out=[];
@@ -20631,6 +20645,7 @@ function ScriptIndex(name,script,args,option)
 
         if (IFrameSplitOperator.IsBool(varItem.IsFirstDraw)) chart.IsDrawFirst=varItem.IsFirstDraw;
 
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -20697,10 +20712,12 @@ function ScriptIndex(name,script,args,option)
         chart.Data.Data=varItem.Draw.DrawData;
         chart.IsShowMaxMinPrice=false;
         chart.IsShowKTooltip=false;
+        if (IFrameSplitOperator.IsNumber(varItem.KLineType)) chart.DrawType=varItem.KLineType;
 
         if (varItem.Color)  //如果设置了颜色,使用外面设置的颜色
             chart.UnchagneColor=chart.DownColor=chart.UpColor=this.GetColor(varItem.Color);
 
+        this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
 
@@ -22540,6 +22557,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         if (IFrameSplitOperator.IsBool(varItem.IsFirstDraw)) chart.IsDrawFirst=varItem.IsFirstDraw;
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 

package/src/jscommon/umychart.js

@@ -5278,6 +5278,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         //更新滚动条
         if (typeof(this.UpdateScrollBar)=='function') this.UpdateScrollBar();
+
+        if (this.LastMouseStatus.MouseOnToolbar)    //工具栏按钮提示信息
+        {
+            var frame=this.LastMouseStatus.MouseOnToolbar.Frame;
+            if (frame && frame.DrawToolbarTooltip) frame.DrawToolbarTooltip(this.LastMouseStatus.MouseOnToolbar);
+        }
        
         //发送图形状态给外部
         if (this.mapEvent.has(JSCHART_EVENT_ID.CHART_STATUS))
@@ -10562,11 +10568,12 @@ function AverageWidthFrame()
 
         this.Canvas.font=this.ButtonTooltip.Font;
         this.Canvas.textAlign="left";
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
 
-        var textWidth=this.Canvas.measureText(text).width+8;
+        var mergin= this.ButtonTooltip.Mergin;
+        var textWidth=this.Canvas.measureText(text).width+mergin.Left+mergin.Right;
         var textHeight=this.GetFontHeight();
-        var bgHeight=textHeight+10;
+        var bgHeight=textHeight+mergin.Top+mergin.Bottom;
         if (mouseOnToolbar.ID=="TitleButton")
         {
             var x=mouseOnToolbar.Point.X;
@@ -10592,14 +10599,33 @@ function AverageWidthFrame()
             if (y<0) y=border.TopEx+1;
             if (x+textWidth>border.ChartWidth) x=border.ChartWidth-textWidth-2;
         }
-        
-        
 
-        this.Canvas.fillStyle=this.ButtonTooltip.ColorBG; 
-        this.Canvas.fillRect(x,y,textWidth,bgHeight);   //画一个背景色, 不然是一个黑的背景
+        if (IFrameSplitOperator.IsNumber(this.ButtonTooltip.BorderRadius))  //圆角
+        {
+            var roundRadius=this.ButtonTooltip.BorderRadius;
+            this.Canvas.beginPath();
+            this.Canvas.roundRect(ToFixedPoint(x), ToFixedPoint(y), ToFixedRect(textWidth), ToFixedRect(bgHeight), [roundRadius]);
+            this.Canvas.closePath();
 
-        this.Canvas.fillStyle=this.ButtonTooltip.Color;
-        this.Canvas.fillText(text, x+4,y+bgHeight/2);
+            this.Canvas.fillStyle=this.ButtonTooltip.ColorBG;
+            this.Canvas.fill();
+
+            this.Canvas.strokeStyle=this.ButtonTooltip.ColorBorder;
+            this.Canvas.stroke();
+
+            this.Canvas.fillStyle=this.ButtonTooltip.Color;
+            this.Canvas.fillText(text, x+mergin.Left, y+bgHeight-mergin.Bottom);
+        }
+        else
+        {
+            this.Canvas.fillStyle=this.ButtonTooltip.ColorBG; 
+            this.Canvas.fillRect(x,y,textWidth,bgHeight);   //画一个背景色, 不然是一个黑的背景
+            this.Canvas.fillStyle=this.ButtonTooltip.Color;
+            this.Canvas.fillText(text, x+mergin.Left,y+bgHeight-mergin.Bottom);
+        }
+        
+
+        
     }
 
     //isLimit 是否限制在当前坐标下
@@ -25793,6 +25819,10 @@ function ChartKLine()
 
     this.Draw=function()
     {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
         this.IsShowOrderText=false;
         this.TooltipRect=[];
         this.InfoTooltipRect=[];
@@ -31177,7 +31207,9 @@ function ChartPointDot()
 
     this.Draw=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -32007,7 +32039,9 @@ function ChartStickLine()
 
     this.Draw=function()
     {
-        if (this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -35108,7 +35142,9 @@ function ChartBand()
 
     this.Draw=function()
     {
-        if (this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -49084,15 +49120,17 @@ function ChartCorssCursor()
     this.DrawRightButton=function(drawTop, drawRight, drawWidth, drawHeight, data)
     {
         this.Canvas.fillStyle=this.RightButton.BGColor;
-        var rtButtom={Left:drawRight-drawWidth, Top:drawTop, Width:drawWidth, Height:drawHeight };
-        this.RightButton.Rect=rtButtom;
+        var rtButton={Left:drawRight-drawWidth, Top:drawTop, Width:drawWidth, Height:drawHeight };
+        rtButton.Right=rtButton.Left+rtButton.Width;
+        rtButton.Bottom=rtButton.Top+rtButton.Height;
+        this.RightButton.Rect=rtButton;
         this.RightButton.Data=data;
-        this.Canvas.fillRect(ToFixedPoint(rtButtom.Left+1),ToFixedPoint(rtButtom.Top),ToFixedRect(rtButtom.Width),ToFixedRect(rtButtom.Height));
+        this.Canvas.fillRect(ToFixedPoint(rtButton.Left+1),ToFixedPoint(rtButton.Top),ToFixedRect(rtButton.Width),ToFixedRect(rtButton.Height));
 
         var pixelRatio=GetDevicePixelRatio();
         var spaceWidth=3;
-        var yCenter=(rtButtom.Top+spaceWidth)+(rtButtom.Height-spaceWidth*2)/2;
-        var xCenter=(rtButtom.Left+spaceWidth)+(rtButtom.Width-spaceWidth*2)/2;
+        var yCenter=(rtButton.Top+spaceWidth)+(rtButton.Height-spaceWidth*2)/2;
+        var xCenter=(rtButton.Left+spaceWidth)+(rtButton.Width-spaceWidth*2)/2;
 
         if (this.RightButton.Icon)
         {
@@ -49113,10 +49151,10 @@ function ChartCorssCursor()
             this.Canvas.linewidth=1*pixelRatio;
             this.Canvas.beginPath();
             this.Canvas.moveTo(ToFixedPoint(x), ToFixedPoint(yCenter));
-            this.Canvas.lineTo(ToFixedPoint(x+rtButtom.Width-spaceWidth*2), ToFixedPoint(yCenter));
+            this.Canvas.lineTo(ToFixedPoint(x+rtButton.Width-spaceWidth*2), ToFixedPoint(yCenter));
 
             this.Canvas.moveTo(ToFixedPoint(xCenter),ToFixedPoint(y));
-            this.Canvas.lineTo(ToFixedPoint(xCenter), ToFixedPoint(y+rtButtom.Height-spaceWidth*2));
+            this.Canvas.lineTo(ToFixedPoint(xCenter), ToFixedPoint(y+rtButton.Height-spaceWidth*2));
 
             this.Canvas.stroke();
             this.Canvas.restore();
@@ -64730,10 +64768,12 @@ function JSChartResource()
 
         Tooltip:
         {
-            Font:14*GetDevicePixelRatio() +"px 微软雅黑",
-            Color:'rgb(255,255,255)',
-            ColorBG:'rgb(42,46,57)',
-            ColorBorder:'rgb(0,0,0)'
+            Font:13*GetDevicePixelRatio() +"px 微软雅黑",
+            Color:'rgb(71,71,71)',
+            ColorBG:'rgb(255,255,255)',
+            ColorBorder:'rgb(0,0,0)',
+            BorderRadius:2,
+            Mergin:{ Left:4, Right:4, Top:2, Bottom:3 },
         }
     }
    
@@ -66034,6 +66074,24 @@ function JSChartResource()
             T_SetButtonStyle(buttons.MaxMinWindow, this.Buttons.MaxMinWindow);
             T_SetButtonStyle(buttons.TitleWindow, this.Buttons.TitleWindow);
             T_SetButtonStyle(buttons.ExportData, this.Buttons.ExportData);
+
+            if (buttons.Tooltip)
+            {
+                var item=buttons.Tooltip;
+                var src=this.Buttons.Tooltip;
+                if (item.Font) src.Font=item.Font;
+                if (item.Color) src.Color=item.Color;
+                if (item.ColorBG) src.ColorBG=item.ColorBG;
+                if (item.ColorBorder) src.ColorBorder=item.ColorBorder;
+                if (item.BorderRadius) src.BorderRadius=item.BorderRadius;
+                if (item.Margin)
+                {
+                    if (IFrameSplitOperator.IsNumber(item.Margin.Left)) src.Margin.Left=item.Margin.Left;
+                    if (IFrameSplitOperator.IsNumber(item.Margin.Top)) src.Margin.Top=item.Margin.Top;
+                    if (IFrameSplitOperator.IsNumber(item.Margin.Bottom)) src.Margin.Bottom=item.Margin.Bottom;
+                    if (IFrameSplitOperator.IsNumber(item.Margin.Right)) src.Margin.Right=item.Margin.Right;
+                }
+            }
         }
 
         if (style.ChartDrawVolProfile)
@@ -67370,7 +67428,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.TickApiUrl=g_JSChartResource.Domain+'/API/StockDetail';                    //当天分笔数据
 
     this.MinuteDialog;      //双击历史K线 弹出分钟走势图
-    this.RightMenu;         //右键菜单
 
     this.BeforeBindMainData=null;   //function(funcName)   在BindMainData() 调用前回调用
     this.AfterBindMainData=null;    //function(funcName)   在BindMainData() 调用前后调用
@@ -72792,6 +72849,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     {
         var windowCount=this.Frame.SubFrame.length; //窗口个数
         var klineChart=this.ChartPaint[0];
+        var klineType=klineChart.DrawType;
+        var bThinAKBar=klineChart.IsThinAKBar;
         var priceGap=klineChart.PriceGap;                   //缺口配置信息
         var coordinateType=null, yCoordinateType=null;      //坐标类型
         var mainFrame=null;
@@ -72924,17 +72983,17 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 Name:"主图线型", 
                 SubMenu:
                 [
-                    { Name:"K线(空心阳线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[3]} },
-                    { Name:"K线(实心阳线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[0]} },
-                    { Name:"美国线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[2, true, { IsThinAKBar:false }]} },
-                    { Name:"美国线(细)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[2, true, { IsThinAKBar:true }]} },
-                    { Name:"收盘线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[1]} },
-                    { Name:"收盘面积", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[4]} },
-                    { Name:"K线(空心阳线阴线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[6]} },
-                    { Name:"Heikin Ashi", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[11]} },
-                    { Name:"Line Break", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[12]} },
-                    { Name:"High-low", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[13]} },
-                    { Name:"HLC Area", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[15]} },
+                    { Name:"K线(空心阳线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[3]}, Checked:klineType==0 },
+                    { Name:"K线(实心阳线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[0]}, Checked:klineType==3 },
+                    { Name:"美国线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[2, true, { IsThinAKBar:false }]}, Checked:(klineType==2&&!bThinAKBar) },
+                    { Name:"美国线(细)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[2, true, { IsThinAKBar:true }]}, Checked:(klineType==2&&bThinAKBar) },
+                    { Name:"收盘线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[1]}, Checked:klineType==1},
+                    { Name:"收盘面积", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[4]}, Checked:klineType==4 },
+                    { Name:"K线(空心阳线阴线)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[6]}, Checked:klineType==6 },
+                    { Name:"Heikin Ashi", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[11]}, Checked:klineType==11 },
+                    { Name:"Line Break", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[12]}, Checked:klineType==12 },
+                    { Name:"High-low", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[13]}, Checked:klineType==13 },
+                    { Name:"HLC Area", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID, Args:[15]}, Checked:klineType==15 },
                 ]
             },
             { 

package/src/jscommon/umychart.popMenu.js

@@ -258,6 +258,12 @@ function JSPopMenu()
         var yBottom=window.innerHeight-15;
         if (yMenuBottom>yBottom) yTop=rtButton.Top-menuHeight;
 
+        if (this.Data.Position==JSPopMenu.POSITION_ID.DROPDOWN_RIGHT_MENU_ID)
+        {
+            var menuWidth=this.RootDOM.offsetWidth;
+            xLeft=rtButton.Right-menuWidth;
+        }
+
         this.RootDOM.style.visibility='visible';
         this.RootDOM.style.top = yTop + "px";
         this.RootDOM.style.left = xLeft + "px";
@@ -346,4 +352,6 @@ function JSPopMenu()
 JSPopMenu.POSITION_ID={ };
 JSPopMenu.POSITION_ID.RIGHT_MENU_ID=0;
 JSPopMenu.POSITION_ID.TAB_MENU_ID=1;
+JSPopMenu.POSITION_ID.DROPDOWN_MENU_ID=2;       //左对齐下拉
+JSPopMenu.POSITION_ID.DROPDOWN_RIGHT_MENU_ID=3; //右对齐下拉
 JSPopMenu.SEPARATOR_LINE_NAME="MENU_SEPARATOR"; //分割线

package/src/jscommon/umychart.resource/js/codemirror/javascript.js

@@ -86,7 +86,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "ISUP":DATA_NAME,"ISEQUAL":DATA_NAME,"ISDOWN":DATA_NAME,
 
       "XMOVE":FUNCTION_NAME,"YMOVE":FUNCTION_NAME,"UPCOLOR":FUNCTION_NAME,"DOWNCOLOR":FUNCTION_NAME,"FIRSTDRAW":FUNCTION_NAME,
-      "STRFORMAT":FUNCTION_NAME,
+      "STRFORMAT":FUNCTION_NAME,"KLINETYPE":FUNCTION_NAME,
 
       //动态行情函数
       "DYNAINFO":FUNCTION_NAME,

package/src/jscommon/umychart.style.js

@@ -327,6 +327,16 @@ function GetBlackStyle()
             {
                 MoveOnColor:"rgb(255,255,255)",
                 Color:"rgb(156,156,156)"
+            },
+
+            Tooltip:
+            {
+                //Font:12*GetDevicePixelRatio() +"px 微软雅黑",
+                Color:'rgb(204,204,204)',
+                ColorBG:'rgb(32,32,32)',
+                ColorBorder:'rgb(69,69,69)',
+                //BorderRadius:4,
+                //Mergin:{ Left:4, Right:4, Top:2, Bottom:4 },
             }
         },