hqchart 1.1.14478 → 1.1.14484

package/src/jscommon/umychart.js

@@ -2695,6 +2695,11 @@ var JSCHART_EVENT_ID=
     SEARCH_DIALOG_ON_CLICK_INDEX:163,           //切换指标-指标对话框
 
     ON_CALCULATE_CHIP_DATA:164,                //计算筹码数据 (筹码图用)
+
+
+    ON_CLICK_DEAL_ROW:165,
+    ON_RCLICK_DEAL_ROW:166,
+    ON_DBCLICK_DEAL_ROW:167,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -25283,7 +25288,7 @@ function IChartPainting()
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var data=this.Data.Data[i];
-            if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+            if (!data || data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
 
             if (firstOverlayOpen==null) firstOverlayOpen=data.Open;
 
@@ -26213,7 +26218,7 @@ function ChartKLine()
         {
             var data=this.Data.Data[i];
             this.ShowRange.End=i;
-            if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+            if (!data || data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
 
             var left=xOffset;
             var right=xOffset+dataWidth;
@@ -28581,6 +28586,7 @@ function ChartKLine()
                     tooltip.Data=this.Data.Data[index];
                     tooltip.ChartPaint=this;
                     tooltip.Type=0; //K线信息
+                    tooltip.Symbol=this.Symbol;
                     return true;
                 }
             }
@@ -28615,7 +28621,7 @@ function ChartKLine()
             for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
             {
                 var data=this.Data.Data[i];
-                if (!IFrameSplitOperator.IsNumber(data.Close)) continue;
+                if (!data || !IFrameSplitOperator.IsNumber(data.Close)) continue;
 
                 if (range.Max==null) range.Max=data.Close;
                 if (range.Min==null) range.Min=data.Close;
@@ -28629,7 +28635,7 @@ function ChartKLine()
             for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
             {
                 var data=this.Data.Data[i];
-                if (data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
+                if (!data || data.Open==null || data.High==null || data.Low==null || data.Close==null) continue;
 
                 if (this.DrawType==5 && data.OrderFlow && IFrameSplitOperator.IsNumber(data.OrderFlow.PriceOffset))
                 {
@@ -57776,6 +57782,19 @@ function DynamicChartTitlePainting()
         DownColor:g_JSChartResource.IndexTitle.UpDownArrow.DownColor,
         UnchangeColor:g_JSChartResource.IndexTitle.UpDownArrow.UnchangeColor
     };
+
+
+    //K线标题颜色
+    this.UpColor=g_JSChartResource.UpTextColor;
+    this.DownColor=g_JSChartResource.DownTextColor;
+    this.UnchangeColor=g_JSChartResource.UnchagneTextColor;
+
+    this.VolColor=g_JSChartResource.Title.VolColor;
+    this.AmountColor=g_JSChartResource.Title.AmountColor;
+    this.DateTimeColor=g_JSChartResource.Title.DateTimeColor;
+    this.NameColor = g_JSChartResource.Title.NameColor;
+    this.PositionColor=g_JSChartResource.Title.PositionColor;   //持仓
+
     
 
     //动态标题
@@ -57796,6 +57815,15 @@ function DynamicChartTitlePainting()
         this.BGColor=g_JSChartResource.IndexTitleBGColor;
         this.BGBorderColor=g_JSChartResource.IndexTitleBorderColor;
         this.BGBorderMoveOnColor=g_JSChartResource.IndexTitleBorderMoveOnColor;
+
+        this.UpColor=g_JSChartResource.UpTextColor;
+        this.DownColor=g_JSChartResource.DownTextColor;
+        this.UnchangeColor=g_JSChartResource.UnchagneTextColor;
+
+        this.VolColor=g_JSChartResource.Title.VolColor;
+        this.AmountColor=g_JSChartResource.Title.AmountColor;
+        this.DateTimeColor=g_JSChartResource.Title.DateTimeColor;
+        this.PositionColor=g_JSChartResource.Title.PositionColor;   //持仓
     }
 
     this.SetDynamicTitleData=function(outName, args, data)
@@ -58019,6 +58047,93 @@ function DynamicChartTitlePainting()
         return aryText;
     }
 
+    this.FromatKLineTitle=function(item, dataInfo)
+    {
+        var defaultfloatPrecision=GetfloatPrecision(dataInfo.Symbol);//价格小数位数
+        var upperSymbol="";
+        if (dataInfo.Symbol) upperSymbol=dataInfo.Symbol.toUpperCase();
+        var pixelRatio=GetDevicePixelRatio();
+        var leftSpace=3*pixelRatio;
+
+        var aryText=[];
+
+
+        if (IFrameSplitOperator.IsNumber(item.Date)) 
+        {
+            var text=IFrameSplitOperator.FormatDateString(item.Date);
+            aryText.push({ Text:text, Color:this.DateTimeColor });
+        }
+
+        if (IFrameSplitOperator.IsNumber(item.Open))
+        {
+            var color=this.GetColor(item.Open,item.YClose);
+            var text=g_JSChartLocalization.GetText('KTitle-Open',this.LanguageID)+item.Open.toFixed(defaultfloatPrecision);
+            aryText.push({ Text:text, Color:color, LeftSpace:leftSpace});
+        }
+           
+        if (IFrameSplitOperator.IsNumber(item.High))
+        {
+            var color=this.GetColor(item.High,item.YClose);
+            var text=g_JSChartLocalization.GetText('KTitle-High',this.LanguageID)+item.High.toFixed(defaultfloatPrecision);
+            aryText.push({ Text:text, Color:color, LeftSpace:leftSpace });
+        }
+        
+        if (IFrameSplitOperator.IsNumber(item.Low))
+        {
+            var color=this.GetColor(item.Low,item.YClose);
+            var text=g_JSChartLocalization.GetText('KTitle-Low',this.LanguageID)+item.Low.toFixed(defaultfloatPrecision);
+            aryText.push({ Text:text, Color:color, LeftSpace:leftSpace});
+        }
+        
+        if (IFrameSplitOperator.IsNumber(item.Close))
+        {
+            var color=this.GetColor(item.Close,item.YClose);
+            var text=g_JSChartLocalization.GetText('KTitle-Close',this.LanguageID)+item.Close.toFixed(defaultfloatPrecision);
+            aryText.push({ Text:text, Color:color, LeftSpace:leftSpace});
+        }
+
+        //涨幅
+        if (item.YFClose>0 && MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+        {
+            var value=(item.Close-item.YFClose)/item.YFClose*100;
+            var color = this.GetColor(value, 0);
+            var text = g_JSChartLocalization.GetText('KTitle-Increase',this.LanguageID) + value.toFixed(2)+'%';
+            aryText.push({ Text:text, Color:color, LeftSpace:leftSpace});
+        }
+        else if (item.YClose>0)
+        {
+            var value=(item.Close-item.YClose)/item.YClose*100;
+            var color = this.GetColor(value, 0);
+            var text = g_JSChartLocalization.GetText('KTitle-Increase',this.LanguageID) + value.toFixed(2)+'%';
+            aryText.push({ Text:text, Color:color, LeftSpace:leftSpace});
+        }
+
+        if (IFrameSplitOperator.IsNumber(item.Vol)) //成交量
+        {
+            var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);
+            var vol=item.Vol/unit;
+            var text=g_JSChartLocalization.GetText('KTitle-Vol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(vol,2,this.LanguageID);
+            aryText.push({ Text:text, Color:this.VolColor, LeftSpace:leftSpace});
+        }
+        
+        if (IFrameSplitOperator.IsNumber(item.Amount))  //成交金额
+        {
+            var text=g_JSChartLocalization.GetText('KTitle-Amount',this.LanguageID)+IFrameSplitOperator.FormatValueString(item.Amount,2,this.LanguageID);
+            aryText.push({ Text:text, Color:this.AmountColor, LeftSpace:leftSpace});
+        }
+
+        return aryText;
+    }
+
+    this.GetColor=function(price,yClose)
+    {
+        if (!IFrameSplitOperator.IsNumber(yClose)) return this.UnchangeColor;
+
+        if(price>yClose) return this.UpColor;
+        else if (price<yClose) return this.DownColor;
+        else return this.UnchangeColor;
+    }
+
     this.ForamtMultiLineTitle=function(dataIndex, dataInfo)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(dataInfo.Lines)) return null;
@@ -58504,6 +58619,12 @@ function DynamicChartTitlePainting()
                 if (!aryText) return null;
                 return { Text:null, ArrayText:aryText };
             }
+            else if (item.DataType=="DRAWKLINE")
+            {
+                aryText=this.FromatKLineTitle(value, item);
+                if (!aryText) return null;
+                return { Text:null, ArrayText:aryText };
+            }
             else if (g_ScriptIndexChartFactory.Has(item.DataType)) //外部挂接
             {
                 var find=g_ScriptIndexChartFactory.Get(item.DataType);
@@ -72446,7 +72567,12 @@ function JSChartResource()
 
         UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
         DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
-        UnchagneTextColor:"rgb(0,0,0)"     //平盘文字颜色 
+        UnchagneTextColor:"rgb(0,0,0)",     //平盘文字颜色 
+
+        Selected:
+        {
+            BGColor:"rgb(180,240,240)",
+        }
     },
 
     //报价列表
@@ -73499,6 +73625,12 @@ function JSChartResource()
                         this.DealList.FieldColor.Bar[i]=filed.Bar[i];
                 }
             }
+
+            if (item.Selected)
+            {
+                var subItem=item.Selected;
+                if (subItem.BGColor) this.DealList.Selected.BGColor=subItem.BGColor;
+            }
         }
 
         if (style.Report) this.SetReportStyle(style.Report);

package/src/jscommon/umychart.style.js

@@ -655,7 +655,12 @@ function GetBlackStyle()
     
             UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
             DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
-            UnchagneTextColor:"rgb(228,228,228)"    //平盘文字颜色 
+            UnchagneTextColor:"rgb(228,228,228)",    //平盘文字颜色 
+
+            Selected:
+            {
+                BGColor:"rgb(49,48,56)",
+            }
         },
     
         //报价列表

package/src/jscommon/umychart.testdata.js

@@ -368,6 +368,8 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
    
     var hqchartData={code:0, data:aryDay, name:symbol, symbol: symbol};
 
+    //hqchartData.data[0].minute.length=45;
+
     callback(hqchartData);
 }
 
@@ -1766,17 +1768,22 @@ HQData.GetKLineDataByDate=function(fullData, startDate, endDate)
 HQData.GetDayMinuteDataBySymbol=function(symbol)
 {
     var data=null;
-    switch(symbol)
+    var upperSymbol=null;
+    if (symbol) upperSymbol=symbol.toUpperCase();
+    switch(upperSymbol)
     {
-        case "000001.sz":
+        case "000001.SZ":
             data=SZ_000001_1DAY_MINUTE;
             break;
-        case "600000.sh":
+        case "600000.SH":
             data=SH_600000_1DAY_MINUTE;
             break;
-        case "000151.sz":
+        case "000151.SZ":
             data=SZ_000151_1DAY_MINUTE;
             break;
+        case "IM2503.CF":
+            data=CF_IM2503_1DAY_MINUTE;
+            break;
         default:
             data=SZ_000151_1DAY_MINUTE;
             break;
@@ -1912,7 +1919,10 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MULTI_TEXT(data, callback);
     else if (request.Data.indexname=="API_PARTLINE")
         HQData.APIIndex_PARTLINE(data, callback);
-    
+    else if (request.Data.indexname=="API_CHANNELV2")
+        HQData.APIIndex_CHANNEL_V2(data, callback);
+    else if (request.Data.indexname=="API_DRAWKLINE")
+        HQData.APIIndex_DRAWKLINE(data, callback);
 }
 
 
@@ -2609,7 +2619,8 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
         { 
             DrawType:'MULTI_BAR', 
             DrawData:[] 
-        } //绘制柱子数组
+        }, //绘制柱子数组\
+        IsShowTitle:false,
     };
 
     //第一组柱子
@@ -2627,14 +2638,15 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
 
     var point2=
     { 
-        Color:'rgb(55,228,181)', //颜色
-        Type:1,
+        Color:'rgb(55,228,181)',            //颜色
+        BorderColor:"rgb(255,165,0)",       //边框景色
+        Type:2,
         Name:"柱子下部",
         Point:
         [
             //{Date:20190916, Time: Value:15.5, Value2:0 },
         ],
-        Width:5
+        Width:10
     };
 
     for(var i=0;i<kData.Data.length;++i)
@@ -2646,7 +2658,7 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
 
 
 
-    barData.Draw.DrawData.push(point);
+    //barData.Draw.DrawData.push(point);
     barData.Draw.DrawData.push(point2);
 
     var apiData=
@@ -2760,3 +2772,106 @@ HQData.APIIndex_PARTLINE=function(data, callback)
 }
 
 
+HQData.APIIndex_CHANNEL_V2=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var channelData= 
+    { 
+        name:'通道示例', type:1, 
+        Draw: 
+        { 
+            DrawType:'JS_CHART_CHANNEL_V2', 
+            DrawData:
+            {
+                AryData:[]
+            }
+        } 
+    };
+
+    var aryTestData=kData.GetCloseMA(10);
+    var ARRAY_COLOR=["rgb(0, 0 ,255)", "rgb(255,0,255)", "rgb(255,165,0)"];
+    var colorIndex=0;
+    for(var i=20;i<kData.Data.length;++i)
+    {
+        var index=i%15;
+        var kItem=kData.Data[i];
+        var value=aryTestData[i];
+        var value2=value*1.03;
+        var item={ Date:kItem.Date, Time:kItem.Time, Value: value, Value2:value2 };
+        //var item={ Date:kItem.Date, Time:kItem.Time, Value: kItem.Close*(1.05), Value2:kItem.Close };
+
+        item.Color=ARRAY_COLOR[colorIndex%ARRAY_COLOR.length];
+        channelData.Draw.DrawData.AryData.push(item);
+
+        if (index==0 && i>0) ++colorIndex;
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[channelData] } 
+    };
+
+    console.log('[HQData.APIIndex_CHANNEL_V2] apiData ', apiData);
+    callback(apiData);
+}
+
+
+HQData.APIIndex_DRAWKLINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var klineData=
+    { 
+        name:"DRAWKLINE", type:1, 
+        Draw:
+        { 
+            Name:"DRAWKLINE",
+            DrawType:"DRAWKLINE",
+            DrawData:[],
+            Config:{ IsShowMaxMinPrice:true, IsShowKTooltip:true, Symbol:"000001.sh", Name:"上证指数11" }
+        },
+        IsShowTitle:true,
+    };
+
+    var aryDate=[];
+    var aryTime=[];
+    for(var i=100;i<kData.Data.length-100;++i)
+    {
+        var kItem=kData.Data[i];
+        var newItem=
+        { 
+            YClose:kItem.YClose, 
+            Open:kItem.Open, 
+            High:kItem.High, 
+            Low:kItem.Low, 
+            Close:kItem.Close, 
+            Date:kItem.Date, 
+            Time:kItem.Time,
+            Vol:kItem.Vol,
+        };
+
+        klineData.Draw.DrawData.push(newItem);
+
+        aryDate.push(kItem.Date);
+        aryTime.push(kItem.Time)
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:aryDate, time:aryTime, outvar:[klineData] } 
+    };
+
+    console.log('[HQData.APIIndex_DRAWKLINE] apiData ', apiData);
+    callback(apiData);
+}
+
+