hqchart 1.1.12790 → 1.1.12798

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

@@ -4451,6 +4451,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             var item=option.EnableYDrag;
             if (IFrameSplitOperator.IsBool(item.Left)) chart.EnableYDrag.Left=item.Left;
             if (IFrameSplitOperator.IsBool(item.Right)) chart.EnableYDrag.Right=item.Right;
+            if (IFrameSplitOperator.IsBool(item.Wheel)) chart.EnableYDrag.Wheel=item.Wheel;
+            if (IFrameSplitOperator.IsNumber(item.WheelYMove)) chart.EnableYDrag.WheelYMove=item.WheelYMove;
         }
 
         if (option.KLine)   //k线图的属性设置
@@ -6404,6 +6406,11 @@ JSChart.GetKLineZoom=function() //K线缩放配置
     return ZOOM_SEED;
 }
 
+JSChart.SetKLineZoom=function(aryZoom)  //设置K线缩放比例
+{
+    ZOOM_SEED=aryZoom;
+}
+
 JSChart.GetDivTooltipDataFormat=function()  //div tooltip数据格式化
 {
     return g_DivTooltipDataForamt;
@@ -6685,6 +6692,8 @@ var JSCHART_EVENT_ID=
     ON_KEYDOWN:117,
 
     ON_CREATE_OVERLAY_FRAME:118,        //创建叠加框架回调
+
+    ON_CREATE_CUSTOM_Y_COORDINATE:119,  //自定义Y轴刻度
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6982,7 +6991,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.ClickDownPoint;         //鼠标点击坐标 {X, Y}, 鼠标放开以后清空为null
     this.IsDestroy=false;        //是否已经销毁了
 
-    this.EnableYDrag={ Left:false, Right:false };   //是否可以拖拽Y轴,放大缩小Y轴最大最小值
+    this.EnableYDrag=
+    { 
+        Left:false, Right:false,    //是否可以拖拽缩放Y轴最大最小值
+        Wheel:false, WheelYMove:5  //是否可以滚轴缩放Y轴最大最小值
+    };  
+
     this.EnableZoomIndexWindow=false;               //是否支持双击缩放附图窗口
     this.EnableVerifyRecvData=false;                //是否检测接收到的数据
 
@@ -47408,130 +47422,144 @@ function IFrameSplitOperator()
         return result;
     }
 
-     //当前屏最新指标数据
-     this.CustomLatestIndexDataCoordinate=function(option)
-     {
-         var pageInfo=this.GetKLinePageInfo();   //获取当前屏信息
-         if (!pageInfo) return;
-         if (!this.HQChart) return;
- 
-         var event=null;
-         if (this.GetEventCallback) 
-             event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_INDEX_Y_LABEL);
- 
-         var endIndex=pageInfo.End.Index;
-         var floatPrecision=2;
-         if (IFrameSplitOperator.IsNumber(this.FloatPrecision)) floatPrecision=this.FloatPrecision;
-         for(var i=0, j=0;i<this.HQChart.ChartPaint.length;++i)
-         {
-             var chart=this.HQChart.ChartPaint[i];
-             if (!chart.ChartFrame) continue;
-             if (!chart.GetItemData) continue;
-             if (chart.ChartFrame.Identify==this.Frame.Identify || chart.ChartFrame==this.Frame)
-             {
-                 var aryItem=chart.GetItemData( {Index:endIndex} );
-                 if (!IFrameSplitOperator.IsNonEmptyArray(aryItem)) continue;
- 
-                 for(j=0; j<aryItem.length; ++j)
-                 {
-                     var item=aryItem[j];
- 
-                     var info=new CoordinateInfo();
-                     info.Type=1;
-                     info.TextColor=g_JSChartResource.FrameLatestPrice.TextColor;
-                     info.LineColor=item.Color;
-                     info.LineType=-1;   //默认不画线
-                     info.IsLast=pageInfo.IsLast;//是否是最后一个数据
-                     if (IFrameSplitOperator.IsNumber(option.LineType)) info.LineType=option.LineType;
-         
-                     info.Value=item.Value;
-                     var text=IFrameSplitOperator.FormatValueString(item.Value, floatPrecision,this.LanguageID);
- 
-                     if (option.Position=='left') info.Message[0]=text;
-                     else info.Message[1]=text;
- 
-                     if (!pageInfo.IsLast)
-                     {
-                         var config={};
-                         if (!pageInfo.IsLast) config.EmptyBGColor=g_JSChartResource.FrameLatestPrice.EmptyBGColor;
- 
-                         info.ExtendData={ Custom:config };
-                     }
- 
-                     if (event)
-                     {
-                         var sendData={ PreventDefault:false, Label:info, Data:item, IndexName:chart.IndexName, FrameID:this.Frame.Identify };
-                         event.Callback(event,sendData,this);
- 
-                         if (sendData.PreventDefault) continue;
-                     }
-         
-                     this.Frame.CustomHorizontalInfo.push(info);
-                 }
-             }
-         }
-     }
-
-     this.CustomLatestOverlayIndexDataCoordinate=function(option)
-     {
+    //当前屏最新指标数据
+    this.CustomLatestIndexDataCoordinate=function(option)
+    {
         var pageInfo=this.GetKLinePageInfo();   //获取当前屏信息
         if (!pageInfo) return;
-        if (!this.OverlayIndex) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.OverlayIndex.ChartPaint)) return;
+        if (!this.HQChart) return;
 
         var event=null;
         if (this.GetEventCallback) 
-            event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_OVERLAY_INDEX_Y_LABEL);
+            event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_INDEX_Y_LABEL);
 
         var endIndex=pageInfo.End.Index;
         var floatPrecision=2;
         if (IFrameSplitOperator.IsNumber(this.FloatPrecision)) floatPrecision=this.FloatPrecision;
-
-        for(var i=0, j=0;i<this.OverlayIndex.ChartPaint.length;++i)
+        for(var i=0, j=0;i<this.HQChart.ChartPaint.length;++i)
         {
-            var chart=this.OverlayIndex.ChartPaint[i];
+            var chart=this.HQChart.ChartPaint[i];
             if (!chart.ChartFrame) continue;
             if (!chart.GetItemData) continue;
-
-            var aryItem=chart.GetItemData( {Index:endIndex} );
-            if (!IFrameSplitOperator.IsNonEmptyArray(aryItem)) continue;
-            for(j=0; j<aryItem.length; ++j)
+            if (chart.ChartFrame.Identify==this.Frame.Identify || chart.ChartFrame==this.Frame)
             {
-                var item=aryItem[j];
-                var info=new CoordinateInfo();
-                info.Type=1;
-                info.TextColor=g_JSChartResource.FrameLatestPrice.TextColor;
-                info.LineColor=item.Color;
-                info.LineType=-1;           //默认不画线
-                info.IsLast=pageInfo.IsLast;//是否是最后一个数据
-                if (IFrameSplitOperator.IsNumber(option.LineType)) info.LineType=option.LineType;
+                var aryItem=chart.GetItemData( {Index:endIndex} );
+                if (!IFrameSplitOperator.IsNonEmptyArray(aryItem)) continue;
 
-                info.Value=item.Value;
-                var text=IFrameSplitOperator.FormatValueString(item.Value, floatPrecision,this.LanguageID);
+                for(j=0; j<aryItem.length; ++j)
+                {
+                    var item=aryItem[j];
 
-                if (option.Position=='left') info.Message[0]=text;
-                else info.Message[1]=text;
+                    var info=new CoordinateInfo();
+                    info.Type=1;
+                    info.TextColor=g_JSChartResource.FrameLatestPrice.TextColor;
+                    info.LineColor=item.Color;
+                    info.LineType=-1;   //默认不画线
+                    info.IsLast=pageInfo.IsLast;//是否是最后一个数据
+                    if (IFrameSplitOperator.IsNumber(option.LineType)) info.LineType=option.LineType;
+        
+                    info.Value=item.Value;
+                    var text=IFrameSplitOperator.FormatValueString(item.Value, floatPrecision,this.LanguageID);
 
-                if (!pageInfo.IsLast)
-                {
-                    var config={};
-                    if (!pageInfo.IsLast) config.EmptyBGColor=g_JSChartResource.FrameLatestPrice.EmptyBGColor;
+                    if (option.Position=='left') info.Message[0]=text;
+                    else info.Message[1]=text;
 
-                    info.ExtendData={ Custom:config };
-                }
+                    if (!pageInfo.IsLast)
+                    {
+                        var config={};
+                        if (!pageInfo.IsLast) config.EmptyBGColor=g_JSChartResource.FrameLatestPrice.EmptyBGColor;
 
-                if (event)
-                {
-                    var sendData={ PreventDefault:false, Label:info, Data:item, IndexName:chart.IndexName, OverlayIdentify:this.OverlayIndex.Identify };
-                    event.Callback(event,sendData,this);
+                        info.ExtendData={ Custom:config };
+                    }
 
-                    if (sendData.PreventDefault) continue;
+                    if (event)
+                    {
+                        var sendData={ PreventDefault:false, Label:info, Data:item, IndexName:chart.IndexName, FrameID:this.Frame.Identify };
+                        event.Callback(event,sendData,this);
+
+                        if (sendData.PreventDefault) continue;
+                    }
+        
+                    this.Frame.CustomHorizontalInfo.push(info);
                 }
-    
-                this.Frame.CustomHorizontalInfo.push(info);
             }
         }
-     }
+    }
+
+    this.CustomLatestOverlayIndexDataCoordinate=function(option)
+    {
+    var pageInfo=this.GetKLinePageInfo();   //获取当前屏信息
+    if (!pageInfo) return;
+    if (!this.OverlayIndex) return;
+    if (!IFrameSplitOperator.IsNonEmptyArray(this.OverlayIndex.ChartPaint)) return;
+
+    var event=null;
+    if (this.GetEventCallback) 
+        event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_OVERLAY_INDEX_Y_LABEL);
+
+    var endIndex=pageInfo.End.Index;
+    var floatPrecision=2;
+    if (IFrameSplitOperator.IsNumber(this.FloatPrecision)) floatPrecision=this.FloatPrecision;
+
+    for(var i=0, j=0;i<this.OverlayIndex.ChartPaint.length;++i)
+    {
+        var chart=this.OverlayIndex.ChartPaint[i];
+        if (!chart.ChartFrame) continue;
+        if (!chart.GetItemData) continue;
+
+        var aryItem=chart.GetItemData( {Index:endIndex} );
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryItem)) continue;
+        for(j=0; j<aryItem.length; ++j)
+        {
+            var item=aryItem[j];
+            var info=new CoordinateInfo();
+            info.Type=1;
+            info.TextColor=g_JSChartResource.FrameLatestPrice.TextColor;
+            info.LineColor=item.Color;
+            info.LineType=-1;           //默认不画线
+            info.IsLast=pageInfo.IsLast;//是否是最后一个数据
+            if (IFrameSplitOperator.IsNumber(option.LineType)) info.LineType=option.LineType;
+
+            info.Value=item.Value;
+            var text=IFrameSplitOperator.FormatValueString(item.Value, floatPrecision,this.LanguageID);
+
+            if (option.Position=='left') info.Message[0]=text;
+            else info.Message[1]=text;
+
+            if (!pageInfo.IsLast)
+            {
+                var config={};
+                if (!pageInfo.IsLast) config.EmptyBGColor=g_JSChartResource.FrameLatestPrice.EmptyBGColor;
+
+                info.ExtendData={ Custom:config };
+            }
+
+            if (event)
+            {
+                var sendData={ PreventDefault:false, Label:info, Data:item, IndexName:chart.IndexName, OverlayIdentify:this.OverlayIndex.Identify };
+                event.Callback(event,sendData,this);
+
+                if (sendData.PreventDefault) continue;
+            }
+
+            this.Frame.CustomHorizontalInfo.push(info);
+        }
+    }
+    },
+
+    //回调外部处理自定义Y轴刻度
+    this.InvokeCustomYCoordinateCallback=function()
+    {
+        if (!this.GetEventCallback) return null;
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_CUSTOM_Y_COORDINATE);
+        if (!event || !event.Callback) return null;
+
+        var data={ ID:this.Frame.Identify, Frame:this.Frame, PreventDefault:false, Custom:this.Custom };
+        if (this.OverlayIdentify) data.OverlayIdentify=this.OverlayIdentify;
+        event.Callback(event,data,this);
+
+        return data;
+    }
 }
 
 //字符串格式化 千分位分割
@@ -48532,6 +48560,10 @@ function FrameSplitKLinePriceY()
     this.CustomCoordinate=function(floatPrecision)
     {
         this.Frame.CustomHorizontalInfo=[];
+
+        var data=this.InvokeCustomYCoordinateCallback();
+        if (data && data.PreventDefault==true) return;
+
         var lastCoordinate, pageLastCoordinate;
         for(var i=0; i<this.Custom.length; ++i)
         {
@@ -49179,6 +49211,9 @@ function FrameSplitY()
     {
         this.Frame.CustomHorizontalInfo=[];
 
+        var data=this.InvokeCustomYCoordinateCallback();
+        if (data && data.PreventDefault==true) return;
+
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Custom)) return;
 
         for(var i=0; i<this.Custom.length; ++i)
@@ -49560,6 +49595,9 @@ function FrameSplitMinutePriceY()
 
     this.CustomCoordinate=function()    //自定义刻度
     {
+        var data=this.InvokeCustomYCoordinateCallback();
+        if (data && data.PreventDefault==true) return;
+
         if (!this.Custom) return;
 
         var defaultfloatPrecision=GetfloatPrecision(this.Symbol);
@@ -70373,12 +70411,47 @@ function KLineChartContainer(uielement,OffscreenElement)
             }
         }
 
-        if (!isInClient) return;
+        if (!isInClient) 
+        {
+           if (!this.OnWheel_ZoomUpDownFrameY(e,x,y)) return;
+        }
 
         if(e.preventDefault) e.preventDefault();
         else e.returnValue = false;
     }
 
+    //通过滚轴缩放Y轴
+    this.OnWheel_ZoomUpDownFrameY=function(e, x, y)
+    {
+        if (!this.EnableYDrag.Wheel) return false;
+
+        var dragY=this.TryYDrag(x,y);
+        if (!dragY) return false;
+       
+        if ((dragY.Left && !dragY.IsOverlay) || dragY.Right)
+        {
+            
+        }
+        else
+        {
+            return false;
+        }
+
+        var wheelValue=e.wheelDelta;
+        if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
+            wheelValue=e.deltaY* -0.01;
+
+        var yMove=this.EnableYDrag.WheelYMove;
+        if (wheelValue>0) yMove*=-1;
+        dragY.Position=0;   //只能两边缩放
+        if (!this.Frame.OnZoomUpDownFrameY(dragY, yMove)) return false;
+
+        this.Frame.SetSizeChage(true);
+        this.Draw();
+
+        return true;
+    }
+
     //创建
     //windowCount 窗口个数
     this.Create=function(windowCount, option)
@@ -114729,7 +114802,7 @@ function ScriptIndex(name,script,args,option)
     //是否超出执行的最大次数
     this.IsExcessRunCount=function()
     {
-        if (this.MaxRunCount<=0) return false;   //没有限制
+        if (this.MaxRunCount<0) return false;   //没有限制
 
         return this.RunCount>=this.MaxRunCount;
     }
@@ -131496,7 +131569,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12789";
+var HQCHART_VERSION="1.1.12797";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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