hqchart 1.1.12614 → 1.1.12627

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -34600,6 +34600,108 @@ function ChartSingleText()
 }
 
 
+function ChartTradeIcon()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartTradeIcon';    //类名
+    this.TextAlign='center';
+    this.TextBaseline='middle';
+    this.SVG={ Family:"iconfont", Size:12 };
+    this.AryIcon;
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if(!this.Data || !this.Data.Data) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryIcon)) return;
+
+        this.Canvas.font=`${this.SVG.Size}px ${this.SVG.Family}`;
+        this.Canvas.textAlign=this.TextAlign;
+        this.Canvas.textBaseline='middle';
+        var yOffset=0;
+        if (this.TradeType=="BUY" || this.TradeType=="BUYSHORT") 
+        {
+            this.Canvas.textBaseline="bottom";
+            yOffset=-2;
+        }
+        else if (this.TradeType=="SELL" || this.TradeType=="SELLSHORT")
+        {
+            this.Canvas.textBaseline="top";
+            yOffset+2;
+        }
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var chartright=this.ChartBorder.GetRight();
+        if (bHScreen) chartright=this.ChartBorder.GetBottom();
+        var xPointCount=this.ChartFrame.XPointCount;
+        var border=this.ChartFrame.GetBorder();
+        var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var value=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsNumber(value)) continue;
+            if (value<=0) continue;
+
+            var iconItem=this.AryIcon[i];
+            if (!IFrameSplitOperator.IsNumber(iconItem.Value) || !iconItem.Icon) continue;
+
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            if (right>chartright) break;
+
+
+            var x=left+(right-left)/2;
+            var y=this.GetYFromData(iconItem.Value, false);
+
+            this.Canvas.fillStyle=iconItem.Color;
+            this.Canvas.fillText(iconItem.Icon,x,y+yOffset);
+        }
+    }
+
+    this.GetMaxMin=function()
+    {
+        var range={Max:null, Min:null };
+        if(!this.Data || !this.Data.Data) return range;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryIcon)) return range;
+
+        var xPointCount=this.ChartFrame.XPointCount;
+        var start=this.Data.DataOffset;
+        if (this.ChartFrame.GlobalOption && this.ChartFrame.GlobalOption.IsValueFullRange)
+        {
+            start=0;
+            xPointCount=this.Data.Data.length;
+        }
+
+        for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        {
+            var value=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsNumber(value)) continue;
+            if (value<=0) continue;
+
+            var iconItem=this.AryIcon[i];
+            if (!IFrameSplitOperator.IsNumber(iconItem.Value) || !iconItem.Icon) continue;
+
+            if (range.Max==null) range.Max=iconItem.Value;
+            else if (range.Max<iconItem.Value) range.Max=iconItem.Value;
+
+            if (range.Min==null) range.Min=iconItem.Value;
+            else if (range.Min>iconItem.Value) range.Min=iconItem.Value;
+        }
+
+        return range;
+    }
+}
+
+
 function ChartDrawText()
 {
     this.newMethod=IChartPainting;   //派生
@@ -55267,7 +55369,7 @@ function IChartDrawPicture()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -58692,7 +58794,7 @@ function ChartDrawPictureParallelChannel()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -78131,34 +78233,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
-    //叠加股票
+    //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        var arySymbol=null;
+        if (IFrameSplitOperator.IsString(symbol)) arySymbol=[symbol];
+        else if (Array.isArray(symbol)) arySymbol=symbol;
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return false;
+
+        var aryNewSymbol=[];
+        for(var i=0, j=0;i<arySymbol.length;++i)
         {
-            var item=this.OverlayChartPaint[i];
-            if (item.Symbol==symbol)
+            var strSymbol=arySymbol[i];
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
             {
-                console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${symbol} exist.`);
-                return false;
+                var item=this.OverlayChartPaint[j];
+                if (item.Symbol==strSymbol)
+                {
+                    bFind=true;
+                    console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${strSymbol} exist.`);
+                    break;
+                }
             }
+
+            if (!bFind) aryNewSymbol.push(strSymbol);
         }
 
-        var paint=new ChartOverlayMinutePriceLine();
-        paint.Canvas=this.Canvas;
-        paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
-        paint.ChartFrame=this.Frame.SubFrame[0].Frame;
-        paint.Name="Overlay-Minute";
-        paint.Symbol=symbol;
-        paint.Identify=`Overlay-Minute-${symbol}`;
-        if (option && option.Color) paint.Color=option.Color; //外部设置颜色
-        else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
-        ++g_JSChartResource.OverlaySymbol.Random;
-        paint.MainData=this.SourceData; //绑定主图数据
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
 
-        if (paint.SetOption) paint.SetOption(option);
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var strSymbol=aryNewSymbol[i];
 
-        this.OverlayChartPaint.push(paint);
+            var paint=new ChartOverlayMinutePriceLine();
+            paint.Canvas=this.Canvas;
+            paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
+            paint.ChartFrame=this.Frame.SubFrame[0].Frame;
+            paint.Name="Overlay-Minute";
+            paint.Symbol=strSymbol;
+            paint.Identify=`Overlay-Minute-${strSymbol}`;
+            if (option && option.Color) paint.Color=option.Color; //外部设置颜色
+            else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
+            ++g_JSChartResource.OverlaySymbol.Random;
+            paint.MainData=this.SourceData; //绑定主图数据
+    
+            if (paint.SetOption) paint.SetOption(option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
 
         if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
         else this.RequestOverlayHistoryMinuteData();
@@ -102441,10 +102564,10 @@ function JSAlgorithm(errorHandler,symbolData)
     }
 
 
-    //格式化字符串 "{0}-{1}", C, O;
+    //格式化字符串 "{0}-{1}", C, O;  小数位数 {0:0.00}
     this.STRFORMAT=function(strFormat,args,node)
     {
-        var aryParam=strFormat.match(/{\d+}/g);
+        var aryParam=strFormat.match(/{[0-9.:]+}/g);
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryParam)) return null;
 
@@ -102456,9 +102579,47 @@ function JSAlgorithm(errorHandler,symbolData)
             if (item.length<3) continue;
 
             var value=item.slice(1, item.length-1);
-            var index=parseInt(value);
+            var index=-1,decimal=-1;
+            if (value.indexOf(":")>0)
+            {
+                var aryTemp=value.split(":");
+                if (aryTemp)
+                {
+                    if (aryTemp[0])
+                        index=parseInt(aryTemp[0]);
 
-            var paramItem={ Src:item, Index:index, Text:null};
+                    if (aryTemp[1])
+                    {
+                        if (aryTemp[1].indexOf(".")>=0)
+                        {
+                            var zeroCount=0;
+                            var strTemp=aryTemp[1];
+                            for(var j=strTemp.length-1; j>=0; --j)
+                            {
+                                if (strTemp[j]=="0") ++zeroCount;
+                                else break;
+                            }
+    
+                            if (zeroCount>0) decimal=zeroCount;
+                        }
+                        else if (aryTemp[1]=="0")
+                        {
+                            decimal=0;
+                        }
+                    }
+                    
+                }
+                
+            }
+            else
+            {
+                index=parseInt(value);
+            }
+
+            if (index<0) continue;
+
+            var paramItem={ Src:item, Index:index, Text:null, Decimal:null };
+            if (decimal>=0) paramItem.Decimal=decimal;
 
             if (maxIndex<index) maxIndex=index;
 
@@ -102495,7 +102656,13 @@ function JSAlgorithm(errorHandler,symbolData)
                         if (Array.isArray(paramItem))
                         {
                             var value=paramItem[i];
-                            if (value) text=`${value}`;
+                            if (value) 
+                            {
+                                if (IFrameSplitOperator.IsNumber(paramInfo.Decimal))
+                                    text=`${value.toFixed(paramInfo.Decimal)}`;
+                                else
+                                    text=`${value}`;
+                            }
                         }
                         else
                         {
@@ -104886,6 +105053,82 @@ function JSDraw(errorHandler,symbolData)
         
         return drawData;
     }
+
+
+    //多头建仓(买入开仓).
+    //参数1为触发条件,参数2为标记放置位置.此函数只适用于特定版本交易模式下.
+    //例如: BUY(CROSS(A,B),LOW),当A上穿B时,在LOW处画标记,同时突出提示或直接下单,如果LOW改为DRAWNULL,就不画标记.(分时图上不支持)
+    this.BUY=function(condition, data, iconSymbol, color)
+    {
+        var iconInfo={ Color:"rgb(0,255,0)", Type:"SVG", Icon:'\ue660' };
+        if (IFrameSplitOperator.IsString(iconSymbol)) iconInfo.Icon=iconSymbol;
+        if (color) iconInfo.Color=color;
+        var result=this.CalculateTradeData(condition, data, iconInfo);
+        result.DrawType='BUY';
+        return result;
+    }
+
+    this.BUYSHORT=function(condition, data, iconSymbol, color)
+    {
+        var iconInfo={ Color:"rgb(0,255,0)", Type:"SVG", Icon:'\ue660' };
+        if (IFrameSplitOperator.IsString(iconSymbol)) iconInfo.Icon=iconSymbol;
+        if (color) iconInfo.Color=color;
+        var result=this.CalculateTradeData(condition, data, iconInfo);
+        result.DrawType='BUYSHORT';
+        return result;
+    }
+
+    //多头平仓(卖出平仓).
+    //参数1为触发条件,参数2为标记放置位置.此函数只适用于特定版本交易模式下.
+    //例如: SELL(CROSS(A,B),HIGH),当A上穿B时,在HIGH处画标记,同时突出提示或直接下单,如果HIGH改为DRAWNULL,就不画标记.(分时图上不支持)
+    this.SELL=function(condition, data, iconSymbol,color)
+    {
+        var iconInfo={ Color:"rgb(255,0,0)", Type:"SVG", Icon:'\ue661' };
+        if (IFrameSplitOperator.IsString(iconSymbol)) iconInfo.Icon=iconSymbol;
+        if (color) iconInfo.Color=color;
+        var result=this.CalculateTradeData(condition, data, iconInfo);
+        result.DrawType='SELL';
+        return result;
+    }
+
+    this.SELLSHORT=function(condition, data, iconSymbol,color)
+    {
+        var iconInfo={ Color:"rgb(255,0,0)", Type:"SVG", Icon:'\ue661' };
+        if (IFrameSplitOperator.IsString(iconSymbol)) iconInfo.Icon=iconSymbol;
+        if (color) iconInfo.Color=color;
+        var result=this.CalculateTradeData(condition, data, iconInfo);
+        result.DrawType='SELLSHORT';
+        return result;
+    }
+
+    this.CalculateTradeData=function(condition, data, IconInfo)
+    {
+        var aryData=[];
+        var aryIcon=[];
+        var result={ DrawData:{ Data:aryData, Icons:aryIcon } };
+
+        if (Array.isArray(condition))
+        {
+            var isAryPosition=Array.isArray(data);
+            for(var i=0;i<condition.length;++i)
+            {
+                aryData[i]=0;
+                aryIcon[i]=null
+                if (!condition[i]) continue;
+
+                aryData[i]=1;
+
+                if (isAryPosition) aryIcon[i]={ Value:data[i], Type:IconInfo.Type, Color:IconInfo.Color, Icon:IconInfo.Icon };
+                else aryIcon[i]={ Value:data, Type:IconInfo.Type, Color:IconInfo.Color, Icon:IconInfo.Icon };
+            }
+        }
+        else if (IFrameSplitOperator.IsNumber(condition) && condition>0)
+        {
+            
+        }
+
+        return result;
+    }
 }
 
 
@@ -104938,7 +105181,8 @@ JSDraw.prototype.IsDrawFunction=function(name)
         "STICKLINE","DRAWTEXT",'SUPERDRAWTEXT','DRAWLINE','DRAWBAND','DRAWKLINE',"DRAWKLINE1",'DRAWKLINE_IF',"DRAWCOLORKLINE",'PLOYLINE',"DRAWOVERLAYKLINE",
         'POLYLINE','DRAWNUMBER',"DRAWNUMBER_FIX",'DRAWICON','DRAWCHANNEL','PARTLINE','DRAWTEXT_FIX','DRAWGBK','DRAWTEXT_LINE','DRAWRECTREL',"DRAWTEXTABS","DRAWTEXTREL",
         'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2","DRAWGBK_DIV",
-        "VERTLINE","HORLINE","TIPICON"
+        "VERTLINE","HORLINE","TIPICON",
+        "BUY","SELL","SELLSHORT","BUYSHORT",
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -111412,6 +111656,24 @@ function JSExecute(ast,option)
                 }
                 break;
 
+            //交易函数
+            case "BUY":
+                node.Draw=this.Draw.BUY(args[0],args[1],args[2],args[3]);
+                node.Out=node.Draw.DrawData.Data;
+                break;
+            case "SELL":
+                node.Draw=this.Draw.SELL(args[0],args[1],args[2],args[3]);
+                node.Out=node.Draw.DrawData.Data;
+                break;
+            case "SELLSHORT":
+                node.Draw=this.Draw.SELLSHORT(args[0],args[1],args[2],args[3]);
+                node.Out=node.Draw.DrawData.Data;
+                break;
+            case "BUYSHORT":
+                node.Draw=this.Draw.BUYSHORT(args[0],args[1],args[2],args[3]);
+                node.Out=node.Draw.DrawData.Data;
+                break;
+
             default:
                 node.Out=this.Algorithm.CallFunction(funcName, args, node, this.SymbolData);
                 break;
@@ -114074,6 +114336,23 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateTradeIcon=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartTradeIcon();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+
+        chart.Data.Data=varItem.Draw.DrawData.Data;
+        chart.AryIcon=varItem.Draw.DrawData.Icons;
+        chart.TradeType=varItem.Draw.DrawType;
+
+        if (varItem.DrawFontSize>0) chart.SVG.Size=varItem.DrawFontSize;    //图标大小
+
+        hqChart.ChartPaint.push(chart);
+    }
+
     this.CreateTextLine=function(hqChart,windowIndex,varItem,id)
     {
         let chart=new ChartTextLine();
@@ -114799,6 +115078,13 @@ function ScriptIndex(name,script,args,option)
                     case "MULTI_POINT_LINE":
                         this.CreateLineMultiData(hqChart,windowIndex,item,i);
                         break;
+                    case "BUY":
+                    case "SELL":
+                    case "SELLSHORT":
+                    case "BUYSHORT":
+                        this.CreateTradeIcon(hqChart,windowIndex,item,i);
+                        break;
+
                     case SCRIPT_CHART_NAME.OVERLAY_BARS:
                         this.CreateStackedBar(hqChart,windowIndex,item,i);
                         break;
@@ -129660,7 +129946,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12613";
+var HQCHART_VERSION="1.1.12627";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12613";
+var HQCHART_VERSION="1.1.12627";
 
 function PrintHQChartVersion()
 {