hqchart 1.1.14256 → 1.1.14269

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55692,6 +55692,10 @@ HQData.NetworkFilter=function(data, callback)
             HQData.Report_RequestVirtualStockData(data, callback);         //股票数据 虚拟表格
             break;
 
+        case "APIScriptIndex::ExecuteScript":   //测试指标
+            HQData.Report_APIIndex(data, callback);
+            break;
+
     }
 }
 
@@ -57349,3 +57353,266 @@ HQData.GetMulitDayMinuteDataByDate=function(aryDay, aryDate)
 }
 
 
+HQData.Report_APIIndex=function(data, callback)
+{
+    var request=data.Request;
+    if (request.Data.indexname=='API-MULTI_POINT')
+        HQData.APIIndex_MULTI_POINT(data, callback);
+    else if (request.Data.indexname=="API-DRAWTEXTREL")
+        HQData.APIIndex_DRAWTEXTREL(data, callback);
+    else if (request.Data.indexname=="API-DRAWCOLORKLINE")
+        HQData.APIIndex_DRAWCOLORKLINE(data, callback);
+    else if (request.Data.indexname=="API-DRAWBAND")
+        HQData.APIIndex_DRAWBAND(data, callback);
+    else if (request.Data.indexname=="API-MULTI_LINE")
+        HQData.APIIndex_MULTI_LINE(data, callback);
+}
+
+
+HQData.APIIndex_MULTI_POINT=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var pointData= 
+    { 
+        name:'MULTI_POINT', type:1, 
+        Draw: 
+        { 
+            DrawType:'MULTI_POINT', 
+            DrawData:[],
+        } 
+    };
+
+    var point=
+    { 
+        Color:'rgb(211,211,211)', 
+        BGColor:"rgb(255,215,0)",
+        PointRadius:10,
+        LineWidth:2,
+        Point:[ ] 
+    };
+
+    for(var i=kData.Data.length-1, j=0; i>=0 && j<6; i-=5, ++j)
+    {
+        var item=kData.Data[i];
+        point.Point.push({Date:item.Date, Time:item.Time, Value:item.Low});
+    }
+
+    pointData.Draw.DrawData.push(point);
+    
+
+    var point=
+    { 
+        Color:'rgb(148,0,211)', 
+        BGColor:"rgb(30,144,255)",
+        PointRadius:5,
+        LineWidth:1,
+        Point:[ ] 
+    };
+
+    for(var i=kData.Data.length-3, j=0; i>=0 && j<5; i-=6, ++j)
+    {
+        var item=kData.Data[i];
+        point.Point.push({Date:item.Date, Time:item.Time, Value:(item.High+item.Low)/2});
+    }
+
+    pointData.Draw.DrawData.push(point);
+
+    var apiData=
+    { 
+        code:0, stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(),  outvar: [pointData] } 
+    };
+               
+    console.log('[HQData.APIIndex_MULTI_POINT] apiData ', apiData);
+    callback(apiData);
+}
+
+HQData.APIIndex_DRAWTEXTREL=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var closeLine={ name:'价', type:0, data:kData.GetClose(), color:"rgb(255, 52, 179)" };
+
+    var divText=
+    { 
+        name:'DRAWTEXTREL', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWTEXTREL', 
+            DrawData: 
+            {
+                Point: {X: 500, Y: 500 },
+                Text: "!!!!前方高能!!!!"
+            },
+
+            Font:"20px 微软雅黑"
+        },
+        color:"rgb(255,0,0)",
+
+        DrawVAlign:1,
+        DrawAlign:1,
+    }
+
+    var divText2=
+    { 
+        name:'DRAWTEXTABS', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWTEXTABS', 
+            DrawData: 
+            {
+                Point: {X: 5, Y: 5 },
+                Text: "后台指标示例"
+            },
+
+            Font:"24px 微软雅黑"
+        },
+        color:"rgb(255,200,0)",
+
+        DrawVAlign:2,
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate() ,time:kData.GetTime(), outvar:[closeLine,divText, divText2] } 
+    };
+   
+    console.log('[HQData::APIIndex_DRAWTEXTREL] apiData ', apiData);
+    callback(apiData);
+}
+
+
+HQData.APIIndex_DRAWCOLORKLINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var aryTestKData=[];
+    var aryTestkData2=[];
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+        if (i%5==3) aryTestKData[i]={ Open:item.Open, High:item.High, Low:item.Low, Close:item.Close };
+        else aryTestKData[i]=null;
+
+        if (i%13==5) aryTestkData2[i]={ Open:item.Open, High:item.High, Low:item.Low, Close:item.Close };
+        else aryTestkData2[i]=null;
+    }
+
+    var varKLine={ type:1, name:"条件K线", Draw:{ DrawData:aryTestKData, DrawType:'DRAWCOLORKLINE', IsEmptyBar:false, Color:"rgb(100,0,100)"} }; 
+    var varKLine2={ type:1, name:"条件K线2", Draw:{ DrawData:aryTestkData2, DrawType:'DRAWCOLORKLINE', IsEmptyBar:false, Color:"rgb(255, 140, 0)"} }; 
+
+    var hqchartData=
+    { 
+        outdata:
+        { 
+            date:kData.GetDate(), time:kData.GetTime(), 
+            outvar:[ varKLine, varKLine2] 
+        } , 
+        code:0
+    };
+
+    console.log("[HQData.APIIndex_DRAWCOLORKLINE] DRAWCOLORKLINE=",hqchartData);
+
+    callback(hqchartData);
+}
+
+
+HQData.APIIndex_DRAWBAND=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+
+    var bandData=
+    { 
+        name:"DRAWBAND", type:1, 
+        Draw:
+        { 
+            Name:"DRAWBAND",
+            DrawType:"DRAWBAND",
+            DrawData:[],
+            Color:["rgb(220,20,60)","rgb(34,139,34)"]
+        }
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        bandData.Draw.DrawData[i]={ Value:kItem.Close, Value2:kItem.Open };
+    }
+
+    //var closeLine={ Name:'收', Type:0, Data:aryClose };
+    //var openLine={ Name:'开', Type:0, Data:aryOpen};
+
+    var hqchartData=
+    { 
+        outdata:{ date:kData.GetDate(), time:kData.GetTime(), outvar:[ bandData, ] } , 
+        code:0
+    };
+
+    callback(hqchartData);
+}
+
+
+HQData.APIIndex_MULTI_LINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var line3= 
+    { 
+        name:'MULTI_LINE', type:1, 
+        
+        Draw: 
+        { 
+            DrawType:'MULTI_LINE', DrawData:[],
+            LineWidth:5,
+            Arrow: 
+            { 
+                Start:true,     //是否绘制开始箭头 <-
+                End:true,       //是否绘制结束箭头 ->
+                Angle:30,       //三角斜边一直线夹角
+                Length:10,      //三角斜边长度
+                LineWidth:4,    //箭头粗细
+            }
+        }, //绘制线段数组
+
+        IsShowTitle:false
+    };
+
+    var point3=
+    {
+        Color:'rgb(255,0,255)', 
+        Point:[]
+    }
+
+    for(var i=kData.Data.length-10;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+        point3.Point.push({Date:item.Date, Time:item.Time, Value:item.High});
+    }
+    line3.Draw.DrawData.push(point3);
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[line3] } 
+    };
+    
+    console.log('[HQData.APIIndex_MULTI_LINE] apiData ', apiData);
+    callback(apiData);
+}
+
+

package/src/jscommon/umychart.js

@@ -2758,6 +2758,8 @@ var JSCHART_BUTTON_ID=
     INDEX_NAME_BUTTON:43,
 
     ADD_INDEX_WINDOW:44,    //增加指标窗口
+
+    CHIP_CLOSE:45,          //关闭筹码图
 }
 
 var JSCHART_DATA_FIELD_ID=
@@ -4842,6 +4844,34 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     }
 
+    this.TryPhoneClickButton=function(x,y,e)
+    {
+        if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域 , 指标标题点击
+        {
+            if (this.TryClickLock && this.TryClickLock(x, y)) return true;
+            if (this.TryClickIndexTitle && this.TryClickIndexTitle(x,y)) return true;
+        }
+
+        if (this.ClickFrameButton)
+        {
+            var button=this.Frame.PtInButtons(x,y);
+            if (button)
+            {
+                this.ClickFrameButton(button, e);
+                return true;
+            }
+        }
+
+        button=this.PtInExtendChartButtons(x,y);
+        if (button && this.ClickExtendChartButton)
+        {
+            this.ClickExtendChartButton(button, e);
+            return true;
+        }
+
+        return false;
+    }
+
     this.OnTouchStart=function(e)
     {
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
@@ -4864,23 +4894,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var touches = this.GetToucheData(e, this.IsForceLandscape);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
-            if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域 , 指标标题点击
-            {
-                var x = pt.X;
-                var y = pt.Y;
-                if (this.TryClickLock && this.TryClickLock(x, y)) return;
-                if (this.TryClickIndexTitle && this.TryClickIndexTitle(x,y)) return;
-            }
-
-            if (this.ClickFrameButton)
-            {
-                var button=this.Frame.PtInButtons(pt.X,pt.Y);
-                if (button)
-                {
-                    this.ClickFrameButton(button, e);
-                    return;
-                }
-            }
+            if (this.TryPhoneClickButton(pt.X, pt.Y, e)) return;
 
             if (this.EnableVerticalDrag )
             {
@@ -9977,8 +9991,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.ShowSelectData && srcParam) this.ShowSelectData(srcParam);
                 break;
             case JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID:
-                if (this.DialogSelectRect && srcParam) this.DrawSelectRectDialog(srcParam);
+                this.OnCMDSelectedSummary(srcParam, aryArgs[1]);
                 break;
+
             case JSCHART_MENU_ID.CMD_SHOW_INDEX_ID:        //显示隐藏指标   [0]=windowIndex [1]=0=自动 1=隐藏 2=显示
                 if (param==null || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
                 var windowIndex=param, showType=aryArgs[1];
@@ -10230,6 +10245,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.PopupMenuByRClick(menuData, x, y);
     }
 
+    this.OnCMDSelectedSummary=function(e, selectData)
+    {
+        if (selectData) this.UpdateSelectRect(selectData.Start,selectData.End);
+
+        this.HideSelectRect();
+
+        if (this.DialogSelectRect && e) this.DrawSelectRectDialog(e);
+    }
+
     //指标窗口扩展图形
     this.CreateChartPaintExtend=function(chart, windowIndex)
     {
@@ -44751,8 +44775,12 @@ function StockChipPhone()
     //手机端没有按钮
     this.DrawToolbar=function(moveonPoint, mouseStatus) { }
 
+    this.CloseButtonConfig=CloneData(g_JSChartResource.StockChip.PhoneCloseButton);
+    
+
     this.Draw=function()
     {
+        this.Buttons=[];
         this.IsHScreen=this.ChartFrame.IsHScreen==true;
         this.PixelRatio=GetDevicePixelRatio();
         if (this.IsHScreen)
@@ -44795,6 +44823,7 @@ function StockChipPhone()
         }
 
         this.DrawBorder();
+        this.DrawCloseButton();
         this.SizeChange=false;
     }
 
@@ -45157,6 +45186,73 @@ function StockChipPhone()
         
         this.Canvas.fill();
     }
+
+    //关闭按钮
+    this.DrawCloseButton=function()
+    {
+        var config=this.CloseButtonConfig;
+        var font=`${config.Size}px ${config.Family}`;
+        var rtButton=null;
+        if (this.IsHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var right=border.Left-2;
+            var bottom=border.ChartHeight-2;
+            var left=right-config.Size;
+            var top=bottom-config.Size;
+
+            var rtButton={ Left:left, Top:top, Bottom:bottom, Right:right };
+            rtButton.Width=rtButton.Right-rtButton.Left;
+            rtButton.Height=rtButton.Bottom-rtButton.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var top=border.Bottom+2;
+            var bottom=top+config.Size;
+            var right=border.ChartWidth-2;
+            var left=right-config.Size;
+
+            var rtButton={ Left:left, Top:top, Bottom:bottom, Right:right };
+            rtButton.Width=rtButton.Right-rtButton.Left;
+            rtButton.Height=rtButton.Bottom-rtButton.Top;
+        }
+
+        if (!rtButton) return;
+
+        if (config.Border)
+        {
+            if (config.Border.BGColor) 
+            {
+                this.Canvas.fillStyle=config.Border.BGColor;
+                this.Canvas.fillRect(rtButton.Left,rtButton.Top,rtButton.Width,rtButton.Height);
+            }
+        }
+
+        this.Canvas.fillStyle=config.Color;
+        this.Canvas.font=font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
+        if (this.IsHScreen)
+        {
+            var radius=config.Size/2;
+            var x=rtButton.Left+radius, y=rtButton.Bottom-radius;
+            this.Canvas.save(); 
+            this.Canvas.translate(x,y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(config.Text,-radius,radius);
+            this.Canvas.restore();
+            
+        }
+        else
+        {
+            this.Canvas.fillText(config.Text, rtButton.Left, rtButton.Bottom);
+        }
+
+        var btnItem={ ID:JSCHART_BUTTON_ID.CHIP_CLOSE, Rect:rtButton };
+        this.Buttons.push(btnItem);
+    
+    }
 }
 
 //窗口分割
@@ -48838,6 +48934,10 @@ IFrameSplitOperator.FormatDateString=function(value,format, languageID)
     {
         case 'MM-DD':
             return IFrameSplitOperator.NumberToString(month) + '-' + IFrameSplitOperator.NumberToString(day);
+        case "MM-DD/W":
+            var date=new Date(year,month-1,day);
+            var week=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],languageID);
+            return `${IFrameSplitOperator.NumberToString(month)}-${IFrameSplitOperator.NumberToString(day)}/${week}`;
         case "MM/DD":
             return `${IFrameSplitOperator.NumberToString(month)}/${IFrameSplitOperator.NumberToString(day)}`;
         case "MM/DD/W":
@@ -70391,6 +70491,16 @@ function JSChartResource()
             Size:13*GetDevicePixelRatio(),
             MerginLeft:4
         },
+
+        //手机端
+        PhoneCloseButton:
+        {
+            Family:"iconfont", 
+            Size:16*GetDevicePixelRatio(), 
+            Text:"\ue60c", 
+            Color:"rgb(255,255,255)",
+            Border:{ BGColor:"rgb(169,169,169)" }
+        }
     }
 
     //深度图
@@ -71309,6 +71419,20 @@ function JSChartResource()
             if (item.DefaultButton) T_SetButtonStyle(item.DefaultButton, this.StockChip.DefaultButton);
             if (item.LongButton) T_SetButtonStyle(item.LongButton, this.StockChip.LongButton);
             if (item.RecentButton) T_SetButtonStyle(item.RecentButton, this.StockChip.RecentButton);
+            if (item.CloseButton) T_SetButtonStyle(item.CloseButton, this.StockChip.CloseButton);
+
+            if (item.PhoneCloseButton)
+            {
+                var subItem=item.PhoneCloseButton;
+                if (subItem.Family) this.StockChip.PhoneCloseButton.Family=subItem.Family;
+                if (subItem.Text) this.StockChip.PhoneCloseButton.Text=subItem.Text;
+                if (subItem.Color) this.StockChip.PhoneCloseButton.Color=subItem.Color;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) this.StockChip.PhoneCloseButton.Size=subItem.Size;
+                if (subItem.Border)
+                {
+                    if (subItem.Border.BGColor) this.StockChip.PhoneCloseButton.Border.BGColor=subItem.Border.BGColor;
+                }
+            }
         }
 
         if (style.DepthChart)
@@ -79178,7 +79302,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     {
         var aryMenu=
         [
-            { Name:"区间统计", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e] }},
+            { Name:"区间统计", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_SUMMARY_ID, Args:[e,data.SelectData] }},
             { Name:"区间放大", Data:{ ID:JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID, Args:[data.SelectData] }}
         ];
         
@@ -80555,6 +80679,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             button.Chart.ShowType=2;
             this.Draw();
         }
+        else if (button.ID==JSCHART_BUTTON_ID.CHIP_CLOSE)
+        {
+            if (this.DeleteStockChipChart) this.DeleteStockChipChart();
+        }
     }
 
     //成交量分布图数据请求
@@ -88155,6 +88283,9 @@ function KLineChartHScreenContainer(uielement)
             var touches = this.GetToucheData(e, false);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
+            if (this.TryPhoneClickButton(pt.X,pt.Y,e)) return;
+
+            /*
             if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域, 指标标题点击
             {
                 var x = pt.X;
@@ -88172,6 +88303,7 @@ function KLineChartHScreenContainer(uielement)
                     return;
                 }
             }
+            */
 
             if (this.EnableVerticalDrag )
             {

package/src/jscommon/umychart.style.js

@@ -498,7 +498,17 @@ function GetBlackStyle()
         StockChip:
         {
             InfoColor:'rgb(255,255,255)', //文字颜色
-            DayInfoColor:'rgb(0,0,0)' //周期颜色内文字颜色
+            DayInfoColor:'rgb(0,0,0)', //周期颜色内文字颜色
+
+            //手机端
+            PhoneCloseButton:
+            {
+                Family:"iconfont", 
+                Size:16*GetDevicePixelRatio(), 
+                Text:"\ue60c", 
+                Color:"rgb(255,255,255)",
+                Border:{ BGColor:"rgb(40,42,44)" }
+            }
         },
     
         //深度图