hqchart 1.1.15008 → 1.1.15018

package/package.json

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

package/src/jscommon/umychart.DialogTooltip.js

@@ -1137,8 +1137,6 @@ function JSFloatTooltip()
         Left:"UMyChart_Tooltip_Float_Text2_Span",       //左对齐
         MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',
         Right:"UMyChart_Tooltip_Float_Text_Span",
-
-        
     }
 
     this.TitleAlign=
@@ -2353,4 +2351,162 @@ function JSFloatTooltip()
 
         this.UpdateStyle();
     }
+}
+
+function JSSmallFloatTooltip()
+{
+    this.DivDialog=null;
+    this.DivContent=null;
+    this.HQChart=null;
+
+    this.Destroy=function()
+    {
+        if (this.DivDialog) 
+        {
+            document.body.removeChild(this.DivDialog);
+            this.DivDialog=null;
+            this.DivContent=null;
+        }
+
+        this.HQChart=null;
+    }
+
+    this.Hide=function()
+    {
+        if (!this.DivDialog) return;
+        if (this.DivDialog.style.visibility!='hidden') this.DivDialog.style.visibility='hidden';
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement("div");
+        divDom.className='UMyChart_Small_Tooltip_Div';
+
+        var divContent=document.createElement("div");
+        divContent.className='UMyChart_Small_Tooltip_Content_Div';
+        divDom.appendChild(divContent);
+
+        document.body.appendChild(divDom);
+
+        this.DivContent=divContent;
+        this.DivDialog=divDom;
+    }
+
+    this.IsShow=function()
+    {
+        if (!this.DivDialog) return false;
+        
+        return this.DivDialog.style.visibility==='visible';
+    }
+
+    this.ShowTooltip=function(data)
+    {
+        if (!data.Point) return;
+
+        var x=data.Point.X;
+        var y=data.Point.Y;
+        this.Show(x, y, { YMove:data.Point.YMove });
+    }
+
+    this.Show=function(x, y, option)
+    {
+        if (!this.DivDialog) return;
+        if (!this.HQChart) return;
+
+        var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+        var yMove=0;
+        if (option && IFrameSplitOperator.IsNumber(option.YMove)) yMove=option.YMove;
+
+        var left=x+rtClient.left,top=y+rtClient.top+yMove;
+        var right=left+this.DivDialog.offsetWidth;
+        var bottom=top+this.DivDialog.offsetHeight;
+        
+        if ((right+5)>=window.innerWidth) left=left-this.DivDialog.offsetWidth;
+        if ((bottom+5)>=window.innerHeight) 
+        {
+            top=(y+rtClient.top)-this.DivDialog.offsetHeight;
+        }
+       
+        this.DivDialog.style.top = top + "px";
+        this.DivDialog.style.left = left + "px";
+        
+        if (this.DivDialog.style.visibility!='visible')
+            this.DivDialog.style.visibility='visible';
+    }
+
+    this.Update=function(data)
+    {
+        var text=data.Data.Data.Text;
+        if (!this.DivContent) return false;
+
+        this.DivContent.innerText=text;
+
+        this.ShowTooltip(data);
+    }
+}
+
+function JSSmallFloatTooltipGroup()
+{
+    this.AryTooltip=[];
+    this.HQChart=null;
+    this.MaxCount=5;
+
+    this.Inital=function(hqchart, option)
+    {
+        this.HQChart=hqchart;
+    }
+
+    this.Create=function()
+    {
+        for(var i=0;i<this.MaxCount;++i)
+        {
+            var item=new JSSmallFloatTooltip();
+            item.HQChart=this.HQChart;
+            item.Create();
+            this.AryTooltip.push(item);
+        }
+    }
+
+    this.Destroy=function()
+    {
+        for(var i=0;i<this.AryTooltip.length;++i)
+        {
+            var item=this.AryTooltip[i];
+            item.Destroy();
+        }
+
+        this.AryTooltip=[];
+    }
+
+    this.Update=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        var pixelTatio = GetDevicePixelRatio();
+        if (pixelTatio===0) pixelTatio=1;   
+        for(var i=0; i<tooltipData.AryData.length && i<this.AryTooltip.length; ++i)
+        {
+            var item=tooltipData.AryData[i];
+            var tooltipItem=this.AryTooltip[i];
+
+            //去掉分辨率倍数
+            var x=tooltipData.X/pixelTatio;
+            var y=item.Y/pixelTatio;
+            tooltipItem.Update({ Data:item, Point:{ X:x, Y:y} });
+        }
+
+        for(var i=tooltipData.AryData.length; i<this.AryTooltip.length; ++i)
+        {
+            var item=this.AryTooltip[i];
+            item.Hide();
+        }
+    }
+
+    this.Hide=function()
+    {
+        for(var i=0;i<this.AryTooltip.length;++i)
+        {
+            var item=this.AryTooltip[i];
+            item.Hide();
+        }
+    }
 }

package/src/jscommon/umychart.complier.js

@@ -9309,6 +9309,55 @@ function JSDraw(errorHandler,symbolData)
     this.ErrorHandler=errorHandler;
     this.SymbolData=symbolData;
 
+    //绘制随光标移动的浮动文字。
+    //用法: DRAWFLAGTEXT(COND,PRICE,TEXT),光标处当COND条件满足时,在PRICE位置用半透明窗口显示文字TEXT,随光标移动而移动。将\\n插入TEXT内容中可实现文字换行。
+    //例如：DRAWFLAGTEXT(CLOSE/OPEN>1.08,LOW,'大阳线')表示当光标移动到涨幅大于8%的地方,在最低价位置显示'大阳线'字样的浮动窗口。
+    this.DRAWFLAGTEXT=function(condition,price,text)
+    {
+        var drawData=[];
+        var result={ DrawData:drawData, DrawType:'DRAWFLAGTEXT' };
+        if (!text) return result;
+
+        if (Array.isArray(condition))
+        {
+            if (condition.length<=0) return result;
+
+            var bSinglePrice=IFrameSplitOperator.IsNumber(price);
+            for(var i=0; i<condition.length; ++i)
+            {
+                drawData[i]=null;
+    
+                if (isNaN(condition[i]) || !condition[i]) continue;
+    
+                if (bSinglePrice) 
+                {
+                    drawData[i]={ YValue:price, Text:text };
+                }
+                else 
+                {
+                    if (IFrameSplitOperator.IsNumber(price[i])) drawData[i]={ YValue:price[i], Text:text };
+                }
+            }
+        }
+        else if (IFrameSplitOperator.IsPlusNumber(condition))
+        {
+            var bSinglePrice=IFrameSplitOperator.IsNumber(price);
+            for(var i=0;i<this.SymbolData.Data.Data.length;++i)
+            {
+                if (bSinglePrice) 
+                {
+                    drawData[i]={ YValue:price, Text:text };
+                }
+                else 
+                {
+                    if (IFrameSplitOperator.IsNumber(price[i])) drawData[i]={ YValue:price[i], Text:text };
+                }
+            }
+        }
+
+        return result;
+    }
+
     this.DRAWTEXT=function(condition,price,text)
     {
         let drawData=[];
@@ -11689,6 +11738,7 @@ JSDraw.prototype.IsDrawFunction=function(name)
         "VERTLINE","HORLINE","TIPICON",
         "BUY","SELL","SELLSHORT","BUYSHORT",
         "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT","DRAWTABLE","DRAWPIE","DRAWRADAR","DRAWDOUGHNUT",
+        "DRAWFLAGTEXT"
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -18254,6 +18304,10 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.DRAWTEXT_FIX(args[0],args[1],args[2],args[3],args[4]);
                 node.Out=[];
                 break;
+            case "DRAWFLAGTEXT":
+                node.Draw=this.Draw.DRAWFLAGTEXT(args[0],args[1],args[2]);
+                node.Out=[];
+                break;
             case 'SUPERDRAWTEXT':
                 node.Draw=this.Draw.SUPERDRAWTEXT(args[0],args[1],args[2],args[3],args[4]);
                 node.Out=[];
@@ -21079,6 +21133,22 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chartText);
     }
 
+    this.CreateDrawFlagText=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartDrawFlagText();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        if (chart.ReloadResource) chart.ReloadResource();
+
+        chart.Data=hqChart.GetKData();
+        if (varItem.Draw.DrawData) chart.AryData=varItem.Draw.DrawData;
+        chart.BuildCacheData();
+       
+        hqChart.ChartPaint.push(chart);
+    }
+
     //COLORSTICK 
     this.CreateMACD=function(hqChart,windowIndex,varItem,id)
     {
@@ -22244,31 +22314,7 @@ function ScriptIndex(name,script,args,option)
         if (IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName)) chart.RowName=varItem.Draw.RowName;
 
         var config=varItem.Draw.Config;
-        if (config)
-        {
-            if (config.BGColor) chart.BGColor=config.BGColor;
-            if (config.TextColor) chart.TextColor=config.TextColor;
-            if (config.BorderColor) chart.BorderColor=config.BorderColor;
-            if (IFrameSplitOperator.IsNumber(config.RowNamePosition)) chart.RowNamePosition=config.RowNamePosition;
-            if (IFrameSplitOperator.IsNumber(config.RowHeightType)) chart.RowHeightType=config.RowHeightType;
-
-            if (config.ItemMergin)
-            {
-                var subItem=config.ItemMergin;
-                if (IFrameSplitOperator.IsNumber(subItem.Left)) chart.ItemMergin.Left=subItem.Left;
-                if (IFrameSplitOperator.IsNumber(subItem.Top)) chart.ItemMergin.Top=subItem.Top;
-                if (IFrameSplitOperator.IsNumber(subItem.Bottom)) chart.ItemMergin.Bottom=subItem.Bottom;
-                if (IFrameSplitOperator.IsNumber(subItem.Right)) chart.ItemMergin.Right=subItem.Right;
-                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) chart.ItemMergin.YOffset=subItem.YOffset;
-            }
-           
-            if (config.TextFont)
-            {
-                var subItem=config.TextFont;
-                if (IFrameSplitOperator.IsNumber(subItem.FontMaxSize)) chart.TextFontConfig.FontMaxSize=subItem.FontMaxSize;
-                if (subItem.Family) chart.TextFontConfig.Family=subItem.Family;
-            }
-        }
+        chart.SetOption(config);
         
         chart.BuildCacheData();
         this.SetChartIndexName(chart);
@@ -22569,6 +22615,9 @@ function ScriptIndex(name,script,args,option)
                     case 'DRAWTEXT':
                         this.CreateDrawTextV2(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWFLAGTEXT":
+                        this.CreateDrawFlagText(hqChart,windowIndex,item,i);
+                        break;
                     case 'SUPERDRAWTEXT':
                         this.CreateText(hqChart,windowIndex,item,i);
                         break;
@@ -22990,6 +23039,8 @@ function OverlayScriptIndex(name,script,args,option)
                     case 'DRAWTEXT':
                         this.CreateDrawTextV2(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWFLAGTEXT":
+                        this.CreateDrawFlagText(hqChart,windowIndex,item,i);
                     case 'SUPERDRAWTEXT':
                         this.CreateText(hqChart,windowIndex,item,i);
                         break;
@@ -23354,6 +23405,25 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chartText);
     }
 
+    this.CreateDrawFlagText=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartDrawFlagText();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+        if (chart.ReloadResource) chart.ReloadResource();
+
+        chart.Data=hqChart.GetKData();
+        if (varItem.Draw.DrawData) chart.AryData=varItem.Draw.DrawData;
+        chart.BuildCacheData();
+
+        frame.ChartPaint.push(chart);
+    }
+
     //创建文本
     this.CreateText=function(hqChart,windowIndex,varItem,id, drawName)
     {
@@ -23953,33 +24023,7 @@ function OverlayScriptIndex(name,script,args,option)
         if (IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName)) chart.RowName=varItem.Draw.RowName;
 
         var config=varItem.Draw.Config;
-        if (config)
-        {
-            if (config.BGColor) chart.BGColor=config.BGColor;
-            if (config.TextColor) chart.TextColor=config.TextColor;
-            if (config.BorderColor) chart.BorderColor=config.BorderColor;
-            if (IFrameSplitOperator.IsNumber(config.RowNamePosition)) chart.RowNamePosition=config.RowNamePosition;
-            if (IFrameSplitOperator.IsNumber(config.RowHeightType)) chart.RowHeightType=config.RowHeightType;
-            if (IFrameSplitOperator.IsNumber(config.Style)) chart.Style=config.Style;
-
-            if (config.ItemMergin)
-            {
-                var subItem=config.ItemMergin;
-                if (IFrameSplitOperator.IsNumber(subItem.Left)) chart.ItemMergin.Left=subItem.Left;
-                if (IFrameSplitOperator.IsNumber(subItem.Top)) chart.ItemMergin.Top=subItem.Top;
-                if (IFrameSplitOperator.IsNumber(subItem.Bottom)) chart.ItemMergin.Bottom=subItem.Bottom;
-                if (IFrameSplitOperator.IsNumber(subItem.Right)) chart.ItemMergin.Right=subItem.Right;
-                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) chart.ItemMergin.YOffset=subItem.YOffset;
-            }
-           
-            if (config.TextFont)
-            {
-                var subItem=config.TextFont;
-                if (IFrameSplitOperator.IsNumber(subItem.FontMaxSize)) chart.TextFontConfig.FontMaxSize=subItem.FontMaxSize;
-                if (subItem.Family) chart.TextFontConfig.Family=subItem.Family;
-            }
-        }
-        
+        chart.SetOption(config);
         chart.BuildCacheData();
         frame.ChartPaint.push(chart);
 
@@ -26048,6 +26092,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType==SCRIPT_CHART_NAME.KLINE_TABLE)
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+                    drawItem.RowCount=draw.RowCount;
+                    drawItem.RowName=draw.RowName;
+                    drawItem.Config=draw.Config;
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接