hqchart 1.1.14734 → 1.1.14742

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

@@ -7124,6 +7124,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()
 {
@@ -7340,6 +7352,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         //图形中的单元选中状态
         MapIndexChartCache:new Map(),      //key 指标GUID
+
+        TradeStatus:null,   //当前交易状态 { Date, Time：数据最后更新的时间, Status: }
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -15863,6 +15877,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()
@@ -16398,6 +16432,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;
+    }
 }
 
 //框架外部挂接
@@ -58376,7 +58444,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);
 
@@ -58457,6 +58525,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;
@@ -58487,6 +58722,7 @@ function FrameSplitY()
             this.Frame.HorizontalInfo.push(item);
         }
     }
+    */
 
     this.IsCallAuctionFrame=function()
     {
@@ -58497,6 +58733,7 @@ function FrameSplitY()
         return this.HQChart.IsCallAuctionFrame(this.Frame.Identify);
     }
 
+    /* 废弃 使用 GetCallAcutionSplitYV2
     this.GetCallAcutionSplitY=function(count,splitData)
     {
         if (!this.IsCallAuctionFrame()) return null;
@@ -58591,6 +58828,7 @@ function FrameSplitY()
 
         return null;
     }
+    */
 
     this.RightFrameSplitY=function()
     {
@@ -64250,7 +64488,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();
@@ -95315,6 +95563,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();    //请求叠加数据 (主数据下载完再下载)
@@ -95341,6 +95590,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)    //不执行自动更新
@@ -158948,7 +159198,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14733";
+var HQCHART_VERSION="1.1.14741";
 
 function PrintHQChartVersion()
 {
@@ -159112,7 +159362,8 @@ export default {
         JSCHART_BUTTON_ID:JSCHART_BUTTON_ID,
         JSCHART_DATA_FIELD_ID:JSCHART_DATA_FIELD_ID,
         JSCHART_WORKER_MESSAGE_ID:JSCHART_WORKER_MESSAGE_ID,
-        JSCHART_MENU_ID:JSCHART_MENU_ID
+        JSCHART_MENU_ID:JSCHART_MENU_ID,
+        JSCHART_TRADE_STATUS_ID,        //交易状态
     },