hqchart 1.1.13644 → 1.1.13652

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

@@ -4025,7 +4025,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     //改参数div
     this.ModifyIndexDialog=new ModifyIndexDialog(divElement);
     this.ChangeIndexDialog=new ChangeIndexDialog(divElement);
-    this.MinuteDialog=new MinuteDialog(divElement);
 
     //额外的画布
     this.MapExtraCanvasElement=new Map();   //key=画布名字, value={ Element:, Canvas:}
@@ -4262,7 +4261,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
         chart.ChangeIndexDialog=this.ChangeIndexDialog;
-        chart.MinuteDialog=this.MinuteDialog;
 
         var pixelRatio=GetDevicePixelRatio();
         
@@ -4309,7 +4307,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (option.KLine.MaxReqeustDataCount>0) chart.MaxRequestDataCount=option.KLine.MaxReqeustDataCount; //兼容老版本
             if (option.KLine.MaxRequestDataCount>0) chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;
             if (option.KLine.Info && option.KLine.Info.length>0) chart.SetKLineInfo(option.KLine.Info,false);
-            if (option.KLine.KLineDoubleClick==false) chart.MinuteDialog=this.MinuteDialog=null;
             if (IFrameSplitOperator.IsBool(item.IsShowTooltip)) chart.IsShowTooltip=item.IsShowTooltip;
             if (IFrameSplitOperator.IsBool(item.IsShowKLineDivTooltip)) chart.IsShowKLineDivTooltip=item.IsShowKLineDivTooltip;
             if (option.KLine.MaxRequestMinuteDayCount>0) chart.MaxRequestMinuteDayCount=option.KLine.MaxRequestMinuteDayCount;
@@ -4709,7 +4706,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         //创建改参数div
         chart.ModifyIndexDialog=this.ModifyIndexDialog;
         chart.ChangeIndexDialog=this.ChangeIndexDialog;
-        chart.MinuteDialog=this.MinuteDialog;
         
         //右键菜单
         if (IFrameSplitOperator.IsBool(option.IsShowRightMenu)) chart.IsShowRightMenu=option.IsShowRightMenu;
@@ -4721,7 +4717,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (option.KLine.Period>=0) chart.Period=option.KLine.Period;
             if (option.KLine.MaxRequestDataCount>0) chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;
             if (option.KLine.Info && option.KLine.Info.length>0) chart.SetKLineInfo(option.KLine.Info,false);
-            if (option.KLine.KLineDoubleClick==false) chart.MinuteDialog=this.MinuteDialog=null;
             if (option.KLine.PageSize>0)  chart.PageSize=option.KLine.PageSize;
             if (option.KLine.IsShowTooltip==false) chart.IsShowTooltip=false;
         }
@@ -5317,6 +5312,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         
     }
 
+    /*废弃 
+    //统一全部使用 MinuteChartContainer
     //历史分钟走势图
     this.CreateHistoryMinuteChartContainer=function(option)
     {
@@ -5378,6 +5375,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         return chart;
     }
+    */
 
     this.CreateKLineTrainChartContainer=function(option)
     {
@@ -5654,9 +5652,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             case "迷你分钟走势图":
                 chart=this.CreateMinMinuteChartContainer(option);
                 break;
-            case "历史分钟走势图":
-                chart=this.CreateHistoryMinuteChartContainer(option);
-                break;
             case 'K线训练':
             case 'K线训练横屏':
             case "简单K线训练":
@@ -11882,6 +11877,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (option.Update && this.Update) this.Update( {UpdateCursorIndexType:2} );       //是否立即更新并重绘
         else if (option.Draw==true) this.Draw(); //是否立即重绘
+
+        if (this.PopMinuteChart) this.PopMinuteChart.ReloadResource(option);
     }
 
     this.ReloadBorder=function(option)  //根据页面缩放调整对应边框的尺长
@@ -70963,6 +70960,12 @@ function JSChartResource()
     this.TooltipBGColor="rgb(255, 255, 255)"; //背景色
     this.TooltipAlpha=0.92;                  //透明度
 
+    this.PopMinuteChart=
+    {
+        BGColor:"rgba(250,250,250,0.95)",
+        BorderColor:"rgb(0,0,0)",
+    }
+
     this.SelectRectBGColor="rgba(1,130,212,0.06)"; //背景色
  //   this.SelectRectAlpha=0.06;                  //透明度
 
@@ -72346,6 +72349,13 @@ function JSChartResource()
             }
         }
 
+        if (style.PopMinuteChart)
+        {
+            var item=style.PopMinuteChart;
+            if (item.BGColor) this.PopMinuteChart.BGColor=item.BGColor;
+            if (item.BorderColor) this.PopMinuteChart.BorderColor=item.BorderColor;
+        }
+
         if (style.DefaultTextColor) this.DefaultTextColor = style.DefaultTextColor;
         if (style.DefaultTextFont) this.DefaultTextFont = style.DefaultTextFont;
         if (style.TitleFont) this.TitleFont = style.TitleFont;
@@ -74304,7 +74314,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.StockHistoryDayApiUrl= g_JSChartResource.Domain+'/API/StockHistoryDay';    //股票历史数据
     this.TickApiUrl=g_JSChartResource.Domain+'/API/StockDetail';                    //当天分笔数据
 
-    this.MinuteDialog;      //双击历史K线 弹出分钟走势图
+    this.PopMinuteChart=null;   //双击历史K线 弹出分钟走势图
 
     this.BeforeBindMainData=null;   //function(funcName)   在BindMainData() 调用前回调用
     this.AfterBindMainData=null;    //function(funcName)   在BindMainData() 调用前后调用
@@ -75236,10 +75246,42 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true);            //键盘消息
         if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true);                  //上下滚动消息
+
+        this.InitalPopMinuteChart(option);
     }
 
-    
+    this.InitalPopMinuteChart=function(option)
+    {
+        if (!option || !option.KLine) return false;
+        var item=option.KLine;
+        if (item.KLineDoubleClick===true)
+        {
+            this.PopMinuteChart=new JSPopMinuteChart();
+            this.PopMinuteChart.Inital(this);
+            return true;
+        }
+        
+        return false;
+    }
+
+    this.ShowMinuteChartDialog=function(data, x,y)
+    {
+        if (!this.PopMinuteChart) return;
+        if (!data.Tooltip || !data.Chart) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        x+=(rtClient.left+rtScroll.Left);
+        y+=(rtClient.top+rtScroll.Top);
 
+        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.OnCustomKeyDown=function(keyID, e) //自定义键盘事件
     {
         if (keyID==37 && e.ctrlKey) //Ctrl+Left
@@ -80582,16 +80624,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 }
             }
         }
-        
-        var event=null;
-        if (this.mapEvent.has(JSCHART_EVENT_ID.DBCLICK_KLINE)) event=this.mapEvent.get(JSCHART_EVENT_ID.DBCLICK_KLINE);
-
-        if (!this.MinuteDialog && !event) return;
 
         var tooltip=new TooltipData();
         if (!this.PtInChartPaintTooltip(x,y,tooltip)) return;
         if (!tooltip.Data) return;
 
+        var event=null;
+        if (this.mapEvent.has(JSCHART_EVENT_ID.DBCLICK_KLINE)) event=this.mapEvent.get(JSCHART_EVENT_ID.DBCLICK_KLINE);
         if (event)
         {
             if (this.ClickChartTimer!=null) //清空单击定时器
@@ -80600,15 +80639,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.ClickChartTimer=null;
             }
             
-            var data={ Tooltip:tooltip, Stock:{Symbol:this.Symbol, Name:this.Name }, X:e.clientX, Y:e.clientY };
+            var data={ Tooltip:tooltip, Stock:{Symbol:this.Symbol, Name:this.Name }, X:e.clientX, Y:e.clientY, PreventDefault:false };
             event.Callback(event,data,this);
+            if (data.PreventDefault) return;
         }
 
-        if (this.MinuteDialog)
-        {
-            e.data={Chart:this,Tooltip:tooltip};
-            this.MinuteDialog.DoModal(e);
-        }
+        //内置弹分时图
+        if (!this.PopMinuteChart) return;
+
+        this.ShowMinuteChartDialog({ Chart:this,Tooltip:tooltip, e:e }, x,y);
     }
 
     this.CancelAutoUpdate=function()    //关闭停止更新
@@ -83605,6 +83644,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 [
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
                     { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
+                    { Name:JSPopMenu.SEPARATOR_LINE_NAME },
+                    
+                    { 
+                        Name:"语言设置", 
+                        SubMenu:
+                        [
+                            { Name:"中文", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["CN"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID  },
+                            { Name:"英语", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["EN"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID },
+                            { Name:"繁体", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID, Args:["TC"]}, Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID },
+                        ]
+                    },
 
                     {
                         Name:"区间选择样式", 
@@ -87999,6 +88049,7 @@ MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data)
 /*
     历史分钟走势图
 */
+/*  废弃 统一使用 MinuteChartContainer
 function HistoryMinuteChartContainer(uielement)
 {
     this.newMethod=MinuteChartContainer;   //派生
@@ -88043,17 +88094,6 @@ function HistoryMinuteChartContainer(uielement)
         this.TitlePaint[0].Frame=this.Frame.SubFrame[0].Frame;
         this.TitlePaint[0].Canvas=this.Canvas;
         this.TitlePaint[0].IsShowDate=true;
-
-        /*
-        //主图叠加画法
-        var paint=new ChartOverlayKLine();
-        paint.Canvas=this.Canvas;
-        paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
-        paint.ChartFrame=this.Frame.SubFrame[0].Frame;
-        paint.Name="Overlay-KLine";
-        this.OverlayChartPaint[0]=paint;
-        */
-
     }
 
     //设置交易日期
@@ -88199,6 +88239,7 @@ HistoryMinuteChartContainer.JsonDataToMinuteData=function(data)
 
     return aryMinuteData;
 }
+*/
 
 /////////////////////////////////////////////////////////////////////////////
 //  自定义指数
@@ -92780,142 +92821,6 @@ function KLineInfoTooltip(divElement)
     }
 }
 
-//历史K线上双击 弹出分钟走势图框
-function MinuteDialog(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-
-    this.JSChart=null;
-    this.Height=500;
-    this.Width=600;
-    this.Symbol;
-    this.TradeDate;
-    this.HistoryData;
-
-    //显示窗口
-    this.Show=function(left,top,width,height)
-    {
-        var div=document.getElementById(this.ID);
-        if (!div) return false;
-
-        var findDiv=div.getElementsByClassName("minute-hqchart");
-        if (!findDiv || findDiv.length!=1) return false;
-        var klineDiv=findDiv[0];
-
-        if (IFrameSplitOperator.IsNumber(width)) div.style.width=width+"px";
-        if (IFrameSplitOperator.IsNumber(height)) div.style.height=height+"px";
-        if (IFrameSplitOperator.IsNumber(left)) div.style.left=left+"px";
-        if (IFrameSplitOperator.IsNumber(top)) div.style.top=top+"px";
-
-        div.style.display='block';
-
-        var klineWdith=klineDiv.offsetWidth;
-        var klineTop=klineDiv.offsetTop;
-        klineDiv.style.width=klineWdith+"px";
-        klineDiv.style.height=(height-klineTop-5)+"px";
-    }
-
-    this.Create=function()
-    {
-        this.ID=Guid();
-        var div=document.createElement('div');
-        div.className='jchart-kline-minute-box';
-        div.id=this.ID;
-        var hqchartID=Guid();
-        div.innerHTML=`<div><div class='minute-dialog-title'><span></span><strong class='close-munite icon iconfont icon-close'></strong></div><div class='minute-hqchart' id='${hqchartID}' ></div></div>`;
-        div.style.width=this.Height+'px';
-        div.style.height=this.Width+'px';
-
-        this.DivElement.appendChild(div);
-        this.JSChart=JSChart.Init(document.getElementById(hqchartID));
-
-        var option=
-        {
-            Type:'历史分钟走势图',
-            Symbol:this.Symbol,     //股票代码
-            IsAutoUpdate:false,       //是自动更新数据
-
-            IsShowRightMenu:false,   //右键菜单
-            HistoryMinute: { TradeDate:this.TradeDate, IsShowName:false, IsShowDate:false }   //显示的交易日期
-        };
-
-        this.JSChart.SetOption(option);
-    }
-
-    this.BindClose=function(chart)
-    {
-        //关闭按钮
-        $("#"+this.ID+" .close-munite").click(
-            {
-                Chart:chart
-            },
-            function(event)
-            {
-                var chart=event.data.Chart;
-                chart.MinuteDialog.Hide();
-            }
-        );
-    }
-
-    this.DoModal=function(event)
-    {
-        this.UpColor=g_JSChartResource.UpTextColor;
-        this.DownColor=g_JSChartResource.DownTextColor;
-        this.UnchagneColor=g_JSChartResource.UnchagneTextColor;
-
-        var chart=event.data.Chart;
-        var tooltip=event.data.Tooltip;
-        var dialog=chart.MinuteDialog;
-
-        dialog.Symbol=chart.Symbol;
-        dialog.TradeDate=tooltip.Data.Date;
-
-        if(!dialog) return;
-        if (dialog.ID==null)
-        {
-            dialog.Create();   //第1次 需要创建div
-        }
-        else
-        {
-            dialog.JSChart.JSChartContainer.TradeDate=dialog.TradeDate;
-            dialog.JSChart.ChangeSymbol(this.Symbol);
-        }
-
-        var left=event.clientX;
-        var top=event.clientY+10;
-
-        var pixelTatio=GetDevicePixelRatio();
-        dialog.Show(500/pixelTatio,100/pixelTatio,600,500);
-        dialog.JSChart.OnSize();
-
-        this.BindClose(chart);
-
-        this.GetColor=function(price,yclse)
-        {
-            if(price>yclse) return this.UpColor;
-            else if (price<yclse) return this.DownColor;
-            else return this.UnchagneColor;
-        }
-
-        var strName = event.data.Chart.Name;
-        var strData=event.data.Tooltip.Data;
-        var date=new Date(parseInt(strData.Date/10000),(strData.Date/100%100-1),strData.Date%100);
-        var strDate = strData.Date.toString();
-        var strNewDate=strDate.substring(0,4)+"-"+strDate.substring(4,6)+"-"+strDate.substring(6,8);  //转换时间格式
-        var str = "<span>"+strName+"</span>"+"<span>"+strNewDate+"</span>&nbsp;"+
-            "<span style='color:"+this.GetColor(strData.Open,strData.YClose)+";'>开:"+strData.Open.toFixed(2)+"</span>"+
-            "<span style='color:"+this.GetColor(strData.High,strData.YClose)+";'>高:"+strData.High.toFixed(2)+"</span>"+
-            "<span style='color:"+this.GetColor(strData.Low,strData.YClose)+";'>低:"+strData.Low.toFixed(2)+"</span>"+
-            "<span style='color:"+this.GetColor(strData.Close,strData.YClose)+";'>收:"+strData.Close.toFixed(2)+"</span>"+
-            "<span style='color:"+this.VolColor+";'>量:"+IFrameSplitOperator.FormatValueString(strData.Vol,2)+"</span>"+
-            "<span style='color:"+this.AmountColor+";'>额:"+IFrameSplitOperator.FormatValueString(strData.Amount,2)+"</span>";
-        $(".minute-dialog-title span").html(str);
-    }
-}
-
 function MinuteSelectRectDialog(divElement)
 {
     this.newMethod=IDivDialog;   //派生
@@ -124137,6 +124042,12 @@ function GetBlackStyle()
                 Night: { Color:"rgb(153,153,153)", BGColor:"rgb(51,51,51)", BorderColor:"rgb(51,51,51)", Margin:{ Left:5, Top:2, Bottom:2, Right:5 } },
             }
         },
+
+        PopMinuteChart:
+        {
+            BGColor:"rgba(0,0,0,0.95)",
+            BorderColor:"rgb(230,230,230)",
+        },
     
     
         DefaultTextColor: "rgb(101,104,112)",
@@ -141296,6 +141207,274 @@ function JSDialogModifyDraw()
 
 
 
+/*
+   Copyright (c) 2018 jones
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+
+   K线点击弹出指定日期分时图
+*/
+
+
+function JSPopMinuteChart()
+{
+    this.DivDialog=null;
+    this.DivInfoText=null;
+    this.HQChart=null;
+    this.DragTitle=null;
+    this.Date=null;
+    this.ID=Guid();
+
+    this.Minute=
+    {
+        Option:JSPopMinuteChart.GetMinuteOption(),
+        JSChart:null,
+        Date:null,
+    }
+
+    this.Inital=function(hqchart)
+    {
+        this.HQChart=hqchart;
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement('div');
+        divDom.className='jchart_pop_minute_dailog';
+        divDom.id=this.ID;
+        divDom.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;
+        divDom.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;
+
+        var divTitle=document.createElement("div");
+        divTitle.className='jschart_pop_minute_chart_Title_Div';
+        divTitle.onmousedown=(e)=>{ this.OnMouseDownTitle(e); }
+        divDom.appendChild(divTitle);
+       
+        var divInfoText=document.createElement("div");
+        divInfoText.className="";
+        divInfoText.innerText="分时图";
+        this.DivInfoText=divInfoText;
+        divTitle.appendChild(divInfoText);
+
+        var divClose=document.createElement("div");
+        divClose.className='jschart_pop_minute_chart_Close_Div';
+        divClose.innerText="x";
+        divClose.onmousedown=(e)=>{ this.Close(e); }
+        divTitle.appendChild(divClose);
+
+
+        var divChart=document.createElement('div');
+        divChart.className='jschart_pop_minute_chart';
+        divDom.appendChild(divChart);
+
+        this.DivDialog=divDom;
+
+        var chart=JSChart.Init(divChart);
+        this.Minute.JSChart=chart;
+        this.Minute.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
+        this.Minute.Option.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback); }
+        chart.SetOption(this.Minute.Option);  //设置K线配置
+
+        document.body.appendChild(divDom);
+    }
+
+    this.NetworkFilter=function(data, callback)
+    {
+        if (!this.HQChart || !this.HQChart.NetworkFilter) return;
+        
+        if (data.Name== 'MinuteChartContainer::RequestMinuteData')  //分时图数据对接
+        {
+            data.Request.Data.date=this.Date;
+            data.Name="MinuteChartContainer::RequestPopMinuteData";
+            data.Explain="指定日期分时数据"
+        };
+
+        this.HQChart.NetworkFilter(data, callback);       
+    }
+
+    this.OnCreateHQChart=function(chart)
+    {
+
+    }
+
+    this.Destroy=function()
+    {
+        document.body.remove(this.DivDialog);
+        this.DivDialog=null;
+        this.DivInfoText=null;
+        this.Minute.JSChart=null;
+    }
+
+    this.IsShow=function()
+    {
+        if (!this.DivDialog) return false;
+        
+        return this.DivDialog.style.visibility==='visible';
+    }
+
+    this.Show=function(data, x,y)
+    {
+        if (!this.DivDialog) this.Create();
+        if (!data.Symbol || !IFrameSplitOperator.IsPlusNumber(data.Date));
+
+        this.Date=data.Date;
+        var name=data.Symbol;
+        if (data.Name) name=data.Name;
+        var title=`${name} ${IFrameSplitOperator.FormatDateString(data.Date)} 分时图`
+        this.DivInfoText.innerText=title;
+
+        if (this.Minute.JSChart)
+        {
+            this.Minute.JSChart.ChangeSymbol(data.Symbol);
+        }
+
+        //超出窗口调整位置
+        var height=this.DivDialog.offsetHeight;
+        var width=this.DivDialog.offsetWidth;
+        var xRight=window.innerWidth-5;
+        var ybottom=window.innerHeight-5;
+        if (x+width>xRight) x=xRight-width;
+        if (y+height>ybottom) y=ybottom-height;
+
+        this.DivDialog.style.visibility='visible';
+        this.DivDialog.style.top = y + "px";
+        this.DivDialog.style.left = x + "px";
+    }
+
+    this.Close=function(e)
+    {
+        if (!this.DivDialog) return;
+
+        this.DivDialog.style.visibility='hidden';
+    }
+
+    this.OnMouseDownTitle=function(e)
+    {
+        if (!this.DivDialog) return;
+
+        var dragData={ X:e.clientX, Y:e.clientY };
+        dragData.YOffset=e.clientX - this.DivDialog.offsetLeft;
+        dragData.XOffset=e.clientY - this.DivDialog.offsetTop;
+        this.DragTitle=dragData;
+
+        document.onmousemove=(e)=>{ this.DocOnMouseMoveTitle(e); }
+        document.onmouseup=(e)=>{ this.DocOnMouseUpTitle(e); }
+    }
+
+    this.DocOnMouseMoveTitle=function(e)
+    {
+        if (!this.DragTitle) return;
+
+        var left = e.clientX - this.DragTitle.YOffset;
+        var top = e.clientY - this.DragTitle.XOffset;
+
+        var right=left+this.DivDialog.offsetWidth;
+        var bottom=top+ this.DivDialog.offsetHeight;
+        
+        if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
+        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+
+        this.DivDialog.style.left = left + 'px';
+        this.DivDialog.style.top = top + 'px';
+
+        if(e.preventDefault) e.preventDefault();
+    }
+
+    this.DocOnMouseUpTitle=function(e)
+    {
+        this.DragTitle=null;
+        this.onmousemove = null;
+        this.onmouseup = null;
+    }
+
+    this.ReloadResource=function(option)
+    {
+        if (!this.DivDialog) return;
+
+        this.DivDialog.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;
+        this.DivDialog.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;
+
+        if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
+    }
+}
+
+
+JSPopMinuteChart.GetMinuteOption=function()
+{
+    var option=
+    {
+        Type:'分钟走势图',   //创建图形类型
+        Windows: //窗口指标
+        [
+            //{ Index:"VOL" },
+            //{ Index:"RSI" }
+        ], 
+                
+        Symbol:null,         // cf1909.czc
+        IsAutoUpdate:false,          //是自动更新数据
+        AutoUpdateFrequency:10000,   //数据更新频率
+        DayCount:1,                     //1 最新交易日数据 >1 多日走势图
+        IsShowRightMenu:false,       //是否显示右键菜单
+        
+        EnableSelectRect:true,
+        EnableZoomIndexWindow:true,
+        EnableResize:true,
+
+        //BeforeOpen:{IsShow:true, Width:120, IsShowMultiDay:true, MulitiDayWidth:100, },
+        //AfterClose:{IsShow:true, Width:100, IsShowMultiDay:true, MulitiDayWidth:50,  ShareVol:2 }, //ShareVol:0=盘后成交量独立坐标, 1==盘后成交量主图共用 2==盘后成交量盘前共用
+
+        CorssCursorInfo:{ Left:2, Right:1, Bottom:1 },
+                
+        MinuteLine:
+        {
+           
+        },
+
+        MinuteTitle:
+        {
+            IsShowTime:true,
+            IsShowName:false,
+            IsShowDate:true,
+            IsShowVolTitle:true,
+            //IsAlwaysShowLastData:true,
+            IsTitleShowLatestData:true,
+        },
+
+        MinuteVol:
+        {
+            BarColorType:1,
+        },
+
+        //Language:'EN',
+    
+        Border: //边框
+        {
+            Left:20,    //左边间距
+            Right:20,     //右边间距
+            Top:25,
+            Bottom:25,
+
+            AutoLeft:{ Blank:10, MinWidth:60 },
+            AutoRight:{ Blank:10, MinWidth:60 },
+        },
+                
+        Frame:  //子框架设置
+        [
+            { SplitCount:5 },
+            { SplitCount:3 },
+            { SplitCount:3 },
+        ],
+    }
+
+    return option;
+}
+
+
+
 ///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
 //
@@ -141417,7 +141596,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13643";
+var HQCHART_VERSION="1.1.13651";
 
 function PrintHQChartVersion()
 {