hqchart 1.1.14108 → 1.1.14116

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);

package/src/jscommon/umychart.report.js

@@ -160,6 +160,11 @@ function JSReportChart(divElement)
             this.CreateExtraCanvasElement(JSReportChart.TooltipCursorCanvasKey, { ZIndex:99 });
         }
 
+        if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable)
+        {
+            chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
+        }
+
         if (option.Symbol) chart.Symbol=option.Symbol;
         if (option.Name) chart.Name=option.Name;
 
@@ -482,6 +487,9 @@ function JSReportChartContainer(uielement)
     this.JSPopMenu;             //内置菜单
     this.IsShowRightMenu=true;
 
+    //
+    this.TooltipMinuteChart;    //分时图
+
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
    
@@ -489,6 +497,8 @@ function JSReportChartContainer(uielement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+
+        this.DestroyMinuteChartTooltip();
     }
 
     this.StopAutoDragScrollTimer=function()
@@ -510,6 +520,48 @@ function JSReportChartContainer(uielement)
         this.JSPopMenu.Inital();
     }
 
+    this.InitalMinuteChartTooltip=function(option)
+    {
+        if (this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart=new JSTooltipMinuteChart();
+        this.TooltipMinuteChart.Inital(this, option);
+        this.TooltipMinuteChart.Create();
+    }
+
+    this.DestroyMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Destroy();
+        this.TooltipMinuteChart=null;
+    }
+
+    //data={ Symbol }
+    this.ShowMinuteChartTooltip=function(x,y, data)
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+
+        data.Offset={ Left:offsetLeft, Top:offsetTop };
+
+        this.TooltipMinuteChart.Show(data, x,y);
+    }
+
+    this.HideMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Hide();
+    }
+
+
+
     this.AutoScrollPage=function(step)
     {
         this.AutoDragScrollTimer=setTimeout(() =>
@@ -1945,6 +1997,9 @@ function JSReportChartContainer(uielement)
         var bDrawTooltip=false;
         if (this.LastMouseStatus.TooltipStatus) bDrawTooltip=true;
         this.LastMouseStatus.TooltipStatus=null;
+
+        var bShowChartTooltip=false;
+        var chartTooltipData=null;
         
         if (this.DragRow) return;
         if (this.DrawHeader) return;
@@ -2015,8 +2070,19 @@ function JSReportChartContainer(uielement)
                 var tooltipData=report.GetTooltipData(x,y);  //单元格提示信息
                 if (tooltipData)
                 {
-                    this.LastMouseStatus.TooltipStatus={ X:x, Y:y, Data:tooltipData, ClientX:e.clientX, ClientY:e.clientY };
-                    bDrawTooltip=true;
+                    if (tooltipData.Type==20)
+                    {
+                        if (tooltipData.Stock && tooltipData.Stock.Symbol)
+                        {
+                            bShowChartTooltip=true;
+                            chartTooltipData={ Symbol:tooltipData.Stock.OriginalSymbol, Rect:tooltipData.Rect };
+                        }
+                    }
+                    else
+                    {
+                        this.LastMouseStatus.TooltipStatus={ X:x, Y:y, Data:tooltipData, ClientX:e.clientX, ClientY:e.clientY };
+                        bDrawTooltip=true;
+                    }
                 }
             }
 
@@ -2047,6 +2113,15 @@ function JSReportChartContainer(uielement)
 
         if (bDraw || bDrawTab) this.Draw();
         else if (bDrawTooltip) this.DrawTooltip(this.LastMouseStatus.TooltipStatus);
+
+        if (bShowChartTooltip)
+        {
+            this.ShowMinuteChartTooltip(null, null, chartTooltipData);
+        }
+        else
+        {
+            this.HideMinuteChartTooltip();
+        }
     }
 
     this.UIOnMounseOut=function(e)
@@ -4497,7 +4572,7 @@ function ChartReport()
     this.RectClient={};
 
     //{ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:drawInfo.Tooltip.Type, Data:{ AryText:[ {Text:xx} ]} };
-    //Type:1=数据截断
+    //Type:1=数据截断 2=表头提示信息  20=分时图
     // { Text, Color, Title:, TitleColor, Space, Margin:{ Left, Top, Right, Bottom }}
     this.TooltipRect=[];
 
@@ -4631,6 +4706,7 @@ function ChartReport()
             if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
             else colItem.IsDrawCallback=false;
             if (item.Icon) colItem.Icon=item.Icon;
+            if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.EnableChartTooltip=item.EnableChartTooltip;
 
             //点击表头弹出菜单
             if (IFrameSplitOperator.IsBool(item.EnablePopupHeaderMenu)) colItem.EnablePopupHeaderMenu=item.EnablePopupHeaderMenu;
@@ -6070,12 +6146,19 @@ function ChartReport()
             var tooltipData={ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:drawInfo.Tooltip.Type, Data:drawInfo.Tooltip.Data };
             this.TooltipRect.push(tooltipData);
         }
+        else if (column.EnableChartTooltip)
+        {
+            var tooltipData={ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:20 };
+            this.TooltipRect.push(tooltipData);
+        }
 
         if (drawInfo.Botton)
         {
             var buttonData={ Stock:stock, Index:index, ColumnIndex:columnIndex, Column:column, Rect:drawInfo.Botton.Rect, Type:drawInfo.Botton.Type, Data:drawInfo.Data };
             this.ButtonRect.push(buttonData);
         }
+
+       
     }
 
     this.IsReserveProgressBarColumn=function(value)

package/src/jscommon/umychart.resource/css/tools.css

@@ -1508,7 +1508,7 @@ input[type="color"] {
     height: 500px;
     width: 600px;
     z-index: 809;
-    visibility:'hidden';
+    visibility:hidden;
     background-color: rgba(255,255,255,0.95);
     border: solid 1px rgba(200, 210, 219, 0.92);
     display: flex;
@@ -1538,9 +1538,41 @@ input[type="color"] {
     margin-left: auto;
     padding-right: 4px;
     cursor:pointer;
+    color:rgb(180,180,180)
 }
 
 
+/*
+    Copyright (c) 2018 jones
+ 
+    http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+
+   内置分时图浮动框
+*/
+
+.UMyChart_Tooltip_Minute_Div
+{
+    position: absolute;
+    height: 300px;
+    width: 400px;
+    visibility:hidden;
+    background-color: rgba(255,255,255,0.95);
+    border: solid 1px rgba(200, 210, 219, 0.92);
+    display: flex;
+    flex-flow: column;  
+    z-index: 99;
+    pointer-events:none;
+}
+
+.UMyChart_Tooltip_Minute_Chart_Div
+{
+    flex: 1
+}
+
 
 /*
     Copyright (c) 2018 jones

package/src/jscommon/umychart.style.js

@@ -93,7 +93,7 @@ function GetBlackStyle()
 
         PopMinuteChart:
         {
-            BGColor:"rgba(0,0,0,0.95)",
+            BGColor:"rgba(0,0,0,0.85)",
             BorderColor:"rgb(230,230,230)",
         },
     

package/src/jscommon/umychart.testdata.js

@@ -187,7 +187,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
     setTimeout(()=>{
         var fullData=HQData.GetDayMinuteDataBySymbol(symbol);
         var srcStock=fullData[0];
-        var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+        var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:symbol, name:symbol };
         if (callcation.Before)
         {
             var before=
@@ -212,7 +212,10 @@ HQData.Minute_RequestMinuteData=function(data, callback)
             stockItem.beforeinfo=beforeinfo;
         }
 
-        /* 测试用 这里可以修改数据
+        //测试用 这里可以修改数据
+        //var lastItem=srcStock.minute[srcStock.minute.length-1];
+        //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
+        /*
         for(var i=0;i<srcStock.minute.length;++i)
         {
             var item=srcStock.minute[i];
@@ -1102,125 +1105,132 @@ HQData.Report_RequestStockData=function(data, callback)
     var stocks=data.Request.Data.stocks;    //股票列表
     data.PreventDefault=true;
 
-    var mapStock=new Map();
-    for(var i=0;i<stocks.length;++i)
-    {
-        var item=stocks[i];
-        mapStock.set(item.Symbol,{ Symbol:item.Symbol, Data:null });
-    }
-
-    if (IFrameSplitOperator.IsNonEmptyArray(SHSZ_STOCK_LIST_TEST_DATA.symbol))
+    setTimeout(()=>
     {
-        for(var i=0;i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length;++i)
+        var mapStock=new Map();
+        for(var i=0;i<stocks.length;++i)
         {
-            var symbol=SHSZ_STOCK_LIST_TEST_DATA.symbol[i];
-            if (!mapStock.has(symbol)) continue;
-            var item=mapStock.get(symbol);
-            var name=SHSZ_STOCK_LIST_TEST_DATA.name[i];
-            var price=SHSZ_STOCK_LIST_TEST_DATA.close[i];
-            var vol=SHSZ_STOCK_LIST_TEST_DATA.vol[i];
-            var newItem=
-            [
-                symbol, 
-                name, 
-                SHSZ_STOCK_LIST_TEST_DATA.yclose[i],
-                SHSZ_STOCK_LIST_TEST_DATA.open[i],
-                SHSZ_STOCK_LIST_TEST_DATA.high[i],
-                SHSZ_STOCK_LIST_TEST_DATA.low[i],
-                price,
-                vol,
-                SHSZ_STOCK_LIST_TEST_DATA.amount[i],
-            ];
-
-            //买价 量
-            newItem[9]=price+0.05;
-            newItem[10]=10;
+            var item=stocks[i];
+            mapStock.set(item.Symbol,{ Symbol:item.Symbol, Data:null });
+        }
 
-            //卖价 量
-            newItem[11]=price-0.06;
-            newItem[12]=5;
+        if (IFrameSplitOperator.IsNonEmptyArray(SHSZ_STOCK_LIST_TEST_DATA.symbol))
+        {
+            for(var i=0;i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length;++i)
+            {
+                var symbol=SHSZ_STOCK_LIST_TEST_DATA.symbol[i];
+                if (!mapStock.has(symbol)) continue;
+                var item=mapStock.get(symbol);
+                var name=SHSZ_STOCK_LIST_TEST_DATA.name[i];
+                var price=SHSZ_STOCK_LIST_TEST_DATA.close[i];
+                var vol=SHSZ_STOCK_LIST_TEST_DATA.vol[i];
+                var newItem=
+                [
+                    symbol, 
+                    name, 
+                    SHSZ_STOCK_LIST_TEST_DATA.yclose[i],
+                    SHSZ_STOCK_LIST_TEST_DATA.open[i],
+                    SHSZ_STOCK_LIST_TEST_DATA.high[i],
+                    SHSZ_STOCK_LIST_TEST_DATA.low[i],
+                    price,
+                    vol,
+                    SHSZ_STOCK_LIST_TEST_DATA.amount[i],
+                ];
+
+                //买价 量
+                newItem[9]=price+0.05;
+                newItem[10]=10;
+
+                //卖价 量
+                newItem[11]=price-0.06;
+                newItem[12]=5;
+
+                //均价
+                newItem[13]=price-0.03;   
+                
+                //内盘
+                newItem[18]=vol/4;  
+                //外盘 
+                newItem[19]=vol/5;  
+
+                newItem[14]=vol*1.5;   //流通股本
+                newItem[15]=vol*1.8;  //总股本
+
+                //换手率
+                newItem[23]=(Math.round(Math.random()*60))/100;
+
+                //名字字段
+                var symbolEx={ Text:name };
+                if (i%20==5)
+                    symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}, { Text:'\ue627', Color:'#1c65db'} ] };
+                else if (i%20==9)
+                    symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}] } ;
+                else if (i%20==18)
+                    symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue627', Color:'#1c65db'}] } ;
+
+                newItem[27]=symbolEx;
+
+
+                newItem[38]=HQData.GetRandomTestData(10,20000);        //持仓量
+                newItem[39]=HQData.GetRandomTestData(10,100);        //结算价
+                newItem[40]=HQData.GetRandomTestData(10,100);        //昨结算价
+                newItem[41]=HQData.GetRandomTestData(10,20000);        //开仓量
+                newItem[42]=HQData.GetRandomTestData(10,20000);        //平仓量
+
+                //1,3,5,10,15 涨速%
+                newItem[43]=HQData.GetRandomTestData(-90,90); 
+                newItem[44]=HQData.GetRandomTestData(-90,90); 
+                newItem[45]=HQData.GetRandomTestData(-90,90); 
+                newItem[46]=HQData.GetRandomTestData(-90,90); 
+                newItem[47]=HQData.GetRandomTestData(-90,90); 
+
+
+                //扩展数据 (定制数据)
+                var extendData=[];
+                newItem[30]=extendData;
+
+                //行业
+                extendData[0]="行业X";
+                //地区
+                extendData[1]="地区X";
+                
+                //PE|PB
+                extendData[2]=(Math.round(Math.random()*60))/100;
+                extendData[3]=(Math.round(Math.random()*60))/100;
+                extendData[4]=(Math.round(Math.random()*60))/100;
+                extendData[5]=(Math.round(Math.random()*60))/100;
 
-            //均价
-            newItem[13]=price-0.03;   
             
-            //内盘
-            newItem[18]=vol/4;  
-            //外盘 
-            newItem[19]=vol/5;  
+                //周涨幅
+                extendData[6]=(Math.round(Math.random()*60))/100;
+                extendData[7]=(Math.round(Math.random()*60))/100;
+                extendData[8]=(Math.round(Math.random()*60))/100;
 
-            newItem[14]=vol*1.5;   //流通股本
-            newItem[15]=vol*1.8;  //总股本
 
-            //换手率
-            newItem[23]=(Math.round(Math.random()*60))/100;
+                newItem[101]=105.0;
+                newItem[201]=`A-[${HQData.GetRandomTestData(-90,90)}]-B`;
 
-            //名字字段
-            var symbolEx={ Text:name };
-            if (i%20==5)
-                symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}, { Text:'\ue627', Color:'#1c65db'} ] };
-            else if (i%20==9)
-                symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}] } ;
-            else if (i%20==18)
-                symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue627', Color:'#1c65db'}] } ;
-
-            newItem[27]=symbolEx;
-
-
-            newItem[38]=HQData.GetRandomTestData(10,20000);        //持仓量
-            newItem[39]=HQData.GetRandomTestData(10,100);        //结算价
-            newItem[40]=HQData.GetRandomTestData(10,100);        //昨结算价
-            newItem[41]=HQData.GetRandomTestData(10,20000);        //开仓量
-            newItem[42]=HQData.GetRandomTestData(10,20000);        //平仓量
-
-            //1,3,5,10,15 涨速%
-            newItem[43]=HQData.GetRandomTestData(-90,90); 
-            newItem[44]=HQData.GetRandomTestData(-90,90); 
-            newItem[45]=HQData.GetRandomTestData(-90,90); 
-            newItem[46]=HQData.GetRandomTestData(-90,90); 
-            newItem[47]=HQData.GetRandomTestData(-90,90); 
-
-
-            //扩展数据 (定制数据)
-            var extendData=[];
-            newItem[30]=extendData;
 
-            //行业
-            extendData[0]="行业X";
-            //地区
-            extendData[1]="地区X";
-            
-            //PE|PB
-            extendData[2]=(Math.round(Math.random()*60))/100;
-            extendData[3]=(Math.round(Math.random()*60))/100;
-            extendData[4]=(Math.round(Math.random()*60))/100;
-            extendData[5]=(Math.round(Math.random()*60))/100;
-
-           
-            //周涨幅
-            extendData[6]=(Math.round(Math.random()*60))/100;
-            extendData[7]=(Math.round(Math.random()*60))/100;
-            extendData[8]=(Math.round(Math.random()*60))/100;
-
-
-            newItem[101]=105.0;
-            newItem[201]=`A-[${HQData.GetRandomTestData(-90,90)}]-B`
-             
+                newItem[301]=HQData.GetRandomTestData(0,100)/100;
+                newItem[302]=HQData.GetRandomTestData(0,100)/100;
+                
 
-            item.Data=newItem;
+                item.Data=newItem;
+            }
         }
-    }
 
-    var hqchartData={  data:[], code:0 };
+        var hqchartData={  data:[], code:0 };
 
-    for(var mapItem of mapStock)
-    {
-        var item=mapItem[1];
-        if (!item.Data) continue;
+        for(var mapItem of mapStock)
+        {
+            var item=mapItem[1];
+            if (!item.Data) continue;
 
-        hqchartData.data.push(item.Data);
-    }
+            hqchartData.data.push(item.Data);
+        }
 
-    callback(hqchartData);
+        callback(hqchartData);
+    }, 500);
 }
 
 HQData.Report_RequestStockSortData=function(data, callback)
@@ -1447,6 +1457,10 @@ HQData.Report_RequestVirtualStockData=function(data, callback)
             extendData[8]=(Math.round(Math.random()*60))/100;
 
 
+            newItem[351]={Title:"启动"};
+            newItem[352]={Title:"加入"};
+
+
             aryData.push(newItem);
             aryIndex.push(start+i);
         }