hqchart 1.1.14478 → 1.1.14482

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,105 @@ 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" }
+        }
+    };
+
+    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);
+}
+
+

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -6620,6 +6620,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=
@@ -29208,7 +29213,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;
 
@@ -30138,7 +30143,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;
@@ -32506,6 +32511,7 @@ function ChartKLine()
                     tooltip.Data=this.Data.Data[index];
                     tooltip.ChartPaint=this;
                     tooltip.Type=0; //K线信息
+                    tooltip.Symbol=this.Symbol;
                     return true;
                 }
             }
@@ -32540,7 +32546,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;
@@ -32554,7 +32560,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))
                 {
@@ -76371,7 +76377,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)",
+        }
     },
 
     //报价列表
@@ -77424,6 +77435,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);
@@ -122462,6 +122479,8 @@ var SCRIPT_CHART_NAME=
     SCATTER_PLOT:"SCATTER_PLOT",     //散点图
 
     CLIP_COLOR_STICK:"CLIP_COLOR_STICK",  //上下柱子 裁剪
+
+    DRAW_KLINE:"DRAWKLINE"
 }
 
 
@@ -123530,6 +123549,15 @@ function ScriptIndex(name,script,args,option)
         if (varItem.Color)  //如果设置了颜色,使用外面设置的颜色
             chart.UnchagneColor=chart.DownColor=chart.UpColor=this.GetColor(varItem.Color);
 
+        if (varItem.Draw.Config)
+        {
+            var config=varItem.Draw.Config;
+            if (IFrameSplitOperator.IsBool(config.IsShowMaxMinPrice)) chart.IsShowMaxMinPrice=config.IsShowMaxMinPrice;
+            if (IFrameSplitOperator.IsBool(config.IsShowKTooltip)) chart.IsShowKTooltip=config.IsShowKTooltip;
+            if (config.Symbol) chart.Symbol=config.Symbol;
+            if (config.Name) chart.Title=config.Name;
+        }
+
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
@@ -127489,6 +127517,17 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType==SCRIPT_CHART_NAME.DRAW_KLINE)
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+
+                    drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);
+                    drawItem.Config=draw.Config;
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -129216,7 +129255,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)",
+            }
         },
     
         //报价列表
@@ -129575,6 +129619,17 @@ function JSDealChart(divElement)
 
         this.JSChartContainer=chart;
         this.DivElement.JSChart=this;   //div中保存一份
+
+        //注册事件
+        if (option.EventCallback)
+        {
+            for(var i=0;i<option.EventCallback.length;++i)
+            {
+                var item=option.EventCallback[i];
+                chart.AddEventCallback(item);
+            }
+        }
+
         if (!option.Symbol) 
         {
             chart.Draw();
@@ -129799,6 +129854,7 @@ function JSDealChartContainer(uielement)
         chart.Frame=this.Frame;
         chart.ChartBorder=this.Frame.ChartBorder;
         chart.Canvas=this.Canvas;
+        chart.UIElement=this.UIElement;
         chart.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartPaint[0]=chart;
 
@@ -129826,12 +129882,16 @@ function JSDealChartContainer(uielement)
                 bRegisterWheel=false;
                 JSConsole.Chart.Log('[JSDealChartContainer::Create] not register wheel event.');
             }
+
+            if (IFrameSplitOperator.IsBool(option.EnableSelected)) chart.SelectedData.Enable=option.EnableSelected;
         }
 
         if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true);            //键盘消息
         if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true);                  //上下滚动消息
 
         this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
+        this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
+        this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
     }
 
     this.Draw=function()
@@ -130215,20 +130275,28 @@ function JSDealChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
          
-        /*
         var clickData=chart.OnMouseDown(x,y,e);
         if (!clickData) return;
 
-        if ((clickData.Type==2) && (e.button==0 || e.button==2))  //点击行
+        if ((clickData.Type==1) && (e.button==0 || e.button==2))  //点击行
         {
             if (clickData.Redraw==true) this.Draw();
         }
-        else if (clickData.Type==3 && e.button==0) //表头
-        {
-            this.OnClickHeader(clickData, e);
-        }
-        */
-        
+    }
+
+    this.UIOnDblClick=function(e)
+    {
+        var pixelTatio = GetDevicePixelRatio();
+        var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+        var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+
+        var chart=this.ChartPaint[0];
+        if (chart) chart.OnDblClick(x,y,e);
+    }
+
+    this.UIOnContextMenu=function(e)
+    {
+        e.preventDefault();
     }
 
     this.GotoNextPage=function()
@@ -130450,7 +130518,7 @@ function ChartDealList()
     this.IsSingleTable=false;    //单表模式
     this.IsShowHeader=true;    //是否显示表头
     this.ShowOrder=1;           //0=顺序 1=倒序
-    this.SelectedData={ Index:10 };         //{ Index:序号 }
+    this.SelectedData={ Index:null, Guid:null, Enable:false };         //{ Index:序号, Guid, Enable:是否启动 }
 
     this.SizeChange=true;
 
@@ -130461,7 +130529,7 @@ function ChartDealList()
 
     this.BorderColor=g_JSChartResource.DealList.BorderColor;    //边框线
 
-    this.SelectedConfig={ BGColor:"rgb(100,0,100)"};
+    this.SelectedConfig={ BGColor:g_JSChartResource.DealList.Selected.BGColor };
 
     //表头配置
     this.HeaderFontConfig={ Size:g_JSChartResource.DealList.Header.Font.Size, Name:g_JSChartResource.DealList.Header.Font.Name };
@@ -130502,6 +130570,7 @@ function ChartDealList()
     ];
 
     this.RectClient={};
+    this.AryCellRect=[];    //{ Rect:, Type: 1=单行 }
 
     this.ReloadResource=function(resource)
     {
@@ -130602,6 +130671,7 @@ function ChartDealList()
 
     this.Draw=function()
     {
+        this.AryCellRect=[];
         if (this.SizeChange) this.CalculateSize();
         else this.UpdateCacheData();
 
@@ -130757,7 +130827,7 @@ function ChartDealList()
                 for(j=0;j<this.RowCount && index>=0;++j, --index)
                 {
                     var dataItem=this.Data.Data[index];
-                    if (this.SelectedData && this.SelectedData.Index==index) this.DrawSelectedRow(dataItem, textLeft-this.HeaderMergin.Left, textTop, index);
+                    this.DrawSelectedRow(dataItem, index, rtRow);
     
                     this.DrawRow(dataItem, textLeft, textTop, index);
     
@@ -130775,10 +130845,15 @@ function ChartDealList()
                 for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
                 {
                     var dataItem=this.Data.Data[index];
+                    var rtRow={ Left:textLeft-this.HeaderMergin.Left, Top:textTop, Height:this.RowHeight, Width:this.TableWidth };
+                    rtRow.Right=rtRow.Left+rtRow.Width;
+                    rtRow.Bottom=rtRow.Top+rtRow.Height;
 
-                    if (this.SelectedData && this.SelectedData.Index==index) this.DrawSelectedRow(dataItem, textLeft-this.HeaderMergin.Left, textTop, index);
+                    this.DrawSelectedRow(dataItem, index, rtRow);
     
                     this.DrawRow(dataItem, textLeft, textTop, index);
+
+                    this.AryCellRect.push({ Rect:rtRow, Type:1, DataIndex:index });
     
                     textTop+=this.RowHeight;
                 }
@@ -130884,11 +130959,11 @@ function ChartDealList()
         }
     }
 
-    this.DrawSelectedRow=function(data, left, top, dataIndex, colIndex)
+    this.DrawSelectedRow=function(data, index, rtRow)
     {
-        var rtRow={ Left:left, Top:top, Height:this.RowHeight, Width:this.TableWidth };
-        rtRow.Right=rtRow.Left+rtRow.Width;
-        rtRow.Bottom=rtRow.Top+rtRow.Bottom;
+        if (!this.SelectedData) return;
+        if (!this.SelectedData.Enable) return;
+        if (!this.SelectedData.Guid || this.SelectedData.Guid!=data.Guid) return; 
 
         this.Canvas.fillStyle=this.SelectedConfig.BGColor;
         this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
@@ -131021,7 +131096,7 @@ function ChartDealList()
         return GetFontHeight(this.Canvas, font, word);
     }
 
-    this.OnMouseDown=function(x,y,e)    //Type: 2=行 3=表头
+    this.OnMouseDown=function(x,y,e)    //Type: 1=行
     {
         if (!this.Data) return null;
 
@@ -131032,12 +131107,68 @@ function ChartDealList()
         else uiElement={Left:null, Top:null};
 
         var row=this.PtInBody(x,y);
+        if (row)
+        {
+            var bRedraw=true;
+            var index=row.DataIndex;
+            var id=row.Item.Guid
+            if (this.SelectedData.Index==index && this.SelectedData.Guid==id) bRedraw=false;
+
+            this.SelectedData.Index=index;
+            this.SelectedData.Guid=id;
+
+            var eventID=JSCHART_EVENT_ID.ON_CLICK_DEAL_ROW;
+            if (e.button==2) eventID=JSCHART_EVENT_ID.ON_RCLICK_DEAL_ROW;
+
+            this.SendClickEvent(eventID, { Data:row, X:x, Y:y, e:e, Inside:insidePoint, UIElement:uiElement });
+
+            return { Type:row.Type, Redraw:bRedraw, Row:row };
+        }
+
+        return null;
+    }
+
+    this.OnDblClick=function(x,y,e)
+    {
+        if (!this.Data) return false;
+
+        var row=this.PtInBody(x,y);
+        if (row)
+        {
+            this.SendClickEvent(JSCHART_EVENT_ID.ON_DBCLICK_DEAL_ROW, { Data:row, X:x, Y:y });
+            return true;
+        }
+
+        return false;
     }
 
     this.PtInBody=function(x,y)
     {
         if (!this.Data) return null;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect)) return null;
+
+        for(var i=0;i<this.AryCellRect.length;++i)
+        {
+            var item=this.AryCellRect[i];
+            var rtRow=item.Rect;
+            if (x>=rtRow.Left && x<=rtRow.Right && y>=rtRow.Top && y<=rtRow.Bottom)
+            {
+                var data={ Rect:rtRow, DataIndex:item.DataIndex, Item:this.Data.Data[item.DataIndex], Type:item.Type };
+                return data;
+            }
+        }
+
+        return null;
+    }
+
+    this.SendClickEvent=function(id, data)
+    {
+        var event=this.GetEventCallback(id);
+        if (event && event.Callback)
+        {
+            event.Callback(event,data,this);
+        }
     }
 }
 /*
@@ -143792,7 +143923,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14477";
+var HQCHART_VERSION="1.1.14481";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.14477";
+var HQCHART_VERSION="1.1.14481";
 
 function PrintHQChartVersion()
 {