hqchart 1.1.12635 → 1.1.12649

package/src/jscommon/umychart.js

@@ -934,6 +934,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowXLine)) chart.Frame.SubFrame[i].Frame.IsShowXLine=item.IsShowXLine;
                 if (IFrameSplitOperator.IsBool(item.IsShowYLine)) chart.Frame.SubFrame[i].Frame.IsShowYLine=item.IsShowYLine;
                 if (IFrameSplitOperator.IsNumber(item.YTextBaseline)) chart.Frame.SubFrame[i].Frame.YTextBaseline=item.YTextBaseline;
+                if (IFrameSplitOperator.IsBool(item.IsShowIndexTitle)) chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;
 
                 if (item.TopSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace;
                 if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace;
@@ -30547,13 +30548,13 @@ function ChartTradeIcon()
         var yOffset=0;
         if (this.TradeType=="BUY" || this.TradeType=="BUYSHORT") 
         {
-            this.Canvas.textBaseline="bottom";
-            yOffset=-2;
+            this.Canvas.textBaseline="top";
+            yOffset+2;
         }
         else if (this.TradeType=="SELL" || this.TradeType=="SELLSHORT")
         {
-            this.Canvas.textBaseline="top";
-            yOffset+2;
+            this.Canvas.textBaseline="bottom";
+            yOffset=-2;
         }
 
         var bHScreen=(this.ChartFrame.IsHScreen===true);
@@ -30578,12 +30579,30 @@ function ChartTradeIcon()
             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);
+
+            if (dataWidth>2) x=ToFixedPoint(x);
+
+            this.DrawTradeIcon(iconItem.Icon,x,y+yOffset, bHScreen);
+        }
+    }
+
+    this.DrawTradeIcon=function(text,x,y,isHScreen)
+    {
+        if (isHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(y, x);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(text,0,0);
+            this.Canvas.restore();
+        }
+        else
+        {
+            this.Canvas.fillText(text,x,y);
         }
     }
 
@@ -48593,7 +48612,7 @@ function DynamicKLineTitlePainting()
                 var item=this.OverlayChartPaint[i];
                 if (!item.Symbol || !item.Title) continue;
             
-                data.OverlayStock.push({ Symbol:item.Symbol, Name:item.Title, Data:item.Data });
+                data.OverlayStock.push({ Symbol:item.Symbol, Name:item.Title, Data:item.Data, Color:item.Color });
             }
         }
         
@@ -53149,6 +53168,7 @@ function ChartDrawHLine()
     this.IsPointIn=this.IsPointIn_XYValue_Line;
     
 
+    /*
     this.GetXYCoordinate=function()
     {
         if (this.IsFrameMinSize()) return null;
@@ -53156,6 +53176,7 @@ function ChartDrawHLine()
 
         return this.PointRange(drawPoint);
     }
+    */
 
     this.IsDrawMain=function()  //选中绘制在动态绘图上， 没有选中绘制在背景上
     {

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

@@ -115,6 +115,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "OPEN":DATA_NAME, "O":DATA_NAME, "HIGH":DATA_NAME, "H":DATA_NAME, "LOW":DATA_NAME,"L":DATA_NAME,"AMOUNT":DATA_NAME,
       "CURRBARSCOUNT":DATA_NAME, "VOLINSTK":DATA_NAME, "ZSTJJ":DATA_NAME, "OPI":DATA_NAME,
 
+      "DOPEN":DATA_NAME,"DHIGH":DATA_NAME,"DLOW":DATA_NAME,"DCLOSE":DATA_NAME,"DVOL":DATA_NAME,
+
       //大盘数据
       "INDEXA":DATA_NAME,"INDEXC":DATA_NAME,"INDEXH":DATA_NAME,"INDEXL":DATA_NAME,"INDEXO":DATA_NAME,"INDEXV":DATA_NAME,'INDEXADV':DATA_NAME,'INDEXDEC':DATA_NAME,
       'UPCOUNT':FUNCTION_NAME,'DOWNCOUNT':FUNCTION_NAME,
@@ -133,7 +135,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       'COLORSTICK':DRAW_NAME,'CIRCLEDOT':DRAW_NAME,'POINTDOT':DRAW_NAME,'LINESTICK':DRAW_NAME,'STICK':DRAW_NAME,'NODRAW':DRAW_NAME,
       "LINEAREA":DRAW_NAME,
 
-      "BUY":DRAW_NAME,"SELL":DRAW_NAME,"SELLSHORT":DRAW_NAME,"BUYSHORT":DRAW_NAME,"TIPICON":DRAW_NAME,
+      "BUY":DRAW_NAME,"SELL":DRAW_NAME,"SELLSHORT":DRAW_NAME,"BUYSHORT":DRAW_NAME,"TIPICON":DRAW_NAME,"AUTOFILTER":FUNCTION_NAME,
 
       //颜色
       'COLORYELLOW':COLORYELLOW,'COLORBLACK':COLORBLACK,'COLORBLUE':COLORBLUE,'COLORGREEN':COLORGREEN,'COLORCYAN':COLORCYAN,'COLORRED':COLORRED,

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

@@ -5014,6 +5014,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowXLine)) chart.Frame.SubFrame[i].Frame.IsShowXLine=item.IsShowXLine;
                 if (IFrameSplitOperator.IsBool(item.IsShowYLine)) chart.Frame.SubFrame[i].Frame.IsShowYLine=item.IsShowYLine;
                 if (IFrameSplitOperator.IsNumber(item.YTextBaseline)) chart.Frame.SubFrame[i].Frame.YTextBaseline=item.YTextBaseline;
+                if (IFrameSplitOperator.IsBool(item.IsShowIndexTitle)) chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;
 
                 if (item.TopSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace;
                 if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace;
@@ -34627,13 +34628,13 @@ function ChartTradeIcon()
         var yOffset=0;
         if (this.TradeType=="BUY" || this.TradeType=="BUYSHORT") 
         {
-            this.Canvas.textBaseline="bottom";
-            yOffset=-2;
+            this.Canvas.textBaseline="top";
+            yOffset+2;
         }
         else if (this.TradeType=="SELL" || this.TradeType=="SELLSHORT")
         {
-            this.Canvas.textBaseline="top";
-            yOffset+2;
+            this.Canvas.textBaseline="bottom";
+            yOffset=-2;
         }
 
         var bHScreen=(this.ChartFrame.IsHScreen===true);
@@ -34658,12 +34659,30 @@ function ChartTradeIcon()
             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);
+
+            if (dataWidth>2) x=ToFixedPoint(x);
+
+            this.DrawTradeIcon(iconItem.Icon,x,y+yOffset, bHScreen);
+        }
+    }
+
+    this.DrawTradeIcon=function(text,x,y,isHScreen)
+    {
+        if (isHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(y, x);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(text,0,0);
+            this.Canvas.restore();
+        }
+        else
+        {
+            this.Canvas.fillText(text,x,y);
         }
     }
 
@@ -52673,7 +52692,7 @@ function DynamicKLineTitlePainting()
                 var item=this.OverlayChartPaint[i];
                 if (!item.Symbol || !item.Title) continue;
             
-                data.OverlayStock.push({ Symbol:item.Symbol, Name:item.Title, Data:item.Data });
+                data.OverlayStock.push({ Symbol:item.Symbol, Name:item.Title, Data:item.Data, Color:item.Color });
             }
         }
         
@@ -57229,6 +57248,7 @@ function ChartDrawHLine()
     this.IsPointIn=this.IsPointIn_XYValue_Line;
     
 
+    /*
     this.GetXYCoordinate=function()
     {
         if (this.IsFrameMinSize()) return null;
@@ -57236,6 +57256,7 @@ function ChartDrawHLine()
 
         return this.PointRange(drawPoint);
     }
+    */
 
     this.IsDrawMain=function()  //选中绘制在动态绘图上， 没有选中绘制在背景上
     {
@@ -107294,6 +107315,46 @@ function JSSymbolData(ast,option,jsExecute)
         return result;
     }
 
+    //求真实波幅, (最高-最低),(最高-昨收),(最低-昨收)三者绝对值中的最大值.
+    //用法:
+    //TR,求真实波幅.
+    //例如:ATR:=MA(TR,10);
+    //表示求真实波幅的10周期均值
+    this.GetTRData=function(node)
+    {
+        var result=[];
+        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        let lCount=this.Data.Data.length;
+        for(var i=0 ;i<lCount;++i)
+        {
+            var item=this.Data.Data[i];
+            var max=null;
+            if (IFrameSplitOperator.IsNumber(item.High) && IFrameSplitOperator.IsNumber(item.Low))
+            {
+                var value=Math.abs(item.High-item.Low);
+                if (max==null || max<value) max=value;
+            }
+
+            if (IFrameSplitOperator.IsNumber(item.High) && IFrameSplitOperator.IsNumber(item.YClose))
+            {
+                var value=Math.abs(item.High-item.YClose);
+                if (max==null || max<value) max=value;
+            }
+
+            if (IFrameSplitOperator.IsNumber(item.YClose) && IFrameSplitOperator.IsNumber(item.Low))
+            {
+                var value=Math.abs(item.Low-item.YClose);
+                if (max==null || max<value) max=value;
+            }
+
+            result[i]=max;
+        }
+
+
+        return result;
+    }
+
     //融资融券函数
     this.GetMarginCacheData=function(id, node)
     {
@@ -110433,7 +110494,10 @@ function JSExecute(ast,option)
         ['DRAWNULL',null],
         ["NULL",null],
 
-        ["MACHINEDATE",null],["MACHINETIME",null],["MACHINEWEEK",null]
+        ["MACHINEDATE",null],["MACHINETIME",null],["MACHINEWEEK",null],
+
+        ["TR", null], //真实波幅
+        ["AUTOFILTER", null]
 
     ]);   
 
@@ -110601,6 +110665,9 @@ function JSExecute(ast,option)
             case 'VOLR':
                 return this.SymbolData.GetVolRateCacheData(node);
 
+            case "TR":  //TR,求真实波幅.
+                return this.SymbolData.GetTRData(node);
+
             //大盘数据
             case 'INDEXA':
             case 'INDEXC':
@@ -112031,7 +112098,8 @@ function JSExplainer(ast,option)
         ["HYSYL","指数市盈率或个股所属行业的市盈率"],
         ["HYSJL","指数市净率或个股所属行业的市净率"],
 
-        ['DRAWNULL',"无效数据"]
+        ['DRAWNULL',"无效数据"],
+        ["TR", "求真实波幅"],
 
     ]);   
 
@@ -112166,6 +112234,8 @@ function JSExplainer(ast,option)
                     let isDotLine=false;
                     let isOverlayLine=false;    //叠加线
                     var isNoneName=false;
+                    var fontSize=-1;
+                    var drawAlign=-1, drawVAlign=-1;
                     //显示在位置之上,对于DRAWTEXT和DRAWNUMBER等函数有用,放在语句的最后面(不能与LINETHICK等函数共用),比如:
                     //DRAWNUMBER(CLOSE>OPEN,HIGH,CLOSE),DRAWABOVE;
                     var isDrawAbove=false;      
@@ -112191,9 +112261,23 @@ function JSExplainer(ast,option)
                             else if (value==="DRAWABOVE") isDrawAbove=true;
                             else if (value.indexOf('COLOR')==0) color=value;
                             else if (value.indexOf('LINETHICK')==0) lineWidth=value;
+
+                            else if (value=="ALIGN0") drawAlign=0;
+                            else if (value=="ALIGN1") drawAlign=1;
+                            else if (value=="ALIGN2") drawAlign=2;
+                       
+                            else if (value=="VALIGN0") drawVAlign=0;
+                            else if (value=="VALIGN1") drawVAlign=1;
+                            else if (value=="VALIGN2") drawVAlign=2;
+
                             else if (value.indexOf('NODRAW')==0) isShow=false;
                             else if (value.indexOf('EXDATA')==0) isExData=true; //扩展数据, 不显示再图形里面
                             else if (value.indexOf('LINEOVERLAY')==0) isOverlayLine=true;
+                            else if (value.indexOf("FONTSIZE")==0)
+                            {
+                                var strFontSize=value.replace("FONTSIZE","");
+                                fontSize=parseInt(strFontSize);
+                            }
                             else 
                             {
                                 varName=itemExpression.Name;
@@ -112212,17 +112296,20 @@ function JSExplainer(ast,option)
                         }
                         else if (itemExpression.Type==Syntax.CallExpression)
                         {
-                            if (this.IsDrawFunction(itemExpression.Callee.Name))
-                            {
-                                draw=itemExpression.Out;
-                                drawName=itemExpression.Callee.Name;
-                            }
-                            else
+                            if (j==0)
                             {
-                                let varValue=itemExpression.Out;
-                                varName=`__temp_sc_${itemExpression.Callee.Name}_${i}__`;
-                                isNoneName=true;
-                                this.VarTable.set(varName,varValue);
+                                if (this.IsDrawFunction(itemExpression.Callee.Name))
+                                {
+                                    draw=itemExpression.Out;
+                                    drawName=itemExpression.Callee.Name;
+                                }
+                                else
+                                {
+                                    let varValue=itemExpression.Out;
+                                    varName=`__temp_sc_${itemExpression.Callee.Name}_${i}__`;
+                                    isNoneName=true;
+                                    this.VarTable.set(varName,varValue);
+                                }
                             }
                         }
                         else if (itemExpression.Type==Syntax.BinaryExpression)
@@ -112507,6 +112594,7 @@ function JSExplainer(ast,option)
             ["CODELIKE", { Name:"CODELIKE", Param:{ Count:1 }, ToString:function(args) { return `查找品种名称中包含${args[0]}`; } } ],
             ["INBLOCK", { Name:"AVEDEV", Param:{ Count:1 }, ToString:function(args) { return `属于${args[0]}板块`; } } ],
             ["STKINDI",{ Name:"STKINDI", Param:{ Dynamic:true }, ToString:function(args) { return "指标引用"; } }],
+            ["STRFORMAT",{ Name:"STRFORMAT", Param:{ Dynamic:true }, ToString:function(args) { return `格式化${args[0]}字符串`; } }],
             
 
             [
@@ -112619,6 +112707,8 @@ function JSExplainer(ast,option)
                 return "相对位置上画矩形.";
             case "DRAWGBK":
                 return "填充背景";
+            case "TIPICON":
+                return `当满足条件${args[0]}时,在${args[1]}位置画${args[2]}号图标`;
             case "STICKLINE":
                 var barType="";
                 if (args[4]==-1) barType="虚线空心柱";
@@ -112626,6 +112716,18 @@ function JSExplainer(ast,option)
                 else barType="实线空心柱";
                 return `当满足条件${args[0]}时, 在${args[1]}和${args[2]}位置之间画柱状线,宽度为${args[3]},${barType}`;
 
+            case "SELL":
+                return "卖出平仓";
+            case "BUY":
+                return "买入开仓";
+            case "SELLSHORT":
+                return "卖出开仓";
+            case "BUYSHORT":
+                return "买入平仓";
+
+            case "YMOVE":
+                return;
+
             default:
                 this.ThrowUnexpectedNode(node,`函数${funcName}不存在`);
         }
@@ -112768,7 +112870,8 @@ function JSExplainer(ast,option)
         [
             "STICKLINE","DRAWTEXT",'SUPERDRAWTEXT','DRAWLINE','DRAWBAND','DRAWKLINE',"DRAWKLINE1",'DRAWKLINE_IF','PLOYLINE',
             'POLYLINE','DRAWNUMBER',"DRAWNUMBER_FIX",'DRAWICON','DRAWCHANNEL','PARTLINE','DRAWTEXT_FIX','DRAWGBK','DRAWTEXT_LINE','DRAWRECTREL',"DRAWTEXTABS",
-            'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2"
+            'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2",
+            "BUY","BUYSHORT","SELL","SELLSHORT",
         ]);
         if (setFunctionName.has(name)) return true;
     
@@ -112968,10 +113071,21 @@ function JSExplainer(ast,option)
             return this.SymbolPeriodExplain(aryPeriod[0],aryPeriod[1]);
         }
 
+        if (name=="AUTOFILTER") //信号过滤
+        {
+            return this.AUTOFILTER();
+        }
+
         this.ThrowUnexpectedNode(node, '变量'+name+'不存在');
         return name;
     }
 
+    this.AUTOFILTER=function()
+    {
+        //TODO:过滤信号
+        return null;
+    }
+
     this.ThrowUnexpectedNode=function(node,message)
     {
         let marker=node.Marker;
@@ -119154,7 +119268,21 @@ var tokens=JSComplier.Tokenize(code1+code2);
 var ast=JSComplier.Parse(code2+code1);
 
 JSConsole.Complier.Log(ast);
-*//*
+*/
+
+//外部通达信的变量 这些需要外部自己计算
+JSComplier.AddVariant({ Name:'DHIGH',   Description:'不定周期最高价' } );
+JSComplier.AddVariant({ Name:'DOPEN',   Description:'不定周期开盘价' } );
+JSComplier.AddVariant({ Name:'DLOW',    Description:'不定周期最低价' } );
+JSComplier.AddVariant({ Name:'DCLOSE',  Description:'不定周期收盘价' } );
+JSComplier.AddVariant({ Name:'DVOL',    Description:'不定周期成交量价' } );
+
+
+
+
+
+
+/*
    Copyright (c) 2018 jones
  
     http://www.apache.org/licenses/LICENSE-2.0
@@ -130038,7 +130166,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12634";
+var HQCHART_VERSION="1.1.12648";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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