hqchart 1.1.14478 → 1.1.14484

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.14478",
+  "version": "1.1.14484",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogTooltip.js

@@ -1252,14 +1252,21 @@ function JSFloatTooltip()
         var symbol=data.Symbol;
         var name=data.Name;
         var bOverlay=false; //是否是叠加指标
+        var bIndexKLine=false;
         if (tooltipData.ChartPaint.Name=="Overlay-KLine")
         {
             symbol=tooltipData.ChartPaint.Symbol;
             name=tooltipData.ChartPaint.Title;
             bOverlay=true;
         }
+        else if (tooltipData.ChartPaint.Name=="DRAWKLINE")
+        {
+            symbol=tooltipData.ChartPaint.Symbol;
+            name=tooltipData.ChartPaint.Title;
+            bIndexKLine=true;
+        }
 
-        var kItem={ Symbol:symbol, Name:name, Item:CloneData(tooltipData.Data), IsOverlay:bOverlay };
+        var kItem={ Symbol:symbol, Name:name, Item:CloneData(tooltipData.Data), IsOverlay:bOverlay, IsIndexKLine:bIndexKLine };
         var strKItem=JSON.stringify(kItem);
         var bUpdata=false;
         if (this.KItemCacheID!=strKItem)    //数据变动的才更新
@@ -1560,10 +1567,11 @@ function JSFloatTooltip()
         if (IFrameSplitOperator.IsNumber(data.Time)) timeItem=this.FormatTime(data.Time, this.HQChart.Period, null, 'FloatTooltip-Time');
 
         var overlayItem=null;
-        if (kItem.IsOverlay)
+        if (kItem.IsOverlay || (kItem.IsIndexKLine && kItem.Name))
             overlayItem={ Title:"", Text:kItem.Name, Color:this.TextColor, ClassName:this.ValueAlign.Left };
         
         
+        
         var yClose=data.YClose; //昨收价|昨结算价
         var aryText=
         [

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55882,6 +55882,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);
 }
 
@@ -57280,17 +57282,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;
@@ -57426,7 +57433,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);
 }
 
 
@@ -58123,7 +58133,8 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
         { 
             DrawType:'MULTI_BAR', 
             DrawData:[] 
-        } //绘制柱子数组
+        }, //绘制柱子数组\
+        IsShowTitle:false,
     };
 
     //第一组柱子
@@ -58141,14 +58152,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)
@@ -58160,7 +58172,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=
@@ -58274,3 +58286,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);
+}
+
+

package/src/jscommon/umychart.complier.js

@@ -20257,6 +20257,8 @@ var SCRIPT_CHART_NAME=
     SCATTER_PLOT:"SCATTER_PLOT",     //散点图
 
     CLIP_COLOR_STICK:"CLIP_COLOR_STICK",  //上下柱子 裁剪
+
+    DRAW_KLINE:"DRAWKLINE"
 }
 
 
@@ -21325,6 +21327,26 @@ 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;
+        }
+
+        var bShowTitle=false;
+        if (IFrameSplitOperator.IsBool(varItem.IsShowTitle)) bShowTitle=varItem.IsShowTitle;
+        if (bShowTitle)
+        {
+            let titleIndex=windowIndex+1;
+            var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color); //标题
+            titleData.DataType="DRAWKLINE";
+            titleData.Symbol=chart.Symbol;
+            hqChart.TitlePaint[titleIndex].Data[id]=titleData;
+        }
+
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
@@ -25284,6 +25306,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);  //外部挂接

package/src/jscommon/umychart.deal.js

@@ -60,6 +60,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();
@@ -284,6 +295,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;
 
@@ -311,12 +323,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()
@@ -700,20 +716,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()
@@ -935,7 +959,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;
 
@@ -946,7 +970,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 };
@@ -987,6 +1011,7 @@ function ChartDealList()
     ];
 
     this.RectClient={};
+    this.AryCellRect=[];    //{ Rect:, Type: 1=单行 }
 
     this.ReloadResource=function(resource)
     {
@@ -1087,6 +1112,7 @@ function ChartDealList()
 
     this.Draw=function()
     {
+        this.AryCellRect=[];
         if (this.SizeChange) this.CalculateSize();
         else this.UpdateCacheData();
 
@@ -1242,7 +1268,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);
     
@@ -1260,10 +1286,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;
                 }
@@ -1369,11 +1400,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);
@@ -1506,7 +1537,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;
 
@@ -1517,11 +1548,67 @@ 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);
+        }
     }
 }