hqchart 1.1.13590 → 1.1.13600

package/package.json

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

package/src/jscommon/umychart.js

@@ -2602,6 +2602,7 @@ var JSCHART_EVENT_ID=
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
     ON_CLICK_REPORT_BUTTON:142,             //报价列表按钮
     ON_CLICK_REPORT_LINK:143,               //报价列表 链接
+    ON_CREATE_REPORT_HEADER_MENU:144,       //报价列表 表头菜单
 
 
     ON_CHANGE_INDEX:150,        //切换指标
@@ -2778,8 +2779,10 @@ var JSCHART_MENU_ID=
 
 
     CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
-
-    
+    CMD_REPORT_COLUMN_SORT_ID:61,       //报价列表 表头排序  Arg[列序号, 排序方向]
+    CMD_REPORT_COLUMN_DEL_ID:62,        //报价列表 删除列
+    CMD_REPORT_COLUMN_MOVE_ID:63,       //报价列表 列移动
+    CMD_REPORT_COLUMN_FILTER_ID:64,     //报价列表 筛选
 }
 
 
@@ -56956,6 +56959,16 @@ function ChartArrowMarker()
     this.OnlyMoveXIndex=true;
     this.IsSupportMagnet=true;
 
+    this.Super_SetOption=this.SetOption;    //父类函数
+
+    this.SetOption=function(option)
+    {
+        this.Super_SetOption(option);
+
+        if (option.AreaColor) this.AreaColor=option.AreaColor;
+        else this.AreaColor=IChartDrawPicture.ColorToRGBA(this.LineColor, 0.6);
+    }
+
     this.CalculatePoint=function(angle, ptStart, ptEnd, lineWidth)
     {
         var theta=angle;            //三角斜边一直线夹角
@@ -56999,9 +57012,12 @@ function ChartArrowMarker()
         this.Canvas.lineTo(outArrow.Bottom.X,outArrow.Bottom.Y);
         this.Canvas.lineTo(insideArrow.Bottom.X,insideArrow.Bottom.Y);
         this.Canvas.lineTo(ptStart.X,ptStart.Y);
-        this.Canvas.closePath();
 
-        this.Canvas.fillStyle=this.LineColor;
+        this.Canvas.strokeStyle=this.LineColor;
+        this.Canvas.stroke();
+
+        this.Canvas.closePath();
+        this.Canvas.fillStyle=this.AreaColor;
         this.Canvas.fill();
 
         /*
@@ -65792,6 +65808,9 @@ function ChartPriceRange()
 
         this.DrawArrow({X:ToFixedPoint(xCenter), Y:ptStart.Y}, {X:ToFixedPoint(xCenter), Y:ptEnd.Y});
 
+        var bottom=this.Frame.ChartBorder.GetBottomEx();
+        var top=this.Frame.ChartBorder.GetTopEx();
+
         //文字输出
         var startValue=this.Frame.GetYData(ptStart.Y,false);
         var endValue=this.Frame.GetYData(ptEnd.Y,false);
@@ -65807,6 +65826,23 @@ function ChartPriceRange()
         else rtTextBG.Top=ptEnd.Y+4;
         rtTextBG.Bottom=rtTextBG.Top+rtTextBG.Height;
 
+        if (diffValue>0)
+        {
+            if (rtTextBG.Top<=top)
+            {
+                rtTextBG.Top=top;
+                rtTextBG.Bottom=rtTextBG.Top+rtTextBG.Height;
+            }
+        }
+        else
+        {
+            if (rtTextBG.Bottom>=bottom)
+            {
+                rtTextBG.Bottom=bottom;
+                rtTextBG.Top=rtTextBG.Bottom-rtTextBG.Height;
+            }
+        }
+
         if (this.Label.EnableBGColor)
         {
             var path=new Path2D();
@@ -65913,6 +65949,7 @@ function ChartDateRange()
 
         
         //文字输出
+        var bottom=this.Frame.ChartBorder.GetBottomEx();
         var startIndex=this.Frame.GetXData(ptStart.X,false);
         var endIndex=this.Frame.GetXData(ptEnd.X,false);
         var barCount=endIndex-startIndex+1;
@@ -65924,6 +65961,12 @@ function ChartDateRange()
         var rtTextBG={ Left:xCenter-textWidth/2, Top:ptEnd.Y+4, Width:textWidth, Height:textHeight+2 };
         rtTextBG.Bottom=rtTextBG.Top+rtTextBG.Height;
 
+        if (rtTextBG.Bottom>=bottom)
+        {
+            rtTextBG.Bottom=bottom;
+            rtTextBG.Top=rtTextBG.Bottom-rtTextBG.Height;
+        }
+
         if (this.Label.EnableBGColor)
         {
             var path=new Path2D();

package/src/jscommon/umychart.report.js

@@ -3018,10 +3018,73 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    //列排序
+    this.SortColumn=function(index, sortType)
+    {
+        if (index<0) return false;
+        var reportChart=this.GetReportChart();
+        if (!reportChart) return false;
+
+        var column=reportChart.Column[index];
+        
+        if (!column) return false;
+        if (column.Sort!=1 && column.Sort!=2) return false;
+
+        var sortInfo={ Field:index, Sort:sortType };
+        if (sortInfo.Sort==0)   //不排序还原
+        {
+            this.Data.Data=[];
+            if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
+                this.Data.Data=this.SourceData.Data.slice();
+        }
+        else if (sortInfo.Sort==1 || sortInfo.Sort==2)
+        {
+            if (column.Sort==1)  //本地排序
+            {
+                var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+                if (event && event.Callback)
+                {
+                    var sendData={ Column:column, SortInfo:sortInfo, SymbolList:this.Data.Data, Result:null };
+                    event.Callback (event, sendData, this);
+                    if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+                }
+                else
+                {
+                    this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, sortInfo.Sort); });
+                }
+            }
+            else if (column.Sort==2) //远程排序
+            {
+                if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+                
+                this.SortInfo.Field=sortInfo.Field;
+                this.SortInfo.Sort=sortInfo.Sort;
+                this.Data.YOffset=0;
+                this.ResetReportSelectStatus();
+                this.RequestStockSortData(column, sortInfo.Field, sortInfo.Sort);   //远程排序
+                return true;
+            }
+        }
+
+        this.Data.YOffset=0;
+        this.ResetReportSelectStatus();
+        this.SortInfo.Field=sortInfo.Field;
+        this.SortInfo.Sort=sortInfo.Sort;
+        this.Draw();
+        this.DelayUpdateStockData();
+        return true;
+    }
+
     //点表头
     this.OnClickHeader=function(clickData, e)
     {
         var header=clickData.Header;
+        if (header.Column && header.Column.EnablePopupHeaderMenu)
+        {
+            this.PopupHeaderMenu(clickData, e);
+            return;
+        }
+
         if (header.Column && (header.Column.Sort==1 || header.Column.Sort==2))
         {
             var index=header.Index;
@@ -3100,6 +3163,52 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.PopupHeaderMenu=function(clickData, e)
+    {
+        if (!this.JSPopMenu) return;
+        if (!this.GetEventCallback) return;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_REPORT_HEADER_MENU);
+        if (!event || !event.Callback) return;
+
+        var header=clickData.Header;
+        var column=header.Column;
+        var menuData={ Menu:null, Position:JSPopMenu.POSITION_ID.DROPDOWN_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickHeaderMenu(column, data); }
+        
+        var sendData={ MenuData:menuData, Column:column, Index:header.Index, PreventDefault:false, e:e };
+        event.Callback(event, sendData, this);
+        if (sendData.PreventDefault==true) return;
+
+        if (!menuData.Menu) return;
+
+        this.PopupMenuByDrapdown(menuData, header.Rect);
+    }
+
+    //下拉菜单
+    this.PopupMenuByDrapdown=function(menuData, rtButton)
+    {
+        if (!this.JSPopMenu) return;
+
+        var pixelRatio=GetDevicePixelRatio();
+        var rtCell={ Left:rtButton.Left/pixelRatio, Right:rtButton.Right/pixelRatio, Bottom:rtButton.Bottom/pixelRatio, Top:rtButton.Top/pixelRatio };
+        rtCell.Width=rtCell.Right-rtCell.Left;
+        rtCell.Height=rtCell.Bottom-rtCell.Top;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+        rtCell.Left+=offsetLeft;
+        rtCell.Right+=offsetLeft;
+        rtCell.Top+=offsetTop;
+        rtCell.Bottom+=offsetTop;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByDrapdown(rtCell);
+    }
+
     this.GetTabPopMenu=function(tabItem)
     {
         var aryMenu=[ ];
@@ -3215,6 +3324,24 @@ function JSReportChartContainer(uielement)
         this.Draw();
     }
 
+    this.OnClickHeaderMenu=function(menuData, data)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::OnClickHeaderMenu] ',menuData, data);
+
+        var cmdID=data.Data.ID;
+        var aryArgs=data.Data.Args;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data, MenuData:menuData };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID,aryArgs);
+    }
+
     this.ExecuteMenuCommand=function(cmdID, aryArgs)
     {
         JSConsole.Chart.Log('[JSReportChartContainer::ExecuteMenuCommand] cmdID=, aryArgs=', cmdID,aryArgs);
@@ -3231,6 +3358,22 @@ function JSReportChartContainer(uielement)
             case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:
                 if (srcParam) this.ChangeSymbol(srcParam);
                 break;
+            case JSCHART_MENU_ID.CMD_REPORT_COLUMN_SORT_ID:
+                if (IFrameSplitOperator.IsNumber(param) && IFrameSplitOperator.IsNumber(aryArgs[1]))
+                    this.SortColumn(param, aryArgs[1]);
+                break;
+            case JSCHART_MENU_ID.CMD_REPORT_COLUMN_MOVE_ID:
+                if (IFrameSplitOperator.IsNumber(param) && IFrameSplitOperator.IsNumber(aryArgs[1]))
+                {
+                    var leftIndex=param;
+                    var rightIndex=param+aryArgs[1];
+                    this.SwapColumn(leftIndex, rightIndex, {Redraw:true});
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_REPORT_COLUMN_DEL_ID:
+                if (IFrameSplitOperator.IsNumber(param))
+                    this.DeleteColumn(param, {Redraw:true});
+                break;
         }
     }
 
@@ -3248,6 +3391,20 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.DeleteColumn=function(index, option)
+    {
+        var reportChart=this.GetReportChart();
+        if (!reportChart) return;
+
+        if (!reportChart.DeleteColumn(index)) return;
+
+        if (option && option.Redraw)
+        {
+            this.SetSizeChange(true);
+            this.Draw();
+        }
+    }
+
     //本地排序
     this.LocalSort=function(left, right, column, sortType)
     {
@@ -4102,6 +4259,9 @@ function ChartReport()
             else colItem.IsDrawCallback=false;
             if (item.Icon) colItem.Icon=item.Icon;
 
+            //点击表头弹出菜单
+            if (IFrameSplitOperator.IsBool(item.EnablePopupHeaderMenu)) colItem.EnablePopupHeaderMenu=item.EnablePopupHeaderMenu;
+
             if (item.Sort==1 || item.Sort==2)   //1本地排序 2=远程排序
             {
                 colItem.SortType=[1,2];         //默认 降序 ，升序
@@ -4209,6 +4369,15 @@ function ChartReport()
         return true;
     }
 
+    this.DeleteColumn=function(index)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Column)) return false;
+        if (index<0 || index>=this.Column.length) return false;
+       
+        this.Column.splice(index,1);
+        return true;
+    }
+
     this.GetXScrollPos=function()
     {
         return this.Data.XOffset;
@@ -6863,7 +7032,14 @@ function ChartReport()
         
         if (buttonData.Type===0)    //checkbox
         {
-            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data, PreventDefault: false };
+            var sendData=
+            { 
+                Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, ColumnIndex:buttonData.ColumnIndex, 
+                Data:buttonData.Data, Value:true,
+                PreventDefault: false 
+            };
+            if (IFrameSplitOperator.IsBool(buttonData.Data.Checked)) sendData.Value=!buttonData.Data.Checked;
+
             this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_CHECKBOX, sendData)
 
             if (!sendData.PreventDefault)
@@ -6879,7 +7055,7 @@ function ChartReport()
         }
         else if (buttonData.Type===1)   //button
         {
-            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data };
+            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, ColumnIndex:buttonData.ColumnIndex, Data:buttonData.Data };
             this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_BUTTON, sendData)
 
             status.Redraw=true;
@@ -6887,7 +7063,7 @@ function ChartReport()
         }
         else if (buttonData.Type===2)   //link
         {
-            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data };
+            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, ColumnIndex:buttonData.ColumnIndex, Data:buttonData.Data };
             this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_LINK, sendData)
 
             status.Redraw=true;