hqchart 1.1.14104 → 1.1.14115

package/src/jscommon/umychart.PopMinuteChart.js

@@ -14,12 +14,17 @@
 function JSPopMinuteChart()
 {
     this.DivDialog=null;
-    this.DivInfoText=null;
+    this.TitleBox=null; //{ DivTitle, DivName, DivName }
     this.HQChart=null;
     this.DragTitle=null;
     this.Date=null;
     this.ID=Guid();
 
+    this.TitleColor=g_JSChartResource.PopMinuteChart.TitleColor;
+    this.TitleBGColor=g_JSChartResource.PopMinuteChart.TitleBGColor;
+    this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
+    this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
+
     this.Minute=
     {
         Option:JSPopMinuteChart.GetMinuteOption(),
@@ -27,9 +32,18 @@ function JSPopMinuteChart()
         Date:null,
     }
 
-    this.Inital=function(hqchart)
+    this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
+
+        if (option)
+        {
+            if (IFrameSplitOperator.IsObject(option.Option)) 
+            {
+                var item=CloneData(option.Option);  //复制一份出来
+                this.Minute.Option=Object.assign(this.Minute.Option,item);
+            }
+        }
     }
 
     this.Create=function()
@@ -37,8 +51,6 @@ function JSPopMinuteChart()
         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';
@@ -62,6 +74,7 @@ function JSPopMinuteChart()
         divChart.className='jschart_pop_minute_chart';
         divDom.appendChild(divChart);
 
+        this.TitleBox={ DivTitle:divTitle, DivName:divInfoText, DivColor:divClose };
         this.DivDialog=divDom;
 
         var chart=JSChart.Init(divChart);
@@ -73,6 +86,19 @@ function JSPopMinuteChart()
         chart.SetOption(this.Minute.Option);  //设置K线配置
 
         document.body.appendChild(divDom);
+
+        this.UpdateStyle();
+    }
+
+    this.UpdateStyle=function()
+    {
+        if (!this.DivDialog) return;
+
+        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
+        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
+
+        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
+        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
     }
 
     this.NetworkFilter=function(data, callback)
@@ -100,7 +126,7 @@ function JSPopMinuteChart()
     {
         if (this.DivDialog) document.body.removeChild(this.DivDialog);
         this.DivDialog=null;
-        this.DivInfoText=null;
+        this.TitleBox=null;
         this.Minute.JSChart=null;
     }
 
@@ -120,7 +146,7 @@ function JSPopMinuteChart()
         var name=data.Symbol;
         if (data.Name) name=data.Name;
         var title=`${name} ${IFrameSplitOperator.FormatDateString(data.Date)} 分时图`
-        this.DivInfoText.innerText=title;
+        this.TitleBox.DivName.innerText=title;
 
         if (this.Minute.JSChart)
         {
@@ -188,10 +214,14 @@ function JSPopMinuteChart()
 
     this.ReloadResource=function(option)
     {
+        this.TitleColor=g_JSChartResource.PopMinuteChart.TitleColor;
+        this.TitleBGColor=g_JSChartResource.PopMinuteChart.TitleBGColor;
+        this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
+        this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
+
         if (!this.DivDialog) return;
 
-        this.DivDialog.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;
-        this.DivDialog.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;
+        this.UpdateStyle();
 
         if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
     }
@@ -276,4 +306,241 @@ JSPopMinuteChart.GetMinuteOption=function()
 }
 
 
+///////////////////////////////////////////////////////
+//  分时图提示信息
+//
+//////////////////////////////////////////////////////
+
+function JSTooltipMinuteChart()
+{
+    this.DivDialog=null;
+    this.HQChart=null;
+    this.ID=Guid();
+
+    this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
+    this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
+
+    this.Minute=
+    {
+        Option:JSTooltipMinuteChart.GetMinuteOption(),
+        JSChart:null,
+        Symbol:null,
+        Date:null,
+    }
+
+    this.Inital=function(hqchart, option)
+    {
+        this.HQChart=hqchart;
+
+        if (option)
+        {
+            if (IFrameSplitOperator.IsObject(option.Option)) 
+            {
+                var item=CloneData(option.Option);  //复制一份出来
+                this.Minute.Option=Object.assign(this.Minute.Option,item);
+            }
+        }
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement('div');
+        divDom.className='UMyChart_Tooltip_Minute_Div';
+        divDom.id=this.ID;
+
+        var divChart=document.createElement('div');
+        divChart.className='UMyChart_Tooltip_Minute_Chart_Div';
+        divDom.appendChild(divChart);
+
+        this.DivDialog=divDom;
+
+        var chart=JSChart.Init(divChart);
+        this.Minute.JSChart=chart;
+
+        //语言跟主图保持一致
+        if (this.HQChart) this.Minute.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);
+        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.UpdateStyle();
+    }
+
+    this.UpdateStyle=function()
+    {
+        if (!this.DivDialog) return;
+
+        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
+        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
+    }
+
+    this.NetworkFilter=function(data, callback)
+    {
+        if (!this.HQChart || !this.HQChart.NetworkFilter) return;
+
+        /*
+        if (data) data.PopMinuteData={ Date:this.Date };    //弹出分时图额外数据
+        
+        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()
+    {
+        if (this.DivDialog) document.body.removeChild(this.DivDialog);
+        this.DivDialog=null;
+        this.TitleBox=null;
+        if (!this.Minute.JSChart) this.Minute.JSChart.ChartDestory();
+        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 || !data.Symbol) return;
+
+        var symbol=data.Symbol;
+        var date=null;
+        if (IFrameSplitOperator.IsPlusNumber(data.Date)) date=data.Date;
+
+        if (this.Minute.JSChart)
+        {
+            if (this.Minute.Symbol!=symbol || this.Minute.Date!=date)
+            {
+                this.Minute.Symbol=symbol;
+                this.Minute.Date=date;
+                this.Minute.JSChart.ChangeSymbol(symbol);
+            }
+        }
+
+        if (IFrameSplitOperator.IsNumberV2(x,y))
+        {
+
+        }
+        else if (data.Rect)
+        {
+            var rtCell=data.Rect;
+            var pixelRatio=GetDevicePixelRatio();
+            var rtItem={ Left:rtCell.Left/pixelRatio, Right:rtCell.Right/pixelRatio, Bottom:rtCell.Bottom/pixelRatio, Top:rtCell.Top/pixelRatio };
+            rtItem.Width=rtItem.Right-rtItem.Left;
+            rtItem.Height=rtItem.Bottom-rtItem.Top;
+
+            //超出窗口调整位置
+            var height=this.DivDialog.offsetHeight;
+            var width=this.DivDialog.offsetWidth;
+            var x=rtItem.Right+data.Offset.Left;
+            var y=rtItem.Bottom+data.Offset.Top;
+
+            var xRight=window.innerWidth-5;
+            var ybottom=window.innerHeight-5;
+            if (x+width>xRight) x=xRight-width;
+            if (y+height>ybottom) y=(rtItem.Top+data.Offset.Top)-height;
+
+            this.DivDialog.style.visibility='visible';
+            this.DivDialog.style.top = y + "px";
+            this.DivDialog.style.left = x + "px";
+        }
+    }
+
+    this.Hide=function()
+    {
+        if (!this.DivDialog) return;
+        if (this.DivDialog.style.visibility!='hidden')
+            this.DivDialog.style.visibility='hidden';
+    }
+
+}
+
+JSTooltipMinuteChart.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:true,
+            IsShowDate:true,
+            IsShowVolTitle:true,
+            //IsAlwaysShowLastData:true,
+            IsTitleShowLatestData:true,
+        },
+
+        MinuteVol:
+        {
+            BarColorType:1,
+        },
+
+        //Language:'EN',
+    
+        Border: //边框
+        {
+            Left:20,    //左边间距
+            Right:120,     //右边间距
+            Top:25,
+            Bottom:25,
+
+            AutoLeft:{ Blank:10, MinWidth:40 },
+            AutoRight:{ Blank:10, MinWidth:40 },
+        },
+                
+        Frame:  //子框架设置
+        [
+            { SplitCount:5 },
+            { SplitCount:3 },
+            { SplitCount:3 },
+        ],
+    }
+
+    return option;
+}
+
+
 

package/src/jscommon/umychart.js

@@ -10022,7 +10022,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     if (srcParam) 
                     {
                         this.DestroyPopMinuteChart();
-                        this.InitalPopMinuteChart( {KLine:{KLineDoubleClick:true}} );
+                        this.InitalPopMinuteChart( { PopMinuteChart:{ Enable:true }} );
                     }
                     else 
                     {
@@ -68749,6 +68749,9 @@ function JSChartResource()
     {
         BGColor:"rgba(250,250,250,0.95)",
         BorderColor:"rgb(0,0,0)",
+
+        TitleColor:'rgb(250,250,250)',       //标题颜色
+        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
     }
 
     this.SelectRectBGColor="rgba(1,130,212,0.06)"; //背景色
@@ -70250,6 +70253,8 @@ function JSChartResource()
             var item=style.PopMinuteChart;
             if (item.BGColor) this.PopMinuteChart.BGColor=item.BGColor;
             if (item.BorderColor) this.PopMinuteChart.BorderColor=item.BorderColor;
+            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
+            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
         }
 
         if (style.DefaultTextColor) this.DefaultTextColor = style.DefaultTextColor;
@@ -73421,9 +73426,16 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     this.InitalPopMinuteChart=function(option)
     {
-        if (!option || !option.KLine) return false;
-        var item=option.KLine;
-        if (item.KLineDoubleClick===true)
+        if (!option) return false;
+
+        if (option.PopMinuteChart && option.PopMinuteChart.Enable)  //新的配置格式
+        {
+            var item=option.PopMinuteChart;
+            this.PopMinuteChart=new JSPopMinuteChart();
+            this.PopMinuteChart.Inital(this, item);
+            return true;
+        }
+        else if (option.KLine && option.KLine.KLineDoubleClick===true)  //旧的格式 不要使用了
         {
             this.PopMinuteChart=new JSPopMinuteChart();
             this.PopMinuteChart.Inital(this);