hqchart 1.1.14870 → 1.1.14876

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

@@ -4401,6 +4401,16 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         }
     }
 
+    /////////////////////////////////////////////////////////////////////////////////
+    //属性设置
+    //
+
+    this.SetPressKeyboardConfig=function(chart, option)
+    {
+        if (!chart || !option) return;
+        if (IFrameSplitOperator.IsBool(option.PauseUpdate)) chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;
+    }
+
     //历史K线图
     this.CreateKLineChartContainer=function(option)
     {
@@ -4561,6 +4571,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsBool(item.EnableMoveOn)) chart.SelectedChart.EnableMoveOn=item.EnableMoveOn;
         }
 
+        if (option.PressKeyboardConfig) this.SetPressKeyboardConfig(chart, option.PressKeyboardConfig);
+
         if (!option.Windows || option.Windows.length<=0) return null;
 
         //K线扩展计算方法配置
@@ -5138,6 +5150,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsBool(item.EnableMoveOn)) chart.SelectedChart.EnableMoveOn=item.EnableMoveOn;
         }
 
+        if (option.PressKeyboardConfig) this.SetPressKeyboardConfig(chart, option.PressKeyboardConfig);
+
         if (chart.ClassName=="MinuteChartContainer")
         {
             if (!option.DragSelectRect)
@@ -6042,18 +6056,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         this.OnSize( {Type:1} );
     }
 
-    //创建工具条
-    this.CreateToolbar=function(option)
-    {
-
-    }
-
-    //创建设置div窗口
-    this.CreateSettingDiv=function(option)
-    {
-
-    }
-
     this.Focus=function()
     {
         if (this.CanvasElement) this.CanvasElement.focus();
@@ -7359,6 +7361,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.PressTime=500;
     this.IsPress=false;             //是否长按
     this.IsPressKeyboard=false;     //是否键盘按键
+    this.PressKeyboardConfig={ PauseUpdate:false, }; //按键以后 是否涨停数据更新
 
     this.NetworkFilter;         //网络请求回调 function(data, callback);
     this.LastMouseStatus={ MouseOnToolbar:null }; // MouseOnToolbar={ Rect:{}, Title: }
@@ -7946,6 +7949,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DestroyPopMenu();
 
+        if (this.DestroyPopMinuteChart) this.DestroyPopMinuteChart();
+
         this.StopLatestPointFlash();
 
         document.oncontextmenu=null;
@@ -16255,6 +16260,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         return false;
     }
+
+    //键盘下按暂停更新
+    this.IsPauseUpdateByKeyboard=function()
+    {
+        if (!this.IsPressKeyboard) return false;
+        if (!this.PressKeyboardConfig) return false;
+        if (!this.PressKeyboardConfig.PauseUpdate) return false;
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -37925,6 +37940,7 @@ function ChartKLineTable()
 
     this.TextFont;
     this.TextColor='rgb(0,0,0)';
+    this.Style=0;   //0=全部窗口模式  1=顶部指定行数  2=底部指定行数；
 
     this.AryTableData=[];
     this.MapCache=null; //key=date/date-time  value={ Date:, Time:, Data:[ ] }
@@ -37950,9 +37966,15 @@ function ChartKLineTable()
     {
         if (!this.BGColor) return;
 
-        if (this.BGColor)
+        this.Canvas.fillStyle=this.BGColor;
+        if ((this.Style===1 || this.Style===2) && this.RowHeightType==1)
+        {
+            var height=this.RowCount*this.RowHeight;
+            height=Math.min(rtBG.Height,height);
+            this.Canvas.fillRect(rtBG.Left+1, rtBG.Top, rtBG.Width-2, height);
+        }
+        else
         {
-            this.Canvas.fillStyle=this.BGColor;
             this.Canvas.fillRect(rtBG.Left+1, rtBG.Top, rtBG.Width-1, rtBG.Height);
         }
     }
@@ -37961,8 +37983,11 @@ function ChartKLineTable()
     {
         if (!this.BorderColor) return;
 
+        var lineCount=30;
+        if (this.Style===1 || this.Style===2) lineCount=this.RowCount+1;
+
         var yLine=rtBG.Top;
-        for(var i=0;i<30;++i)
+        for(var i=0;i<lineCount;++i)
         {
             this.Canvas.beginPath();
             this.Canvas.moveTo(rtBG.Left,ToFixedPoint(yLine));
@@ -38012,12 +38037,29 @@ function ChartKLineTable()
         var bottom=border.Bottom;
 
         //绘制背景
-        var rtBG={ Left:border.LeftEx, Top:top, Right:border.RightEx, Bottom:bottom };
-        rtBG.Width=rtBG.Right-rtBG.Left;
-        rtBG.Height=rtBG.Bottom-rtBG.Top;
-        this.DrawBG(rtBG);
-
+        if (this.Style===1)
+        {
+            var rtBG={ Left:border.LeftEx, Top:border.TopTitle, Right:border.RightEx, Bottom:border.TopEx };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+        }
+        else if (this.Style===2)
+        {
+            var rtBG={ Left:border.LeftEx, Top:border.BottomEx, Right:border.RightEx, Bottom:border.Bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            top=rtBG.Top;
+        }
+        else
+        {
+            var rtBG={ Left:border.LeftEx, Top:top, Right:border.RightEx, Bottom:bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+        }
+        
         this.CalculateRowHeight(rtBG);
+
+        this.DrawBG(rtBG);
         
         var itemHeight=this.RowHeight;
         var itemWidth=dataWidth+distanceWidth;
@@ -38050,7 +38092,7 @@ function ChartKLineTable()
             if (!bDrawName) this.DrawRow(mapItem, top, bottom, left, right);    //绘制一列
         }
 
-        if (this.RowNamePosition==3) this.DrawRightRowName();
+        if (this.RowNamePosition==3) this.DrawRightRowName(rtBG);
 
         this.DrawBorder(rtBG);
     }
@@ -38097,20 +38139,51 @@ function ChartKLineTable()
     }
 
     //绘制右侧行名
-    this.DrawRightRowName=function()
+    this.DrawRightRowName=function(rtBG)
     {
         var border=this.ChartFrame.GetBorder();
 
         if (this.BGColor)
         {
-            var rtRightBG={Left:border.RightEx, Top:border.Top, Right:border.ChartWidth, Bottom:border.Bottom };
-            rtRightBG.Width=rtRightBG.Right-rtRightBG.Left;
-            rtRightBG.Height=rtRightBG.Bottom-rtRightBG.Top;
-            this.Canvas.fillStyle=this.BGColor;
-            this.Canvas.fillRect(rtRightBG.Left+1, rtRightBG.Top, rtRightBG.Width-1, rtRightBG.Height);
+            if (this.Style===1)
+            {
+                var height=this.RowCount*this.RowHeight;
+                height=Math.min(rtBG.Height,height);
+                var width=border.ChartWidth-rtBG.Right-2;
+                var maxTextWidth=0;
+                for(var i=0;i<this.RowName.length;++i)
+                {
+                    var item=this.RowName[i];
+                    if (!item || !item.Name) continue;
+
+                    var textWidth=this.Canvas.measureText(item.Name).width;
+                    if (textWidth>maxTextWidth) maxTextWidth=textWidth;
+                }
+                if (maxTextWidth>0)
+                {
+                    maxTextWidth+=4;
+                    width=Math.min(width, maxTextWidth);
+                }
+
+                var rtRightBG={Left:rtBG.Right+1, Top:rtBG.Top+1, Width:width, Height:height };
+                rtRightBG.Right=rtRightBG.Left+rtRightBG.Width;
+                rtRightBG.Bottom=rtRightBG.Top+rtRightBG.Height;
+                
+
+                this.Canvas.fillStyle=this.BGColor;
+                this.Canvas.fillRect(rtRightBG.Left, rtRightBG.Top, rtRightBG.Width, rtRightBG.Height);
+            }
+            else
+            {
+                var rtRightBG={Left:border.RightEx, Top:border.Top, Right:border.ChartWidth, Bottom:border.Bottom };
+                rtRightBG.Width=rtRightBG.Right-rtRightBG.Left;
+                rtRightBG.Height=rtRightBG.Bottom-rtRightBG.Top;
+                this.Canvas.fillStyle=this.BGColor;
+                this.Canvas.fillRect(rtRightBG.Left+1, rtRightBG.Top, rtRightBG.Width-2, rtRightBG.Height);
+            }
         }
         
-        var x=border.RightEx, y=border.TopTitle;
+        var x=rtBG.Right, y=rtBG.Top;
         var yOffset=3;
         if (this.ItemMergin.YOffset) yOffset=this.ItemMergin.YOffset;
         for(var i=0;i<this.RowName.length;++i)
@@ -84912,6 +84985,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.PopMinuteChart=null;
     }
 
+    this.ClosePopMinuteChart=function()
+    {
+        if (!this.PopMinuteChart) return;
+
+        this.PopMinuteChart.Close();
+    }
+
     this.ShowMinuteChartDialog=function(data, x,y)
     {
         if (!this.PopMinuteChart) return;
@@ -86678,7 +86758,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.RecvRealtimeData=function(data)
     {
         if (this.IsOnTouch==true) return;           //正在操作手势不更新数据
-        if (this.IsPressKeyboard==true) return;     //正在操作键盘不更新数据
+        if (this.IsPauseUpdateByKeyboard()) return;     //正在操作键盘不更新数据
 
         if (data.Ver==3.0)
         {
@@ -87025,7 +87105,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.RecvMinuteRealtimeDataV2=function(data)    //新版本的
     {
         if (this.IsOnTouch==true) return;   //正在操作中不更新数据
-        if (this.IsPressKeyboard==true) return;     //正在操作键盘不更新数据
+        if (this.IsPauseUpdateByKeyboard()) return;     //正在操作键盘不更新数据
 
         if (this.EnableVerifyRecvData && data.symbol!=this.Symbol)
         {
@@ -87500,6 +87580,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     //周期切换
     this.ChangePeriod=function(period,option)
     {
+        this.ClosePopMinuteChart();
+
         var oldData={ Period:this.Period, Right:this.Right, KLineDrawType:this.KLineDrawType, Symbol:this.Symbol};
 
         var isChangeKLineDrawType=false;
@@ -89058,6 +89140,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ClearIndexRunCount();
         this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
+        this.ClosePopMinuteChart();
         
         
         this.Symbol=symbol;
@@ -96696,7 +96779,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             return;
         }
 
-        if (this.IsOnTouch==true || this.IsPressKeyboard==true)   //正在操作中不更新数据
+        if (this.IsOnTouch==true || this.IsPauseUpdateByKeyboard())   //正在操作中不更新数据
         {
             if (this.SourceData && IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
             {
@@ -130507,6 +130590,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case SCRIPT_CHART_NAME.BASELINE_BAR:
                         this.CreateBaseLineBar(hqChart,windowIndex,item,i);
                         break;
+                    case SCRIPT_CHART_NAME.KLINE_TABLE:
+                        this.CreateKLineTable(hqChart,windowIndex,item,i);
+                        break;
                     case "DRAWCOLORKLINE":
                         this.CreateDrawColorKLine(hqChart,windowIndex,item,i);
                         break;
@@ -131316,6 +131402,7 @@ function OverlayScriptIndex(name,script,args,option)
         }
 
         chart.BuildCacheData();
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -131346,6 +131433,61 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateKLineTable=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartKLineTable();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.HQChart=hqChart;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+
+        chart.Data=hqChart.GetKData();      //绑定K线
+        chart.AryTableData=varItem.Draw.DrawData;
+        if (IFrameSplitOperator.IsNumber(varItem.Draw.RowCount)) chart.RowCount=varItem.Draw.RowCount;
+        if (IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName)) chart.RowName=varItem.Draw.RowName;
+
+        var config=varItem.Draw.Config;
+        if (config)
+        {
+            if (config.BGColor) chart.BGColor=config.BGColor;
+            if (config.TextColor) chart.TextColor=config.TextColor;
+            if (config.BorderColor) chart.BorderColor=config.BorderColor;
+            if (IFrameSplitOperator.IsNumber(config.RowNamePosition)) chart.RowNamePosition=config.RowNamePosition;
+            if (IFrameSplitOperator.IsNumber(config.RowHeightType)) chart.RowHeightType=config.RowHeightType;
+            if (IFrameSplitOperator.IsNumber(config.Style)) chart.Style=config.Style;
+
+            if (config.ItemMergin)
+            {
+                var subItem=config.ItemMergin;
+                if (IFrameSplitOperator.IsNumber(subItem.Left)) chart.ItemMergin.Left=subItem.Left;
+                if (IFrameSplitOperator.IsNumber(subItem.Top)) chart.ItemMergin.Top=subItem.Top;
+                if (IFrameSplitOperator.IsNumber(subItem.Bottom)) chart.ItemMergin.Bottom=subItem.Bottom;
+                if (IFrameSplitOperator.IsNumber(subItem.Right)) chart.ItemMergin.Right=subItem.Right;
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) chart.ItemMergin.YOffset=subItem.YOffset;
+            }
+           
+            if (config.TextFont)
+            {
+                var subItem=config.TextFont;
+                if (IFrameSplitOperator.IsNumber(subItem.FontMaxSize)) chart.TextFontConfig.FontMaxSize=subItem.FontMaxSize;
+                if (subItem.Family) chart.TextFontConfig.Family=subItem.Family;
+            }
+        }
+        
+        chart.BuildCacheData();
+        frame.ChartPaint.push(chart);
+
+        var titleIndex=windowIndex+1;
+        var titlePaint=hqChart.TitlePaint[titleIndex];
+        var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);
+        titleData.DataType="ChartKLineTable";
+        titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
+    }
+
 
     //创建通道
     this.CreateChannel=function(hqChart,windowIndex,varItem,id)
@@ -161815,7 +161957,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14869";
+var HQCHART_VERSION="1.1.14875";
 
 function PrintHQChartVersion()
 {