hqchart 1.1.14394 → 1.1.14404

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

@@ -4920,6 +4920,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             }
         }
 
+        if (option.EnableYDrag)
+        {
+            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.PageInfo) chart.SetPageInfo(option.PageInfo);
 
@@ -4995,7 +5004,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 }
                 if (item.Height>=0) chart.Frame.SubFrame[i].Height = item.Height;
                 if (item.Custom) chart.Frame.SubFrame[i].Frame.YSplitOperator.Custom=item.Custom;
-                if (item.RightTextFormat>0) chart.Frame.SubFrame[i].Frame.YSplitOperator.RightTextFormat=item.RightTextFormat;
                 if (IFrameSplitOperator.IsNumber(item.TitleHeight)) chart.Frame.SubFrame[i].Frame.ChartBorder.TitleHeight=item.TitleHeight;
                 if (IFrameSplitOperator.IsNumber(item.BorderLine)) chart.Frame.SubFrame[i].Frame.BorderLine=item.BorderLine;
                 if (IFrameSplitOperator.IsBool(item.EnableRemoveZero)) chart.Frame.SubFrame[i].Frame.YSplitOperator.EnableRemoveZero=item.EnableRemoveZero;
@@ -5013,6 +5021,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
                 if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
                 if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) subFrame.HorizontalReserved=item.HorizontalReserved;
+
+                if (i==0)
+                {
+                    if (IFrameSplitOperator.IsNumber(item.RightTextFormat)) 
+                    {
+                        subFrame.YSplitOperator.RightTextFormat=item.RightTextFormat;
+                        if (item.RightTextFormat==2) subFrame.MultiTextFormat=1;
+                    }
+                }
             }
 
             chart.UpdateXShowText();
@@ -16405,7 +16422,7 @@ function AverageWidthFrame()
             var item=aryText[i];
             var message=item.Item;
 
-            this.Canvas.textBaseline=message.TextBaseline;
+            this.Canvas.textBaseline=item.TextBaseline;
             if (message.ExtendData && message.ExtendData.Font) this.Canvas.font=message.ExtendData.Font;
             else if (message.Font) this.Canvas.font=message.Font;
 
@@ -18028,20 +18045,17 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1)    //显示1行 格式:价格/百分比
+                    if (this.MultiTextFormat==1 && IFrameSplitOperator.IsNonEmptyArray(item.Message[1]))    //显示1行 格式:价格/百分比
                     {
-                        if (item.ExtendData)
-                        {
-                            if (item.ExtendData.Font) this.Canvas.font=item.ExtendData.Font;
-                            var width1=this.Canvas.measureText(item.Message[1][0]).width;
-                            var width2=this.Canvas.measureText(item.Message[1][1]).width;
-                            var width3=this.Canvas.measureText('/').width;
-                            textWidth=width1+width3;
-
-                            if (rightExtendWidth<width2) rightExtendWidth=width2;
+                        if (item.ExtendData && item.ExtendData.Font) this.Canvas.font=item.ExtendData.Font;
+                        
+                        var width1=this.Canvas.measureText(item.Message[1][0]).width;
+                        var width2=this.Canvas.measureText(item.Message[1][1]).width;
+                        var width3=this.Canvas.measureText('/').width;
+                        textWidth=width1+width3;
+                        if (rightExtendWidth<width2) rightExtendWidth=width2;
 
-                            //JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[1][1]}/${item.Message[1][0]} ${textWidth}, ${rightExtendWidth}`);
-                        }
+                        //JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[1][1]}/${item.Message[1][0]} ${textWidth}, ${rightExtendWidth}`);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
                     {
@@ -41066,7 +41080,7 @@ function ChartMinutePriceLine()
             if (value==null) continue;
 
             var x=this.ChartFrame.GetXFromIndex(j);
-            var y=this.ChartFrame.GetYFromData(value);
+            var y=this.ChartFrame.GetYFromData(value,false);
 
             if (bFirstPoint)
             {
@@ -56303,7 +56317,7 @@ function FrameSplitMinutePriceY()
     this.DefaultSplitType=0;
     this.LimitPrice;                    //{Max: Min:} 涨跌停价
     this.Custom;
-    this.RightTextFormat=0;           //右边刻度显示模式 0=百分比  1=价格
+    this.RightTextFormat=0;           //右边刻度显示模式 0=百分比  1=价格 2=价格 | 百分比
 
     this.BeforeOpenData;
     this.IsBeforeData=false;
@@ -56319,9 +56333,12 @@ function FrameSplitMinutePriceY()
     this.GlobalOption;
     this.HQChart;
 
+    this.FixedYMaxMin;      //{ Max, Min} 固定Y轴最大最小值
+    this.EnableZoomUpDown=false;
+
     this.IsEnableDragY=function()
     {
-        return false;
+        return true;
     }
 
     this.Operator=function()
@@ -56330,23 +56347,35 @@ function FrameSplitMinutePriceY()
         this.Frame.CustomHorizontalInfo=[];
         if (!this.Data) return;
 
-        var range=this.GetMaxMin();
+        var range=null;
+        var isFixedMaxMin=(this.FixedYMaxMin && IFrameSplitOperator.IsNumber(this.FixedYMaxMin.Max) && IFrameSplitOperator.IsNumber(this.FixedYMaxMin.Min));
+        if (isFixedMaxMin)
+        {
+            range={ Max:this.FixedYMaxMin.Max, Min:this.FixedYMaxMin.Min };
+            JSConsole.Chart.Log(`[FrameSplitMinutePriceY::Operator] FixedYMaxMin.Max=${this.FixedYMaxMin.Max} FixedYMaxMin.Min=${this.FixedYMaxMin.Min} `);
+        }
+        else
+        {
+            range=this.GetMaxMin();
+        }
 
         if (this.Symbol && MARKET_SUFFIX_NAME.IsUSA(this.Symbol.toUpperCase()))
         {
-            this.USASplit(range);
+            this.USASplit(range,isFixedMaxMin);
         }
         else if (this.SplitType==2)
         {
-            this.USASplit(range);
+            this.USASplit(range,isFixedMaxMin);
         }
         else
         {
-            this.DefaultSplit(range);
+            this.DefaultSplit(range,isFixedMaxMin);
         }
 
         this.CustomCoordinate();
 
+        if (this.EnableZoomUpDown==true && !this.FixedYMaxMin) this.FixedYMaxMin={ Max:range.Max, Min:range.Min };
+
         this.ReservedHeight({ Max:this.Frame.HorizontalMax, Min:this.Frame.HorizontalMin });     //预留高度
 
         if (this.GetEventCallback)
@@ -56742,10 +56771,21 @@ function FrameSplitMinutePriceY()
                 var per=(price/this.YClose-1)*100;
                 if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
                 else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
+                var strPer=IFrameSplitOperator.FormatValueString(per,2)+'%';
                 if (this.IsShowRightText) 
                 {
-                    if (this.RightTextFormat==1) coordinate.Message[1]=strPrice;
-                    else coordinate.Message[1]=IFrameSplitOperator.FormatValueString(per,2)+'%'; //百分比
+                    if (this.RightTextFormat==1) 
+                    {
+                        coordinate.Message[1]=strPrice;
+                    }
+                    else if (this.RightTextFormat==2) //价格/百分比
+                    {
+                        coordinate.Message[1]=[strPrice,strPer];
+                    }
+                    else 
+                    {
+                        coordinate.Message[1]=strPer; //百分比
+                    }
                 }
             }
 
@@ -56777,22 +56817,25 @@ function FrameSplitMinutePriceY()
         this.Frame.HorizontalMin=min;
     }
 
-    this.DefaultSplit=function(range)
+    this.DefaultSplit=function(range,isFixedMaxMin)
     {
         var max=range.Max;
         var min=range.Min;
         
-        if (this.YClose==max && this.YClose==min)
-        {
-            max=this.YClose+this.YClose*0.1;
-            min=this.YClose-this.YClose*0.1
-        }
-        else
+        if (!isFixedMaxMin)
         {
-            var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));
-            max=this.YClose+distanceValue;
-            min=this.YClose-distanceValue;
-            if (min<0) min=range.Min;
+            if (this.YClose==max && this.YClose==min)
+            {
+                max=this.YClose+this.YClose*0.1;
+                min=this.YClose-this.YClose*0.1
+            }
+            else
+            {
+                var distanceValue=Math.max(Math.abs(this.YClose-max),Math.abs(this.YClose-min));
+                max=this.YClose+distanceValue;
+                min=this.YClose-distanceValue;
+                if (min<0) min=range.Min;
+            }
         }
 
         var pixelTatio = GetDevicePixelRatio(); //获取设备的分辨率
@@ -56805,7 +56848,7 @@ function FrameSplitMinutePriceY()
         const minDistance=[1, 0.1, 0.01, 0.001, 0.0001];
         var defaultfloatPrecision=GetfloatPrecision(this.Symbol);
         if (isPhoneModel && MARKET_SUFFIX_NAME.IsSHSZIndex(this.Symbol)) defaultfloatPrecision = 0;    //手机端指数不显示小数位数,太长了
-        if (distance<minDistance[defaultfloatPrecision]) 
+        if (distance<minDistance[defaultfloatPrecision] && !isFixedMaxMin) 
         {
             distance=minDistance[defaultfloatPrecision];
             max=this.YClose+(distance*(showCount-1)/2);
@@ -56826,11 +56869,21 @@ function FrameSplitMinutePriceY()
                 var per=(price/this.YClose-1)*100;
                 if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
                 else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
-
+                var strPer=`${IFrameSplitOperator.FormatValueString(per,2)}%`;
                 if (this.IsShowRightText) 
                 {
-                    if (this.RightTextFormat==1)  coordinate.Message[1]=strPrice;
-                    else coordinate.Message[1]=IFrameSplitOperator.FormatValueString(per,2)+'%'; //百分比
+                    if (this.RightTextFormat==1)  
+                    {
+                        coordinate.Message[1]=strPrice;
+                    }
+                    else if (this.RightTextFormat==2) //价格/百分比
+                    {
+                        coordinate.Message[1]=[strPer,strPrice];
+                    }
+                    else 
+                    {
+                        coordinate.Message[1]=strPer; //百分比
+                    }
                 }
 
                 if (Math.abs(price-this.YClose) <0.00000000001) //小数有精度问题 使用差值
@@ -87544,14 +87597,30 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var moveSetp=moveData.X;
         var yMoveSetp=moveData.Y;
 
-        if (this.RectSelectDrag && this.RectSelectDrag.Index>=0)    //区间选择
+        var bNeedDraw=true;
+        if (this.UpDownDrag && this.UpDownDrag.Index>=0)
+        {
+            if (yMoveSetp>=5)
+            {
+                var yMove=e.clientY-drag.LastMove.Y;
+                JSConsole.Chart.Log("[MinuteChartContainer::OnDragMode_One] UpDownDrag ",this.UpDownDrag,yMove);
+                //this.UIElement.style.cursor="pointer";
+                this.SetCursor({Cursor:"pointer"});
+                if (this.OnUpDonwFrameY(this.UpDownDrag, yMove)) 
+                {
+                    drag.LastMove.Y=e.clientY;
+                    bNeedDraw=true;
+                }
+            }
+        }
+        else if (this.RectSelectDrag && this.RectSelectDrag.Index>=0)    //区间选择
         {
             if (moveSetp<5) return;
             var obj={ X:e.clientX, Y:e.clientY, PointIndex:this.RectSelectDrag.Index, Name:"MoveRectSelectLine" };
             if (this.MoveRectSelectPoint(obj))
             {
                 drag.LastMove.X=e.clientX;
-                this.Draw();
+                bNeedDraw=true;
             }
         }
         else
@@ -87569,6 +87638,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
+
+        if (bNeedDraw) this.Draw();
     }
 
     this.OnMinuteSelectRectMouseUp=function(e)
@@ -87586,8 +87657,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;
         selectData.JSChartContainer=this;
         selectData.Stock={Symbol:this.Symbol, Name:this.Name};
+        
+        if (this.UpDownDrag)
+        {
 
-        if (this.EnableSelectRect && !this.BorderDrag && this.GetSelectRectData(selectData))
+        }
+        else if (this.EnableSelectRect && !this.BorderDrag && this.GetSelectRectData(selectData))
         {
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
             var paint=this.GetRectSelectPaint();
@@ -87958,25 +88033,83 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+
+    this.GetDataIndexByDatTime=function(date, time)
+    {
+        var result={ DayIndex:-1, DataIndex:-1, Index:-1 };
+        var frame=this.Frame.SubFrame[0].Frame;
+        var minCount=frame.MinuteCount; //每天的分钟个数
+        var kData=this.GetKData();
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var minItem=kData.Data[i];
+            if (!minItem) continue;
+
+            if (minItem.Date==date && minItem.Time==time)
+            {
+                result.Index=i;
+                result.DayIndex=parseInt(i/minCount);
+                result.DataIndex=i%minCount;
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    //获取十字光标位置 通过日期和时间 目前只支持连续交易时间段
+    this.GetCorssCursorIndexByDateTime=function(date, time)
+    {
+        var border=this.Frame.ChartBorder.GetBorder();
+
+        if (border.DayBorder)   //多日分时主图+多日集合竞价
+        {
+            var corssCursorIndex=this.GetDataIndexByDatTime(date, time);
+            corssCursorIndex.Type=10;
+        }
+        else                    //单日,多日
+        {
+            var corssCursorIndex=this.GetDataIndexByDatTime(date, time);
+            corssCursorIndex.Type=1;
+            corssCursorIndex.DayIndex=0;
+            corssCursorIndex.DataIndex=corssCursorIndex.Index;
+        }
+
+        return corssCursorIndex;
+    }
+
     this.LockCorssCursor=function(option)
     {
         var xItem=this.GlobalOption.LockCorssCursor.X;
+
+        var corssCursorIndex={ DayIndex:-1, DataIndex:-1, Type:-1, Index:this.CursorIndex };
+        if (this.EnableNewIndex)
+        {
+            corssCursorIndex.Type=this.CorssCursorIndex.Type;
+            corssCursorIndex.DayIndex=this.CorssCursorIndex.DayIndex;  
+            corssCursorIndex.DataIndex=this.CorssCursorIndex.DataIndex;
+        }
+
+        if (option && option.KItem) //指定日期时间
+        {
+            corssCursorIndex=this.GetCorssCursorIndexByDateTime(option.KItem.Date, option.KItem.Time);
+        }
         
         if (this.EnableNewIndex)
         {
-            if (this.CorssCursorIndex.Type!=1 && this.CorssCursorIndex.Type!=10) return false;    //目前只支持连续交易时间段
+            if (corssCursorIndex.Type!=1 && corssCursorIndex.Type!=10) return false;    //目前只支持连续交易时间段
 
             xItem.Minute=
             { 
-                DayIndex:this.CorssCursorIndex.DayIndex,  
-                DataIndex:this.CorssCursorIndex.DataIndex, 
-                Type:this.CorssCursorIndex.Type,
-                CursorIndex:this.CursorIndex,
+                DayIndex:corssCursorIndex.DayIndex,  
+                DataIndex:corssCursorIndex.DataIndex, 
+                Type:corssCursorIndex.Type,
+                CursorIndex:corssCursorIndex.Index,
             };
         }
         else
         {
-            xItem.Minute={ CursorIndex:this.CursorIndex };
+            xItem.Minute={ CursorIndex:corssCursorIndex.Index };
         }
 
         xItem.Enable=true;
@@ -88052,12 +88185,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var x=null;
         var dayIndex=corssCursorIndex.DayIndex;
         var dataIndex=corssCursorIndex.DataIndex;
-        switch(corssCursorIndex.Type)   //单日  1=主图 2=盘前 3=盘后  //多日  10=主图 20=盘前 30=盘后
+        var frame=this.Frame.SubFrame[0].Frame;
+        switch(corssCursorIndex.Type)   //单日,多日   1=主图 2=盘前 3=盘后  //多日+多日集合竞价  10=主图 20=盘前 30=盘后
         {
-            case 1:     //单日  1=主图
-            case 10:    //多日  10=主图
+            case 1:     //单日，多日  1=主图
                 x=this.Frame.GetXFromIndex(dataIndex)
                 break;
+            case 10:    //多日+多日集合竞价  10=主图
+                var cursorIndex=frame.MinuteCount*dayIndex+dataIndex;
+                x=this.Frame.GetXFromIndex(cursorIndex);
+                break;
                 /*
             case 2:     //单日  2=盘前
                 x=this.Frame.SubFrame[0].Frame.GetLeftExtendXFromIndex(dataIndex,this.GetBeforeOpenData());
@@ -88855,6 +88992,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var bShowCorss=false;   //十字光标十字线
         if (this.ChartCorssCursor) bShowCorss=this.ChartCorssCursor.IsShowCorss;
 
+        var minItem=null;
+        if (frameID>=0 && option && IFrameSplitOperator.IsNumber(option.CursorIndex))
+        {
+            var kData=this.GetKData();
+            if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
+            {
+                var dataIndex=kData.DataOffset+parseInt(option.CursorIndex.toFixed(0));
+                if (dataIndex>=0 && dataIndex<kData.Data.length) minItem=kData.Data[dataIndex];
+            }
+        }
+
         var aryMenu=
         [
             { 
@@ -88986,7 +89134,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             }
             else if (item.Name=="其他设置")
             {
-
+                if (minItem)
+                {
+                    var bLocked=this.IsLockCorssCursor();
+                    if (bLocked)
+                        item.SubMenu.push({ Name:"锁十字光标", Data:{ ID: JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR }, Checked:bLocked });
+                    else  
+                        item.SubMenu.push({ Name:"锁十字光标", Data:{ ID: JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR, Args:[{ KItem:{Date:minItem.Date, Time:minItem.Time}, Draw:true }] }, Checked:bLocked });
+                }
             }
         }
 
@@ -89002,6 +89157,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     {
         JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick]", e);
 
+        if (this.EnableYDrag && (this.EnableYDrag.Left || this.EnableYDrag.Right) && this.Frame && this.Frame.PtInFrameY)
+        {
+            var pixelTatio = GetDevicePixelRatio();
+            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)
+            {
+                this.CancelZoomUpDownFrameY(dragY);
+            }
+        }
+
         if (this.ClickChartTimer!=null)
         {
             clearTimeout(this.ClickChartTimer);
@@ -152986,7 +153153,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14393";
+var HQCHART_VERSION="1.1.14403";
 
 function PrintHQChartVersion()
 {