hqchart 1.1.12771 → 1.1.12778

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.12771",
+  "version": "1.1.12778",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -3121,7 +3121,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (!this.Frame || !this.Frame.PtInFrameY) return null;
 
         var dragY=this.Frame.PtInFrameY(x,y);
-        if (!dragY || dragY.Index<0 || dragY.IsOverlay==true) return null;
+        if (!dragY || dragY.Index<0 ) return null;
+
+        if (dragY.IsOverlay===true)
+        {
+            if (!dragY.Right || !this.EnableYDrag.Right) return null;
+
+            if (this.Frame.IsEnableOverlayDragY(dragY.Index, dragY.OverlayIndex)) return dragY;
+
+            return null;
+        }
 
         if (dragY.Left && this.EnableYDrag.Left && this.Frame.IsEnableDragY(dragY.Index))
         {
@@ -16547,6 +16556,12 @@ function HQTradeFrame()
 
         var subFrame=this.SubFrame[index];
         var frame=subFrame.Frame;
+        if (obj.IsOverlay)
+        {
+            var overlayItem=subFrame.OverlayIndex[obj.OverlayIndex];
+            if (!overlayItem) return false;
+            if (!overlayItem.Frame.IsShareY) frame=overlayItem.Frame;
+        }
         var splitOper=frame.YSplitOperator;
 
         if (splitOper.FixedYMaxMin)
@@ -16575,6 +16590,13 @@ function HQTradeFrame()
 
         var subFrame=this.SubFrame[index];
         var frame=subFrame.Frame;
+        if (obj.IsOverlay)
+        {
+            var overlayItem=subFrame.OverlayIndex[obj.OverlayIndex];
+            if (!overlayItem) return false;
+            if (!overlayItem.Frame.IsShareY) frame=overlayItem.Frame;
+        }
+       
         var top=frame.ChartBorder.GetTopEx();
         var bottom=frame.ChartBorder.GetBottomEx();
 
@@ -17843,6 +17865,22 @@ function HQTradeFrame()
         return split.IsEnableDragY();
     }
 
+    this.IsEnableOverlayDragY=function(index, overlayIndex)
+    {
+        if (!this.SubFrame) return false;
+        var item=this.SubFrame[index];
+        var overlayItem=item.OverlayIndex[overlayIndex];
+        if (!overlayItem || !overlayItem.Frame) return false;
+
+        var split=overlayItem.Frame.YSplitOperator;
+        if (overlayItem.Frame.IsShareY)
+            split=overlayItem.Frame.MainFrame.YSplitOperator;
+        
+        if (!split || typeof(split.IsEnableDragY)!='function') return false;
+
+        return split.IsEnableDragY();
+    }
+
     this.PtInFrameY=function(x,y)
     {
         var rightExtendWith=0;
@@ -71171,7 +71209,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
             var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
             var dragY=this.Frame.PtInFrameY(x,y);
-            if (dragY && dragY.Index>=0 && dragY.IsOverlay==false)
+            if (dragY && dragY.Index>=0)
             {
                 this.CancelZoomUpDownFrameY(dragY);
             }
@@ -74987,6 +75025,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.DataStatus.LatestDay=false;
     }
 
+    this.ClearOverlaySymbolData=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var chart=this.OverlayChartPaint[i];
+            chart.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;  //重置状态
+            chart.Data.Data=[]; //清空数据
+        }
+    }
+
     //切换股票代码
     this.ChangeSymbol=function(symbol,option)
     {
@@ -75154,6 +75202,58 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
+    //[{ Symbol: , Color, Option: }]
+    this.OverlaySymbols=function(aryData)
+    {
+        var aryNewOverlay=[];
+        for(var i=0, j=0;i<aryData.length;++i)  //去重，已经叠加过的不用在叠加
+        {
+            var overlayItem=aryData[i];
+            var strSymbol=overlayItem.Symbol;
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
+            {
+                var item=this.OverlayChartPaint[j];
+                if (item.Symbol==strSymbol)
+                {
+                    bFind=true;
+                    console.warn(`[MinuteChartContainer::OverlaySymbols] overlay symbol=${strSymbol} exist.`);
+                    break;
+                }
+            }
+
+            if (!bFind) aryNewOverlay.push(overlayItem);
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay)) return true;
+
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var overlayItem=aryNewSymbol[i];
+            var strSymbol=overlayItem.Symbol;
+            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 (overlayItem.Option && overlayItem.Option.Color) paint.Color=overlayItem.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(overlayItem.Option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
+
+        if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
+        else this.RequestOverlayHistoryMinuteData();
+        
+        return true;
+    }
+
     //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
@@ -76329,7 +76429,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
-            let item=this.OverlayChartPaint[i]
+            var item=this.OverlayChartPaint[i]
             var symbol=item.Symbol;
             if (!symbol) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;

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

@@ -7265,7 +7265,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (!this.Frame || !this.Frame.PtInFrameY) return null;
 
         var dragY=this.Frame.PtInFrameY(x,y);
-        if (!dragY || dragY.Index<0 || dragY.IsOverlay==true) return null;
+        if (!dragY || dragY.Index<0 ) return null;
+
+        if (dragY.IsOverlay===true)
+        {
+            if (!dragY.Right || !this.EnableYDrag.Right) return null;
+
+            if (this.Frame.IsEnableOverlayDragY(dragY.Index, dragY.OverlayIndex)) return dragY;
+
+            return null;
+        }
 
         if (dragY.Left && this.EnableYDrag.Left && this.Frame.IsEnableDragY(dragY.Index))
         {
@@ -20691,6 +20700,12 @@ function HQTradeFrame()
 
         var subFrame=this.SubFrame[index];
         var frame=subFrame.Frame;
+        if (obj.IsOverlay)
+        {
+            var overlayItem=subFrame.OverlayIndex[obj.OverlayIndex];
+            if (!overlayItem) return false;
+            if (!overlayItem.Frame.IsShareY) frame=overlayItem.Frame;
+        }
         var splitOper=frame.YSplitOperator;
 
         if (splitOper.FixedYMaxMin)
@@ -20719,6 +20734,13 @@ function HQTradeFrame()
 
         var subFrame=this.SubFrame[index];
         var frame=subFrame.Frame;
+        if (obj.IsOverlay)
+        {
+            var overlayItem=subFrame.OverlayIndex[obj.OverlayIndex];
+            if (!overlayItem) return false;
+            if (!overlayItem.Frame.IsShareY) frame=overlayItem.Frame;
+        }
+       
         var top=frame.ChartBorder.GetTopEx();
         var bottom=frame.ChartBorder.GetBottomEx();
 
@@ -21987,6 +22009,22 @@ function HQTradeFrame()
         return split.IsEnableDragY();
     }
 
+    this.IsEnableOverlayDragY=function(index, overlayIndex)
+    {
+        if (!this.SubFrame) return false;
+        var item=this.SubFrame[index];
+        var overlayItem=item.OverlayIndex[overlayIndex];
+        if (!overlayItem || !overlayItem.Frame) return false;
+
+        var split=overlayItem.Frame.YSplitOperator;
+        if (overlayItem.Frame.IsShareY)
+            split=overlayItem.Frame.MainFrame.YSplitOperator;
+        
+        if (!split || typeof(split.IsEnableDragY)!='function') return false;
+
+        return split.IsEnableDragY();
+    }
+
     this.PtInFrameY=function(x,y)
     {
         var rightExtendWith=0;
@@ -75315,7 +75353,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
             var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
             var dragY=this.Frame.PtInFrameY(x,y);
-            if (dragY && dragY.Index>=0 && dragY.IsOverlay==false)
+            if (dragY && dragY.Index>=0)
             {
                 this.CancelZoomUpDownFrameY(dragY);
             }
@@ -79131,6 +79169,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.DataStatus.LatestDay=false;
     }
 
+    this.ClearOverlaySymbolData=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var chart=this.OverlayChartPaint[i];
+            chart.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;  //重置状态
+            chart.Data.Data=[]; //清空数据
+        }
+    }
+
     //切换股票代码
     this.ChangeSymbol=function(symbol,option)
     {
@@ -79298,6 +79346,58 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
+    //[{ Symbol: , Color, Option: }]
+    this.OverlaySymbols=function(aryData)
+    {
+        var aryNewOverlay=[];
+        for(var i=0, j=0;i<aryData.length;++i)  //去重，已经叠加过的不用在叠加
+        {
+            var overlayItem=aryData[i];
+            var strSymbol=overlayItem.Symbol;
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
+            {
+                var item=this.OverlayChartPaint[j];
+                if (item.Symbol==strSymbol)
+                {
+                    bFind=true;
+                    console.warn(`[MinuteChartContainer::OverlaySymbols] overlay symbol=${strSymbol} exist.`);
+                    break;
+                }
+            }
+
+            if (!bFind) aryNewOverlay.push(overlayItem);
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay)) return true;
+
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var overlayItem=aryNewSymbol[i];
+            var strSymbol=overlayItem.Symbol;
+            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 (overlayItem.Option && overlayItem.Option.Color) paint.Color=overlayItem.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(overlayItem.Option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
+
+        if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
+        else this.RequestOverlayHistoryMinuteData();
+        
+        return true;
+    }
+
     //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
@@ -80473,7 +80573,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
-            let item=this.OverlayChartPaint[i]
+            var item=this.OverlayChartPaint[i]
             var symbol=item.Symbol;
             if (!symbol) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
@@ -131277,7 +131377,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12770";
+var HQCHART_VERSION="1.1.12777";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -7309,7 +7309,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (!this.Frame || !this.Frame.PtInFrameY) return null;
 
         var dragY=this.Frame.PtInFrameY(x,y);
-        if (!dragY || dragY.Index<0 || dragY.IsOverlay==true) return null;
+        if (!dragY || dragY.Index<0 ) return null;
+
+        if (dragY.IsOverlay===true)
+        {
+            if (!dragY.Right || !this.EnableYDrag.Right) return null;
+
+            if (this.Frame.IsEnableOverlayDragY(dragY.Index, dragY.OverlayIndex)) return dragY;
+
+            return null;
+        }
 
         if (dragY.Left && this.EnableYDrag.Left && this.Frame.IsEnableDragY(dragY.Index))
         {
@@ -20735,6 +20744,12 @@ function HQTradeFrame()
 
         var subFrame=this.SubFrame[index];
         var frame=subFrame.Frame;
+        if (obj.IsOverlay)
+        {
+            var overlayItem=subFrame.OverlayIndex[obj.OverlayIndex];
+            if (!overlayItem) return false;
+            if (!overlayItem.Frame.IsShareY) frame=overlayItem.Frame;
+        }
         var splitOper=frame.YSplitOperator;
 
         if (splitOper.FixedYMaxMin)
@@ -20763,6 +20778,13 @@ function HQTradeFrame()
 
         var subFrame=this.SubFrame[index];
         var frame=subFrame.Frame;
+        if (obj.IsOverlay)
+        {
+            var overlayItem=subFrame.OverlayIndex[obj.OverlayIndex];
+            if (!overlayItem) return false;
+            if (!overlayItem.Frame.IsShareY) frame=overlayItem.Frame;
+        }
+       
         var top=frame.ChartBorder.GetTopEx();
         var bottom=frame.ChartBorder.GetBottomEx();
 
@@ -22031,6 +22053,22 @@ function HQTradeFrame()
         return split.IsEnableDragY();
     }
 
+    this.IsEnableOverlayDragY=function(index, overlayIndex)
+    {
+        if (!this.SubFrame) return false;
+        var item=this.SubFrame[index];
+        var overlayItem=item.OverlayIndex[overlayIndex];
+        if (!overlayItem || !overlayItem.Frame) return false;
+
+        var split=overlayItem.Frame.YSplitOperator;
+        if (overlayItem.Frame.IsShareY)
+            split=overlayItem.Frame.MainFrame.YSplitOperator;
+        
+        if (!split || typeof(split.IsEnableDragY)!='function') return false;
+
+        return split.IsEnableDragY();
+    }
+
     this.PtInFrameY=function(x,y)
     {
         var rightExtendWith=0;
@@ -75359,7 +75397,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
             var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
             var dragY=this.Frame.PtInFrameY(x,y);
-            if (dragY && dragY.Index>=0 && dragY.IsOverlay==false)
+            if (dragY && dragY.Index>=0)
             {
                 this.CancelZoomUpDownFrameY(dragY);
             }
@@ -79175,6 +79213,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.DataStatus.LatestDay=false;
     }
 
+    this.ClearOverlaySymbolData=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var chart=this.OverlayChartPaint[i];
+            chart.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;  //重置状态
+            chart.Data.Data=[]; //清空数据
+        }
+    }
+
     //切换股票代码
     this.ChangeSymbol=function(symbol,option)
     {
@@ -79342,6 +79390,58 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
+    //[{ Symbol: , Color, Option: }]
+    this.OverlaySymbols=function(aryData)
+    {
+        var aryNewOverlay=[];
+        for(var i=0, j=0;i<aryData.length;++i)  //去重，已经叠加过的不用在叠加
+        {
+            var overlayItem=aryData[i];
+            var strSymbol=overlayItem.Symbol;
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
+            {
+                var item=this.OverlayChartPaint[j];
+                if (item.Symbol==strSymbol)
+                {
+                    bFind=true;
+                    console.warn(`[MinuteChartContainer::OverlaySymbols] overlay symbol=${strSymbol} exist.`);
+                    break;
+                }
+            }
+
+            if (!bFind) aryNewOverlay.push(overlayItem);
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay)) return true;
+
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var overlayItem=aryNewSymbol[i];
+            var strSymbol=overlayItem.Symbol;
+            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 (overlayItem.Option && overlayItem.Option.Color) paint.Color=overlayItem.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(overlayItem.Option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
+
+        if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
+        else this.RequestOverlayHistoryMinuteData();
+        
+        return true;
+    }
+
     //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
@@ -80517,7 +80617,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
-            let item=this.OverlayChartPaint[i]
+            var item=this.OverlayChartPaint[i]
             var symbol=item.Symbol;
             if (!symbol) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
@@ -131435,7 +131535,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12770";
+var HQCHART_VERSION="1.1.12777";
 
 function PrintHQChartVersion()
 {