hqchart 1.1.14121 → 1.1.14128

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

@@ -12859,6 +12859,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (IFrameSplitOperator.IsBool(option.IsShowXLine)) subFrame.Frame.IsShowXLine=option.IsShowXLine;
         if (IFrameSplitOperator.IsBool(option.IsShowYLine)) subFrame.Frame.IsShowYLine=option.IsShowYLine;
         if (IFrameSplitOperator.IsBool(option.IsShowIndexTitle)) subFrame.Frame.IsShowIndexTitle=option.IsShowIndexTitle;
+        if (IFrameSplitOperator.IsNumber(option.Height)) subFrame.Height=option.Height; //高度
         
 
         if (IFrameSplitOperator.IsBool(option.IsShowLeftText)) 
@@ -39385,6 +39386,136 @@ function ChartDrawNumber()
     }
 }
 
+function ChartDrawLastBarText()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartDrawLastBarText';    //类名
+    this.LastBarItem=null;
+
+    this.TextSize=
+    {
+        Max: g_JSChartResource.DRAWICON.Text.MaxSize, Min:g_JSChartResource.DRAWICON.Text.MinSize, //字体的最大最小值
+        Zoom:{ Type:g_JSChartResource.DRAWICON.Text.Zoom.Type , Value:g_JSChartResource.DRAWICON.Text.Zoom.Value }, //放大倍数
+        FontName:g_JSChartResource.DRAWICON.Text.FontName,
+        YOffset:g_JSChartResource.DRAWICON.Text.YOffset
+    }
+
+    this.IconSize=
+    { 
+        Max: g_JSChartResource.DRAWICON.Icon.MaxSize, Min:g_JSChartResource.DRAWICON.Icon.MinSize, //图标的最大最小值
+        Zoom:{ Type:g_JSChartResource.DRAWICON.Icon.Zoom.Type , Value:g_JSChartResource.DRAWICON.Icon.Zoom.Value }, //放大倍数
+        YOffset:g_JSChartResource.DRAWICON.Icon.YOffset //Direction==2的向下偏移
+    };  
+
+    this.IconFamily=g_JSChartResource.DRAWLASTICON.Family;
+
+    this.ReloadResource=function(resource)
+    {
+        this.TextSize=
+        {
+            Max: g_JSChartResource.DRAWTEXT.MaxSize, Min:g_JSChartResource.DRAWTEXT.MinSize, //字体的最大最小值
+            Zoom:{ Type:g_JSChartResource.DRAWTEXT.Zoom.Type , Value:g_JSChartResource.DRAWTEXT.Zoom.Value }, //放大倍数
+            FontName:g_JSChartResource.DRAWTEXT.FontName,
+        };
+
+        this.IconSize=
+        { 
+            Max: g_JSChartResource.DRAWICON.Icon.MaxSize, Min:g_JSChartResource.DRAWICON.Icon.MinSize, //图标的最大最小值
+            Zoom:{ Type:g_JSChartResource.DRAWICON.Icon.Zoom.Type , Value:g_JSChartResource.DRAWICON.Icon.Zoom.Value }, //放大倍数
+        }; 
+        
+        this.IconFamily=g_JSChartResource.DRAWLASTICON.Family;
+    }
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        if (!this.LastBarItem) return;
+        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+
+        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
+        var xPointCount=this.ChartFrame.XPointCount;
+        var offset=this.Data.DataOffset;
+        var index=offset+xPointCount;
+        if (index<this.Data.Data.length) return;
+        var lastIndex=(this.Data.Data.length-1)-offset;
+        var x=this.ChartFrame.GetXFromIndex(lastIndex);
+        var item=this.LastBarItem;
+
+        if (item.Value=="Top") y=top;
+        else if (item.Value=="Bottom") y=bottom;
+        else y=this.ChartFrame.GetYFromData(item.Value, false);
+        if (IFrameSplitOperator.IsNumber(item.YOffset)) y+=item.YOffset;    //Y轴偏移
+        if (IFrameSplitOperator.IsNumber(item.XOffset)) x+=item.XOffset;
+
+        this.Canvas.save();
+        this.ClipClient(this.IsHScreen);
+
+        //文本
+        if (item.Text) this.DrawLastText(item, x, y);
+        else if (item.Icon) this.DrawLastIcon(item, x, y);
+
+        this.Canvas.restore();
+    }
+
+    this.DrawLastText=function(item,x,y)
+    {
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var font=this.GetDynamicFont(dataWidth,distanceWidth,this.TextSize.Max,this.TextSize.Min,this.TextSize.Zoom,this.TextSize.FontName);
+
+        var textBaseline='bottom';
+        if (item.TextBaseline) textBaseline=item.TextBaseline;
+        var textAlign="center";
+        if (item.TextAlign) textAlign=item.TextAlign;
+
+        this.Canvas.font=font;
+        this.Canvas.textBaseline=textBaseline;
+        this.Canvas.textAlign=textAlign;
+        this.Canvas.fillStyle = item.Color;
+        this.Canvas.fillText(item.Text, x, y);
+    }
+
+    this.DrawLastIcon=function(item,x,y)
+    {
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var iconSize=this.GetDynamicIconSize(dataWidth,distanceWidth,this.IconSize.Max,this.IconSize.Min,this.IconSize.Zoom);
+        var font=`${iconSize}px ${this.IconFamily}`;
+
+        var textBaseline='bottom';
+        if (item.TextBaseline) textBaseline=item.TextBaseline;
+        var textAlign="center";
+        if (item.TextAlign) textAlign=item.TextAlign;
+
+        this.Canvas.font=font;
+        this.Canvas.textBaseline=textBaseline;
+        this.Canvas.textAlign=textAlign;
+        this.Canvas.fillStyle = item.Color;
+        this.Canvas.fillText(item.Icon.Symbol, x, y);
+    }
+
+    this.GetMaxMin=function()
+    {
+        var range={ Min:null, Max:null };
+        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return range;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var offset=this.Data.DataOffset;
+        var index=offset+xPointCount;
+        if (index<this.Data.Data.length) return range;
+        if (!this.LastBarItem) return range;
+       
+        if (IFrameSplitOperator.IsNumber(this.LastBarItem.Value)) range.Max=range.Min=this.LastBarItem.Value;
+
+        return range;
+    }
+}
+
 //直线 水平直线 只有1个数据
 function ChartStraightLine()
 {
@@ -73614,6 +73745,11 @@ function JSChartResource()
         Color:"rgb(255,165,0)"
     }
 
+    this.DRAWLASTICON=
+    {
+        Family:'iconfont', 
+    }
+
     this.POINTDOT=
     {
         Radius:2*GetDevicePixelRatio()
@@ -77215,6 +77351,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());
         isInClient=this.Canvas.isPointInPath(x,y);
 
+        //PC触摸板双指缩放时deltaY数值在[-20,20]之间
+        if (IFrameSplitOperator.IsNumber(e.deltaY) && Math.abs(e.deltaY)<90) return;
+
         var wheelValue=e.wheelDelta;
         if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
             wheelValue=e.deltaY* -0.01;
@@ -110403,6 +110542,105 @@ function JSDraw(errorHandler,symbolData)
 
         return result;
     }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////
+    //DRAWLASTBARICON ：在最后一根k线绘制图标。
+    //用法：DRAWLASTBARICON(PRICE,ICON);
+    //最后一根k线,在PRICE位置画图标ICON。
+    //
+    //注：
+    //1、该函数可以指定位置PRICE标注图标ICON
+    //2、ICON位置可以写成'ICON'的形式，也可以写为数字的形式，即DRAWLASTBARICON(PRICE,'ICO1');等价于DRAWLASTBARICON(PRICE,1);
+    //3、不支持将该函数定义为变量，即不支持下面的写法：
+    //A:DRAWLASTBARICON(PRICE,ICON);
+    //4、该函数可以用ALIGN，VALIGN设置图标的对齐方式。
+    //例1：
+    //DRAWLASTBARICON(LOW,'ICO1');//在最后一根k线最低价上画出图标ICON1。
+    //例2：
+    //MA5:=MA(C,5);
+    //DRAWLASTBARICON(MA5,2);//表示在最后一根k线对应的MA5数值位置上画出图标ICON2。
+
+    this.DRAWLASTBARICON=function(data, type)
+    {
+        if (IFrameSplitOperator.IsString(type)) //把ICO1=>1
+        {
+            var value=type.replace('ICO',"");
+            type=parseInt(value);
+        } 
+
+        var icon=g_JSComplierResource.GetDrawIcon(type);
+        if (!icon) g_JSComplierResource.GetDrawTextIcon(type);
+        if (!icon) icon={ Symbol:'🚩'};
+
+        var drawItem={ Value:null, Icon:icon, IconType:type };
+        if (IFrameSplitOperator.IsNonEmptyArray(data)) drawItem.Value=data[data.length-1];
+        else drawItem.Value=data;
+
+        var result={ DrawData:drawItem, DrawType:'DRAWLASTBARICON' };
+
+        return result;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //DRAWLASTBARTEXT：显在最后一根k线显示文字。
+    //用法：DRAWLASTBARTEXT(PRICE,TEXT);
+    //最后一根k线,在PRICE位置书写文字TEXT。
+    //注：
+    //1、显示的汉字用单引号标注
+    //2、可以设置文字显示的对齐方式，字体大小以及文字的颜色，即支持下面的写法：
+    //DRAWLASTBARTEXT(PRICE,TEXT),COLOR,ALIGN,VALIGN;
+    //例1：
+    //DRAWLASTBARTEXT(LOW,'注');// 
+    //最后一根k线，在最低价上写"注"字。
+    //例2：
+    //DRAWLASTBARTEXT(LOW,'低'),ALIGN0,FONTSIZE16,COLORRED;//在最后一根k线，在最低价写"低"字，文字左对齐，字体大小为16，文字颜色为红色。
+
+    this.DRAWLASTBARTEXT=function(data, text)
+    {
+        var drawItem={ Value:null, Text:text };
+        if (IFrameSplitOperator.IsNonEmptyArray(data)) drawItem.Value=data[data.length-1];
+        else drawItem.Value=data;
+
+        var result={ DrawData:drawItem, DrawType:'DRAWLASTBARTEXT' };
+
+        return result;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    //DRAWLASTBARNUMBER：在最后一根k线输出数值。
+    //用法：DRAWLASTBARNUMBER(DATA,NUMBER,PRECISION,COLOR); 
+    //最后一根k线在DATA位置写数字NUMBER。PRECISION为精度（小数点后有几位数字）。COLOR为颜色。
+    //注：
+    //该函数支持在函数后设置文字的大小和文字对齐方式。即支持下面的写法：
+    //DRAWLASTBARNUMBER(DATA,NUMBER,PRECISION,COLOR),ALIGN,VALIGN;
+    //例1：
+    //DRAWLASTBARNUMBER(HIGH,(CLOSE-OPEN)/OPEN*100,2,COLORRED);//最后一根k线在最高价位置红色显示涨幅数值(相对开盘价的百分比，精确2位小数)。
+    //例2：
+    //DRAWLASTBARNUMBER(L,REF(C,1),2,COLORRED),ALIGN0,VALIGN0;//表示最后一根k线的最低价处以红色显示昨收盘价数值(精确2位小数)，标注文字居左，居上对齐。
+
+    this.DRAWLASTBARNUMBER=function(data,value,dec,color)
+    {
+        var drawItem={ Value:null, Text:null, Color:color };
+        if (IFrameSplitOperator.IsNonEmptyArray(data)) drawItem.Value=data[data.length-1];
+        else drawItem.Value=data;
+
+        var precision=2;
+        if (IFrameSplitOperator.IsNumber(dec)) precision=parseInt(dec);
+        if (IFrameSplitOperator.IsNumber(value)) 
+        {
+            drawItem.Text=value.toFixed(precision);
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(value))
+        {
+            var lastValue=value[value.length-1];
+            if (IFrameSplitOperator.IsNumber(lastValue)) drawItem.Text=lastValue.toFixed(precision);
+        }
+
+        var result={ DrawData:drawItem, DrawType:'DRAWLASTBARNUMBER' };
+
+        return result;
+    }
 }
 
 
@@ -110457,6 +110695,7 @@ JSDraw.prototype.IsDrawFunction=function(name)
         'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2","DRAWGBK_DIV",
         "VERTLINE","HORLINE","TIPICON",
         "BUY","SELL","SELLSHORT","BUYSHORT",
+        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT",
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -115739,6 +115978,7 @@ function JSExecute(ast,option)
         ["OFFERCANCELVOL", null],   //累计总有效撤卖量,专业版等(资金流向功能)沪深京品种行情专用  累计总有效委卖量-累计总有效撤卖量=总卖+总成交量
         ["AVGOFFERPX", null],       //专业版等(资金流向功能)沪深京品种行情专用:最新委卖均价
         //["", null],
+
     ]);   
 
     this.SymbolData=new JSSymbolData(this.AST,option,this);
@@ -117195,6 +117435,20 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.HORLINE(args[0],args[1],args[2],args[3]);
                 node.Out=node.Draw.DrawData.Data;
                 break;
+
+            case "DRAWLASTBARICON":
+                node.Draw=this.Draw.DRAWLASTBARICON(args[0],args[1]);
+                node.Out=[];
+                break;
+            case "DRAWLASTBARNUMBER":
+                node.Draw=this.Draw.DRAWLASTBARNUMBER(args[0],args[1],args[2],args[3]);
+                node.Out=[];
+                break;
+            case "DRAWLASTBARTEXT":
+                node.Draw=this.Draw.DRAWLASTBARTEXT(args[0],args[1]);
+                node.Out=[];
+                break;
+
             case 'CODELIKE':
                 node.Out=this.SymbolData.CODELIKE(args[0]);
                 break;
@@ -117607,6 +117861,22 @@ function JSExplainer(ast,option)
         ["OFFERCANCELVOL", "累计总有效撤卖量"],   
         ["AVGOFFERPX", "最新委卖均价"],
 
+        ['COLORBLACK','黑色'],
+        ['COLORBLUE','蓝色'],
+        ['COLORGREEN','绿色'],
+        ['COLORCYAN','青色'],
+        ['COLORRED','红色'],
+        ['COLORMAGENTA','洋红色'],
+        ['COLORBROWN','棕色'],
+        ['COLORLIGRAY','淡灰色'],
+        ['COLORGRAY','深灰色'],
+        ['COLORLIBLUE','淡蓝色'],       
+        ['COLORLIGREEN','淡绿色'],
+        ['COLORLICYAN','淡青色'],
+        ['COLORLIRED','淡红色'],
+        ['COLORLIMAGENTA','淡洋红色'],
+        ['COLORWHITE','白色'],
+        ['COLORYELLOW','黄色']
     ]);   
 
     if (option)
@@ -118308,6 +118578,12 @@ function JSExplainer(ast,option)
             case "BUYSHORT":
                 return "买入平仓";
 
+            case "DRAWLASTBARNUMBER":
+                return "在最后一根k线输出数值";
+            case "DRAWLASTBARTEXT":
+                return "在最后一根k线显示文字";
+            case "DRAWLASTBARICON":
+                return "在最后一根k线绘制图标";
             case "YMOVE":
                 return;
             case "BACKGROUND":
@@ -120479,6 +120755,49 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateDrawLastBarText=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartDrawLastBarText();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+
+        if (hqChart.ChartPaint[0].IsMinuteFrame())
+            chart.Data=hqChart.SourceData;
+        else
+            chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+
+        var lastItem=varItem.Draw.DrawData;
+        if (lastItem)
+        {
+            if (lastItem.Color) lastItem.Color=this.GetColor(lastItem.Color);
+            else lastItem.Color=this.GetDefaultColor(id);
+            if (varItem.Color) lastItem.Color=this.GetColor(varItem.Color);
+            
+            if (varItem.DrawVAlign>=0)
+            {
+                if (varItem.DrawVAlign==0) lastItem.TextBaseline='top';
+                else if (varItem.DrawVAlign==1) lastItem.TextBaseline='middle';
+                else if (varItem.DrawVAlign==2) lastItem.TextBaseline='bottom';
+            }
+    
+            if (varItem.DrawAlign>=0)
+            {
+                if (varItem.DrawAlign==0) lastItem.TextAlign="left";
+                else if (varItem.DrawAlign==1) lastItem.TextAlign="center";
+                else if (varItem.DrawAlign==2) lastItem.TextAlign='right';
+            }
+
+            if (IFrameSplitOperator.IsNumber(varItem.YOffset)) lastItem.YOffset=varItem.YOffset;
+            if (IFrameSplitOperator.IsNumber(varItem.XOffset)) lastItem.XOffset=varItem.XOffset;
+            if (varItem.DrawFontSize>0) lastItem.FontSize=varItem.DrawFontSize;
+        }
+
+        chart.LastBarItem=lastItem;
+        hqChart.ChartPaint.push(chart);
+    }
+
     //创建通道
     this.CreateChannel=function(hqChart,windowIndex,varItem,id)
     {
@@ -121075,6 +121394,12 @@ function ScriptIndex(name,script,args,option)
                         this.CreateTradeIcon(hqChart,windowIndex,item,i);
                         break;
 
+                    case "DRAWLASTBARICON":
+                    case "DRAWLASTBARNUMBER":
+                    case "DRAWLASTBARTEXT":
+                        this.CreateDrawLastBarText(hqChart,windowIndex,item,i);
+                        break;
+
                     case SCRIPT_CHART_NAME.OVERLAY_BARS:
                         this.CreateStackedBar(hqChart,windowIndex,item,i);
                         break;
@@ -145937,9 +146262,28 @@ function JSFloatTooltip()
 
         var item=tooltipData.Data.Item;
         var aryText=[];
+        if (item && IFrameSplitOperator.IsObject(item.Text))
+        {
+            var tooltipData=item.Text;
+            if (IFrameSplitOperator.IsNonEmptyArray(tooltipData.AryText))
+            {
+                for(var i=0;i<tooltipData.AryText.length;++i)
+                {
+                    var tooltipItem=tooltipData.AryText[i];
+                    var textItem={ Title:tooltipItem.Title, Text:tooltipItem.Text, Color:this.ValueColor };
+                    if (tooltipItem.Color) textItem.Color=tooltipItem.Color;
+                    if (tooltipItem.Align=="Left") tooltipItem.ClassName=this.ValueAlign.Left;
 
-        var rowItem={ Text:"", HTMLTitle:item.Text, Color:this.ValueColor, IsMergeCell:true };
-        aryText.push(rowItem);
+                    aryText.push(tooltipItem);
+                }
+            }
+        }
+        else
+        {
+            var rowItem={ Text:"", HTMLTitle:item.Text, Color:this.ValueColor, IsMergeCell:true };
+            aryText.push(rowItem);
+        }
+        
 
         this.AryText=aryText;
         this.UpdateTableDOM();
@@ -148618,7 +148962,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14120";
+var HQCHART_VERSION="1.1.14127";
 
 function PrintHQChartVersion()
 {