hqchart 1.1.14734 → 1.1.14746

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

@@ -7080,6 +7080,18 @@ var JSCHART_MENU_ID=
     CMD_REPORT_CHANGE_COLUMN_ID:105,     //报价列表 切换列  Arg[Column, ]
 }
 
+var JSCHART_TRADE_STATUS_ID=
+{
+    START_ID:1000,             //8：45～9：15
+    BEFORE_OPEN_ID:2000,       //9：15~9：25 是开盘集合竞价阶段
+    TRADE_ID:3000,             //9：25~14：57 是连续竞价阶段
+    AFTER_CLOSE_ID:4000,       //14：57～15：00 是收盘集合竞价阶段
+    CLOSE_ID:5000,             //15：00 后，首先发 CLOSE 标志
+    ENDTR_ID:6000,             //交易结束
+    //上面状态个位数 是停牌状态 如3001 连续交易时间段停牌
+    SUSP_ID:1,                 //停牌
+}
+
 
 function PhoneDBClick()
 {
@@ -7296,6 +7308,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         //图形中的单元选中状态
         MapIndexChartCache:new Map(),      //key 指标GUID
+
+        TradeStatus:null,   //当前交易状态 { Date, Time：数据最后更新的时间, Status: }
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -10330,7 +10344,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         
         var bDrawDialogTooltip=false;
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
-        var corssCursorPos=this.GetCorssCursorPosition()
+        var corssCursorPos=this.GetCorssCursorPosition();
         if (corssCursorPos.LastPoint.X!=null || corssCursorPos.LastPoint.Y!=null)
         {
             if (this.ChartCorssCursor)
@@ -10784,6 +10798,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DrawDynamicInfo=function(option)
     {
         this.LastMouseStatus.MouseOnToolbar=null;   //鼠标在工具栏按钮上
+        if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
 
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_BEFORE_DRAW_DYNAMIC_INFO);
         if (event && event.Callback)
@@ -15819,6 +15834,26 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         return false;
     }
+
+    //更新交易状态
+    this.UpdateTradeStatusData=function(data, option)
+    {
+        if (option)
+        {
+            //是否清空
+            if (option.IsClear===true) this.GlobalOption.TradeStatus=null;
+        }
+
+        if (!data) return false;
+
+        if (IFrameSplitOperator.IsNumber(data.Date) && IFrameSplitOperator.IsNumber(data.Time) && IFrameSplitOperator.IsNumber(data.Status))
+        {
+            this.GlobalOption.TradeStatus={ Date:data.Date, Time:data.Time, Status:data.Status };
+            return true;
+        }
+
+        return false;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -16354,6 +16389,40 @@ function ChartBorder()
     {
         return this.TitleHeight;
     }
+
+    //是否显示单日集合竞价 盘前
+    this.IsShowBeforeOpen=function()
+    {
+        if (this.LeftExtendWidth<10) return false;
+
+        return true;
+    }
+
+    //是否显示单日集合竞价 盘后
+    this.IsShowAfterClose=function()
+    {
+        if (this.RightExtendWidth<10) return false;
+
+        return true;
+    }
+
+    //是否显示多日集合竞价 盘前
+    this.IsShowMultiDayBeforeOpen=function()
+    {
+        if (!this.MultiDayMinute) return false;
+        if (this.MultiDayMinute.Count<=1 || this.MultiDayMinute.Left<=0) return false;
+
+        return true;
+    }
+
+    //是否显示多日集合竞价 盘后
+    this.IsShowMultiDayAfterClose=function()
+    {
+        if (!this.MultiDayMinute) return false;
+        if (this.MultiDayMinute.Count<=1 || this.MultiDayMinute.Right<=0) return false;
+
+        return true;
+    }
 }
 
 //框架外部挂接
@@ -17024,7 +17093,7 @@ function AverageWidthFrame()
         }
         else
         {
-            var right=border.Right-3;
+            var right=border.RightEx-3;
             var left=border.Left;
             var yButton=border.Top+this.ChartBorder.TitleHeight/2;
 
@@ -58332,7 +58401,7 @@ function FrameSplitY()
         
         this.RightFrameSplitY();
         this.MainOverlayFrameSplitY();  //主图Y轴绑定叠加Y轴坐标
-        this.CallAcutionSplitY(this.SplitCount,splitData);
+        this.CallAcutionSplitYV2(splitData, this.Frame.HorizontalInfo.slice());
 
         if (this.EnableRemoveZero) this.RemoveZero(this.Frame.HorizontalInfo);
 
@@ -58413,6 +58482,173 @@ function FrameSplitY()
         }
     }
 
+    this.CallAcutionSplitYV2=function(splitData, aryHorizontalInfo)
+    {
+        if (!this.IsCallAuctionFrame()) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryHorizontalInfo)) return;
+
+        var aryCallAcution=this.GetCallAcutionSplitYV2(splitData,aryHorizontalInfo);
+        if (!aryCallAcution) return;
+
+        for(var i=0; i<this.Frame.HorizontalInfo.length; ++i) //把显示的数据迁移到 Message[2] Message[3]
+        {
+            var item=this.Frame.HorizontalInfo[i];
+            if (aryCallAcution.IsBeforeData)
+            {
+                item.Message[2]=item.Message[0];    
+                item.Message[0]=null;
+            }
+
+            if (aryCallAcution.IsAfterData &&  (this.ShareAfterVol==0 || this.ShareAfterVol==2) )
+            {
+                item.Message[3]=item.Message[1];
+                item.Message[1]=null;
+            }
+        }
+
+        //集合竞价的坐标插入最后
+        for(var i=0; i<aryCallAcution.HorizontalInfo.length; ++i)
+        {
+            var item=aryCallAcution.HorizontalInfo[i];
+            this.Frame.HorizontalInfo.push(item);
+        }
+    }
+
+    this.GetCallAcutionSplitYV2=function(splitData, arySource)
+    {
+        if (!this.IsCallAuctionFrame()) return null;
+
+        var bBeforeData=(this.IsBeforeData==true && this.BeforeOpenData && (this.BeforeOpenData.Ver==2.0 || this.BeforeOpenData.Ver==3.0));
+        var bAfterData=(this.IsAfterData==true && this.AfterCloseData && (this.AfterCloseData.Ver==2.0 || this.AfterCloseData.Ver==3.0));
+
+        var bottom=this.Frame.ChartBorder.GetBottomEx();
+        var height=this.Frame.ChartBorder.GetHeightEx();
+        var bHScreen=this.Frame.IsHScreen;
+        if (this.Frame.IsHScreen)
+        {
+            var border=this.Frame.GetBorder();
+            var width=border.RightEx-border.LeftEx;
+        }
+
+        if (bBeforeData || bAfterData)
+        {
+            var aryHorizontalInfo=[];
+            for(var i=0;i<arySource.length;++i)
+            {
+                var hItem=arySource[i];
+                if (!hItem || !IFrameSplitOperator.IsNumber(hItem.Value)) continue;
+                var y=this.Frame.GetYFromData(hItem.Value);
+
+                var item=new CoordinateInfo();
+                item.Value=hItem.Value;
+                item.LineType=8;
+                if (bBeforeData)
+                {
+                    if (bHScreen)
+                    {
+                        var value=(y-border.LeftEx)/width*(this.BeforeOpenData.VolMax-this.BeforeOpenData.VolMin)+this.BeforeOpenData.VolMin;
+                    }
+                    else
+                    {
+                        var value=(bottom-y)/height*(this.BeforeOpenData.VolMax-this.BeforeOpenData.VolMin)+this.BeforeOpenData.VolMin;
+                    }
+                    
+                    item.Message[0]=this.FormatValueString(value);
+                }
+
+                if (bAfterData && (this.ShareAfterVol==0 || this.ShareAfterVol==2) )
+                {
+                    if (bHScreen)
+                    {
+                        var value=(y-border.LeftEx)/width*(this.AfterCloseData.VolMax-this.AfterCloseData.VolMin)+this.AfterCloseData.VolMin;
+                    }
+                    else
+                    {
+                        var value=(bottom-y)/height*(this.AfterCloseData.VolMax-this.AfterCloseData.VolMin)+this.AfterCloseData.VolMin;
+                    }
+                    
+                    item.Message[1]=this.FormatValueString(value);
+                }   
+
+                aryHorizontalInfo.push(item);
+            }
+
+            return { HorizontalInfo:aryHorizontalInfo,  IsBeforeData:bBeforeData, IsAfterData:bAfterData };
+        }
+
+        var bMultiDayBeforeData=false, bMultiDayAfterData=false;
+        var beforeDayData=null, afterDayData=null;
+        if (this.MultiDayBeforeOpenData && IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData)) 
+        {
+            bMultiDayBeforeData=true;
+            var firstDayData=this.MultiDayBeforeOpenData[0];
+            if (firstDayData.Ver==2.0 || firstDayData.Ver==3.0)
+                beforeDayData=firstDayData;
+        }
+
+        if (this.MultiDayAfterCloseData && IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) 
+        {
+            bMultiDayAfterData=true;
+            var firstDayData=this.MultiDayAfterCloseData[0];
+            if (firstDayData.Ver==2.0 || firstDayData.Ver==3.0)
+                afterDayData=firstDayData;
+        }
+
+        if (bMultiDayBeforeData || bMultiDayAfterData)
+        {
+            var aryHorizontalInfo=[];
+            for(var i=0;i<arySource.length;++i)
+            {
+                var hItem=arySource[i];
+                if (!hItem || !IFrameSplitOperator.IsNumber(hItem.Value)) continue;
+                var y=this.Frame.GetYFromData(hItem.Value);
+
+                var item=new CoordinateInfo();
+                item.Value=hItem.Value;
+                item.LineType=9;
+               
+                var isVaild=false;
+                if (beforeDayData)
+                {
+                    if (bHScreen)
+                    {
+                        var value=(y-border.LeftEx)/width*(beforeDayData.VolMax-beforeDayData.VolMin)+beforeDayData.VolMin;
+                    }
+                    else
+                    {
+                        var value=(bottom-y)/height*(beforeDayData.VolMax-beforeDayData.VolMin)+beforeDayData.VolMin;
+                    }
+                    
+                    item.Message[0]=this.FormatValueString(value);
+                    isVaild=true;
+                }
+
+                if (afterDayData && (this.ShareAfterVol==0 || this.ShareAfterVol==2))
+                {
+                    if (bHScreen)
+                    {
+                        var value=(y-border.LeftEx)/width*(afterDayData.VolMax-afterDayData.VolMin)+afterDayData.VolMin;
+                    }
+                    else
+                    {
+                        var value=(bottom-y)/height*(afterDayData.VolMax-afterDayData.VolMin)+afterDayData.VolMin;
+                    }
+                    
+                    item.Message[1]=this.FormatValueString(value);
+                    isVaild=true;
+                } 
+
+                if (isVaild) aryHorizontalInfo.push(item);
+            }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(aryHorizontalInfo))
+                return { HorizontalInfo:aryHorizontalInfo,  IsBeforeData:bMultiDayBeforeData, IsAfterData:bMultiDayAfterData };
+        }
+
+        return null;
+    }
+
+    /* 废弃 使用 CallAcutionSplitYV2
     this.CallAcutionSplitY=function(count,splitData)
     {
         if (!this.IsCallAuctionFrame()) return;
@@ -58443,6 +58679,7 @@ function FrameSplitY()
             this.Frame.HorizontalInfo.push(item);
         }
     }
+    */
 
     this.IsCallAuctionFrame=function()
     {
@@ -58453,6 +58690,7 @@ function FrameSplitY()
         return this.HQChart.IsCallAuctionFrame(this.Frame.Identify);
     }
 
+    /* 废弃 使用 GetCallAcutionSplitYV2
     this.GetCallAcutionSplitY=function(count,splitData)
     {
         if (!this.IsCallAuctionFrame()) return null;
@@ -58547,6 +58785,7 @@ function FrameSplitY()
 
         return null;
     }
+    */
 
     this.RightFrameSplitY=function()
     {
@@ -64206,7 +64445,17 @@ function DynamicMinuteTitlePainting()
     {
         this.OnDrawEventCallback(null);
 
-        if (this.IsAlwaysShowLastData) 
+        var bShowLastData=this.IsAlwaysShowLastData
+        if (this.DrawStatus && this.DrawStatus.IsTitleShowLatestData)
+        {
+            var status=this.DrawStatus;
+            if (!IFrameSplitOperator.IsNumber(status.FrameID) || status.FrameID<0)
+                bShowLastData=true;
+            else if (status.CorssCursorTouchEnd && status.IsOnTouch==false)
+                bShowLastData=true;
+        }
+
+        if (bShowLastData) 
         {
             this.Canvas.save();
             this.DrawLastDataItem();
@@ -64406,6 +64655,7 @@ function DynamicChartTitlePainting()
     this.IsShowIndexTitle=true;    //是否显示指标标题信息
     this.IsShowNameArrow=false;
     this.NameArrowConfig=CloneData(g_JSChartResource.IndexTitle.NameArrow);
+    this.CustomLocation;    //自定义位置 { IsShow:, Top:， TitleHeight: }
 
     this.TradeIndex;    //专家系统名字{Name:'名字', Param:'参数'}
     this.IsShowTradeIndexTitle=true;
@@ -65095,7 +65345,16 @@ function DynamicChartTitlePainting()
         if (this.Frame.IsShowIndexTitle==false) return;
         if (g_JSChartResource.IsDOMFrameTitle===true) return;
         if (!this.Data) return;
-        if (this.Frame.ChartBorder.TitleHeight<5) return;
+        if (this.CustomLocation)
+        {
+            if (!this.CustomLocation.IsShow) return;
+            if (!IFrameSplitOperator.IsNumber(this.CustomLocation.Top) || !IFrameSplitOperator.IsNumber(this.CustomLocation.TitleHeight)) return;
+        }
+        else
+        {
+            if (this.Frame.ChartBorder.TitleHeight<5) return;
+        }
+        
         if (this.CursorIndex==null && !(this.GlobalOption && this.GlobalOption.IsDisplayLatest)) return;
 
         if (this.Frame.IsHScreen===true)
@@ -65117,6 +65376,11 @@ function DynamicChartTitlePainting()
 
         var left=this.Frame.ChartBorder.GetLeft()+this.MerginLeft;
         var bottom=this.Frame.ChartBorder.GetTop()+this.Frame.ChartBorder.TitleHeight/2;    //上下居中显示
+        if (this.CustomLocation)    //自定义标题位置
+        {
+            bottom=this.Frame.ChartBorder.GetTop()+this.CustomLocation.Top+this.CustomLocation.TitleHeight/2;
+        }
+
         var right=this.Frame.ChartBorder.GetRight();
 
         var toolbarInfo={ Width:0, YCenter:bottom };
@@ -95271,6 +95535,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.UpdateCallCationData(beforeOpenData,afterCloseData);
             this.UpdateLineColorData(aryColorData,data.stock[0].date);
             this.UpdateLatestMinuteData(aryMinuteData, data.stock[0].date, data.stock[0]);
+            this.UpdateTradeStatusData(data.TradeStatus);
             this.UpdateHistoryMinuteUI(updateTime);
             this.RecvMinuteDataEvent({FunctionName:"RecvMinuteData"} );
             this.RequestOverlayMinuteData();    //请求叠加数据 (主数据下载完再下载)
@@ -95297,6 +95562,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.ColorLineData=aryColorData;
 
+        this.UpdateTradeStatusData(data.TradeStatus);
         this.UpdateMinuteUI(data.stock[0],  {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} });
 
         if (data.AutoUpdate===false)    //不执行自动更新
@@ -148133,7 +148399,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14733";
+var HQCHART_VERSION="1.1.14745";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -55762,7 +55762,6 @@ HQData.Minute_RequestMinuteData=function(data, callback)
 
         var lastPrice=stockItem.minute[stockItem.minute.length-1].price;
 
-
         if (bBuySellBar)    //盘口分析
         {
             var aryBuy=[];
@@ -55803,6 +55802,95 @@ HQData.Minute_RequestMinuteData=function(data, callback)
     }, 50);
 }
 
+HQData.Minute_RequestMinuteDataV2=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var callcation=data.Request.Data.callcation;        //集合竞价
+    console.log(`[HQData::Minute_RequestMinuteDataV2] Symbol=${symbol}`);
+
+    setTimeout(()=>
+    {
+        var fullData=HQData.GetDayMinuteDataBySymbol(symbol);
+        var srcStock=fullData[0];
+        var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:symbol, name:symbol };
+
+        if (callcation.Before)
+        {
+            var TEST_BEFORE_DATA=
+            [
+                [8.52, 50000, 30000, 1, 200000],
+                [8.53, 55000, 40000, 0, 80000],
+                [8.52, 40000, 60000, 1, 80000],
+                [8.55, 30000, 21000, 2, 44000],
+                [8.51, 21000, 25000, 2, 40000],
+                [8.50, 36000, 55000, 2, 60000],
+                [8.49, 10000, 20000, 2, 33000],
+            ];
+
+            var date=new Date(parseInt(stockItem.date/10000),(stockItem.date/100%100-1),stockItem.date%100, 9, 15, 0);
+            var count=10*60;    //9:15-9:25
+            var before=[];
+            for(var i=0;i<count;++i)
+            {
+                var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
+                var testIndex=Math.floor(Math.random()*10)%TEST_BEFORE_DATA.length;
+                var testData=TEST_BEFORE_DATA[testIndex];
+                var item=[ time, null, null, null, null, null ];
+                if (i%20==0 || i==count-1) 
+                {
+                    item=[ time, testData[0], testData[1], testData[2], testData[3], (testData[1]+testData[2])*1.5 ];
+                }
+                before.push(item);
+                date.setSeconds(date.getSeconds()+1);
+            }
+
+            //before.length=200;
+            var beforeinfo={ totalcount:count, ver:2.0 };
+
+            stockItem.before=before;
+            stockItem.beforeinfo=beforeinfo;
+
+            var TEST_AFTER_DATA=
+            [
+                [8.51, 40000, 30000, 1, 80000],
+                [8.51, 55000, 60000, 0, 150000],
+                [8.51, 30000, 60000, 1, 160000],
+                [8.51, 35000, 21000, 2, 50000],
+                [8.51, 21000, 35000, 2, 70000],
+                [8.51, 26000, 55000, 2, 100000],
+                [8.51, 30000, 10000, 2, 50000],
+            ];
+
+            var date=new Date(parseInt(stockItem.date/10000),(stockItem.date/100%100-1),stockItem.date%100, 14, 57, 0);
+            var count=3*60;    //14:57-15:00
+            var after=[];
+            for(var i=0;i<count;++i)
+            {
+                var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
+                var testIndex=Math.floor(Math.random()*10)%TEST_AFTER_DATA.length;
+                var testData=TEST_AFTER_DATA[testIndex];
+                var item=[ time, null, null, null, null, null ];
+                if (i%10==0 || i==count-1) 
+                {
+                    item=[ time, testData[0], testData[1], testData[2], testData[3], (testData[1]+testData[2])*1.5 ];
+                }
+                after.push(item);
+                date.setSeconds(date.getSeconds()+1);
+            }
+
+            var afterinfo={ totalcount:count, ver:2.0 };
+            stockItem.after=after;
+            stockItem.afterinfo=afterinfo;
+        }
+
+        //stockItem.minute.length=0;
+
+        var hqchartData={code:0, stock:[stockItem] };
+        callback(hqchartData);
+    }, 50);
+}
+
 HQData.Minute_RequestPopMinuteData=function(data, callback)
 {
     data.PreventDefault=true;