hqchart 1.1.13810 → 1.1.13816

package/src/jscommon/umychart.node/umychart.node.js

@@ -5702,6 +5702,13 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             this.JSChartContainer.ChangeIndex(windowIndex,indexName,option);
     }
 
+    //切换一个窗口指标，包含叠加指标，以及这个窗口的属性
+    this.ChangeIndexWindow=function(windowIndex, option)
+    {
+        if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindow)=='function')
+            this.JSChartContainer.ChangeIndexWindow(windowIndex, option);
+    }
+
     this.AddIndexWindow=function(indexName,option)
     {
         if (this.JSChartContainer && typeof(this.JSChartContainer.AddIndexWindow)=='function')
@@ -6693,6 +6700,8 @@ var JSCHART_MENU_ID=
     CMD_SHOW_CORSS_LINE_ID:39,          //显示十字光标线
     CMD_ENABLE_POP_MINUTE_CHART_ID:40,  //双击弹分时图
 
+    CMD_CHANGE_INFO_POSITION_ID:41,     //修改信息地雷位置
+
 
     CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
     CMD_REPORT_COLUMN_SORT_ID:61,       //报价列表 表头排序  Arg[列序号, 排序方向]
@@ -10980,6 +10989,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (!paint) return;
 
         var data=this.ChartPaint[0].Data;
+        var count=data.Data.length;
+        if (end>=count) end=count-1;
         var startItem=data.Data[start];
         var endItem=data.Data[end];
 
@@ -11007,6 +11018,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Frame.ResetXSplit();
     }
 
+    this.ResetFrameYCustomSplit=function(windowIndex)
+    {
+        if (typeof(this.Frame.ResetYCustomSplit)=='function')
+            this.Frame.ResetYCustomSplit(windowIndex);
+    }
+
     this.UpdateFrameMaxMinV2=function()
     {
         var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
@@ -13520,6 +13537,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     }
                 }
                 break;
+            case JSCHART_MENU_ID.CMD_CHANGE_INFO_POSITION_ID:
+                if (param==null) return false;
+                var klineChart=this.ChartPaint[0];
+                if (!klineChart) return false;
+                klineChart.InfoPosition=param;
+                this.Draw();
+                break;
         }
     }
 
@@ -13694,6 +13718,101 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.ChartDragSelectRect.SetSecondPoint(ptEnd.X, ptEnd.Y);
         this.ChartDragSelectRect.Draw();
     }
+
+    //切换窗口指标 option={ Window:{}, OverlayIndex:[], Frame:{ }}
+    this.ChangeIndexWindow=function(windowIndex, option)
+    {
+        JSConsole.Chart.Log('[KLineChartContainer::ChangeIndexWindow] windowIndex, option', windowIndex, option);
+        if (windowIndex<0 || windowIndex>=this.Frame.SubFrame.length) return false;
+        if (!option) return false;
+
+        var frame=this.Frame.SubFrame[windowIndex];
+        if (option.Delete)
+        {
+            var item=option.Delete;
+            if (item.Window===true) this.DeleteIndexPaint(windowIndex);             //删除主指标
+            if (item.Overlay===true) this.DeleteWindowsOverlayIndex(windowIndex);    //清空叠加指标
+        }
+        
+        //清空标题栏
+        var titleIndex=windowIndex+1;
+        this.TitlePaint[titleIndex].Data=[];
+        this.TitlePaint[titleIndex].Title=null;
+
+        if (option.Window)   //主指标
+        {
+            this.DeleteIndexPaint(windowIndex);             //删除主指标
+
+            var item=option.Window;
+
+            if (item.Script)    //自定义指标脚本
+            {
+                this.WindowIndex[windowIndex]=new ScriptIndex(item.Name,item.Script,item.Args,item);    //脚本执行
+            }
+            else if (item.API)  //后台指标
+            {
+                var apiItem=item.API;
+                this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);
+            }
+            else
+            {
+                var indexID=item.Index;
+                var indexItem=JSIndexMap.Get(indexID);
+                if (indexItem)
+                {
+                    this.WindowIndex[windowIndex]=indexItem.Create();
+                    this.CreateWindowIndex(windowIndex);
+                }
+                else
+                {
+                    var systemScript = new JSIndexScript();
+                    var indexInfo = systemScript.Get(indexID);
+                    if (indexInfo)
+                    {
+                        JSIndexScript.ModifyAttribute(indexInfo,item);
+                        this.WindowIndex[windowIndex]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);    //脚本执行
+                    }
+                }
+            }
+
+            this.SetSubFrameAttribute(frame, item, option.Frame);
+        }
+
+        //叠加指标
+        var aryOverlayIndex=[];
+        if (IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex))
+        {
+            this.DeleteWindowsOverlayIndex(windowIndex);    //清空叠加指标
+
+            for(var i=0;i<option.OverlayIndex.length;++i)
+            {
+                var item=option.OverlayIndex[i];
+                if (item.Index) item.IndexName=item.Index;
+                item.WindowIndex=windowIndex;
+                if (item.Windows>=0) item.WindowIndex=item.Windows;
+
+                var overlay=this.CreateOverlayWindowsIndex(item);
+                if (!overlay) continue;
+
+                aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
+            }
+        }
+
+        //刷新指标
+        var bindData=this.ChartPaint[0].Data;
+        this.BindIndexData(windowIndex,bindData);   //请求主指标
+
+        for(var i=0;i<aryOverlayIndex.length;++i)   //请求叠加指标
+        {
+            var item=aryOverlayIndex[i];
+            this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
+        }
+
+        this.UpdataDataoffset();           //更新数据偏移
+        this.ResetFrameXYSplit();
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Draw();
+    }
 }
 
 function GetDevicePixelRatio()
@@ -13930,6 +14049,9 @@ function CoordinateInfo()
                                                                 //百分比 { PriceColor:, PercentageColor:, SplitColor:, Font: }
                                                                 //自定义刻度 { Custom:{ Position: 1=强制内部 }}
     this.AreaData;  //区域: { Start:, End:, BGColor:, Position:[0=左, 1=右] }
+
+    //不在当前屏范围
+    //this.OutRange={ BGColor:"", TextColor:, BorderColor: TopYOffset:, BottomYOffset: }
 }
 
 
@@ -16114,11 +16236,177 @@ function AverageWidthFrame()
         return  { MaxWidth:width, Text:aryText };
     }
 
+    this.DrawOutRangeCustomItem=function(item, mapTextRect)
+    {
+        if (this.IsHScreen===true) return;
+        if (!this.IsShow && !this.IsYDrawMainFrame) return;
+        if (!item.Message[1] && !item.Message[0]) return;
+        if (!item.OutRange) return;
+        var position=0; //1=top 2=bottom
+        if (item.Value>this.HorizontalMax) position=1;
+        else if (item.Value<this.HorizontalMin) position=2;
+        else return;
+
+        this.Canvas.save(); 
+        var outRange=item.OutRange;
+        var border=this.GetBorder();
+        var left=border.Left;
+        var right=border.Right;
+        var bottom=border.Bottom;
+        var top=border.Top;
+        var borderRight = this.ChartBorder.Right;
+        var borderLeft = this.ChartBorder.Left;
+        var titleHeight = this.ChartBorder.TitleHeight;
+
+        if (this.IsHScreen)
+        {
+            borderLeft=this.ChartBorder.Top;
+            borderRight=this.ChartBorder.Bottom;
+            top=border.Top;
+            bottom=border.Bottom;
+        }
+
+        var pixelTatio = GetDevicePixelRatio();
+        var defaultTextHeight=18*pixelTatio;
+        var textHeight=defaultTextHeight;
+
+        if (item.Message[0] && borderLeft>=10)
+        {
+            if (item.Font != null) this.Canvas.font = item.Font;
+            var textInfo=this.GetCustomItemTextInfo(item,true,pixelTatio);
+            var textWidth=textInfo.MaxWidth;
+            var itemLeft=left-textWidth;
+            var fontHeight=this.GetFontHeight();
+            var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
+            this.Canvas.textAlign = "right";
+            this.Canvas.textBaseline = "middle";
+
+            var yText=null;
+            if (position==1) 
+            {
+                yText=border.TopEx;
+                if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
+            }
+            else if (position==2) 
+            {
+                yText=border.BottomEx+textHeight;
+                if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
+            }
+
+            for(var i=0;i<textInfo.Text.length;++i)
+            {
+                var itemText=textInfo.Text[i];
+                var rtBG={ Left:itemLeft, Width:itemText.Width, Bottom:yText, Height:textHeight };
+                rtBG.Top=rtBG.Bottom-rtBG.Height;
+                rtBG.Right=rtBG.Left+rtBG.Width;
+
+                if (item.ExtendLine && item.ExtendLine[0])  //右侧延长线
+                {
+                    var exLine=item.ExtendLine[0];
+                    if (IFrameSplitOperator.IsNumber(exLine.Width))
+                    {
+                        var yLine=rtBG.Bottom;
+                        if (position==2) yLine=rtBG.Top;
+                        var lineType=item.LineType;
+                        if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
+                        if (i==0) this.DrawLine(left,left-exLine.Width,yLine,item.LineColor,lineType,item);
+
+                        rtBG.Left-=exLine.Width;
+                        rtBG.Right-=exLine.Width;
+                    }
+                }
+
+                this.Canvas.fillStyle=outRange.BGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+                if (outRange.Border && outRange.Border.Color)
+                {
+                    if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
+                        this.Canvas.setLineDash(outRange.Border.LineDash);   //虚线
+
+                    this.Canvas.strokeStyle = outRange.Border.Color;
+                    this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
+                }
+
+                this.Canvas.fillStyle = outRange.TextColor;
+                this.Canvas.fillText(itemText.Text, rtBG.Right - 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
+
+                yText+=textHeight+1;
+            }
+            
+        }
+        else if (item.Message[1] && borderRight>=10)
+        {
+            if (item.Font != null) this.Canvas.font = item.Font;
+            var textInfo=this.GetCustomItemTextInfo(item,false,pixelTatio);
+            var textWidth=textInfo.MaxWidth;
+            var itemRight=right+textWidth;
+            var fontHeight=this.GetFontHeight();
+            var textHeight=fontHeight>defaultTextHeight? fontHeight:defaultTextHeight;
+            this.Canvas.textAlign = "left";
+            this.Canvas.textBaseline = "middle";
+
+            var yText=null;
+            if (position==1) 
+            {
+                yText=border.TopEx;
+                if (IFrameSplitOperator.IsNumber(outRange.TopYOffset)) yText+=outRange.TopYOffset;
+            }
+            else if (position==2) 
+            {
+                yText=border.BottomEx+textHeight;
+                if (IFrameSplitOperator.IsNumber(outRange.BottomYOffset)) yText+=outRange.BottomYOffset;
+            }
+
+            for(var i=0;i<textInfo.Text.length;++i)
+            {
+                var itemText=textInfo.Text[i];
+                var rtBG={ Right:itemRight, Width:itemText.Width, Bottom:yText, Height:textHeight };
+                rtBG.Top=rtBG.Bottom-rtBG.Height;
+                rtBG.Left=rtBG.Right-rtBG.Width;
+
+                if (item.ExtendLine && item.ExtendLine[1])  //右侧延长线
+                {
+                    var exLine=item.ExtendLine[1];
+                    if (IFrameSplitOperator.IsNumber(exLine.Width))
+                    {
+                        var yLine=rtBG.Bottom;
+                        if (position==2) yLine=rtBG.Top;
+                        var lineType=item.LineType;
+                        if (IFrameSplitOperator.IsNumber(outRange.ExtendLine.Type)) lineType=outRange.ExtendLine.Type;
+                        if (i==0) this.DrawLine(right,right+exLine.Width,yLine,item.LineColor,lineType,item);
+
+                        rtBG.Left+=exLine.Width;
+                        rtBG.Right+=exLine.Width;
+                    }
+                }
+
+                this.Canvas.fillStyle=outRange.BGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+                if (outRange.Border && outRange.Border.Color)
+                {
+                    if (IFrameSplitOperator.IsNonEmptyArray(outRange.Border.LineDash))
+                        this.Canvas.setLineDash(outRange.Border.LineDash);   //虚线
+
+                    this.Canvas.strokeStyle = outRange.Border.Color;
+				    this.Canvas.strokeRect(ToFixedPoint(rtBG.Left), ToFixedPoint(rtBG.Top), ToFixedRect(rtBG.Width), ToFixedRect(rtBG.Height));
+                }
+
+                this.Canvas.fillStyle = outRange.TextColor;
+                this.Canvas.fillText(itemText.Text, rtBG.Left + 1*pixelTatio, rtBG.Top+rtBG.Height/2+1*pixelTatio);
+
+                yText+=textHeight+1;
+            }
+        }
+
+        this.Canvas.restore();
+    }
+
     this.DrawCustomItem=function(item, mapTextRect) //显示自定义Y刻度
     {
         if (!item.Message[1] && !item.Message[0]) return;
         if (item.Value>this.HorizontalMax || item.Value<this.HorizontalMin) 
         {
+            this.DrawOutRangeCustomItem(item, mapTextRect);
             this.SendDrawCountDownEvent( { IsShow:false } );
             return;
         }
@@ -16255,6 +16543,18 @@ function AverageWidthFrame()
                             var textLeft=left-(textWidth-itemText.Width);
                         }
 
+
+                        if (item.ExtendLine && item.ExtendLine[0])  //右侧延长线
+                        {
+                            var exLine=item.ExtendLine[0];
+                            if (IFrameSplitOperator.IsNumber(exLine.Width))
+                            {
+                                if (i==0) this.DrawLine(left,left-exLine.Width,y,item.LineColor,item.LineType,item);
+                                textLeft-=exLine.Width;
+                                rectLeft-=exLine.Width
+                            }
+                        }
+
                         if (emptyBGColor)
                         {
                             this.Canvas.fillStyle=emptyBGColor;
@@ -20971,6 +21271,7 @@ function OverlayKLineFrame()
         if (!item.Message[1] && !item.Message[0]) return;
         if (item.Value>this.HorizontalMax || item.Value<this.HorizontalMin) 
         {
+            //this.DrawOutRangeCustomItem(item, mapTextRect);
             this.SendDrawCountDownEvent( { IsShow:false } );
             return;
         }
@@ -23453,6 +23754,24 @@ function HQTradeFrame()
         }
     }
 
+    this.ResetYCustomSplit=function(windowIndex)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame)) return;
+
+        if (IFrameSplitOperator.IsNumber(windowIndex) && windowIndex>=0)
+        {
+            var item=this.SubFrame[windowIndex];
+            if (item.Frame) item.Frame.YCustomSplit=true;
+        }
+        else
+        {
+            for(var i=0;i<this.SubFrame.length;++i)
+            {
+                this.SubFrame[i].Frame.YCustomSplit=true;
+            }
+        }
+    }
+
     //清空Y轴坐标的最大最小值
     this.ClearYCoordinateMaxMin=function(windowIndex)
     {
@@ -36995,9 +37314,11 @@ function ChartStickLine()
             else this.Canvas.lineWidth=GetDevicePixelRatio();
             this.Canvas.strokeStyle=this.Color;
         }
-        else if(this.Width==0)
+        else if(this.Width==0)  //宽度时0，使用宽度1
         {
             this.SetEmptyBar();
+            this.Canvas.lineWidth=GetDevicePixelRatio();
+            this.Canvas.strokeStyle=this.Color;
         }
         else if (this.Width==3 || this.Width==50)   //3和50 K线宽度
         {
@@ -47608,6 +47929,17 @@ function RectSelectPaint()
     this.AreaColor=g_JSChartResource.RectSelect.AreaColor;          //面积
     this.SubAreaColor=g_JSChartResource.RectSelect.SubAreaColor;
 
+    //标记图标
+    this.MarkConfig=
+    {  
+        Family:g_JSChartResource.RectSelect.Mark.Family, 
+        Text:g_JSChartResource.RectSelect.Mark.Text, 
+        Color:g_JSChartResource.RectSelect.Mark.Color, 
+        Size:g_JSChartResource.RectSelect.Mark.Size, 
+        IsShow:false, 
+        Position: { Index:g_JSChartResource.RectSelect.Mark.Position.Index, Top:g_JSChartResource.RectSelect.Mark.Position.Top } 
+    }
+
     this.FirstPoint;
     this.SecondPoint;
     this.CenterPoint;
@@ -47655,6 +47987,17 @@ function RectSelectPaint()
                 if (IFrameSplitOperator.IsNumber(item.Position)) this.ShowRangeText.Position=item.Position;
                 if (IFrameSplitOperator.IsNumber(item.SubPosition)) this.ShowRangeText.SubPosition=item.SubPosition;
             }
+
+            if (option.Mark)
+            {
+                var item=option.Mark;
+                if (IFrameSplitOperator.IsBool(item.IsShow)) this.MarkConfig.IsShow=item.IsShow;
+                if (item.Position)
+                {
+                    if (IFrameSplitOperator.IsNumber(item.Position.Index)) this.MarkConfig.Position.Index=item.Position.Index;
+                    if (item.Position.Top) this.MarkConfig.Position.Top=item.Position.Top;
+                }
+            }
         }
     }
 
@@ -48127,6 +48470,7 @@ function RectSelectPaint()
 
         this.DrawLines(aryLines);
         this.DrawArea(startPoint, endPoint, startDate, startEnd, this.AreaColor);
+        this.DrawMark(startPoint, endPoint);
 
         if (this.SubClient && this.SubClient.Start && this.SubClient.End)
         {
@@ -48360,6 +48704,45 @@ function RectSelectPaint()
             if (IFrameSplitOperator.IsNumber(type)) this.DragRect.push( {Rect:rtArea, Type:type} );
         }
     }
+
+    this.DrawMark=function(startPoint,endPoint)
+    {
+        if (!startPoint ||!endPoint) return;
+
+        if (!this.ChartFrame || !this.ChartFrame.SubFrame) return;
+        var subFrame=this.ChartFrame.SubFrame[0].Frame;
+        if (!subFrame) return;
+
+        if (!this.MarkConfig) return;
+        var config=this.MarkConfig;
+        if (!config.IsShow) return;
+
+        var font=`${config.Size}px ${config.Family}`;
+        this.Canvas.font=font;
+        var top=null;
+        switch(config.Position.Top)
+        {
+            case "TopEx":
+                top=subFrame.ChartBorder.GetTopEx();
+                break;
+            case "Top":
+                top=subFrame.ChartBorder.GetTop();
+                break;
+            case "TopTitle":
+                top=subFrame.ChartBorder.GetTopTitle();
+                break;
+            default:
+                return;
+        }
+       
+        var xText=startPoint.X;
+        var yText=top;
+
+        this.Canvas.textAlign="center";
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.fillStyle=config.Color;
+        this.Canvas.fillText(config.Text,xText,yText);
+    }
 }
 
 //鼠标拖动选中区域
@@ -72488,6 +72871,8 @@ function JSChartResource()
         RangeTextSubColor:"rgb(255,255,255)",
         RangeTextSubFont:12*GetDevicePixelRatio() +"px 微软雅黑",
         RangeTextSubBGColor:'rgb(54,54,54)',
+
+        Mark:{ Family:'iconfont', Text:'\ue695' , Color:'rgb(250,0,0)', Size:15*GetDevicePixelRatio(), Position:{ Index:0, Top:"TopEx" } }
     }
 
     //选中图形
@@ -73344,6 +73729,20 @@ function JSChartResource()
             if (item.RangeTextSubColor) this.RectSelect.RangeTextSubColor=item.RangeTextSubColor;
             if (item.RangeTextSubFont) this.RectSelect.RangeTextSubFont=item.RangeTextSubFont;
             if (item.RangeTextSubBGColor) this.RectSelect.RangeTextSubBGColor=item.RangeTextSubBGColor;
+
+            if (item.Mark)
+            {
+                var subItem=item.Mark;
+                if (subItem.Family) this.RectSelect.Mark.Family=subItem.Family;
+                if (subItem.Text) this.RectSelect.Mark.Text=subItem.Text;
+                if (subItem.Color) this.RectSelect.Mark.Color=subItem.Color;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) this.RectSelect.Mark.Size=subItem.Size;
+                if (subItem.Position)
+                {
+                    if (subItem.Position.Top) this.RectSelect.Mark.Position.Top=subItem.Position.Top;
+                    if (IFrameSplitOperator.IsNumber(subItem.Position.Index)) this.RectSelect.Mark.Position.Index=subItem.Position.Index;
+                }
+            }
         }
 
         if (style.RectDrag)
@@ -75919,6 +76318,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (!this.PopMinuteChart) return;
         if (!data.Tooltip || !data.Chart) return;
 
+        var pixelRatio=GetDevicePixelRatio();
         var rtClient=this.UIElement.getBoundingClientRect();
         var rtScroll=GetScrollPosition();
 
@@ -75928,7 +76328,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var date=data.Tooltip.Data.Date;
         var symbol=data.Chart.Symbol;
 
-        this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x,y);
+        this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x/pixelRatio,y/pixelRatio);
     }
 
    
@@ -80529,6 +80929,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var klineType=klineChart.DrawType;
         var bThinAKBar=klineChart.IsThinAKBar;
         var priceGap=klineChart.PriceGap;                   //缺口配置信息
+        var infoPosition=klineChart.InfoPosition;
         var coordinateType=null, yCoordinateType=null;      //坐标类型
         var mainFrame=null;
         if (this.Frame.SubFrame[0] && this.Frame.SubFrame[0].Frame) mainFrame=this.Frame.SubFrame[0].Frame;
@@ -80638,6 +81039,16 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"大宗交易", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["大宗交易", !aryKLineInfo.includes("BlockTrading")]}, Checked:aryKLineInfo.includes("BlockTrading") },
                     { Name:"龙虎榜", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["龙虎榜", !aryKLineInfo.includes("TradeDetail")]}, Checked:aryKLineInfo.includes("TradeDetail") },
                     { Name:"互动易", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_KLINE_INFO_ID, Args:["互动易", !aryKLineInfo.includes("InvestorInfo")]}, Checked:aryKLineInfo.includes("InvestorInfo") },
+                    { Name:JSPopMenu.SEPARATOR_LINE_NAME },
+                    { 
+                        Name:"显示位置", 
+                        SubMenu:
+                        [
+                            { Name:"底部", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INFO_POSITION_ID, Args:[1]}, Checked:infoPosition===1 },
+                            { Name:"K线上", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INFO_POSITION_ID, Args:[0]}, Checked:infoPosition===0 },
+                        ]
+                    },
+                   
                 ]
             },
             { 
@@ -83248,6 +83659,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (end>=count) end=count-1;
         var endItem=data.Data[end];
 
+        if (!startItem || !endItem) return;
+
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
         paint.SetPoint(startItem, { Index:0 });
         paint.SetPoint(endItem, { Index:1 });
@@ -92285,56 +92698,29 @@ function PforecastInfo()
 
         if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
 
-        //请求数据
-        JSNetwork.HttpRequest({
-            url: url,
-            data:
-            {
-                "field": ["pforecast.type","pforecast.reportdate","fweek"],
-                "condition":
-                [
-                    {"item":["pforecast.reportdate","int32","gte",this.StartDate]}
-                ],
-                "symbol": [param.HQChart.Symbol],
-                "start":0,
-                "end":this.MaxRequestDataCount,
-            },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (recvData)
-            {
-                self.RecvData(recvData,param);
-            }
-        });
-
+        console.warn("[PforecastInfo::RequestData] NetworkFilter error.");
         return true;
     }
 
     this.RecvData=function(recvData,param)
     {
-        if (recvData.stock.length!=1) return;
-        if (recvData.stock[0].stockday.length<=0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(recvData.report)) return;
 
-        for(var i in recvData.stock[0].stockday)
+        for(var i=0; i<recvData.report.length; ++i)
         {
-            var item=recvData.stock[0].stockday[i];
-            if (item.pforecast.length>0)
+            var item=recvData.report[i];
+            var infoData=new KLineInfoData();
+            infoData.Date= item.date;
+            infoData.Title=item.title;
+            infoData.InfoType=KLINE_INFO_TYPE.PFORECAST;
+            infoData.ExtendData={ Type:item.title, ReportDate:item.reportdate}
+            if(item.fweek)  //未来周涨幅
             {
-                var dataItem=item.pforecast[0];
-                var infoData=new KLineInfoData();
-                infoData.Date= item.date;
-                infoData.Title=dataItem.type;
-                infoData.InfoType=KLINE_INFO_TYPE.PFORECAST;
-                infoData.ExtendData={ Type:dataItem.type, ReportDate:dataItem.reportdate}
-                if(item.fweek)  //未来周涨幅
-                {
-                    infoData.ExtendData.FWeek={};
-                    if (item.fweek.week1!=null) infoData.ExtendData.FWeek.Week1=item.fweek.week1;
-                    if (item.fweek.week4!=null) infoData.ExtendData.FWeek.Week4=item.fweek.week4;
-                }
-                this.Data.push(infoData);
+                infoData.ExtendData.FWeek={};
+                if (item.fweek.week1!=null) infoData.ExtendData.FWeek.Week1=item.fweek.week1;
+                if (item.fweek.week4!=null) infoData.ExtendData.FWeek.Week4=item.fweek.week4;
             }
+            this.Data.push(infoData);
         }
 
         param.HQChart.UpdataChartInfo();
@@ -92366,34 +92752,15 @@ function ResearchInfo()
 
         if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
 
-        //请求数据
-        JSNetwork.HttpRequest({
-            url: url,
-            data:
-            {
-                "filed": ["releasedate","researchdate","level","symbol","id",'type'],
-                "querydate":{"StartDate":this.StartDate,"EndDate":this.GetToday()},
-                "symbol": [param.HQChart.Symbol],
-                "start":0,
-                "end":this.MaxRequestDataCount,
-            },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (recvData)
-            {
-                self.RecvData(recvData,param);
-            }
-        });
-
+        console.warn("[ResearchInfo::RequestData] NetworkFilter error.");
         return true;
     }
 
     this.RecvData=function(recvData,param)
     {
-        if (recvData.list.length<=0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(recvData.list)) return;
 
-        for(var i in recvData.list)
+        for(var i=0;i<recvData.list.length; ++i)
         {
             var item=recvData.list[i];
             var infoData=new KLineInfoData();
@@ -93287,204 +93654,206 @@ function ChangeIndexDialog(divElement)
     }
 }
 
-//信息地理tooltip
-function KLineInfoTooltip(divElement)
+function MinuteSelectRectDialog(divElement)
 {
     this.newMethod=IDivDialog;   //派生
     this.newMethod(divElement);
     delete this.newMethod;
 
-    this.UpColor=g_JSChartResource.UpTextColor;
-    this.DownColor=g_JSChartResource.DownTextColor;
-    this.UnchagneColor=g_JSChartResource.UnchagneTextColor;
+    this.SelectData;
+    this.Dialog;
+    this.HQChart;
+    this.RectSelectPaint;
 
+    //隐藏窗口
+    this.Close=function()
+    {
+        if (this.Dialog) 
+        {
+            this.DivElement.removeChild(this.Dialog);
+            this.Dialog=null;
+            this.ID=null;
+        }
+
+        if (this.RectSelectPaint) this.RectSelectPaint.PreventClose=false;
+    }
+
+    //创建
     this.Create=function()
     {
         this.ID=Guid();
-
         var div=document.createElement('div');
-        div.className='jchart-klineinfo-tooltip';
+        div.className='jchart-select-statistics-box';
         div.id=this.ID;
-        div.innerHTML="<div class='title-length'></div>";
+        div.innerHTML=
+        "<div class='parameter jchart-select-section'>\
+            <div class='parameter-header'>\
+                <span>分时图区间统计</span>\
+                <strong id='close' class='icon iconfont icon-close'></strong>\
+            </div>\
+            <div class='parameter-content'>统计数据</div>\
+        <div class='parameter-footer'>\
+            <button id='close' class='submit' >确定</button>\
+        </div>\
+        </div>";
+
         this.DivElement.appendChild(div);
-    }
+        this.Dialog=div;
 
+        //关闭按钮
+        $("#"+this.ID+" #close").click(
+            {
+                divBox:this,
+            },
+            function(event)
+            {
+                event.data.divBox.Close();
+            });
+    }
 
-    this.BindInfoList=function(infoType,infoList)
+    this.BindData=function()
     {
-        var strBox="<div class='total-list'>共"+infoList.length+"条</div>";
-        var strText=[];
-        for(var i in infoList)
+        var hqData=this.SelectData.Data;
+        var start=this.SelectData.Start;
+        var end=this.SelectData.End;
+        this.HQChart.UpdateSelectRect(start,end);
+        if (this.RectSelectPaint) this.RectSelectPaint.PreventClose=true;
+
+        var showData=
+        { 
+            Open:0,Close:0,High:0,Low:0,  //起始价格, 结束价格, 最高, 最低
+            Vol:0, Amount:0, 
+            Date:
+            { 
+                Start:{Time:null, Date:null },
+                End:{ Time:null, Date:null }
+            }, 
+            Count:0,
+        }
+
+        for(var i=start; i<=end && i<hqData.Data.length; ++i)
         {
-            var item=infoList[i];
-            var strOld=item.Date;
-            if(infoType==KLINE_INFO_TYPE.PFORECAST)
-            {
-                var reportDate=item.ExtendData.ReportDate;
-                var year=parseInt(reportDate/10000);  //年份
-                var day=reportDate%10000;   //比较 这个去掉年份的日期
-                var reportType;
-                if(day == 1231){
-                    reportType = "年报"
-                }else if(day == 331){
-                    reportType = "一季度报"
-                }else if(day == 630){
-                    reportType = "半年度报"
-                }else if(day == 930){
-                    reportType = "三季度报"
-                }
-
-                var weekData="";
-                if (item.ExtendData.FWeek)
-                {
-                    if (item.ExtendData.FWeek.Week1!=null) weekData+="一周后涨幅:<i class='increase' style='color:"+this.GetColor(item.ExtendData.FWeek.Week1.toFixed(2))+"'>"+ item.ExtendData.FWeek.Week1.toFixed(2)+"%</i>";
-                    if (item.ExtendData.FWeek.Week4!=null) weekData+="&nbsp;四周后涨幅:<i class='increase' style='color:"+this.GetColor(item.ExtendData.FWeek.Week4.toFixed(2))+"'>"+ item.ExtendData.FWeek.Week4.toFixed(2)+"%</i>";
-                    if (weekData.length>0) weekData="<br/>&nbsp;&nbsp;<i class='prorecast-week'>"+weekData+"</i>";
-                }
-                var strDate=item.Date.toString();
-                var strNew=strDate.substring(0,4)+"-"+strDate.substring(4,6)+"-"+strDate.substring(6,8);  //转换时间格式
-                strText+="<span>"+strNew+"&nbsp;&nbsp;"+year+reportType+item.Title+"&nbsp;"+weekData+"</span>";
-
-            }
-            else if (infoType==KLINE_INFO_TYPE.RESEARCH)    //调研单独处理
-            {
-                var levels=item.ExtendData.Level;
-                var recPerson=[];
-                if(levels.length==0){
-                    recPerson = "<i>无</i>"
-                }else{
-                    for(var j in levels)
-                    {
-                        if(levels[j]==0){
-                            recPerson+="<i style='color:#00a0e9'>证券代表&nbsp;&nbsp;&nbsp;</i>";
-                        }else if(levels[j]==1){
-                            recPerson+="<i>董秘&nbsp;&nbsp;&nbsp;</i>";
-                        }else if(levels[j]==2){
-                            recPerson+="<i style='color:#00a0e9'>总经理&nbsp;&nbsp;&nbsp;</i>";
-                        }else if(levels[j]==3){
-                            recPerson+="<i style='color:#00a0e9'>董事长&nbsp;&nbsp;&nbsp;</i>";
-                        }
-                    }
-                }
-                var strDate=item.Date.toString();
-                var strNew=strDate.substring(0,4)+"-"+strDate.substring(4,6)+"-"+strDate.substring(6,8);  //转换时间格式
-                strText+="<span>"+strNew+"&nbsp;&nbsp;&nbsp;接待:&nbsp;&nbsp;&nbsp;"+recPerson+"</span>";
-            }else if(infoType==KLINE_INFO_TYPE.BLOCKTRADING)
-            {
-                var showPriceInfo = item.ExtendData;
-                var strDate=item.Date.toString();
-                var strNew=strDate.substring(0,4)+"-"+strDate.substring(4,6)+"-"+strDate.substring(6,8);  //转换时间格式
-                strText+="<span><i class='date-tipbox'>"+strNew+"</i>&nbsp;&nbsp;<i class='tipBoxTitle'>成交价:&nbsp;"+showPriceInfo.Price.toFixed(2)+"</i><i class='tipBoxTitle'>收盘价:&nbsp;"+showPriceInfo.ClosePrice.toFixed(2)+
-                    "</i><br/><i class='rate-discount tipBoxTitle'>溢折价率:&nbsp;<strong style='color:"+ this.GetColor(showPriceInfo.Premium.toFixed(2))+"'>"+
-                    showPriceInfo.Premium.toFixed(2)+"%</strong></i><i class='tipBoxTitle'>成交量(万股):&nbsp;"+showPriceInfo.Vol.toFixed(2)+"</i></span>";
-            }
-            else if (infoType==KLINE_INFO_TYPE.TRADEDETAIL) //龙虎榜
-            {
-                /*var detail=[
-                    "日价格涨幅偏离值达到9.89%",
-                    "日价格涨幅偏离值达格涨幅偏离值达格涨幅偏离值达到9.89%"
-                ]*/
-                var detail=item.ExtendData.Detail;
-                //格式：日期 上榜原因: detail[0].TypeExplain
-                //                    detail[1].TypeExplain
-                //      一周后涨幅: xx 四周后涨幅: xx
-                var str=strOld.toString();
-                var strNew=str.substring(0,4)+"-"+str.substring(4,6)+"-"+str.substring(6,8);  //转换时间格式
-                var reasons = [];
-                for(var i in detail){
-                    reasons += "<i>"+detail[i].TypeExplain+"</i><br/>"
-                    // reasons += detail[i] + "<br/>"
-                }
-
-                strText = "<span><i class='trade-time'>"+strNew+"&nbsp;&nbsp;&nbsp;上榜原因:&nbsp;&nbsp;</i><i class='reason-list'>"+reasons+"</i><br/><i class='trade-detall'>一周后涨幅:&nbsp;<strong style='color:"+
-                    this.GetColor(item.ExtendData.FWeek.Week1.toFixed(2))+"'>"+ item.ExtendData.FWeek.Week1.toFixed(2)+
-                    "%</strong>&nbsp;&nbsp;&nbsp;四周后涨幅:&nbsp;<strong style='color:"+this.GetColor(item.ExtendData.FWeek.Week4.toFixed(2))+";'>"+
-                    item.ExtendData.FWeek.Week4.toFixed(2)+"%</strong></i></span>";
-            }
-            else
+            var item=hqData.Data[i];
+            if (i==start) 
             {
-                var str=strOld.toString();
-                var strNew=str.substring(0,4)+"-"+str.substring(4,6)+"-"+str.substring(6,8);  //转换时间格式
-                strText+="<span>"+strNew+"&nbsp;&nbsp;&nbsp;"+item.Title+"</span>";
+                showData.Date.Start.Date=item.Date;
+                showData.Date.Start.Time=item.Time;
+                showData.Open=item.Close;
+                showData.High=item.High;
+                showData.Low=item.Low;
             }
+
+            showData.Date.End.Date=item.Date;
+            showData.Date.End.Time=item.Time;
+            showData.Close=item.Close;
+            showData.Vol+=item.Vol;
+            showData.Amount+=item.Amount;
+            ++showData.Count;
+            if (showData.High<item.High) showData.High=item.High;
+            if(showData.Low>item.Low) showData.Low=item.Low;
         }
-        var titleInnerBox = $(".title-length").html(strText);
 
-        $("#"+this.ID).html(titleInnerBox);
+        if (showData.Count<=0) return false;
 
-        //当信息超过8条时，添加“共XX条”统计总数
-        if(infoList.length > 8){
-            $("#"+this.ID).append(strBox);
+        if (showData.Vol>0) showData.AvPrice=showData.Amount/showData.Vol;  //均价
+        if (showData.Open>0)
+        {
+            showData.Increase = (showData.Close - showData.Open) / showData.Open *100;   //区间涨幅
+            showData.Amplitude = (showData.High - showData.Low) / showData.Open * 100;   //区间振幅
         }
-    }
 
+        // JSConsole.Chart.Log('[KLineSelectRectDialog::BindData]', showData);
+        var defaultfloatPrecision=GetfloatPrecision(this.SelectData.Symbol);
+        var startDate=IFrameSplitOperator.FormatDateString(showData.Date.Start.Date);
+        var endDate=IFrameSplitOperator.FormatDateString(showData.Date.End.Date);
+        startDate+=' '+IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM");
+        endDate+=" "+IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM");
+       
+        var startLeftClass="",startRightClass="",endLeftClass="",endRightClass="";
+        if(start<=0) startLeftClass = "BtnBackground";
+        if(start >= end) {
+            startRightClass = "BtnBackground";
+            endLeftClass = "BtnBackground";
+        }
+        if(end >= hqData.Data.length - 1) endRightClass = "BtnBackground";
 
-    this.GetColor=function(price)
-    {
-        if(price>0) return this.UpColor;
-        else if (price<0) return this.DownColor;
-        else return this.UnchagneColor;
+        var div=document.createElement('div');
+        div.className='jchart-select-table-right';
+        div.innerHTML=
+            '<div class="jchart-select-date">\n' +
+            '            <span>开始: '+ startDate +'<i class="start-date-left '+ startLeftClass +'"><</i><i class="start-date-right '+ startRightClass +'">></i></span>\n' +
+            '            <span>结束: '+ endDate +'<i class="end-date-left '+ endLeftClass +'"><</i><i class="end-date-right '+ endRightClass +'">></i></span>\n' +
+            '            <span>总个数: '+ showData.Count +'</span>\n' +
+            '        </div>\n' +
+            '        <table>\n' +
+            '            <tr><td><strong>起始价: </strong><span>'+ showData.Open.toFixed(defaultfloatPrecision) +'</span></td>' +
+            '               <td><strong>终止价: </strong><span>'+ showData.Close.toFixed(defaultfloatPrecision) +'</span></td>' +
+            '               <td><strong>均价: </strong><span>'+ (IFrameSplitOperator.IsNumber(showData.AvPrice) ? showData.AvPrice.toFixed(defaultfloatPrecision):"--.--") +'</span></td></tr>\n' +
+            '            <tr><td><strong>最低价: </strong><span>'+ showData.Low.toFixed(defaultfloatPrecision) +'</span></td>' +
+            '               <td><strong>最高价: </strong><span>'+ showData.High.toFixed(defaultfloatPrecision) +'</span></td>' +
+            '               <td><strong>涨跌幅: </strong><span class="'+ IFrameSplitOperator.FormatValueColor(showData.Increase) +'">'+ showData.Increase.toFixed(2) +'%</span></td></tr>\n' +
+            '            <tr><td><strong>振幅: </strong><span>'+ showData.Amplitude.toFixed(2) +'%</span></td>' +
+            '               <td><strong>成交量: </strong><span>'+ IFrameSplitOperator.FormatValueString(showData.Vol,2) +'股</span></td>' +
+            '               <td><strong>金额: </strong><span>'+ IFrameSplitOperator.FormatValueString(showData.Amount,2) +'元</span></td></tr>\n' +
+            '        </table>';
+
+        $(".parameter-content").html(div);
+        this.BindEvent();
+
+        return true;
     }
 
-    //显示窗口，改函数仅为KLineInfoTooltip使用
-    this.Show=function(left,top,width,height,tooltip,times)
+    this.BindEvent = function () 
     {
-        //显示位置
-        $("#"+this.ID).css({'display':'block','top':top+'px', "left":left+'px', "width":width+'px', "height":height+'px' });
-
-        function toolHide() {
-            tooltip.Hide();
+        var _self = this;
+        if(_self.SelectData.Start > 0){
+            $(".jchart-select-date .start-date-left").click(function () {
+                _self.SelectData.Start--;
+                _self.BindData();
+                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
+            })
+        }
+        if(_self.SelectData.Start < _self.SelectData.End){
+            $(".jchart-select-date .start-date-right").click(function () {
+                _self.SelectData.Start++;
+                _self.BindData();
+                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
+            })
+            $(".jchart-select-date .end-date-left").click(function () {
+                _self.SelectData.End--;
+                _self.BindData();
+                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
+            })
+        }
+        if(_self.SelectData.End < _self.SelectData.Data.Data.length - 1){
+            $(".jchart-select-date .end-date-right").click(function () {
+                _self.SelectData.End++;
+                _self.BindData();
+                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
+            })
         }
-
-        if (this.TimeOut!=null)
-            clearTimeout(this.TimeOut); //清空上一次的定时器,防止定时器不停的被调用
-
-        //设置窗口定时隐藏
-        this.TimeOut=setTimeout(toolHide,times);
-
     }
 
 
+    //显示
     this.DoModal=function(event)
     {
         var chart=event.data.Chart;
-        var infoType=event.data.InfoType;   //信息地雷类型
-        var infoList=event.data.InfoList;    //信息数据列表
-        var tooltip=chart.KLineInfoTooltip;
-
-        if(!tooltip) return;
-        if (tooltip.ID==null) tooltip.Create();   //第1次 需要创建div
-
-        tooltip.BindInfoList(infoType,infoList);
-
-        var left=event.pageX;
-        var top=event.pageY+10;
-        var widthTool=380;
-        var heightTool=$("#"+tooltip.ID).height();
-
-        if((left + widthTool) > chart.UIElement.getBoundingClientRect().width){
-            left = left - widthTool;
-        }
-        /*if(top+heightTool>chart.UIElement.getBoundingClientRect().height){
-            top=top-heightTool-45;
-        }*/
+        if (this.ID==null) this.Create();   //第1次 需要创建div
+        this.SelectData=event.data.SelectData;
+        this.RectSelectPaint=event.data.RectSelectPaint;
+        this.HQChart=chart;
+        this.HQChart.HideSelectRect();
+        if (!this.BindData()) return;
 
-        tooltip.Show(left,top,widthTool,"auto",tooltip,8000);
+        this.Show();      //通过CSS居中显示
     }
 
-    //鼠标离开
-    this.Leave=function(event)
-    {
-        var chart=event.data.Chart;
-        var tooltip=chart.KLineInfoTooltip;
-
-        if(!tooltip || tooltip.ID==null) return;
 
-        tooltip.Hide();
-    }
 }
 
-function MinuteSelectRectDialog(divElement)
+//区间统计
+function KLineSelectRectDialog(divElement)
 {
     this.newMethod=IDivDialog;   //派生
     this.newMethod(divElement);
@@ -93502,7 +93871,6 @@ function MinuteSelectRectDialog(divElement)
         {
             this.DivElement.removeChild(this.Dialog);
             this.Dialog=null;
-            this.ID=null;
         }
 
         if (this.RectSelectPaint) this.RectSelectPaint.PreventClose=false;
@@ -93518,12 +93886,13 @@ function MinuteSelectRectDialog(divElement)
         div.innerHTML=
         "<div class='parameter jchart-select-section'>\
             <div class='parameter-header'>\
-                <span>分时图区间统计</span>\
+                <span>区间统计</span>\
                 <strong id='close' class='icon iconfont icon-close'></strong>\
             </div>\
             <div class='parameter-content'>统计数据</div>\
         <div class='parameter-footer'>\
             <button id='close' class='submit' >确定</button>\
+            <button id='match' class='submit' >形态匹配</button>\
         </div>\
         </div>";
 
@@ -93539,6 +93908,16 @@ function MinuteSelectRectDialog(divElement)
             {
                 event.data.divBox.Close();
             });
+        
+        //形态匹配
+        $("#"+this.ID+" #match").click(
+            {
+                divBox:this,
+            },
+            function(event)
+            {
+                event.data.divBox.KLineMatch();
+            });   
     }
 
     this.BindData=function()
@@ -93551,7 +93930,7 @@ function MinuteSelectRectDialog(divElement)
 
         var showData=
         { 
-            Open:0,Close:0,High:0,Low:0,  //起始价格, 结束价格, 最高, 最低
+            Open:0,Close:0,High:0,Low:0, YClose:0,
             Vol:0, Amount:0, 
             Date:
             { 
@@ -93559,6 +93938,7 @@ function MinuteSelectRectDialog(divElement)
                 End:{ Time:null, Date:null }
             }, 
             Count:0,
+            KLine:{ Up:0,Down:0,Unchanged:0 }    //阳线|阴线|平线
         }
 
         for(var i=start; i<=end && i<hqData.Data.length; ++i)
@@ -93568,9 +93948,10 @@ function MinuteSelectRectDialog(divElement)
             {
                 showData.Date.Start.Date=item.Date;
                 showData.Date.Start.Time=item.Time;
-                showData.Open=item.Close;
+                showData.Open=item.Open;
                 showData.High=item.High;
                 showData.Low=item.Low;
+                showData.YClose=item.YClose;
             }
 
             showData.Date.End.Date=item.Date;
@@ -93581,21 +93962,32 @@ function MinuteSelectRectDialog(divElement)
             ++showData.Count;
             if (showData.High<item.High) showData.High=item.High;
             if(showData.Low>item.Low) showData.Low=item.Low;
+            if (item.Close>item.Open) ++showData.KLine.Up;
+            else if (item.Close<item.Open) ++showData.KLine.Down;
+            else ++showData.KLine.Unchanged;
         }
 
         if (showData.Vol>0) showData.AvPrice=showData.Amount/showData.Vol;  //均价
-        if (item.Open>0)
+        if (item.YClose>0)
         {
-            showData.Increase = (showData.Close - showData.Open) / showData.Open *100;   //区间涨幅
-            showData.Amplitude = (showData.High - showData.Low) / showData.Open * 100;   //区间振幅
+            showData.Increase = (showData.Close - showData.YClose) / showData.YClose *100;   //涨幅
+            showData.Amplitude = (showData.High - showData.Low) / showData.YClose * 100;     //振幅
         }
 
         // JSConsole.Chart.Log('[KLineSelectRectDialog::BindData]', showData);
         var defaultfloatPrecision=GetfloatPrecision(this.SelectData.Symbol);
         var startDate=IFrameSplitOperator.FormatDateString(showData.Date.Start.Date);
         var endDate=IFrameSplitOperator.FormatDateString(showData.Date.End.Date);
-        startDate+=' '+IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM");
-        endDate+=" "+IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM");
+        if (ChartData.IsMinutePeriod(this.HQChart.Period))
+        {
+            startDate+=' '+IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM");
+            endDate+=" "+IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM");
+        }
+        else if (ChartData.IsSecondPeriod(this.HQChart.Period) || ChartData.IsTickPeriod(this.HQChart.Period))
+        {
+            startDate+=' '+IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM:SS");
+            endDate+=" "+IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM:SS");
+        }
        
         var startLeftClass="",startRightClass="",endLeftClass="",endRightClass="";
         if(start<=0) startLeftClass = "BtnBackground";
@@ -93614,8 +94006,8 @@ function MinuteSelectRectDialog(divElement)
             '            <span>总个数: '+ showData.Count +'</span>\n' +
             '        </div>\n' +
             '        <table>\n' +
-            '            <tr><td><strong>起始价: </strong><span>'+ showData.Open.toFixed(defaultfloatPrecision) +'</span></td>' +
-            '               <td><strong>终止价: </strong><span>'+ showData.Close.toFixed(defaultfloatPrecision) +'</span></td>' +
+            '            <tr><td><strong>起始价: </strong><span>'+ showData.YClose.toFixed(defaultfloatPrecision) +'</span></td>' +
+            '               <td><strong>最终价: </strong><span>'+ showData.Close.toFixed(defaultfloatPrecision) +'</span></td>' +
             '               <td><strong>均价: </strong><span>'+ (IFrameSplitOperator.IsNumber(showData.AvPrice) ? showData.AvPrice.toFixed(defaultfloatPrecision):"--.--") +'</span></td></tr>\n' +
             '            <tr><td><strong>最低价: </strong><span>'+ showData.Low.toFixed(defaultfloatPrecision) +'</span></td>' +
             '               <td><strong>最高价: </strong><span>'+ showData.High.toFixed(defaultfloatPrecision) +'</span></td>' +
@@ -93623,234 +94015,16 @@ function MinuteSelectRectDialog(divElement)
             '            <tr><td><strong>振幅: </strong><span>'+ showData.Amplitude.toFixed(2) +'%</span></td>' +
             '               <td><strong>成交量: </strong><span>'+ IFrameSplitOperator.FormatValueString(showData.Vol,2) +'股</span></td>' +
             '               <td><strong>金额: </strong><span>'+ IFrameSplitOperator.FormatValueString(showData.Amount,2) +'元</span></td></tr>\n' +
+            '            <tr><td><strong>阴线: </strong><span>'+ showData.KLine.Up +'</span></td>' +
+            '               <td><strong>阳线: </strong><span>'+ showData.KLine.Down +'</span></td>' +
+            '               <td><strong>平线: </strong><span>'+ showData.KLine.Unchanged +'</span></td></tr>\n' +
             '        </table>';
 
         $(".parameter-content").html(div);
         this.BindEvent();
     }
 
-    this.BindEvent = function () 
-    {
-        var _self = this;
-        if(_self.SelectData.Start > 0){
-            $(".jchart-select-date .start-date-left").click(function () {
-                _self.SelectData.Start--;
-                _self.BindData();
-                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
-            })
-        }
-        if(_self.SelectData.Start < _self.SelectData.End){
-            $(".jchart-select-date .start-date-right").click(function () {
-                _self.SelectData.Start++;
-                _self.BindData();
-                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
-            })
-            $(".jchart-select-date .end-date-left").click(function () {
-                _self.SelectData.End--;
-                _self.BindData();
-                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
-            })
-        }
-        if(_self.SelectData.End < _self.SelectData.Data.Data.length - 1){
-            $(".jchart-select-date .end-date-right").click(function () {
-                _self.SelectData.End++;
-                _self.BindData();
-                _self.HQChart.UpdateSelectRect(_self.SelectData.Start,_self.SelectData.End);
-            })
-        }
-    }
-
-
-    //显示
-    this.DoModal=function(event)
-    {
-        var chart=event.data.Chart;
-        if (this.ID==null) this.Create();   //第1次 需要创建div
-        this.SelectData=event.data.SelectData;
-        this.RectSelectPaint=event.data.RectSelectPaint;
-        this.HQChart=chart;
-        this.HQChart.HideSelectRect();
-        this.BindData();
-
-        this.Show();      //通过CSS居中显示
-    }
-
-
-}
-
-//区间统计
-function KLineSelectRectDialog(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.SelectData;
-    this.Dialog;
-    this.HQChart;
-    this.RectSelectPaint;
-
-    //隐藏窗口
-    this.Close=function()
-    {
-        if (this.Dialog) 
-        {
-            this.DivElement.removeChild(this.Dialog);
-            this.Dialog=null;
-        }
-
-        if (this.RectSelectPaint) this.RectSelectPaint.PreventClose=false;
-    }
-
-    //创建
-    this.Create=function()
-    {
-        this.ID=Guid();
-        var div=document.createElement('div');
-        div.className='jchart-select-statistics-box';
-        div.id=this.ID;
-        div.innerHTML=
-        "<div class='parameter jchart-select-section'>\
-            <div class='parameter-header'>\
-                <span>区间统计</span>\
-                <strong id='close' class='icon iconfont icon-close'></strong>\
-            </div>\
-            <div class='parameter-content'>统计数据</div>\
-        <div class='parameter-footer'>\
-            <button id='close' class='submit' >确定</button>\
-            <button id='match' class='submit' >形态匹配</button>\
-        </div>\
-        </div>";
-
-        this.DivElement.appendChild(div);
-        this.Dialog=div;
-
-        //关闭按钮
-        $("#"+this.ID+" #close").click(
-            {
-                divBox:this,
-            },
-            function(event)
-            {
-                event.data.divBox.Close();
-            });
-        
-        //形态匹配
-        $("#"+this.ID+" #match").click(
-            {
-                divBox:this,
-            },
-            function(event)
-            {
-                event.data.divBox.KLineMatch();
-            });   
-    }
-
-    this.BindData=function()
-    {
-        var hqData=this.SelectData.Data;
-        var start=this.SelectData.Start;
-        var end=this.SelectData.End;
-        this.HQChart.UpdateSelectRect(start,end);
-        if (this.RectSelectPaint) this.RectSelectPaint.PreventClose=true;
-
-        var showData=
-        { 
-            Open:0,Close:0,High:0,Low:0, YClose:0,
-            Vol:0, Amount:0, 
-            Date:
-            { 
-                Start:{Time:null, Date:null },
-                End:{ Time:null, Date:null }
-            }, 
-            Count:0,
-            KLine:{ Up:0,Down:0,Unchanged:0 }    //阳线|阴线|平线
-        }
-
-        for(var i=start; i<=end && i<hqData.Data.length; ++i)
-        {
-            var item=hqData.Data[i];
-            if (i==start) 
-            {
-                showData.Date.Start.Date=item.Date;
-                showData.Date.Start.Time=item.Time;
-                showData.Open=item.Open;
-                showData.High=item.High;
-                showData.Low=item.Low;
-                showData.YClose=item.YClose;
-            }
-
-            showData.Date.End.Date=item.Date;
-            showData.Date.End.Time=item.Time;
-            showData.Close=item.Close;
-            showData.Vol+=item.Vol;
-            showData.Amount+=item.Amount;
-            ++showData.Count;
-            if (showData.High<item.High) showData.High=item.High;
-            if(showData.Low>item.Low) showData.Low=item.Low;
-            if (item.Close>item.Open) ++showData.KLine.Up;
-            else if (item.Close<item.Open) ++showData.KLine.Down;
-            else ++showData.KLine.Unchanged;
-        }
-
-        if (showData.Vol>0) showData.AvPrice=showData.Amount/showData.Vol;  //均价
-        if (item.YClose>0)
-        {
-            showData.Increase = (showData.Close - showData.YClose) / showData.YClose *100;   //涨幅
-            showData.Amplitude = (showData.High - showData.Low) / showData.YClose * 100;     //振幅
-        }
-
-        // JSConsole.Chart.Log('[KLineSelectRectDialog::BindData]', showData);
-        var defaultfloatPrecision=GetfloatPrecision(this.SelectData.Symbol);
-        var startDate=IFrameSplitOperator.FormatDateString(showData.Date.Start.Date);
-        var endDate=IFrameSplitOperator.FormatDateString(showData.Date.End.Date);
-        if (ChartData.IsMinutePeriod(this.HQChart.Period))
-        {
-            startDate+=' '+IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM");
-            endDate+=" "+IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM");
-        }
-        else if (ChartData.IsSecondPeriod(this.HQChart.Period) || ChartData.IsTickPeriod(this.HQChart.Period))
-        {
-            startDate+=' '+IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM:SS");
-            endDate+=" "+IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM:SS");
-        }
-       
-        var startLeftClass="",startRightClass="",endLeftClass="",endRightClass="";
-        if(start<=0) startLeftClass = "BtnBackground";
-        if(start >= end) {
-            startRightClass = "BtnBackground";
-            endLeftClass = "BtnBackground";
-        }
-        if(end >= hqData.Data.length - 1) endRightClass = "BtnBackground";
-
-        var div=document.createElement('div');
-        div.className='jchart-select-table-right';
-        div.innerHTML=
-            '<div class="jchart-select-date">\n' +
-            '            <span>开始: '+ startDate +'<i class="start-date-left '+ startLeftClass +'"><</i><i class="start-date-right '+ startRightClass +'">></i></span>\n' +
-            '            <span>结束: '+ endDate +'<i class="end-date-left '+ endLeftClass +'"><</i><i class="end-date-right '+ endRightClass +'">></i></span>\n' +
-            '            <span>总个数: '+ showData.Count +'</span>\n' +
-            '        </div>\n' +
-            '        <table>\n' +
-            '            <tr><td><strong>起始价: </strong><span>'+ showData.YClose.toFixed(defaultfloatPrecision) +'</span></td>' +
-            '               <td><strong>最终价: </strong><span>'+ showData.Close.toFixed(defaultfloatPrecision) +'</span></td>' +
-            '               <td><strong>均价: </strong><span>'+ (IFrameSplitOperator.IsNumber(showData.AvPrice) ? showData.AvPrice.toFixed(defaultfloatPrecision):"--.--") +'</span></td></tr>\n' +
-            '            <tr><td><strong>最低价: </strong><span>'+ showData.Low.toFixed(defaultfloatPrecision) +'</span></td>' +
-            '               <td><strong>最高价: </strong><span>'+ showData.High.toFixed(defaultfloatPrecision) +'</span></td>' +
-            '               <td><strong>涨跌幅: </strong><span class="'+ IFrameSplitOperator.FormatValueColor(showData.Increase) +'">'+ showData.Increase.toFixed(2) +'%</span></td></tr>\n' +
-            '            <tr><td><strong>振幅: </strong><span>'+ showData.Amplitude.toFixed(2) +'%</span></td>' +
-            '               <td><strong>成交量: </strong><span>'+ IFrameSplitOperator.FormatValueString(showData.Vol,2) +'股</span></td>' +
-            '               <td><strong>金额: </strong><span>'+ IFrameSplitOperator.FormatValueString(showData.Amount,2) +'元</span></td></tr>\n' +
-            '            <tr><td><strong>阴线: </strong><span>'+ showData.KLine.Up +'</span></td>' +
-            '               <td><strong>阳线: </strong><span>'+ showData.KLine.Down +'</span></td>' +
-            '               <td><strong>平线: </strong><span>'+ showData.KLine.Unchanged +'</span></td></tr>\n' +
-            '        </table>';
-
-        $(".parameter-content").html(div);
-        this.BindEvent();
-    }
-
-    this.BindEvent = function () {
+    this.BindEvent = function () {
         var _self = this;
         if(_self.SelectData.Start > 0){
             $(".jchart-select-date .start-date-left").click(function () {
@@ -97025,6 +97199,7 @@ function FuturesTimeData()
         [MARKET_SUFFIX_NAME.CZCE + '-SA', {Time:6,Decimal:0, Name:"纯碱"}],
         [MARKET_SUFFIX_NAME.CZCE + '-PF', {Time:6,Decimal:0, Name:"短纤"}],
         [MARKET_SUFFIX_NAME.CZCE + '-PK', {Time:0,Decimal:0, Name:"花生"}],
+        [MARKET_SUFFIX_NAME.CZCE + '-PR', {Time:6,Decimal:0, Name:"瓶片"}],
 
 
         //中期所 
@@ -99859,20 +100034,17 @@ function Node(ErrorHandler)
             return;
         }
 
-        if (callee.Name=='GPJYVALUE')
-        {
-            var item={ ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_GPJYVALUE, Args:args,  FunctionName:callee.Name };
-            if (token) item.Token={ Index:token.Start, Line:token.LineNumber };
-            this.FunctionData.push(item);
-            return;
-        }
-
-        if (callee.Name=="SCJYVALUE")
+        //专业财务数据
+        for(var i=0;i<JS_ARRAY_PROFESSIONAL_FINANCE.length;++i)
         {
-            var item={ ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SCJYVALUE, Args:args,  FunctionName:callee.Name };
-            if (token) item.Token={ Index:token.Start, Line:token.LineNumber };
-            this.FunctionData.push(item);
-            return;
+            var financeItem=JS_ARRAY_PROFESSIONAL_FINANCE[i];
+            if (financeItem.Name==callee.Name)
+            {
+                var item={ ID:financeItem.JobID, Args:args,  FunctionName:callee.Name };
+                if (token) item.Token={ Index:token.Start, Line:token.LineNumber };
+                this.FunctionData.push(item);
+                return;
+            }
         }
 
         if (callee.Name==='MARGIN')
@@ -112872,54 +113044,6 @@ function JSSymbolData(ast,option,jsExecute)
         return financeData.get(id);
     }
 
-    this.GetFinOne=function(jobItem)
-    {
-        var aryArgs=this.JobArgumentsToArray(jobItem, 3);
-        var key=this.GetStockDataKey(jobItem,aryArgs);
-        if (this.StockData.has(key)) return this.Execute.RunNextJob();
-        var self=this;
-        if (this.NetworkFilter)
-        {
-            var dateRange=this.Data.GetDateRange();
-            var obj=
-            {
-                Name:'JSSymbolData::GetFinOne', //类名::
-                Explain:'财务数据FINONE(ID,Y,MMDD)',
-                JobID:jobItem.ID,
-                Request:{ Url:self.StockHistoryDayApiUrl, Type:'POST', Data:{ Args:aryArgs, symbol: this.Symbol, daterange:dateRange } },
-                Self:this,
-                PreventDefault:false
-            };
-            this.NetworkFilter(obj, function(recvData) 
-            { 
-                self.RecvStockValue(recvData,jobItem,key,1);
-                self.Execute.RunNextJob();
-            });
-
-            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
-        }
-
-        var apiDownload=new DownloadFinOneData( 
-            {
-                Job:jobItem, 
-                Symbol:this.Symbol, 
-                Url:this.StockHistoryDayApiUrl, 
-                Args:aryArgs,
-                DataKey:key,
-                Callback:function(recvData, jobItem, key) 
-                { 
-                    self.RecvStockValue(recvData, jobItem, key,1);
-                    self.Execute.RunNextJob();
-                },
-                ErrorCallback:function(strError)
-                {
-                    self.AddStockValueError(key,strError);
-                }
-            });
-
-        apiDownload.Download();
-    }
-
     this.GetStockDataKey=function(jobItem, aryArgs)
     {
         var key=jobItem.FunctionName;
@@ -112937,55 +113061,6 @@ function JSSymbolData(ast,option,jsExecute)
         return key;
     }
 
-    this.GetFinValue=function(jobItem)
-    {
-        var aryArgs=this.JobArgumentsToArray(jobItem, 1);
-        var lID=aryArgs[0];
-        var key=this.GetStockDataKey(jobItem,aryArgs);
-        if (this.StockData.has(key)) return this.Execute.RunNextJob();
-        var self=this;
-        if (this.NetworkFilter)
-        {
-            var dateRange=this.Data.GetDateRange();
-            var obj=
-            {
-                Name:'JSSymbolData::GetFinValue', //类名::
-                Explain:'财务数据FINVALUE(ID)',
-                JobID:jobItem.ID,
-                Request:{ Url:self.StockHistoryDayApiUrl, Type:'POST', Data:{ id:lID, symbol: this.Symbol, daterange:dateRange } },
-                Self:this,
-                PreventDefault:false
-            };
-            this.NetworkFilter(obj, function(recvData) 
-            { 
-                self.RecvStockValue(recvData,jobItem,key,0);
-                self.Execute.RunNextJob();
-            });
-
-            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
-        }
-
-        var apiDownload=new DownloadFinValueData( 
-            {
-                Job:jobItem, 
-                Symbol:this.Symbol, 
-                Url:this.StockHistoryDayApiUrl, 
-                Args:aryArgs,
-                DataKey:key,
-                Callback:function(recvData, jobItem, key) 
-                { 
-                    self.RecvStockValue(recvData, jobItem, key,0);
-                    self.Execute.RunNextJob();
-                },
-                ErrorCallback:function(strError)
-                {
-                    self.AddStockValueError(key,strError);
-                }
-            });
-
-        apiDownload.Download();
-    }
-
     this.GetFinance=function(jobItem)
     {
         var aryArgs=this.JobArgumentsToArray(jobItem, 1);
@@ -113038,74 +113113,41 @@ function JSSymbolData(ast,option,jsExecute)
         apiDownload.Download();
     }
 
-    this.GetGPJYValue=function(jobItem)
+    this.GetProFinance=function(jobItem)
     {
-        var aryArgs=this.JobArgumentsToArray(jobItem, 3);
-        var key=this.GetStockDataKey(jobItem,aryArgs);
-        if (this.StockData.has(key)) return this.Execute.RunNextJob();
-
-        var self=this;
-        //TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理
-        var dataType=aryArgs[2]==1?0:2;
-        if (this.NetworkFilter)
+        var jobID=jobItem.ID;
+        var finder=null;
+        for(var i=0;i<JS_ARRAY_PROFESSIONAL_FINANCE.length;++i)
         {
-            var dateRange=this.Data.GetDateRange();
-            var obj=
+            var item=JS_ARRAY_PROFESSIONAL_FINANCE[i];
+            if (item.JobID==jobID)
             {
-                Name:'JSSymbolData::GetGPJYValue', //类名::
-                Explain:'股票交易类数据GPJYVALUE(ID,N,TYPE)',
-                JobID:jobItem.ID,
-                Request:{ Url:self.StockHistoryDayApiUrl, Type:'POST', Data:{ Args:aryArgs, symbol: this.Symbol, daterange:dateRange } },
-                Self:this,
-                PreventDefault:false
-            };
-            this.NetworkFilter(obj, function(recvData) 
-            { 
-                self.RecvStockValue(recvData,jobItem,key,dataType);
-                self.Execute.RunNextJob();
-            });
-
-            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+                finder=item;
+                break;
+            }
         }
 
-        var apiDownload=new DownloadGPJYValue( 
-            {
-                Job:jobItem, 
-                Symbol:this.Symbol, 
-                Url:this.StockHistoryDayApiUrl,
-                Args:aryArgs,
-                DataKey:key,
-                Callback:function(recvData, jobItem, key) 
-                { 
-                    self.RecvStockValue(recvData, jobItem, key,dataType);
-                    self.Execute.RunNextJob();
-                },
-                ErrorCallback:function(strError)
-                {
-                    self.AddStockValueError(key,strError);
-                }
-            });
+        if (!finder) return this.Execute.RunNextJob();
 
-        apiDownload.Download();
-    }
-
-    this.GetSCJYValue=function(jobItem)
-    {
-        var aryArgs=this.JobArgumentsToArray(jobItem, 3);
+        var aryArgs=this.JobArgumentsToArray(jobItem, finder.ArgCount);
         var key=this.GetStockDataKey(jobItem,aryArgs);
         if (this.StockData.has(key)) return this.Execute.RunNextJob();
 
         var self=this;
-        //TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理
-        var dataType=aryArgs[2]==1?0:2;
+        var dataType=0;
+        if ([JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_GPJYVALUE,JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SCJYVALUE,JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_BKJYVALUE].includes(jobID))
+        {
+            dataType=aryArgs[2]==1?0:2; //TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理
+        }
+
         if (this.NetworkFilter)
         {
             var dateRange=this.Data.GetDateRange();
             var obj=
             {
-                Name:'JSSymbolData::GetSCJYValue', //类名::
-                Explain:'股票交易类数据SCJYVALUE(ID,N,TYPE)',
-                JobID:jobItem.ID,
+                Name:finder.FuncName, //类名::
+                Explain:finder.Explain,
+                JobID:jobID,
                 Request:{ Url:self.StockHistoryDayApiUrl, Type:'POST', Data:{ Args:aryArgs, symbol: this.Symbol, daterange:dateRange } },
                 Self:this,
                 PreventDefault:false
@@ -113119,25 +113161,7 @@ function JSSymbolData(ast,option,jsExecute)
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
 
-        var apiDownload=new DownloadSCJYValue( 
-            {
-                Job:jobItem, 
-                Symbol:this.Symbol, 
-                Url:this.StockHistoryDayApiUrl,
-                Args:aryArgs,
-                DataKey:key,
-                Callback:function(recvData, jobItem, key) 
-                { 
-                    self.RecvStockValue(recvData, jobItem, key,dataType);
-                    self.Execute.RunNextJob();
-                },
-                ErrorCallback:function(strError)
-                {
-                    self.AddStockValueError(key,strError);
-                }
-            });
-
-        apiDownload.Download();
+        JSConsole.Chart.Warn(`[JSSymbolData::GetProFinance] ${finder.FuncName} Not implemented.`);
     }
 
     this.GetVariantData=function(jobItem)
@@ -115137,6 +115161,11 @@ var JS_EXECUTE_JOB_ID=
     JOB_DOWNLOAD_GPJYVALUE:304,                 //引用股票交易类数据 GPJYVALUE(ID,N,TYPE),ID为数据编号,N表示第几个数据,TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理
     JOB_DOWNLOAD_VARIANT:305,                   //CAPITAL , TOTALCAPITAL, EXCHANGE
     JOB_DOWNLOAD_SCJYVALUE:306,                 //引用市场总的交易类数据.SCJYVALUE(ID,N,TYPE),ID为数据编号,N表示第几个数据,TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理
+    JOB_DOWNLOAD_GPJYONE:307,                   //GPJYONE(ID,N,Y,MMDD),ID为数据编号,N表示第几个数据(取1或2),Y和MMDD表示年和月日. 如果Y为0,MMDD为0,表示最新数据,MMDD为1,2,3...,表示倒数第2,3,4...个数据
+    JOB_DOWNLOAD_SCJYONE:308,                   //SCJYONE(ID,N,Y,MMDD),ID为数据编号,N表示第几个数据(取1或2),Y和MMDD表示年和月日.如果Y为0,MMDD为0,表示最新数据,MMDD为1,2,3...,表示倒数第2,3,4...个数据
+    JOB_DOWNLOAD_BKJYVALUE:309,                 //BKJYVALUE(ID,N,TYPE),ID为数据编号,N表示第几个数据(取1或2),TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理;2表示没有数据则为0.
+    JOB_DOWNLOAD_BKJYONE:310,                   //BKJYONE(ID,N,Y,MMDD),ID为数据编号,N表示第几个数据(取1或2),Y和MMDD表示年和月日.如果Y为0,MMDD为0,表示最新数据,MMDD为1,2,3...,表示倒数第2,3,4...个数据
+
     
     
    
@@ -115333,6 +115362,46 @@ var JS_EXECUTE_JOB_ID=
 
 };
 
+
+//专业财务数据
+var JS_ARRAY_PROFESSIONAL_FINANCE=
+[
+    { 
+        Name:"GPJYVALUE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_GPJYVALUE, 
+        Explain:"股票交易类数据GPJYVALUE(ID,N,TYPE)", FuncName:"JSSymbolData::GetGPJYValue", ArgCount:3  
+    },
+    { 
+        Name:"GPJYONE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_GPJYONE,
+        Explain:"股票交易类数据GPJYONE(ID,N,Y,MMDD)", FuncName:"JSSymbolData::GetGPJYOne", ArgCount:4
+    },
+    { 
+        Name:"SCJYVALUE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SCJYVALUE,
+        Explain:"市场交易类数据SCJYVALUE(ID,N,TYPE)", FuncName:"JSSymbolData::GetSCJYValue",ArgCount:3 
+    },
+    { 
+        Name:"SCJYONE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SCJYONE,
+        Explain:"市场交易类数据SCJYONE(ID,N,Y,MMDD)", FuncName:"JSSymbolData::GetSCJYOne",ArgCount:4 
+    },
+    { 
+        Name:"BKJYVALUE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_BKJYVALUE,
+        Explain:"板块交易类数据BKJYVALUE(ID,N,TYPE)", FuncName:"JSSymbolData::GetBKJYValue",ArgCount:3 
+    },
+    { 
+        Name:"BKJYONE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_BKJYONE,
+        Explain:"板块交易类数据BKJYONE(ID,N,Y,MMDD)", FuncName:"JSSymbolData::GetBKJYOne",ArgCount:4 
+    },
+    {
+        Name:"FINVALUE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINVALUE,
+        Explain:"财务数据FINVALUE(ID)", FuncName:"JSSymbolData::GetFinValue",ArgCount:1
+    },
+    {
+        Name:"FINONE", JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINONE,
+        Explain:"财务数据FINONE(ID,Y,MMDD)", FuncName:"JSSymbolData::GetFinOne",ArgCount:3
+    }
+
+    
+];
+
 function JSExecute(ast,option)
 {
     this.AST=ast;   //语法树
@@ -115539,16 +115608,19 @@ function JSExecute(ast,option)
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SECTION_SF:
                 return this.SymbolData.GetSectionFinanceData(jobItem);   //财务截面报告数据
 
-            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINONE:
-                return this.SymbolData.GetFinOne(jobItem);
-            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINVALUE:
-                return this.SymbolData.GetFinValue(jobItem);
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINANCE:
                 return this.SymbolData.GetFinance(jobItem);
+
+            //专业财务数据
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINONE:
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_FINVALUE:
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_GPJYVALUE:
-                return this.SymbolData.GetGPJYValue(jobItem);
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_GPJYONE:
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SCJYVALUE:
-                return this.SymbolData.GetSCJYValue(jobItem);
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SCJYONE:
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_BKJYVALUE:
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_BKJYONE:
+                return this.SymbolData.GetProFinance(jobItem);
 
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_VARIANT:    //CAPITAL, TOTALCAPITAL 
                 return this.SymbolData.GetVariantData(jobItem);
@@ -116908,11 +116980,15 @@ function JSExecute(ast,option)
                 node.Out=this.SymbolData.GetStockCacheData( {FunctionName:funcName, Args:args, ArgCount:3, Node:node } );
                 break;
             case "GPJYVALUE":
-                node.Out=this.SymbolData.GetStockCacheData( {FunctionName:funcName, Args:args, ArgCount:3, Node:node } );
-                break;
             case "SCJYVALUE":
+            case "BKJYVALUE":
                 node.Out=this.SymbolData.GetStockCacheData( {FunctionName:funcName, Args:args, ArgCount:3, Node:node } );
                 break;
+            case "GPJYONE":
+            case "SCJYONE":
+            case "BKJYONE":
+                node.Out=this.SymbolData.GetStockCacheData( {FunctionName:funcName, Args:args, ArgCount:4, Node:node } );
+                break;
             case "MARGIN":
                 node.Out=this.SymbolData.GetMarginCacheData(args[0],node);
                 break;
@@ -121101,6 +121177,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case SCRIPT_CHART_NAME.OVERLAY_BARS:
                         this.CreateStackedBar(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWCOLORKLINE":
+                        this.CreateDrawColorKLine(hqChart,windowIndex,item,i);
+                        break;
 
                     default:
                         {
@@ -121718,6 +121797,24 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateDrawColorKLine=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        let chart=new ChartColorKline();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.DrawName="DRAWCOLORKLINE";
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+
+        chart.Data.Data=varItem.Draw.DrawData;
+        if (IFrameSplitOperator.IsBool(varItem.Draw.IsEmptyBar)) chart.IsEmptyBar=varItem.Draw.IsEmptyBar;
+        if (varItem.Draw.Color) chart.Color=varItem.Draw.Color;
+        frame.ChartPaint.push(chart);
+    }
+
     //创建图标
     this.CreateIcon=function(hqChart,windowIndex,varItem,id)
     {
@@ -122954,6 +123051,8 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                 if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow;  //是否绘制线段
                 if (item.isexdata==true) outVarItem.IsExData = true;
                 if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
+                if (item.UpColor) outVarItem.UpColor=item.UpColor;
+                if (item.DownColor) outVarItem.DownColor=item.DownColor;
                 if (IFrameSplitOperator.IsBool(item.isDotLine)) outVarItem.IsDotLine = item.isDotLine;
                 if (IFrameSplitOperator.IsNonEmptyArray(item.lineDash)) outVarItem.LineDash=item.lineDash;
                 if (IFrameSplitOperator.IsBool(item.isSingleLine))  outVarItem.IsSingleLine=item.isSingleLine;
@@ -123215,6 +123314,19 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWCOLORKLINE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);
+
+                    outVarItem.Draw=drawItem;
+                    if (draw.Color) drawItem.Color=draw.Color;
+                    if (IFrameSplitOperator.IsBool(draw.IsEmptyBar)) drawItem.IsEmptyBar=draw.IsEmptyBar;
+                    
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -123429,6 +123541,9 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                 if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
                 if (item.UpColor) outVarItem.UpColor=item.UpColor;
                 if (item.DownColor) outVarItem.DownColor=item.DownColor;
+                if (IFrameSplitOperator.IsBool(item.isDotLine)) outVarItem.IsDotLine = item.isDotLine;
+                if (IFrameSplitOperator.IsNonEmptyArray(item.lineDash)) outVarItem.LineDash=item.lineDash;
+                if (IFrameSplitOperator.IsBool(item.isSingleLine))  outVarItem.IsSingleLine=item.isSingleLine;
 
                 result.push(outVarItem);
             }
@@ -123569,6 +123684,19 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWCOLORKLINE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);
+
+                    outVarItem.Draw=drawItem;
+                    if (draw.Color) drawItem.Color=draw.Color;
+                    if (IFrameSplitOperator.IsBool(draw.IsEmptyBar)) drawItem.IsEmptyBar=draw.IsEmptyBar;
+                    
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -123855,349 +123983,6 @@ ScriptIndexConsole.SetDomain = function (domain, cacheDomain)   //修改API地
     JSComplier.SetDomain(domain,cacheDomain);
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////
-//内置财务数据下载
-//
-function DownloadFinValueData(obj)
-{
-    this.Url=obj.Url;
-    this.Job=obj.Job;
-    this.Symbol=obj.Symbol;
-    this.Args=obj.Args;
-    this.DataKey=obj.DataKey;
-    this.RecvCallback=obj.Callback;
-    this.ErrorCallback=obj.ErrorCallback;
-
-    this.Download=function()
-    {
-        var self=this;
-        var fieldList=this.GetFieldList();
-        if (!fieldList)
-        {
-            message=`${this.Job.FunctionName}(${this.Args[0]}) can't support.`;
-            this.ErrorCallback(message);
-            self.RecvCallback(null, self.Job, self.DataKey);
-            return;
-        }
-
-        //请求数据
-        JSNetwork.HttpRequest({
-            url: this.Url,
-            data:
-            {
-                "field": fieldList,
-                "symbol": [this.Symbol],
-                "condition":[ {"item":["finance","doc","exists","true"]}] ,
-                "start": 0,
-                "end": 200
-            },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (recvData)
-            {
-                var data=self.ToHQChartData(recvData);
-                if (data) //排序
-                    data.sort(function (a, b) { return (a.Date - b.Date) });
-
-                self.RecvCallback(data, self.Job, self.DataKey);
-            }
-        });
-    }
-
-    this.ToHQChartData=function(recvData)
-    {
-        if (!recvData.stock || recvData.stock.length!=1) return null;
-
-        var aryData=[];
-        var setDate=new Set();  //有重复数据 去掉
-        var stock=recvData.stock[0];
-        for(var i in stock.stockday)
-        {
-            var item=stock.stockday[i];
-            if (item.announcement1)
-            {
-                var hqchartItem=this.ToHQChartItemData(item.announcement1, item.finance1, item);
-                if (hqchartItem && !setDate.has(hqchartItem.Date)) 
-                {
-                    aryData.push(hqchartItem);
-                    setDate.add(hqchartItem.Date);
-                }
-            }
-
-            if (item.announcement2)
-            {
-                var hqchartItem=this.ToHQChartItemData(item.announcement2, item.finance2, item);
-                if (hqchartItem && !setDate.has(hqchartItem.Date)) 
-                {
-                    aryData.push(hqchartItem);
-                    setDate.add(hqchartItem.Date);
-                }
-            }
-
-            if (item.announcement3)
-            {
-                var hqchartItem=this.ToHQChartItemData(item.announcement3, item.finance3, item);
-                if (hqchartItem && !setDate.has(hqchartItem.Date)) 
-                {
-                    aryData.push(hqchartItem);
-                    setDate.add(hqchartItem.Date);
-                }
-            }
-
-            if (item.announcement4)
-            {
-                var hqchartItem=this.ToHQChartItemData(item.announcement4, item.finance4, item);
-                if (hqchartItem && !setDate.has(hqchartItem.Date)) 
-                {
-                    aryData.push(hqchartItem);
-                    setDate.add(hqchartItem.Date);
-                }
-            }
-        }
-
-        return aryData;
-    }
-
-    //{ Date：日期 , Value:数值 }
-    this.ToHQChartItemData=function(announcement, finance, sourceItem)
-    {
-        var id=this.Args[0];
-        var date=announcement.year*10000;
-        var quarter=announcement.quarter;
-        switch(quarter)
-        {
-            case 1:
-                date+=331;
-                break;
-            case 2:
-                date+=630;
-                break;
-            case 3:
-                date+=930;
-                break;
-            case 4:
-                date+=1231;
-                break;
-            default:
-                return null;
-        }
-
-        var result={ Date:date, Value:0 };
-        switch(id)
-        {
-            case 0:
-                result.Value=date%1000000;  //0--返回报告期(YYMMDD格式),150930表示为2015年第三季
-                break;
-            case 1:
-                result.Value=finance.persearning;
-                break;
-            case 3:
-                result.Value=finance.peruprofit;
-                break;
-            case 4:
-                result.Value=finance.pernetasset;
-                break;
-            case 5:
-                result.Value=finance.percreserve;
-                break;
-            case 6:
-                result.Value=finance.woewa;
-                break;
-            case 7:
-                result.Value=finance.perccfo;
-                break;
-            case 8:
-                result.Value=finance.monetaryfunds;
-                break;
-            case 11:
-                result.Value=finance.areceivable;
-                break;
-        }
-
-        return result;
-    }
-
-    this.GetFieldList=function()
-    {
-        var id=this.Args[0];
-        switch(id)
-        {
-            case 0:
-                return ["finance.date"];
-            case 1: //persearning	每股收益
-                return ["finance.persearning"];
-            case 3: //peruprofit	每股未分配利润
-                return ["finance.peruprofit"];
-            case 4: //pernetasset	每股净资产
-                return ["finance.pernetasset"];
-            case 5: //percreserve	每股资本公积金
-                return ["finance.percreserve"];
-            case 6: //woewa	加权平均净资产收益
-                return ["finance.woewa"];
-            case 7: //perccfo	每股经营性现金流
-                return ["finance.perccfo"];
-            case 8: //monetaryfunds	货币资金
-                return ["finance.monetaryfunds"];
-            case 11: //areceivable	应收账款
-                return ["finance.areceivable"];
-            default:
-                return null;
-        }
-    }
-}
-
-/////////////////////////////////////////////////////////
-// 内置财务数据下载 某一期的数据
-//
-function DownloadFinOneData(obj)
-{
-    this.newMethod=DownloadFinValueData;   //派生
-    this.newMethod(obj);
-    delete this.newMethod;
-
-    this.Download=function()
-    {
-        var self=this;
-        var fieldList=this.GetFieldList();
-        if (!fieldList)
-        {
-            message=`${this.Job.FunctionName}(${this.Args[0]}, ${this.Args[1]}, ${this.Args[2]}) can't support.`;
-            this.ErrorCallback(message);
-            self.RecvCallback(null, self.Job, self.DataKey);
-            return;
-        }
-
-        var aryCondition=[ {"item":["finance","doc","exists","true"] } ];
-
-        var year=this.Args[1];
-        var month=this.Args[2];
-        var dataIndex=0;
-        var dataEnd=3;
-        var preYear=null;
-        if (year==0 && month==0)    //如果Y和MMDD都为0,表示最新的财报;
-        {
-
-        }
-        else if (year==0 && month<300)  //如果Y为0,MMDD为小于300的数字,表示最近一期向前推MMDD期的数据,如果是331,630,930,1231这些,表示最近一期的对应季报的数据;
-        {
-            dataIndex=month;
-            dataEnd=200;
-        }
-        else if (month==0 && year<1000) //如果Y为0,MMDD为小于300的数字,表示最近一期向前推MMDD期的数据,如果是331,630,930,1231这些,表示最近一期的对应季报的数据;
-        {
-            preYear=year;
-        }
-        else if (year>1909)
-        {
-            if (month==331) 
-            {
-                aryCondition=
-                [
-                    {"item":["announcement1.year","int32","eq",year]},
-                    {"item":["finance1","doc","exists","true"]}
-                ];
-
-                fieldList.push("announcement1.year");
-                fieldList.push("announcement1.quarter");
-            }
-            else if (month==630)
-            {
-                aryCondition=
-                [
-                    {"item":["announcement2.year","int32","eq",year]},
-                    {"item":["finance2","doc","exists","true"]}
-                ];
-
-                fieldList.push("announcement2.year");
-                fieldList.push("announcement2.quarter");
-            }
-            else if (month==930)
-            {
-                aryCondition=
-                [
-                    {"item":["announcement3.year","int32","eq",year]},
-                    {"item":["finance3","doc","exists","true"]}
-                ];
-
-                fieldList.push("announcement4.year");
-                fieldList.push("announcement4.quarter");
-            }
-            else
-            {
-                aryCondition=
-                [
-                    {"item":["announcement4.year","int32","eq",year]},
-                    {"item":["finance4","doc","exists","true"]}
-                ];
-
-                fieldList.push("announcement4.year");
-                fieldList.push("announcement4.quarter");
-            }
-        }
-
-        //请求数据
-        JSNetwork.HttpRequest({
-            url: this.Url,
-            data:
-            {
-                "field": fieldList,
-                "symbol": [this.Symbol],
-                "condition":aryCondition,
-                "start": 0,
-                "end": dataEnd
-            },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (recvData)
-            {
-                var data=self.ToHQChartData(recvData);
-                var result=null;
-                if (data && data.length>0) 
-                {
-                    data.sort(function (a, b) { return (b.Date-a.Date) });
-                    if (preYear==null)
-                        result=data[dataIndex];   //返回一个数据
-                    else 
-                        result=self.GetPreYearData(data, preYear);
-                }
-                self.RecvCallback(result, self.Job, self.DataKey);
-            }
-        });
-    }
-
-    this.GetPreYearData=function(data, preYear)
-    {
-        //331,630,930,1231这些,表示最近一期的对应季报的数据;
-        if (preYear==331 || preYear==630|| preYear==930 || preYear==1231)
-        {
-            for(var i in data)
-            {
-                var item=data[i];
-                if (item.Date%10000==preYear) return item;
-            }
-        }
-        else
-        {   
-            //如果MMDD为0,Y为一数字,表示最近一期向前推Y年的同期数据;
-            var month=data[0].Date%1000;
-            for(var i=1, j=0; i<data.length ;++i)
-            {
-                var item=data[i];
-                if (item.Date%10000==month)
-                {
-                    ++j;
-                    if (j==preYear) return item;
-                }
-            }
-
-            return null;
-        }
-    }
-}
-
-
 function DownloadFinanceData(obj)
 {
     this.Url=obj.Url;
@@ -124486,285 +124271,6 @@ function DownloadFinanceData(obj)
     }
 }
 
-function DownloadGPJYValue(obj)
-{
-    this.Url=obj.Url;
-    this.RealtimeUrl=obj.RealtimeUrl;
-    this.Job=obj.Job;
-    this.Symbol=obj.Symbol;
-    this.Args=obj.Args;
-    this.DataKey=obj.DataKey;
-    this.RecvCallback=obj.Callback;
-    this.ErrorCallback=obj.ErrorCallback;
-
-    this.Download=function()
-    {
-        var self=this;
-        var fieldList=this.GetFieldList();
-        if (!fieldList)
-        {
-            message=`${this.Job.FunctionName}(${this.Args[0]}, ${this.Args[1]}, ${this.Args[2]}) can't support.`;
-            this.ErrorCallback(message);
-            self.RecvCallback(null, self.Job, self.DataKey, true);
-            return;
-        }
-
-        //请求数据
-        JSNetwork.HttpRequest({
-            url: this.Url,
-            data:
-            {
-                "field": fieldList,
-                "symbol": [this.Symbol],
-                "orderfield":"date",             
-                "order":-1,   
-                "start":0,
-                "end":5
-            },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (recvData)
-            {
-                var data=self.ToHQChartData(recvData);
-                if (data && data.length>0) 
-                {
-                    data.sort(function (a, b) { return (a.Date-b.Date) });
-                }
-                self.RecvCallback(data, self.Job, self.DataKey);
-            }
-        });
-    }
-
-    this.GetFieldList=function()
-    {
-        var id=this.Args[0];
-        switch(id)
-        {
-            case 1: //1--股东人数 股东户数(户)           
-                return ["shareholder", "date", "symbol"];
-            case 2: //2--龙虎榜   买入总计(万元) 卖出总计(万元)
-                return ["tradedetail.buy","tradedetail.sell", "date", "symbol"];
-            case 3: //3--融资融券1 融资余额(万元) 融券余量(股)
-                return ["margin","date", "symbol"];
-            case 4: //4--大宗交易 成交均价(元) 成交额(万元)
-                return ["blocktrading.amount","blocktrading.price","date", "symbol"]
-            default:
-                return null;
-        }
-    }
-
-    this.ToHQChartData=function(recvData)
-    {
-        if (!recvData.stock || recvData.stock.length!=1) return null;
-
-        var aryData=[];
-        var setDate=new Set();  //有重复数据 去掉
-        var stock=recvData.stock[0];
-        var id=this.Args[0];
-        var subID=this.Args[1];
-        for(var i in stock.stockday)
-        {
-            var item=stock.stockday[i];
-
-            var hqchartItem=this.ToHQChartItemData(item,id,subID);
-            if (hqchartItem && !setDate.has(hqchartItem.Date)) 
-            {
-                aryData.push(hqchartItem);
-                setDate.add(hqchartItem.Date);
-            }
-        }
-
-        return aryData;
-    }
-
-    this.ToHQChartItemData=function(item, id, subID)
-    {
-        if (!item) return null;
-        var date=item.date;
-        switch(id)
-        {
-            case 1:
-                if (!item.shareholder) return null;
-                return { Date:date, Value:item.shareholder.count };
-            case 2:
-                if (!item.tradedetail && item.tradedetail[0]) return null;
-                if (subID==0)
-                    return { Date:date, Value:item.tradedetail[0].buy };
-                else 
-                    return { Date:date, Value:item.tradedetail[0].sell };
-            case 3:
-                if (!item.margin) return null;
-                if (subID==0)
-                {
-                    if (item.margin.buy)
-                        return { Date:date, Value:item.margin.buy.balance };
-                }
-                else
-                {
-                    if (item.margin.sell)
-                        return { Date:date, Value:item.margin.sell.balance };
-                }
-                return null;
-            case 4:
-                if (!item.blocktrading) return null;
-                if (subID==0)
-                    return { Date:date, Value:item.blocktrading.price };
-                else
-                    return { Date:date, Value:item.blocktrading.amount };
-            default:
-                return null;
-        }
-    }
-}
-
-
-
-/*
-引用市场总的交易类数据.如果指标支持云数据函数,则不需要[专业财务数据]下载.
-SCJYVALUE(ID,N,TYPE),ID为数据编号,N表示第几个数据,TYPE:为1表示做平滑处理,没有数据的周期返回上一周期的值;为0表示不做平滑处理
-
-市场交易类数据函数，数据编号如下:
-1--融资融券       沪深融资余额(万元) 沪深融券余额(万元)
-2--陆股通资金流入 沪股通流入金额(亿元) 深股通流入金额(亿元)
-3--沪深涨停股个数 涨停股个数  曾涨停股个数 [注：该指标展示20160926日之后的数据]
-4--沪深跌停股个数 跌停股个数  曾跌停股个数
-5--上证50股指期货  净持仓(手)[注：该指标展示20171009日之后的数据]
-6--沪深300股指期货 净持仓(手) [注：该指标展示20171009日之后的数据]
-7--中证500股指期货 净持仓(手) [注：该指标展示20171009日之后的数据]
-8--ETF基金规模数据 ETF基金规模(亿) ETF净申赎(亿)
-9--每周新增投资者 新增投资者(万户)
-10--增减持统计    增持额(万元)  减持额(万元)[注：部分公司公告滞后,造成每天查看的数据可能会不一样] 
-11--大宗交易      溢价的大宗交易额(万元) 折价的大宗交易额(万元)
-12--限售解禁      限售解禁计划额(亿元)  限售解禁股份实际上市金额(亿元)[注：该指标展示201802月之后的数据;部分股票的解禁日期延后，造成不同日期提取的某天的计划额可能不同]
-13--分红          市场总分红额(亿元)[注：除权派息日的A股市场总分红额] 
-14--募资          市场总募资额(亿元)[注：发行日期/除权日期的首发、配股和增发的总募资额] 
-15--打板资金    封板成功资金(亿元) 封板失败资金(亿元) [注：该指标展示20160926日之后的数据]
-*/
-function DownloadSCJYValue(obj)
-{
-    this.Url=obj.Url;
-    //this.RealtimeUrl=obj.RealtimeUrl;
-    this.Job=obj.Job;
-    this.Symbol=obj.Symbol;
-    this.Args=obj.Args;
-    this.DataKey=obj.DataKey;
-    this.RecvCallback=obj.Callback;
-    this.ErrorCallback=obj.ErrorCallback;
-    
-    this.Download=function()
-    {
-        var self=this;
-        var query=this.GetQueryCondtion();
-        if (!query)
-        {
-            message=`${this.Job.FunctionName}(${this.Args[0]}, ${this.Args[1]}, ${this.Args[2]}) can't support.`;
-            this.ErrorCallback(message);
-            self.RecvCallback(null, self.Job, self.DataKey, true);
-            return;
-        }
-
-        //请求数据
-        JSNetwork.HttpRequest({
-            url: this.Url,
-            data:
-            {
-                "field": query.Field,
-                "symbol": query.Symbol,
-                "condition":query.Cond ,
-                "start": 0,
-                "end": 2000
-            },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (recvData)
-            {
-                var data=self.ToHQChartData(recvData);
-                if (data) //排序
-                    data.sort(function (a, b) { return (a.Date - b.Date) });
-
-                self.RecvCallback(data, self.Job, self.DataKey);
-            }
-        });
-
-    }
-
-    this.GetQueryCondtion=function()
-    {
-        var day=new Date();
-        var endDate=day.getFullYear()*10000+(day.getMonth()+1)*100+day.getDate();
-        day.setDate(day.getDate()-100); //取最近1000条数据
-        var startDate=day.getFullYear()*10000+(day.getMonth()+1)*100+day.getDate()
-        var id=this.Args[0];
-        switch(id)
-        {
-            case 1:
-                var data=
-                {
-                    Symbol:["CNA.ci"],
-                    Field:["margin"], 
-                    Cond:
-                    [
-                        {"item":["date","int32","gte",startDate.toString(),"lte",endDate.toString()]}, 
-                        {"item":["margin","doc","exists","true"]}
-                    ]
-                }
-                return data;
-        }
-    }
-
-    this.ToHQChartData=function(recvData)
-    {
-        if (!recvData.stock || recvData.stock.length!=1) return null;
-
-        var aryData=[];
-        var setDate=new Set();  //有重复数据 去掉
-        var stock=recvData.stock[0];
-        var id=this.Args[0];
-        var subID=this.Args[1];
-        for(var i in stock.stockday)
-        {
-            var item=stock.stockday[i];
-
-            var hqchartItem=this.ToHQChartItemData(item,id,subID);
-            if (hqchartItem && !setDate.has(hqchartItem.Date)) 
-            {
-                aryData.push(hqchartItem);
-                setDate.add(hqchartItem.Date);
-            }
-        }
-
-        return aryData;
-    }
-
-    this.ToHQChartItemData=function(item, id, subID)
-    {
-        if (!item) return null;
-        var date=item.date;
-        var subItem=null;
-        switch(id)
-        {
-            case 1:
-                if (!item.margin) return null;
-                subItem=item.margin;
-                if (subID==1)
-                {
-                    if (!subItem.buy || !IFrameSplitOperator.IsNumber(subItem.buy.balance)) return null;
-                    return { Date:date, Value:subItem.buy.balance }
-                }
-                else
-                {
-                    if (!IFrameSplitOperator.IsNumber(subItem.sell.balance)) return null;
-                    return { Date:date, Value:subItem.sell.balance }
-                }
-                
-            default:
-                return null;
-        }
-    }
-}
-
 function DownloadGroupData(obj)
 {
     this.Url=obj.Url;