npm - hqchart - Versions diffs - 1.1.14608 → 1.1.14613 - Mend

hqchart 1.1.14608 → 1.1.14613

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/umychart.vue.js +21 -17
package/package.json +1 -1
package/src/jscommon/umychart.report.js +156 -66
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +157 -67
package/src/jscommon/umychart.version.js +1 -1
package/src/jscommon/umychart.vue/umychart.vue.js +157 -67

package/lib/umychart.vue.js CHANGED Viewed

@@ -12979,7 +12979,7 @@ this.ChartPaint=[];//图形画法
 this.ChartSplashPaint=null;//等待提示
 this.LoadDataSplashTitle="数据加载中";//下载数据提示信息
 this.SplashTitle={StockList:"下载码表中.....",MemberList:"下载成分中....."};this.Canvas=uielement.getContext("2d");//画布
-this.Tooltip=document.createElement("div");this.Tooltip.className='jsreport-tooltip';this.Tooltip.style.background=g_JSChartResource.TooltipBGColor;this.Tooltip.style.opacity=g_JSChartResource.TooltipAlpha;this.Tooltip.style["pointer-events"]="none";this.Tooltip.id=Guid();uielement.parentNode.appendChild(this.Tooltip);this.Symbol;//板块代码
+this.Symbol;//板块代码
 this.Name;//板块名称
 this.NetworkFilter;//数据回调接口
 this.Data={XOffset:0,YOffset:0,Data:[],Virtual:{Enable:false,Count:0}};//股票列表  (Virtual 虚拟表)
@@ -13214,13 +13214,11 @@ if(tooltipData){if(tooltipData.Type==20){if(tooltipData.Stock&&tooltipData.Stock
             event.Callback(event,sendData,this);
         }
         */if(mouseStatus)this.UIElement.style.cursor=mouseStatus.Cursor;if(bDraw||bDrawTab)this.Draw();if(this.LastMouseStatus.TooltipStatus){var xTooltip=e.clientX-this.UIElement.getBoundingClientRect().left;var yTooltip=e.clientY-this.UIElement.getBoundingClientRect().top;this.DrawFloatTooltip({X:xTooltip,Y:yTooltip,YMove:20/pixelTatio},this.LastMouseStatus.TooltipStatus.Data);}else{this.HideFloatTooltip();}if(!bShowKLineTooltip)this.HideKLineChartTooltip();if(!bShowMinuteTooltip)this.HideMinuteChartTooltip();if(bShowMinuteTooltip)this.ShowMinuteChartTooltip(null,null,chartTooltipData);if(bShowKLineTooltip)this.ShowKLineChartTooltip(null,null,chartTooltipData);};this.UIOnMounseOut=function(e){this.HideAllTooltip();var bDraw=false;var tabChart=this.GetTabChart();if(tabChart&&tabChart.MoveOnTabIndex>=0){tabChart.MoveOnTabIndex=-1;bDraw=true;this.Draw();}var scrollbar=this.GetVScrollbarChart();if(scrollbar.Enable){this.IsShowVScrollbar=false;if(!this.DragYScroll){if(scrollbar.LastStatus.Draw)bDraw=true;}}if(bDraw)this.Draw();};this.UIOnMouseleave=function(e){this.HideAllTooltip();var tabChart=this.GetTabChart();if(tabChart&&tabChart.MoveOnTabIndex>=0){tabChart.MoveOnTabIndex=-1;this.Draw();}};this.DocOnMouseMove=function(e){this.DragMove.PreMove.X=this.DragMove.Move.X;this.DragMove.PreMove.Y=this.DragMove.Move.Y;this.DragMove.Move.X=e.clientX;this.DragMove.Move.Y=e.clientX;if(this.DragMove.Move.X!=this.DragMove.PreMove.X||this.DragMove.Move.Y!=this.DragMove.PreMove.Y)this.StopAutoDragScrollTimer();if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;//JSConsole.Chart.Log(`[JSReportChartContainer::DocOnMouseMove] x=${x}, y=${y}`);
-if(this.DragRow){var drag=this.DragRow;var moveSetpY=drag.LastMove.Y-e.clientY;if(Math.abs(moveSetpY)<2)return;var reportChart=this.GetReportChart();drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;drag.Inside={X:x,Y:y};if(reportChart){var moveRow=reportChart.OnDrawgRow(x,y,e);if(moveRow){if(moveRow.Type==2){if(moveRow.Data.DataIndex!=drag.Data.Row.DataIndex){drag.MoveRow=moveRow;}}else if(moveRow.Type==7){var pageStatus=reportChart.GetCurrentPageStatus();if(!pageStatus.IsEnd){this.MoveYOffset(1,false);drag.MoveRow=null;this.EnablePageScroll=true;this.AutoScrollPage(2);}}else if(moveRow.Type==5){if(this.Data.YOffset>0){this.MoveYOffset(-1,false);drag.MoveRow=null;this.EnablePageScroll=true;this.AutoScrollPage(-2);}}}reportChart.DragRow=drag;}this.Draw();}else if(this.DragXScroll){var chart=this.ChartPaint[0];if(!chart||!chart.Tab)return;this.DragXScroll.LastMove.X=x;this.DragXScroll.LastMove.Y=y;var pos=chart.Tab.GetScrollPostionByPoint(x,y);if(this.SetXOffset(pos))this.Draw();}else if(this.DragYScroll){var chart=this.ChartPaint[0];if(!chart||!chart.VScrollbar)return;this.DragYScroll.LastMove.X=x;this.DragYScroll.LastMove.Y=y;var pos=chart.VScrollbar.GetScrollPostionByPoint(x,y);if(this.SetYOffset(pos)){this.Draw();this.DelayUpdateStockData();}}else if(this.DragHeader&&this.DragHeader.ClickData)//表头拖拽
-{if(this.DragHeader.ClickData.Header.IsFixed)return;if(!this.EnableDragHeader)return;var xMove=e.clientX-this.DragHeader.Click.X;var yMove=e.clientY-this.DragHeader.Click.Y;if(Math.abs(yMove)<=1&&Math.abs(xMove)<=1)return;this.DragHeader.LastMove.X=e.clientX;this.DragHeader.LastMove.Y=e.clientY;if(!this.DragHeader.MovePoint){this.DragHeader.MovePoint={X:x,Y:y};}else{this.DragHeader.MovePoint.X=x;this.DragHeader.MovePoint.Y=y;}this.OnMoveDragHeader(x,y,e);this.ShowDragHeaderTooltip(x,y,e);}else if(this.DragColumnWidth&&this.DragColumnWidth.ClickData)//列宽度拖拽
-{var xMove=x-this.DragColumnWidth.ClickPoint.X;if(Math.abs(xMove)<1)return;var fixedWidth=this.DragColumnWidth.ColumnWidth+xMove;if(fixedWidth<=10)return;var index=this.DragColumnWidth.ClickData.Index;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_COLUMN_WIDTH);if(event&&event.Callback){var sendData={Index:index,Width:fixedWidth,PreventDefault:false};if(this.DragColumnWidth&&this.DragColumnWidth.ClickData)sendData.Column=this.DragColumnWidth.ClickData.Column;event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}this.SetColumnFixedWidth(index,fixedWidth);this.DragColumnWidth.LastPoint.X=x;this.DragColumnWidth.LastPoint.Y=y;}};this.SetColumnFixedWidth=function(index,width){var chart=this.ChartPaint[0];if(!chart)return;var item=chart.Column[index];if(!item)return;item.FixedWidth=width;this.SetSizeChange(true);this.Draw();};this.OnMoveDragHeader=function(x,y,e){var chart=this.ChartPaint[0];if(!chart)return;var clickData=this.DragHeader.ClickData;this.DragHeader.MoveToData=null;if(!clickData.Header.IsFixed)//固定列不能拖
-{var yHeader=this.DragHeader.ClickPoint.Y;var moveData=chart.OnMouseDown(x,yHeader,e);if(!moveData||!moveData.Header)return;if(moveData.Header.IsFixed)return;if(moveData.Header.Index==clickData.Header.Index)return;this.DragHeader.MoveToData=moveData;console.log('[JSReportChartContainer::OnMoveDragHeader] Click[Index='+clickData.Header.Index+', Title='+clickData.Header.Column.Title+'] => Move[Index='+moveData.Header.Index+', Title='+moveData.Header.Column.Title+']');}};this.ShowDragHeaderTooltip=function(x,y,e){if(!this.DragHeader)return;var drag=this.DragHeader;if(!drag.ClickData||!drag.MovePoint)return;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_HEADER_TOOLTIP);if(event){var sendData={PreventDefault:false,e:e,X:x,Y:y,DragHeader:this.DragHeader,Tooltip:this.Tooltip};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}var title=drag.ClickData.Header.Column.Title;this.Tooltip.className='jchart-chartdrawsvg-tooltip';//ChartDrawSVG指标数据
-this.Tooltip.style.position="absolute";this.Tooltip.style.left=e.clientX+"px";this.Tooltip.style.top=e.clientY+"px";this.Tooltip.style.width=100+"px";this.Tooltip.style.height=null;this.Tooltip.innerHTML=title;this.Tooltip.style.display="block";};this.HideTooltip=function(){if(this.Tooltip.style.display!="none")this.Tooltip.style.display="none";};this.DocOnMouseUp=function(e){//清空事件
+if(this.DragRow){var drag=this.DragRow;var moveSetpY=drag.LastMove.Y-e.clientY;if(Math.abs(moveSetpY)<2)return;var reportChart=this.GetReportChart();drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;drag.Inside={X:x,Y:y};if(reportChart){var moveRow=reportChart.OnDragRow(x,y,e);if(moveRow){if(moveRow.Type==2){if(moveRow.Data.DataIndex!=drag.Data.Row.DataIndex){drag.MoveRow=moveRow;}}else if(moveRow.Type==7){var pageStatus=reportChart.GetCurrentPageStatus();if(!pageStatus.IsEnd){this.MoveYOffset(1,false);drag.MoveRow=null;this.EnablePageScroll=true;this.AutoScrollPage(2);}}else if(moveRow.Type==5){if(this.Data.YOffset>0){this.MoveYOffset(-1,false);drag.MoveRow=null;this.EnablePageScroll=true;this.AutoScrollPage(-2);}}}reportChart.DragRow=drag;}this.Draw();}else if(this.DragXScroll){var chart=this.ChartPaint[0];if(!chart||!chart.Tab)return;this.DragXScroll.LastMove.X=x;this.DragXScroll.LastMove.Y=y;var pos=chart.Tab.GetScrollPostionByPoint(x,y);if(this.SetXOffset(pos))this.Draw();}else if(this.DragYScroll){var chart=this.ChartPaint[0];if(!chart||!chart.VScrollbar)return;this.DragYScroll.LastMove.X=x;this.DragYScroll.LastMove.Y=y;var pos=chart.VScrollbar.GetScrollPostionByPoint(x,y);if(this.SetYOffset(pos)){this.Draw();this.DelayUpdateStockData();}}else if(this.DragHeader&&this.DragHeader.ClickData)//表头拖拽
+{if(this.DragHeader.ClickData.Header.IsFixed)return;if(!this.EnableDragHeader)return;var xMove=e.clientX-this.DragHeader.Click.X;var yMove=e.clientY-this.DragHeader.Click.Y;if(Math.abs(yMove)<=1&&Math.abs(xMove)<=1)return;var reportChart=this.GetReportChart();var clickData=this.DragHeader.ClickData;this.DragHeader.LastMove.X=e.clientX;this.DragHeader.LastMove.Y=e.clientY;if(!this.DragHeader.MovePoint){this.DragHeader.MovePoint={X:x,Y:y};}else{this.DragHeader.MovePoint.X=x;this.DragHeader.MovePoint.Y=y;}var moveData=reportChart.OnDragHeader(x,y,e);if(!moveData)return;if(moveData.Type!=1)return;if(moveData.Header.Index!=clickData.Header.Index){this.DragHeader.MoveToData=moveData;}reportChart.DragHeader=this.DragHeader;this.Draw();}else if(this.DragColumnWidth&&this.DragColumnWidth.ClickData)//列宽度拖拽
+{var xMove=x-this.DragColumnWidth.ClickPoint.X;if(Math.abs(xMove)<1)return;var fixedWidth=this.DragColumnWidth.ColumnWidth+xMove;if(fixedWidth<=10)return;var index=this.DragColumnWidth.ClickData.Index;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_COLUMN_WIDTH);if(event&&event.Callback){var sendData={Index:index,Width:fixedWidth,PreventDefault:false};if(this.DragColumnWidth&&this.DragColumnWidth.ClickData)sendData.Column=this.DragColumnWidth.ClickData.Column;event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}this.SetColumnFixedWidth(index,fixedWidth);this.DragColumnWidth.LastPoint.X=x;this.DragColumnWidth.LastPoint.Y=y;}};this.SetColumnFixedWidth=function(index,width){var chart=this.ChartPaint[0];if(!chart)return;var item=chart.Column[index];if(!item)return;item.FixedWidth=width;this.SetSizeChange(true);this.Draw();};this.DocOnMouseUp=function(e){//清空事件
 document.onmousemove=null;document.onmouseup=null;this.StopAutoDragScrollTimer();this.HideAllTooltip();var reportChart=this.GetReportChart();var mouseStatus={Cursor:"default",Name:"Default"};;//鼠标状态
-var bRedraw=false;if(this.DragRow){if(reportChart){this.OnDragRow();reportChart.DragRow=null;}bRedraw=true;}var dragHeader=this.DragHeader;this.DragHeader=null;this.DragXScroll=null;if(this.DragYScroll){bRedraw=true;this.DragYScroll=null;}this.DragRow=null;this.DragMove=null;this.DragColumnWidth=null;if(bRedraw)this.Draw();if(dragHeader){var clickData=dragHeader.ClickData;var moveToData=dragHeader.MoveToData;if(clickData&&moveToData){this.SwapColumn(clickData.Header.Index,moveToData.Header.Index,{Redraw:true});}else{this.OnClickHeader(clickData,e);}}if(mouseStatus)this.UIElement.style.cursor=mouseStatus.Cursor;};this.OnDragRow=function(){if(!this.SourceData||!IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))return;if(!this.DragRow||!this.DragRow.MoveRow)return;var drag=this.DragRow;var srcIndex=drag.Data.Row.DataIndex;var moveIndex=drag.MoveRow.Data.DataIndex;if(srcIndex==moveIndex||srcIndex<0||moveIndex<0)return;var data=this.SourceData.Data;if(srcIndex>=data.length||moveIndex>=data.length)return;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_ROW);if(event){var sendData={Symbol:this.Symbol,Src:{Index:srcIndex,Symbol:data[srcIndex]},To:{Index:moveIndex,Symbol:data[moveIndex]},PreventDefault:false//PreventDefault 是否阻止内置的点击处理
+var bRedraw=false;if(this.DragRow){if(reportChart){this.OnDragRow();reportChart.DragRow=null;}bRedraw=true;}var dragHeader=this.DragHeader;this.DragHeader=null;this.DragXScroll=null;if(this.DragYScroll){bRedraw=true;this.DragYScroll=null;}this.DragRow=null;this.DragMove=null;this.DragColumnWidth=null;if(reportChart.DragHeader){bRedraw=true;reportChart.DragHeader=null;}if(bRedraw)this.Draw();if(dragHeader){var clickData=dragHeader.ClickData;var moveToData=dragHeader.MoveToData;if(clickData&&moveToData){this.SwapColumn(clickData.Header.Index,moveToData.Header.Index,{Redraw:true});}else{this.OnClickHeader(clickData,e);}}if(mouseStatus)this.UIElement.style.cursor=mouseStatus.Cursor;};this.OnDragRow=function(){if(!this.SourceData||!IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))return;if(!this.DragRow||!this.DragRow.MoveRow)return;var drag=this.DragRow;var srcIndex=drag.Data.Row.DataIndex;var moveIndex=drag.MoveRow.Data.DataIndex;if(srcIndex==moveIndex||srcIndex<0||moveIndex<0)return;var data=this.SourceData.Data;if(srcIndex>=data.length||moveIndex>=data.length)return;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_ROW);if(event){var sendData={Symbol:this.Symbol,Src:{Index:srcIndex,Symbol:data[srcIndex]},To:{Index:moveIndex,Symbol:data[moveIndex]},PreventDefault:false//PreventDefault 是否阻止内置的点击处理
 };event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}if(this.DragRowType==1){//原始数据交换顺序
 var temp=data[srcIndex];data[srcIndex]=data[moveIndex];data[moveIndex]=temp;this.Data.Data=data.slice(0);}else{//插入模式
 var srcItem=data[srcIndex];data.splice(srcIndex,1);data.splice(moveIndex,0,srcItem);this.Data.Data=data.slice(0);}//更新选中行
@@ -13378,6 +13376,7 @@ this.MultiSelectModel=0;//0=禁用 1=开启
 this.MultiSelectedRow=[];//选中行
 this.ShowSymbol=[];//显示的股票列表 { Index:序号(排序用), Symbol:股票代码 }
 this.DragRow;//拖拽行
+this.DragHeader;//拖拽表头
 this.Tab;this.VScrollbar;this.GlobalOption;this.TextOverflowStyle=0;//输出内容比单元格长度大 0=裁剪  1=输出"####"
 //涨跌颜色
 this.UpColor=g_JSChartResource.Report.UpTextColor;this.DownColor=g_JSChartResource.Report.DownTextColor;this.UnchagneColor=g_JSChartResource.Report.UnchagneTextColor;this.BorderColor=g_JSChartResource.Report.BorderColor;//边框线
@@ -13413,8 +13412,8 @@ this.ButtonRect=[];this.LastMouseStatus;this.ReloadResource=function(resource){t
 this.SelectedColor=g_JSChartResource.Report.SelectedColor;//选中行
 //表头配置
 this.HeaderFontConfig={Size:g_JSChartResource.Report.Header.Font.Size,Name:g_JSChartResource.Report.Header.Font.Name};this.HeaderColor=g_JSChartResource.Report.Header.Color;this.HeaderMergin={Left:g_JSChartResource.Report.Header.Mergin.Left,Right:g_JSChartResource.Report.Header.Mergin.Right,Top:g_JSChartResource.Report.Header.Mergin.Top,Bottom:g_JSChartResource.Report.Header.Mergin.Bottom};//表格内容配置
-this.ItemFontConfig={Size:g_JSChartResource.Report.Item.Font.Size,Name:g_JSChartResource.Report.Item.Font.Name};this.ItemMergin={Left:g_JSChartResource.Report.Item.Mergin.Left,Right:g_JSChartResource.Report.Item.Mergin.Right,Top:g_JSChartResource.Report.Item.Mergin.Top,Bottom:g_JSChartResource.Report.Item.Mergin.Bottom};this.BarMergin={Top:g_JSChartResource.Report.Item.BarMergin.Top,Left:g_JSChartResource.Report.Item.BarMergin.Left,Right:g_JSChartResource.Report.Item.BarMergin.Right,Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom};this.LimitBorderColor=g_JSChartResource.Report.LimitBorder.Color;this.LimitMergin={Top:g_JSChartResource.Report.LimitBorder.Mergin.Top,Left:g_JSChartResource.Report.LimitBorder.Mergin.Left,Right:g_JSChartResource.Report.LimitBorder.Mergin.Right,Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom//排序图标
-};this.SortConfig={Size:g_JSChartResource.Report.SortIcon.Size,Family:g_JSChartResource.Report.SortIcon.Family,Arrow:g_JSChartResource.Report.SortIcon.Arrow.slice(),Color:g_JSChartResource.Report.SortIcon.Color.slice(),Margin:{Left:g_JSChartResource.Report.SortIcon.Margin.Left,Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom}};for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(item.Type==REPORT_COLUMN_ID.INDEX_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Index;else if(item.Type==REPORT_COLUMN_ID.SYMBOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Symbol;else if(item.Type==REPORT_COLUMN_ID.NAME_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Name;else if(item.Type==REPORT_COLUMN_ID.VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.BUY_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.SELL_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.AMOUNT_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Amount;else if(item.Type==REPORT_COLUMN_ID.VOL_IN_ID)item.TextColor=g_JSChartResource.Report.DownTextColor;else if(item.Type==REPORT_COLUMN_ID.VOL_OUT_ID)item.TextColor=g_JSChartResource.Report.UpTextColor;else item.TextColor=g_JSChartResource.Report.FieldColor.Text;}if(this.Tab)this.Tab.ReloadResource(resource);if(this.VScrollbar)this.VScrollbar.ReloadResource(resource);this.CheckBoxConfig=CloneData(g_JSChartResource.Report.CheckBox);this.LinkConfig=CloneData(g_JSChartResource.Report.Link);this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);};this.CreateColumnItem=function(item){var colItem=this.GetDefaultColunm(item.Type);if(!colItem)return null;if(item.Title)colItem.Title=item.Title;if(IFrameSplitOperator.IsNonEmptyArray(item.AryTitle))colItem.AryTitle=item.AryTitle;if(item.TextAlign)colItem.TextAlign=item.TextAlign;if(item.TextColor)colItem.TextColor=item.TextColor;if(item.HeaderColor)colItem.HeaderColor=item.HeaderColor;if(item.MaxText)colItem.MaxText=item.MaxText;if(item.MaxText2)colItem.MaxText=item.MaxText2;if(IFrameSplitOperator.IsNumber(item.Space))colItem.Space=item.Space;if(item.ID)colItem.ID=item.ID;if(item.FullColBGColor)colItem.FullColBGColor=item.FullColBGColor;//整列背景色
+this.ItemFontConfig={Size:g_JSChartResource.Report.Item.Font.Size,Name:g_JSChartResource.Report.Item.Font.Name};this.ItemMergin={Left:g_JSChartResource.Report.Item.Mergin.Left,Right:g_JSChartResource.Report.Item.Mergin.Right,Top:g_JSChartResource.Report.Item.Mergin.Top,Bottom:g_JSChartResource.Report.Item.Mergin.Bottom};this.BarMergin={Top:g_JSChartResource.Report.Item.BarMergin.Top,Left:g_JSChartResource.Report.Item.BarMergin.Left,Right:g_JSChartResource.Report.Item.BarMergin.Right,Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom};this.LimitBorderColor=g_JSChartResource.Report.LimitBorder.Color;this.LimitMergin={Top:g_JSChartResource.Report.LimitBorder.Mergin.Top,Left:g_JSChartResource.Report.LimitBorder.Mergin.Left,Right:g_JSChartResource.Report.LimitBorder.Mergin.Right,Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom};this.DragRowColor=g_JSChartResource.Report.DragRow.Color;this.DragRowTextColor=g_JSChartResource.Report.DragRow.TextColor;this.DragMoveRowColor=g_JSChartResource.Report.DragRow.MoveRowColor;this.DragSrcRowColor=g_JSChartResource.Report.DragRow.SrcRowColor;//排序图标
+this.SortConfig={Size:g_JSChartResource.Report.SortIcon.Size,Family:g_JSChartResource.Report.SortIcon.Family,Arrow:g_JSChartResource.Report.SortIcon.Arrow.slice(),Color:g_JSChartResource.Report.SortIcon.Color.slice(),Margin:{Left:g_JSChartResource.Report.SortIcon.Margin.Left,Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom}};for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(item.Type==REPORT_COLUMN_ID.INDEX_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Index;else if(item.Type==REPORT_COLUMN_ID.SYMBOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Symbol;else if(item.Type==REPORT_COLUMN_ID.NAME_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Name;else if(item.Type==REPORT_COLUMN_ID.VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.BUY_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.SELL_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.AMOUNT_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Amount;else if(item.Type==REPORT_COLUMN_ID.VOL_IN_ID)item.TextColor=g_JSChartResource.Report.DownTextColor;else if(item.Type==REPORT_COLUMN_ID.VOL_OUT_ID)item.TextColor=g_JSChartResource.Report.UpTextColor;else item.TextColor=g_JSChartResource.Report.FieldColor.Text;}if(this.Tab)this.Tab.ReloadResource(resource);if(this.VScrollbar)this.VScrollbar.ReloadResource(resource);this.CheckBoxConfig=CloneData(g_JSChartResource.Report.CheckBox);this.LinkConfig=CloneData(g_JSChartResource.Report.Link);this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);};this.CreateColumnItem=function(item){var colItem=this.GetDefaultColunm(item.Type);if(!colItem)return null;if(item.Title)colItem.Title=item.Title;if(IFrameSplitOperator.IsNonEmptyArray(item.AryTitle))colItem.AryTitle=item.AryTitle;if(item.TextAlign)colItem.TextAlign=item.TextAlign;if(item.TextColor)colItem.TextColor=item.TextColor;if(item.HeaderColor)colItem.HeaderColor=item.HeaderColor;if(item.MaxText)colItem.MaxText=item.MaxText;if(item.MaxText2)colItem.MaxText=item.MaxText2;if(IFrameSplitOperator.IsNumber(item.Space))colItem.Space=item.Space;if(item.ID)colItem.ID=item.ID;if(item.FullColBGColor)colItem.FullColBGColor=item.FullColBGColor;//整列背景色
 if(item.HeaderBGColor)colItem.HeaderBGColor=item.HeaderBGColor;//表头背景色
 if(IFrameSplitOperator.IsNumber(item.Sort))colItem.Sort=item.Sort;if(IFrameSplitOperator.IsNumber(item.FixedWidth))colItem.FixedWidth=item.FixedWidth;if(IFrameSplitOperator.IsBool(item.EnableDragWidth))colItem.EnableDragWidth=item.EnableDragWidth;if(IFrameSplitOperator.IsBool(item.IsDrawCallback))colItem.IsDrawCallback=item.IsDrawCallback;else colItem.IsDrawCallback=false;if(IFrameSplitOperator.IsNumber(item.FloatPrecision))colItem.FloatPrecision=item.FloatPrecision;//小数位数
 if(IFrameSplitOperator.IsNumber(item.ColorType))colItem.ColorType=item.ColorType;//0=默认 1=(>0, =0, <0) 2=(>=0, <0)
@@ -13444,19 +13443,20 @@ if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIn
 //{ Type:REPORT_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
 {Type:REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.CUSTOM_ICON_ID,Title:"  ",TextAlign:"left",FixedWidth:20,TextColor:g_JSChartResource.Report.FieldColor.Text},{Type:REPORT_COLUMN_ID.KLINE_ID,Title:"K线",TextAlign:"left",FixedWidth:50,TextColor:g_JSChartResource.Report.FieldColor.Text},{Type:REPORT_COLUMN_ID.TIME_ID,Title:"时间",TextAlign:"left",ValueType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"99:99:99.999"},{Type:REPORT_COLUMN_ID.DATE_ID,Title:"日期",TextAlign:"left",FormatType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.CHECKBOX_ID,Title:"",TextAlign:"center",FixedWidth:20*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID,Title:"",TextAlign:"center",FixedWidth:20*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID,Title:"",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID,Title:"进度条",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_LINK_ID,Title:"链接地址",TextAlign:"center",MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.FUTURES_POSITION_ID,Title:"持仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_CLOSE_ID,Title:"结算价",TextAlign:"right",Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_YCLOSE_ID,Title:"昨结算价",TextAlign:"right",Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID,Title:"开仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID,Title:"平仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.RISING_SPEED_1M_ID,Title:"涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_3M_ID,Title:"3分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_5M_ID,Title:"5分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_10M_ID,Title:"10分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_15M_ID,Title:"15分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},//组合多行字段
 {Type:REPORT_COLUMN_ID.MULTI_LINE_CONTAINER,Title:"涨幅",TextAlign:"right",MaxText:"1000.00%",AryField:[{Type:REPORT_COLUMN_ID.PRICE_ID},{Type:REPORT_COLUMN_ID.INCREASE_ID,DynamicFormat:"{Value}%"}]},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,Title:"数值1",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,Title:"数值2",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,Title:"数值3",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,Title:"数值4",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,Title:"数值5",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,Title:"数值6",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,Title:"数值7",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,Title:"数值8",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,Title:"数值9",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,Title:"数值10",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_STRING1_ID,Title:"文字1",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING2_ID,Title:"文字2",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING3_ID,Title:"文字3",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING4_ID,Title:"文字4",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING5_ID,Title:"文字5",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING6_ID,Title:"文字6",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING7_ID,Title:"文字7",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING8_ID,Title:"文字8",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING9_ID,Title:"文字9",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING10_ID,Title:"文字10",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID,Title:"进度条1",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,Title:"进度条2",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,Title:"进度条3",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,Title:"进度条4",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,Title:"进度条5",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,Title:"进度条6",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,Title:"进度条7",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,Title:"进度条8",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,Title:"进度条9",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID,Title:"进度条10",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON1_ID,Title:"按钮1",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON2_ID,Title:"按钮2",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON3_ID,Title:"按钮3",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON4_ID,Title:"按钮4",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON5_ID,Title:"按钮5",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON6_ID,Title:"按钮6",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON7_ID,Title:"按钮7",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,Title:"按钮8",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,Title:"按钮9",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,Title:"按钮10",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()}];for(var i=0;i<DEFAULT_COLUMN.length;++i){var item=DEFAULT_COLUMN[i];if(item.Type==id)return item;}return null;};this.ClipClient=function(){this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(this.RectClient.Left,this.RectClient.Top,this.RectClient.Right-this.RectClient.Left,this.RectClient.Bottom-this.RectClient.Top);//this.Canvas.stroke(); //调试用
-this.Canvas.clip();};this.Draw=function(lastMouseStatus){this.ShowSymbol=[];this.TooltipRect=[];this.ButtonRect=[];this.DevicePixelRatio=GetDevicePixelRatio();this.LastMouseStatus=lastMouseStatus;if(this.GlobalOption)this.GlobalOption.FlashBGCount=0;if(this.SizeChange)this.CalculateSize();else this.UpdateCacheData();this.ClipClient();this.DrawHeader();this.DrawBody();this.Canvas.restore();if(this.Tab&&this.BottomToolbarHeight>0){var bottom=this.ChartBorder.GetBottom();this.Tab.DrawTab(this.RectClient.Left,bottom-this.BottomToolbarHeight,this.RectClient.Right,bottom);this.Tab.DrawScrollbar(this.RectClient.Left,bottom-this.BottomToolbarHeight,this.RectClient.Right,bottom);}this.ClipClient();this.DrawBorder();this.Canvas.restore();this.DrawDragRow();if(this.VScrollbar){var bottom=this.ChartBorder.GetBottom();this.VScrollbar.DrawScrollbar(this.RectClient.Left,this.RectClient.Top+this.HeaderHeight,this.RectClient.Right,bottom-this.BottomToolbarHeight-4);}this.LastMouseStatus=null;this.SizeChange=false;};//更新缓存变量
+this.Canvas.clip();};this.Draw=function(lastMouseStatus){this.ShowSymbol=[];this.TooltipRect=[];this.ButtonRect=[];this.DevicePixelRatio=GetDevicePixelRatio();this.LastMouseStatus=lastMouseStatus;if(this.GlobalOption)this.GlobalOption.FlashBGCount=0;if(this.SizeChange)this.CalculateSize();else this.UpdateCacheData();this.ClipClient();this.DrawDragHeaderBG();this.DrawHeader();this.DrawBody();this.Canvas.restore();if(this.Tab&&this.BottomToolbarHeight>0){var bottom=this.ChartBorder.GetBottom();this.Tab.DrawTab(this.RectClient.Left,bottom-this.BottomToolbarHeight,this.RectClient.Right,bottom);this.Tab.DrawScrollbar(this.RectClient.Left,bottom-this.BottomToolbarHeight,this.RectClient.Right,bottom);}this.ClipClient();this.DrawBorder();this.Canvas.restore();this.DrawDragRow();this.DrawDragHeader();if(this.VScrollbar){var bottom=this.ChartBorder.GetBottom();this.VScrollbar.DrawScrollbar(this.RectClient.Left,this.RectClient.Top+this.HeaderHeight,this.RectClient.Right,bottom-this.BottomToolbarHeight-4);}this.LastMouseStatus=null;this.SizeChange=false;};this.DrawDragHeaderBG=function(){if(!this.DragHeader)return;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;//竖线
+var columnLeft=left;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];columnLeft+=item.Width;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];if(this.DragHeader){if(this.DragHeader.ClickData){var clickData=this.DragHeader.ClickData;if(clickData.Header.Index==i){var rtBG={Left:columnLeft,Top:top,Bottom:bottom,Right:columnLeft+item.Width};rtBG.Width=rtBG.Right-rtBG.Left;rtBG.Height=rtBG.Bottom-rtBG.Top;this.Canvas.fillStyle=this.DragSrcRowColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}}if(this.DragHeader.MoveToData){var moveToData=this.DragHeader.MoveToData;if(moveToData.Header.Index==i){var rtBG={Left:columnLeft,Top:top,Bottom:bottom,Right:columnLeft+item.Width};rtBG.Width=rtBG.Right-rtBG.Left;rtBG.Height=rtBG.Bottom-rtBG.Top;this.Canvas.fillStyle=this.DragMoveRowColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}}}columnLeft+=item.Width;}};//更新缓存变量
 this.UpdateCacheData=function(){this.RectClient.Left=this.ChartBorder.GetLeft();this.RectClient.Right=this.ChartBorder.GetRight();this.RectClient.Top=this.ChartBorder.GetTop();this.RectClient.Bottom=this.ChartBorder.GetBottom()-this.BottomToolbarHeight;};this.GetPageSize=function(recalculate)//recalculate 是否重新计算
 {if(recalculate)this.CalculateSize();var size=this.RowCount;return size;};this.GetCurrentPageStatus=function()//{ Start:起始索引, End:结束索引（数据）, PageSize:页面可以显示几条记录, IsEnd:是否是最后一页, IsSinglePage:是否只有一页数据}
 {var result={Start:this.Data.YOffset,PageSize:this.RowCount,IsEnd:false,SelectedRow:this.SelectedRow,IsSinglePage:false,DataCount:0,MultiSelectModel:this.MultiSelectModel};if(this.MultiSelectModel==1){result.SelectedRow=-1;result.MultiSelectedRow=this.MultiSelectedRow.slice();result.MultiSelectedRow.sort(function(left,right){return left>right;});}if(IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)){result.End=this.Data.YOffset+this.RowCount-1;result.IsSinglePage=this.Data.Data.length<=this.RowCount;result.DataCount=this.Data.Data.length;if(result.End>=this.Data.Data.length-1)result.IsEnd=true;if(result.End>=this.Data.Data.length)result.End=this.Data.Data.length-1;}else{result.Start=0;result.End=0;result.IsEnd=true;result.IsSinglePage=true;}return result;};this.CalculateSize=function()//计算大小
 {if(this.Tab&&this.Tab.IsShow){this.Tab.CalculateSize();this.BottomToolbarHeight=this.Tab.Height;}else{this.BottomToolbarHeight=0;}if(this.VScrollbar&&this.VScrollbar.Enable)this.VScrollbar.CalculateSize();this.UpdateCacheData();var pixelRatio=GetDevicePixelRatio();this.HeaderFont=this.HeaderFontConfig.Size*pixelRatio+'px '+this.HeaderFontConfig.Name;this.ItemFont=this.ItemFontConfig.Size*pixelRatio+'px '+this.ItemFontConfig.Name;this.ItemFixedFont=this.ItemFixedFontConfg.Size*pixelRatio+'px '+this.ItemFixedFontConfg.Name;this.ItemSymbolFont=this.ItemSymbolFontConfig.Size*pixelRatio+'px '+this.ItemSymbolFontConfig.Name;this.ItemNameFont=this.ItemNameFontConfg.Size*pixelRatio+'px '+this.ItemNameFontConfg.Name;this.NameSymbolFont.Symbol=this.NameSymbolV2Config.Symbol.Size*pixelRatio+'px '+this.NameSymbolV2Config.Symbol.Name;this.NameSymbolFont.Name=this.ItemSymbolFontConfig.Name.Size*pixelRatio+'px '+this.NameSymbolV2Config.Name.Name;this.ItemFontHeight=this.GetFontHeight(this.ItemFont,"擎");this.RowHeight=this.ItemFontHeight+this.ItemMergin.Top+this.ItemMergin.Bottom;this.ItemTextLines=1;this.FixedRowHeight=this.GetFontHeight(this.ItemFixedFont,"擎")+this.ItemMergin.Top+this.ItemMergin.Bottom;this.SortFont=this.SortConfig.Size*pixelRatio+'px '+this.SortConfig.Family;this.Canvas.font=this.ItemFont;var itemWidth=0;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(item.Type==REPORT_COLUMN_ID.SYMBOL_NAME_ID){this.Canvas.font=this.ItemNameFont;var nameWidth=this.Canvas.measureText(item.MaxText).width;var nameHeight=this.GetFontHeight(this.ItemNameFont,"擎");this.ItemNameHeight=nameHeight;this.Canvas.font=this.ItemSymbolFont;var symbolWidth=this.Canvas.measureText(item.MaxText).width;var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");this.ItemSymbolHeight=symboHeight;this.Canvas.font=this.ItemFont;itemWidth=Math.max(nameWidth,symbolWidth);item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;var rowHeight=nameHeight+symboHeight+this.ItemMergin.Top+this.ItemMergin.Bottom;this.ItemTextLines=2;if(rowHeight>this.RowHeight)this.RowHeight=rowHeight;if(rowHeight>this.FixedRowHeight)this.FixedRowHeight=rowHeight;}else if(item.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){if(IFrameSplitOperator.IsNumber(item.FixedWidth))itemWidth=item.FixedWidth;else itemWidth=this.Canvas.measureText(item.MaxText).width;item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;this.ItemTextLines=item.AryField.length;var rowHeight=this.ItemFontHeight*item.AryField.length+this.ItemMergin.Top+this.ItemMergin.Bottom;if(rowHeight>this.RowHeight)this.RowHeight=rowHeight;if(rowHeight>this.FixedRowHeight)this.FixedRowHeight=rowHeight;}else if(item.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID)//单行显示
-{this.Canvas.font==this.NameSymbolFont.Name;var nameWidth=this.Canvas.measureText(item.MaxText).width;var nameHeight=this.GetFontHeight(this.ItemNameFont,"擎");this.Canvas.font==this.NameSymbolFont.Symbol;var symbolWidth=this.Canvas.measureText(item.MaxText2).width;var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");this.ItemNameHeight=Math.abs(nameHeight,symboHeight);var space=2;if(IFrameSplitOperator.IsNumber(item.Space))space=item.Space;itemWidth=nameWidth+symbolWidth+space;item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;}else{if(IFrameSplitOperator.IsNumber(item.FixedWidth))itemWidth=item.FixedWidth;else itemWidth=this.Canvas.measureText(item.MaxText).width;item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;}if(item.Icon&&item.Icon.Symbol){item.Width+=item.Icon.Size;if(item.Icon.Margin){var margin=item.Icon.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))item.Width+=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))item.Width+=margin.Right;}}}this.Canvas.font=this.HeaderFont;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(!item.Title||item.Title.length<=0)continue;var text=item.Title;itemWidth=this.Canvas.measureText(text).width;if(item.Sort>0)itemWidth+this.SortConfig.Size*pixelRatio;itemWidth+=4+this.HeaderMergin.Left+this.HeaderMergin.Right;if(item.Width<itemWidth)item.Width=itemWidth;}this.HeaderFontHeight=this.GetFontHeight(this.HeaderFont,"擎");if(this.HeaderRowCount<=1)//单行
-{this.HeaderHeight=this.HeaderFontHeight+(this.HeaderMergin.Top+this.HeaderMergin.Bottom);}else{this.HeaderHeight=this.HeaderFontHeight*this.HeaderRowCount+(this.HeaderMergin.Top+this.HeaderMergin.Bottom);}if(!this.IsShowHeader)this.HeaderHeight=0;if(this.FixedRowCount<=0)this.FixedRowHeight=0;this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight-this.FixedRowHeight*this.FixedRowCount)/this.RowHeight);var subWidth=0;var reportWidth=this.RectClient.Right-this.RectClient.Left;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];subWidth+=item.Width;}this.IsShowAllColumn=subWidth<reportWidth;};this.DrawHeaderItem=function(column,rtCell,index){if(column.HeaderBGColor)//背景色
+{this.Canvas.font==this.NameSymbolFont.Name;var nameWidth=this.Canvas.measureText(item.MaxText).width;var nameHeight=this.GetFontHeight(this.ItemNameFont,"擎");this.Canvas.font==this.NameSymbolFont.Symbol;var symbolWidth=this.Canvas.measureText(item.MaxText2).width;var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");this.ItemNameHeight=Math.abs(nameHeight,symboHeight);var space=2;if(IFrameSplitOperator.IsNumber(item.Space))space=item.Space;itemWidth=nameWidth+symbolWidth+space;item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;}else{if(IFrameSplitOperator.IsNumber(item.FixedWidth))itemWidth=item.FixedWidth;else itemWidth=this.Canvas.measureText(item.MaxText).width;item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;}if(item.Icon&&item.Icon.Symbol){item.Width+=item.Icon.Size;if(item.Icon.Margin){var margin=item.Icon.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))item.Width+=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))item.Width+=margin.Right;}}}this.Canvas.font=this.HeaderFont;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(!item.Title||item.Title.length<=0)continue;var text=item.Title;itemWidth=this.Canvas.measureText(text).width;if(item.Sort>0)itemWidth+=this.SortConfig.Size*pixelRatio;itemWidth+=4+this.HeaderMergin.Left+this.HeaderMergin.Right;if(item.Width<itemWidth)item.Width=itemWidth;}this.HeaderFontHeight=this.GetFontHeight(this.HeaderFont,"擎");if(this.HeaderRowCount<=1)//单行
+{this.HeaderHeight=this.HeaderFontHeight+(this.HeaderMergin.Top+this.HeaderMergin.Bottom);}else{this.HeaderHeight=this.HeaderFontHeight*this.HeaderRowCount+(this.HeaderMergin.Top+this.HeaderMergin.Bottom);}if(!this.IsShowHeader)this.HeaderHeight=0;if(this.FixedRowCount<=0)this.FixedRowHeight=0;this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight-this.FixedRowHeight*this.FixedRowCount)/this.RowHeight);var subWidth=0;var reportWidth=this.RectClient.Right-this.RectClient.Left;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];subWidth+=item.Width;}this.IsShowAllColumn=subWidth<reportWidth;};this.DrawHeaderItem=function(column,rtCell,index,option){if(column.HeaderBGColor)//背景色
 {this.DrawItemBG({Rect:rtCell,BGColor:column.HeaderBGColor});}var textWidth=rtCell.Width-this.HeaderMergin.Left-this.HeaderMergin.Right;//AryText=[ { Text:标题, Sort:{Type:排序}, Icon:图标 }]
 var drawInfo={Rect:rtCell,AryText:[{Text:null}],YText:rtCell.Bottom-this.HeaderMergin.Bottom,Index:index,TextWidth:textWidth};if(this.HeaderRowCount>1)//多行
 {if(IFrameSplitOperator.IsNonEmptyArray(column.AryTitle)){drawInfo.AryText=[];for(var i=0;i<column.AryTitle.length&&i<this.HeaderRowCount;++i){var text=column.AryTitle[i];drawInfo.AryText.push({Text:text});}drawInfo.YText-=(this.HeaderRowCount-1)*this.HeaderFontHeight;}else{if(column.Title)drawInfo.AryText[0].Text=column.Title;drawInfo.YText=rtCell.Bottom-this.HeaderMergin.Bottom-this.HeaderRowCount*this.HeaderFontHeight/2+this.HeaderFontHeight/2;}}else//单行
 {if(column.Title)drawInfo.AryText[0].Text=column.Title;}var lastItem=drawInfo.AryText[drawInfo.AryText.length-1];//排序
 var bDrawSortBG=this.IsDrawSortBGIcon();if(this.SortInfo&&this.SortInfo.Field==index&&this.SortInfo.Sort>0)lastItem.Sort={Type:this.SortInfo.Sort};else if(column.Sort>0&&bDrawSortBG&&IFrameSplitOperator.IsNonEmptyArray(column.SortType)&&column.SortType.length>=2)lastItem.Sort={Type:0};//图标
-if(column.Icon)lastItem.Icon=column.Icon;this.DrawHeaderText(column,drawInfo);};this.DrawHeaderText=function(column,drawInfo){if(column.HeaderColor)this.Canvas.fillStyle=column.HeaderColor;else this.Canvas.fillStyle=this.HeaderColor;var pixelRatio=GetDevicePixelRatio();var cellWidth=drawInfo.Rect.Width;var bDrawSortBG=this.IsDrawSortBGIcon();var y=drawInfo.YText;for(var i=0;i<drawInfo.AryText.length;++i){var x=drawInfo.Rect.Left+this.HeaderMergin.Left;var item=drawInfo.AryText[i];var textSize={TextMaxWidth:drawInfo.TextWidth};var iconWidth=0;if(item.Icon&&item.Icon.Symbol)//图标
+if(column.Icon)lastItem.Icon=column.Icon;if(option){if(option.HeaderColor)drawInfo.HeaderColor=option.HeaderColor;}this.DrawHeaderText(column,drawInfo);};this.DrawHeaderText=function(column,drawInfo){if(drawInfo.HeaderColor)this.Canvas.fillStyle=drawInfo.HeaderColor;else if(column.HeaderColor)this.Canvas.fillStyle=column.HeaderColor;else this.Canvas.fillStyle=this.HeaderColor;var pixelRatio=GetDevicePixelRatio();var cellWidth=drawInfo.Rect.Width;var bDrawSortBG=this.IsDrawSortBGIcon();var y=drawInfo.YText;for(var i=0;i<drawInfo.AryText.length;++i){var x=drawInfo.Rect.Left+this.HeaderMergin.Left;var item=drawInfo.AryText[i];var textSize={TextMaxWidth:drawInfo.TextWidth};var iconWidth=0;if(item.Icon&&item.Icon.Symbol)//图标
 {var iconWidth=item.Icon.Size;if(item.Icon.Margin){var margin=item.Icon.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))iconWidth+=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))iconWidth+=margin.Right;}}if(iconWidth>0)textSize.TextMaxWidth-=iconWidth;var sortWidth=0;//排序图标
 if(item.Sort&&this.SortConfig&&IFrameSplitOperator.IsPlusNumber(this.SortConfig.Size)){sortWidth=this.SortConfig.Size*pixelRatio;if(this.SortConfig.Margin){var margin=this.SortConfig.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))sortWidth+=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))sortWidth+=margin.Right;}}if(sortWidth>0)textSize.TextMaxWidth-=sortWidth;var textWidth=0;if(item.Text){this.Canvas.font=this.HeaderFont;textWidth=this.Canvas.measureText(item.Text).width;}if(column.TextAlign=='center')x=x+(cellWidth-textWidth)/2;else if(column.TextAlign=='right')x=x+textSize.TextMaxWidth-textWidth;if(item.Text)//文字
 {this.Canvas.fillText(item.Text,x,y);x+=textWidth;}if(sortWidth>1)//排序
@@ -13544,14 +13544,18 @@ this.GetNameColor=function(colunmInfo,symbol,rowType){var event=this.GetEventCal
 {this.OnShiftClickRow(row);}else{if(this.MultiSelectedRow.length==1&&this.MultiSelectedRow[0]==row.DataIndex)bRedraw=false;else this.MultiSelectedRow=[row.DataIndex];}this.SelectedFixedRow=-1;}else{if(this.SelectedModel==0){if(this.SelectedRow==row.Index)bRedraw=false;this.SelectedRow=row.Index;this.SelectedFixedRow=-1;}else{if(this.SelectedRow==row.DataIndex)bRedraw=false;this.SelectedRow=row.DataIndex;this.SelectedFixedRow=-1;}}var eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_ROW;if(e.button==2)eventID=JSCHART_EVENT_ID.ON_RCLICK_REPORT_ROW;this.SendClickEvent(eventID,{Data:row,X:x,Y:y,e:e,Inside:insidePoint,UIElement:uiElement});return{Type:2,Redraw:bRedraw||btnStatus.Redraw,Row:row};//行
 }var header=this.PtInHeader(x,y);if(header){var eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;if(e.button==2){eventID=JSCHART_EVENT_ID.ON_RCLICK_REPORT_HEADER;}else if(e.button==0){eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;}this.SendClickEvent(eventID,{Data:row,X:x,Y:y,e:e,Inside:insidePoint,UIElement:uiElement});return{Type:3,Redraw:bRedraw,Header:header};//表头
 }return null;};this.OnShiftClickRow=function(row){if(this.MultiSelectedRow.length<=0){this.MultiSelectedRow.push(row.DataIndex);return;}var max=null,min=null;for(var i=0;i<this.MultiSelectedRow.length;++i){var value=this.MultiSelectedRow[i];if(max==null||max<value)max=value;if(min==null||min>value)min=value;if(value==row.DataIndex)//移除
-{this.MultiSelectedRow.splice(i,1);return;}}if(max==min){var start=row.DataIndex,end=max;if(start>end){start=max;end=row.DataIndex;}this.MultiSelectedRow=[];for(var i=start;i<=end;++i){this.MultiSelectedRow.push(i);}}else{if(row.DataIndex<=max&&row.DataIndex>=min){this.MultiSelectedRow.push(row.DataIndex);}else{var start=Math.min(row.DataIndex,min);var end=Math.max(row.DataIndex,max);this.MultiSelectedRow=[];for(var i=start;i<=end;++i){this.MultiSelectedRow.push(i);}}}};this.OnDrawgRow=function(x,y,e)//Type: 5=顶部  6=空白行 2=行 7=底部
-{if(!this.Data)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var topOffset=this.RowHeight/2;var top=this.RectClient.Top+this.HeaderHeight;var right=this.ChartBorder.GetChartWidth();var textTop=top+this.FixedRowHeight*this.FixedRowCount;if(y<textTop+topOffset)return{Type:5};for(var i=this.Data.YOffset,j=0;i<this.Data.Data.length&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var rtRow={Left:0,Top:textTop,Right:right,Bottom:textTop+this.RowHeight};rtRow.Top+=topOffset;rtRow.Bottom+=topOffset;if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={DataIndex:i,Index:j,Symbol:symbol,Pos:0};if(j==0)data.Pos=1;else if(j==this.RowCount-1)data.Pos=2;return{Type:2,Data:data};}textTop+=this.RowHeight;}if(j<this.RowCount)return{Type:6};return{Type:7};};this.OnClickButton=function(x,y,e,status){if(e.button!=0)return false;var buttonData=this.GetButtonData(x,y);if(!buttonData)return true;if(buttonData.Type===0)//checkbox
+{this.MultiSelectedRow.splice(i,1);return;}}if(max==min){var start=row.DataIndex,end=max;if(start>end){start=max;end=row.DataIndex;}this.MultiSelectedRow=[];for(var i=start;i<=end;++i){this.MultiSelectedRow.push(i);}}else{if(row.DataIndex<=max&&row.DataIndex>=min){this.MultiSelectedRow.push(row.DataIndex);}else{var start=Math.min(row.DataIndex,min);var end=Math.max(row.DataIndex,max);this.MultiSelectedRow=[];for(var i=start;i<=end;++i){this.MultiSelectedRow.push(i);}}}};this.OnDragRow=function(x,y,e)//Type: 5=顶部  6=空白行 2=行 7=底部
+{if(!this.Data)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var topOffset=this.RowHeight/2;var top=this.RectClient.Top+this.HeaderHeight;var right=this.ChartBorder.GetChartWidth();var textTop=top+this.FixedRowHeight*this.FixedRowCount;if(y<textTop+topOffset)return{Type:5};for(var i=this.Data.YOffset,j=0;i<this.Data.Data.length&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var rtRow={Left:0,Top:textTop,Right:right,Bottom:textTop+this.RowHeight};rtRow.Top+=topOffset;rtRow.Bottom+=topOffset;if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={DataIndex:i,Index:j,Symbol:symbol,Pos:0};if(j==0)data.Pos=1;else if(j==this.RowCount-1)data.Pos=2;return{Type:2,Data:data};}textTop+=this.RowHeight;}if(j<this.RowCount)return{Type:6};return{Type:7};};this.OnDragHeader=function(x,y,e)//Type:1=行 2=左边  3=右边 4=空白 5=固定行
+{if(!this.IsShowHeader)return null;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(x<left)return{Type:2};else if(x>right)return{Type:3};var cell=this.PtInItem(x,top+2,top,bottom);if(!cell)return{Type:4};if(cell.IsFixed)return{Type:5};return{Type:1,Header:cell};};this.OnClickButton=function(x,y,e,status){if(e.button!=0)return false;var buttonData=this.GetButtonData(x,y);if(!buttonData)return true;if(buttonData.Type===0)//checkbox
 {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){if(IFrameSplitOperator.IsBool(buttonData.Data.Checked))buttonData.Data.Checked=!buttonData.Data.Checked;else buttonData.Data.Checked=true;}status.Redraw=true;return true;}else if(buttonData.Type===1)//button
 {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;return true;}else if(buttonData.Type===2)//link
 {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;return true;}return false;};this.OnDblClick=function(x,y,e){if(!this.Data)return false;var header=this.PtInHeaderDragBorder(x,y);if(header){this.SendClickEvent(JSCHART_EVENT_ID.ON_DBCLICK_REPORT_DRAG_COLUMN_WIDTH,{Data:header,X:x,Y:y});return true;}var row=this.PtInBody(x,y);if(row){this.SendClickEvent(JSCHART_EVENT_ID.ON_DBCLICK_REPORT_ROW,{Data:row,X:x,Y:y});return true;}return false;};this.PtInClient=function(x,y){if(x>this.RectClient.Left&&x<this.RectClient.Right&&y>this.RectClient.Top&&y<this.RectClient.Bottom)return true;return false;};this.PtInBody=function(x,y){if(!this.Data)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var right=this.RectClient.Right;var rowWidth=this.RectClient.Right-this.RectClient.Left;var textTop=top+this.FixedRowHeight*this.FixedRowCount;for(var i=this.Data.YOffset,j=0;i<this.Data.Data.length&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var rtRow={Left:left,Top:textTop,Right:right,Bottom:textTop+this.RowHeight};if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={Rect:rtRow,DataIndex:i,Index:j,Symbol:symbol};data.Item=this.PtInItem(x,y,rtRow.Top,rtRow.Bottom);return data;}textTop+=this.RowHeight;}return null;};this.PtInFixedBody=function(x,y){if(this.FixedRowCount<=0)return null;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var right=this.RectClient.Right;var rowWidth=this.RectClient.Right-this.RectClient.Left;var textTop=top;for(var i=0;i<this.FixedRowCount;++i){var rtRow={Left:left,Top:textTop,Right:right,Bottom:textTop+this.FixedRowHeight};if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={Rect:rtRow,Index:i};data.Item=this.PtInItem(x,y,rtRow.Top,rtRow.Bottom);return data;}textTop+=this.FixedRowHeight;}return null;};this.PtInItem=function(x,y,top,bottom){var left=this.RectClient.Left;var right=this.RectClient.Right;var textLeft=left;//固定列
 for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];var header={Left:textLeft,Right:textLeft+item.Width,Top:top,Bottom:bottom};if(x>=header.Left&&x<=header.Right&&y>=header.Top&&y<=header.Bottom){return{Rect:header,Column:item,Index:i,IsFixed:true};}textLeft+=item.Width;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];if(textLeft>=right)break;var header={Left:textLeft,Right:textLeft+item.Width,Top:top,Bottom:bottom};if(x>=header.Left&&x<=header.Right&&y>=header.Top&&y<=header.Bottom){return{Rect:header,Column:item,Index:i,IsFixed:false};}textLeft+=item.Width;}return null;};this.PtInHeader=function(x,y){if(!this.IsShowHeader)return null;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(!(x>=left&&x<=right&&y>=top&&y<=bottom))return null;return this.PtInItem(x,y,top,bottom);};this.IsPtInBody=function(x,y){var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left;var right=this.RectClient.Right;var bottom=this.RectClient.Bottom;if(x>=left&&x<=right&&y>=top&&y<=bottom)return true;return false;};this.IsPtInHeader=function(x,y){if(!this.IsShowHeader)return false;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(x>=left&&x<=right&&y>=top&&y<=bottom)return true;return false;};this.SendClickEvent=function(id,data){var event=this.GetEventCallback(id);if(event&&event.Callback){event.Callback(event,data,this);}};this.DrawDragRow=function(){if(!this.DragRow)return;var drag=this.DragRow;if(!drag.Data||!drag.Inside||!drag.Data.Row)return;var dataIndex=drag.Data.Row.DataIndex;if(!IFrameSplitOperator.IsNumber(dataIndex)||dataIndex<0)return;var textTop=drag.Inside.Y-this.RowHeight/2;var top=textTop;var left=this.RectClient.Left;var rowWidth=this.RectClient.Right-this.RectClient.Left;//背景
 this.Canvas.fillStyle=this.DragRowColor;this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);var symbol=this.Data.Data[dataIndex];var data={Symbol:symbol,Stock:null,Block:null};if(this.GetStockDataCallback)data.Stock=this.GetStockDataCallback(symbol);if(this.GetBlockDataCallback)data.Block=this.GetBlockDataCallback(symbol);data.Decimal=GetfloatPrecision(symbol);//小数位数
-var chartRight=this.RectClient.Right;this.Canvas.font=this.ItemFont;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}};this.GetTooltipData=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect))return null;for(var i=0;i<this.TooltipRect.length;++i){var item=this.TooltipRect[i];var rt=item.Rect;if(!rt)continue;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Rect:item.Rect,Stock:item.Stock,Column:item.Column,Index:item.Index,Type:item.Type,Data:item.Data};}}return null;};this.GetButtonData=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.ButtonRect))return null;for(var i=0;i<this.ButtonRect.length;++i){var item=this.ButtonRect[i];var rt=item.Rect;if(!rt)continue;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Rect:item.Rect,Stock:item.Stock,Column:item.Column,Index:item.Index,Type:item.Type,Data:item.Data,ColumnIndex:item.ColumnIndex};}}};this.PtInHeaderDragBorder=function(x,y){if(!this.IsShowHeader)return null;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(!(x>=left&&x<=right&&y>=top&&y<=bottom))return null;var textLeft=left;var dragBarWidth=5*GetDevicePixelRatio();//固定列
+var chartRight=this.RectClient.Right;this.Canvas.font=this.ItemFont;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,3);left+=item.Width;if(left>=chartRight)break;}};this.DrawDragHeader=function(){if(!this.DragHeader)return;var drag=this.DragHeader;var clickData=drag.ClickData;var rtHeader=clickData.Header.Rect;var headerWidth=rtHeader.Right-rtHeader.Left;var rtRow={Left:drag.MovePoint.X-headerWidth/2,Top:this.RectClient.Top+this.HeaderHeight,Width:headerWidth};rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;rtRow.Right=rtRow.Left+rtRow.Width;rtRow.Height=rtRow.Bottom-rtRow.Top;//背景
+this.Canvas.fillStyle=this.DragRowColor;this.Canvas.fillRect(rtRow.Left,rtRow.Top,rtRow.Width,rtRow.Height);//文字
+var cellHeader={Left:rtRow.Left,Top:rtRow.Top,Right:rtRow.Right,Width:rtRow.Width,Height:this.HeaderHeight};cellHeader.Bottom=cellHeader.Top+cellHeader.Height;this.DrawHeaderItem(clickData.Header.Column,cellHeader,clickData.Header.Index,{HeaderColor:this.DragRowTextColor});var textTop=cellHeader.Bottom+this.FixedRowHeight*this.FixedRowCount;this.Canvas.font=this.ItemFont;var dataCount=this.GetAllRowCount();for(var i=this.Data.YOffset,j=0;i<dataCount&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var data={Symbol:symbol,Stock:null,Block:null};if(this.GetStockDataCallback)data.Stock=this.GetStockDataCallback(symbol);if(this.GetBlockDataCallback)data.Block=this.GetBlockDataCallback(symbol);if(this.GetFlashBGDataCallback)data.FlashBG=this.GetFlashBGDataCallback(symbol,Date.now());data.Decimal=GetfloatPrecision(symbol);//小数位数
+var item=this.Column[clickData.Header.Index];this.DrawItem(i,data,item,cellHeader.Left,textTop,3);textTop+=this.RowHeight;}};this.GetTooltipData=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect))return null;for(var i=0;i<this.TooltipRect.length;++i){var item=this.TooltipRect[i];var rt=item.Rect;if(!rt)continue;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Rect:item.Rect,Stock:item.Stock,Column:item.Column,Index:item.Index,Type:item.Type,Data:item.Data};}}return null;};this.GetButtonData=function(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.ButtonRect))return null;for(var i=0;i<this.ButtonRect.length;++i){var item=this.ButtonRect[i];var rt=item.Rect;if(!rt)continue;if(x>=rt.Left&&x<=rt.Right&&y>=rt.Top&&y<=rt.Bottom){return{Rect:item.Rect,Stock:item.Stock,Column:item.Column,Index:item.Index,Type:item.Type,Data:item.Data,ColumnIndex:item.ColumnIndex};}}};this.PtInHeaderDragBorder=function(x,y){if(!this.IsShowHeader)return null;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight;if(!(x>=left&&x<=right&&y>=top&&y<=bottom))return null;var textLeft=left;var dragBarWidth=5*GetDevicePixelRatio();//固定列
 for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];if(item.EnableDragWidth===true){var header={Right:textLeft+item.Width,Top:top,Bottom:bottom};header.Left=header.Right-dragBarWidth;if(x>=header.Left&&x<=header.Right&&y>=header.Top&&y<=header.Bottom){return{Rect:header,Column:item,Index:i,IsFixed:true};}}textLeft+=item.Width;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];if(textLeft>=right)break;if(item.EnableDragWidth===true){var header={Right:textLeft+item.Width,Top:top,Bottom:bottom};header.Left=header.Right-dragBarWidth;if(x>=header.Left&&x<=header.Right&&y>=header.Top&&y<=header.Bottom){return{Rect:header,Column:item,Index:i,IsFixed:false};}}textLeft+=item.Width;}return null;};//设置选中行 option={ Symbol:, AutoYScroll:true/false Y滚动条自定定位 }
 this.SetSelectedRow=function(option){if(!option)return false;if(this.SelectedModel===0)return false;if(option.Symbol){var symbol=option.Symbol;var bFinder=false;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];if(symbol==item){this.SelectedRow=i;bFinder=true;break;}}if(!bFinder)return false;if(option.AutoYScroll===true){this.UpdatePageYOffset({SelectedRow:this.SelectedRow});}return bFinder;}return false;};this.UpdatePageYOffset=function(option){if(!option)return;var selectedRow=option.SelectedRow;if(selectedRow<0)return;var pageStatus=this.GetCurrentPageStatus();if(pageStatus.IsSinglePage)return;if(selectedRow>=pageStatus.Start&&selectedRow<=pageStatus.End)return;this.Data.YOffset=selectedRow;//选中行不在当前屏 设置为第1行
 };}//报价列表底部tab和横向滚动条
@@ -14849,7 +14853,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  *
- */var HQCHART_VERSION="1.1.14607";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.14612";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json CHANGED Viewed

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

package/src/jscommon/umychart.report.js CHANGED Viewed

@@ -416,14 +416,6 @@ function JSReportChartContainer(uielement)
     this.Canvas=uielement.getContext("2d");         //画布
-    this.Tooltip=document.createElement("div");
-    this.Tooltip.className='jsreport-tooltip';
-    this.Tooltip.style.background=g_JSChartResource.TooltipBGColor;
-    this.Tooltip.style.opacity=g_JSChartResource.TooltipAlpha;
-    this.Tooltip.style["pointer-events"]="none";
-    this.Tooltip.id=Guid();
-    uielement.parentNode.appendChild(this.Tooltip);
     this.Symbol;    //板块代码
     this.Name;      //板块名称
     this.NetworkFilter;                                 //数据回调接口
@@ -2464,7 +2456,7 @@ function JSReportChartContainer(uielement)
             if (reportChart)
             {
-                var moveRow=reportChart.OnDrawgRow(x,y,e);
+                var moveRow=reportChart.OnDragRow(x,y,e);
                 if (moveRow )
                 {
                     if (moveRow.Type==2)
@@ -2537,6 +2529,8 @@ function JSReportChartContainer(uielement)
             var yMove=e.clientY-this.DragHeader.Click.Y;
             if ( Math.abs(yMove)<=1 && Math.abs(xMove)<=1) return;
+            var reportChart=this.GetReportChart();
+            var clickData=this.DragHeader.ClickData;
             this.DragHeader.LastMove.X=e.clientX;
             this.DragHeader.LastMove.Y=e.clientY;
             if (!this.DragHeader.MovePoint)
@@ -2549,8 +2543,17 @@ function JSReportChartContainer(uielement)
                 this.DragHeader.MovePoint.Y=y;
             }
-            this.OnMoveDragHeader(x,y,e);
-            this.ShowDragHeaderTooltip(x,y,e);
+            var moveData=reportChart.OnDragHeader(x,y,e);
+            if (!moveData) return;
+            if (moveData.Type!=1) return;
+            if (moveData.Header.Index!=clickData.Header.Index)
+            {
+                this.DragHeader.MoveToData=moveData;
+            }
+            reportChart.DragHeader=this.DragHeader;
+            this.Draw();
         }
         else if (this.DragColumnWidth && this.DragColumnWidth.ClickData)    //列宽度拖拽
         {
@@ -2592,57 +2595,6 @@ function JSReportChartContainer(uielement)
         this.Draw();
     }
-    this.OnMoveDragHeader=function(x, y,e)
-    {
-        var chart=this.ChartPaint[0];
-        if (!chart) return;
-        var clickData=this.DragHeader.ClickData;
-        this.DragHeader.MoveToData=null;
-        if (!clickData.Header.IsFixed)  //固定列不能拖
-        {
-            var yHeader=this.DragHeader.ClickPoint.Y;
-            var moveData=chart.OnMouseDown(x,yHeader,e);
-            if (!moveData || !moveData.Header) return;
-            if (moveData.Header.IsFixed) return;
-            if (moveData.Header.Index== clickData.Header.Index) return;
-            this.DragHeader.MoveToData=moveData;
-            console.log(`[JSReportChartContainer::OnMoveDragHeader] Click[Index=${clickData.Header.Index}, Title=${clickData.Header.Column.Title}] => Move[Index=${moveData.Header.Index}, Title=${moveData.Header.Column.Title}]`);
-        }
-    }
-    this.ShowDragHeaderTooltip=function(x,y,e)
-    {
-        if (!this.DragHeader) return;
-        var drag=this.DragHeader;
-        if (!drag.ClickData || !drag.MovePoint) return;
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_HEADER_TOOLTIP);
-        if (event)
-        {
-            var sendData={ PreventDefault:false, e, X:x, Y:y, DragHeader:this.DragHeader, Tooltip:this.Tooltip };
-            event.Callback(event,sendData,this);
-            if (sendData.PreventDefault) return;
-        }
-        var title=drag.ClickData.Header.Column.Title;
-        this.Tooltip.className='jchart-chartdrawsvg-tooltip'; //ChartDrawSVG指标数据
-        this.Tooltip.style.position = "absolute";
-        this.Tooltip.style.left = e.clientX + "px";
-        this.Tooltip.style.top = e.clientY+ "px";
-        this.Tooltip.style.width = 100+"px";
-        this.Tooltip.style.height =null;
-        this.Tooltip.innerHTML=title;
-        this.Tooltip.style.display = "block";
-    }
-    this.HideTooltip=function()
-    {
-        if (this.Tooltip.style.display!="none") this.Tooltip.style.display = "none";
-    }
     this.DocOnMouseUp=function(e)
     {
         //清空事件
@@ -2679,6 +2631,12 @@ function JSReportChartContainer(uielement)
         this.DragMove=null;
         this.DragColumnWidth=null;
+        if (reportChart.DragHeader)
+        {
+            bRedraw=true;
+            reportChart.DragHeader=null;
+        }
         if (bRedraw) this.Draw();
         if (dragHeader)
@@ -4763,6 +4721,7 @@ function ChartReport()
     this.ShowSymbol=[];                 //显示的股票列表 { Index:序号(排序用), Symbol:股票代码 }
     this.DragRow;                       //拖拽行
+    this.DragHeader;                    //拖拽表头
     this.Tab;
     this.VScrollbar;
@@ -4970,6 +4929,11 @@ function ChartReport()
             Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom
         }
+        this.DragRowColor=g_JSChartResource.Report.DragRow.Color;
+        this.DragRowTextColor=g_JSChartResource.Report.DragRow.TextColor;
+        this.DragMoveRowColor=g_JSChartResource.Report.DragRow.MoveRowColor;
+        this.DragSrcRowColor=g_JSChartResource.Report.DragRow.SrcRowColor;
         //排序图标
         this.SortConfig=
         {
@@ -5389,6 +5353,7 @@ function ChartReport()
         this.ClipClient();
+        this.DrawDragHeaderBG();
         this.DrawHeader();
         this.DrawBody();
         this.Canvas.restore();
@@ -5406,6 +5371,8 @@ function ChartReport()
         this.DrawDragRow();
+        this.DrawDragHeader();
         if (this.VScrollbar)
         {
             var bottom=this.ChartBorder.GetBottom();
@@ -5416,6 +5383,60 @@ function ChartReport()
         this.SizeChange=false;
     }
+    this.DrawDragHeaderBG=function()
+    {
+        if (!this.DragHeader) return;
+        var left=this.RectClient.Left;
+        var right=this.RectClient.Right;
+        var top=this.RectClient.Top;
+        var bottom=top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
+        //竖线
+        var columnLeft=left;
+        for(var i=0;i<this.FixedColumn && i<this.Column.length; ++i)
+        {
+            var item=this.Column[i];
+            columnLeft+=item.Width;
+        }
+        for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i)
+        {
+            var item=this.Column[i];
+            if (this.DragHeader)
+            {
+                if (this.DragHeader.ClickData)
+                {
+                    var clickData=this.DragHeader.ClickData;
+                    if (clickData.Header.Index==i)
+                    {
+                        var rtBG={ Left:columnLeft,Top:top, Bottom:bottom, Right:columnLeft+item.Width };
+                        rtBG.Width=rtBG.Right-rtBG.Left;
+                        rtBG.Height=rtBG.Bottom-rtBG.Top;
+                        this.Canvas.fillStyle=this.DragSrcRowColor;
+                        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                    }
+                }
+                if (this.DragHeader.MoveToData)
+                {
+                    var moveToData=this.DragHeader.MoveToData;
+                    if (moveToData.Header.Index==i)
+                    {
+                        var rtBG={ Left:columnLeft,Top:top, Bottom:bottom, Right:columnLeft+item.Width };
+                        rtBG.Width=rtBG.Right-rtBG.Left;
+                        rtBG.Height=rtBG.Bottom-rtBG.Top;
+                        this.Canvas.fillStyle=this.DragMoveRowColor;
+                        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                    }
+                }
+            }
+            columnLeft+=item.Width;
+        }
+    }
     //更新缓存变量
     this.UpdateCacheData=function()
     {
@@ -5577,7 +5598,8 @@ function ChartReport()
             if (!item.Title || item.Title.length<=0) continue;
             var text=item.Title;
             itemWidth=this.Canvas.measureText(text).width;
-            if (item.Sort>0) itemWidth+this.SortConfig.Size*pixelRatio;
+            if (item.Sort>0) itemWidth+=this.SortConfig.Size*pixelRatio;
             itemWidth+=(4+this.HeaderMergin.Left+this.HeaderMergin.Right);
             if (item.Width<itemWidth) item.Width=itemWidth;
         }
@@ -5609,7 +5631,7 @@ function ChartReport()
         this.IsShowAllColumn=(subWidth<reportWidth);
     }
-    this.DrawHeaderItem=function(column, rtCell, index)
+    this.DrawHeaderItem=function(column, rtCell, index, option)
     {
         if (column.HeaderBGColor)     //背景色
         {
@@ -5653,12 +5675,18 @@ function ChartReport()
         //图标
         if (column.Icon) lastItem.Icon=column.Icon;
+        if (option)
+        {
+            if (option.HeaderColor) drawInfo.HeaderColor=option.HeaderColor;
+        }
         this.DrawHeaderText(column, drawInfo);
     }
     this.DrawHeaderText=function(column, drawInfo)
     {
-        if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
+        if (drawInfo.HeaderColor) this.Canvas.fillStyle=drawInfo.HeaderColor;
+        else if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
         else this.Canvas.fillStyle=this.HeaderColor;
         var pixelRatio=GetDevicePixelRatio();
@@ -8365,7 +8393,7 @@ function ChartReport()
     }
-    this.OnDrawgRow=function(x, y, e) //Type: 5=顶部  6=空白行 2=行 7=底部
+    this.OnDragRow=function(x, y, e) //Type: 5=顶部  6=空白行 2=行 7=底部
     {
         if (!this.Data) return null;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
@@ -8401,6 +8429,26 @@ function ChartReport()
         return { Type:7 };
     }
+    this.OnDragHeader=function(x,y,e)   //Type:1=行 2=左边  3=右边 4=空白 5=固定行
+    {
+        if (!this.IsShowHeader) return null;
+        var left=this.RectClient.Left;
+        var right=this.RectClient.Right;
+        var top=this.RectClient.Top;
+        var bottom=top+this.HeaderHeight;
+        if (x<left) return { Type:2 };
+        else if (x>right) return { Type:3 };
+        var cell=this.PtInItem(x,top+2,top,bottom);
+        if (!cell) return { Type:4 };
+        if (cell.IsFixed) return { Type:5 }
+        return { Type:1, Header:cell };
+    }
     this.OnClickButton=function(x, y, e, status)
     {
         if (e.button!=0) return false;
@@ -8669,6 +8717,48 @@ function ChartReport()
     }
+    this.DrawDragHeader=function()
+    {
+        if (!this.DragHeader) return;
+        var drag=this.DragHeader;
+        var clickData=drag.ClickData;
+        var rtHeader=clickData.Header.Rect;
+        var headerWidth=rtHeader.Right-rtHeader.Left;
+        var rtRow={ Left:drag.MovePoint.X-headerWidth/2, Top:this.RectClient.Top+this.HeaderHeight, Width:headerWidth };
+        rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
+        rtRow.Right=rtRow.Left+rtRow.Width;
+        rtRow.Height=rtRow.Bottom-rtRow.Top;
+        //背景
+        this.Canvas.fillStyle=this.DragRowColor;
+        this.Canvas.fillRect(rtRow.Left, rtRow.Top, rtRow.Width, rtRow.Height);
+        //文字
+        var cellHeader={ Left:rtRow.Left, Top:rtRow.Top, Right:rtRow.Right, Width:rtRow.Width, Height:this.HeaderHeight };
+        cellHeader.Bottom=cellHeader.Top+cellHeader.Height;
+        this.DrawHeaderItem(clickData.Header.Column, cellHeader, clickData.Header.Index, { HeaderColor:this.DragRowTextColor });
+        var textTop=cellHeader.Bottom+this.FixedRowHeight*this.FixedRowCount;
+        this.Canvas.font=this.ItemFont;
+        var dataCount=this.GetAllRowCount();
+        for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
+        {
+            var symbol=this.Data.Data[i];
+            var data= { Symbol:symbol , Stock:null, Block:null };
+            if (this.GetStockDataCallback) data.Stock=this.GetStockDataCallback(symbol);
+            if (this.GetBlockDataCallback) data.Block=this.GetBlockDataCallback(symbol);
+            if (this.GetFlashBGDataCallback) data.FlashBG=this.GetFlashBGDataCallback(symbol, Date.now());
+            data.Decimal=GetfloatPrecision(symbol); //小数位数
+            var item=this.Column[clickData.Header.Index];
+            this.DrawItem(i, data, item, cellHeader.Left, textTop, 3);
+            textTop+=this.RowHeight;
+        }
+    }
     this.GetTooltipData=function(x,y)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect)) return null;

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

@@ -133430,14 +133430,6 @@ function JSReportChartContainer(uielement)
     this.Canvas=uielement.getContext("2d");         //画布
-    this.Tooltip=document.createElement("div");
-    this.Tooltip.className='jsreport-tooltip';
-    this.Tooltip.style.background=g_JSChartResource.TooltipBGColor;
-    this.Tooltip.style.opacity=g_JSChartResource.TooltipAlpha;
-    this.Tooltip.style["pointer-events"]="none";
-    this.Tooltip.id=Guid();
-    uielement.parentNode.appendChild(this.Tooltip);
     this.Symbol;    //板块代码
     this.Name;      //板块名称
     this.NetworkFilter;                                 //数据回调接口
@@ -135478,7 +135470,7 @@ function JSReportChartContainer(uielement)
             if (reportChart)
             {
-                var moveRow=reportChart.OnDrawgRow(x,y,e);
+                var moveRow=reportChart.OnDragRow(x,y,e);
                 if (moveRow )
                 {
                     if (moveRow.Type==2)
@@ -135551,6 +135543,8 @@ function JSReportChartContainer(uielement)
             var yMove=e.clientY-this.DragHeader.Click.Y;
             if ( Math.abs(yMove)<=1 && Math.abs(xMove)<=1) return;
+            var reportChart=this.GetReportChart();
+            var clickData=this.DragHeader.ClickData;
             this.DragHeader.LastMove.X=e.clientX;
             this.DragHeader.LastMove.Y=e.clientY;
             if (!this.DragHeader.MovePoint)
@@ -135563,8 +135557,17 @@ function JSReportChartContainer(uielement)
                 this.DragHeader.MovePoint.Y=y;
             }
-            this.OnMoveDragHeader(x,y,e);
-            this.ShowDragHeaderTooltip(x,y,e);
+            var moveData=reportChart.OnDragHeader(x,y,e);
+            if (!moveData) return;
+            if (moveData.Type!=1) return;
+            if (moveData.Header.Index!=clickData.Header.Index)
+            {
+                this.DragHeader.MoveToData=moveData;
+            }
+            reportChart.DragHeader=this.DragHeader;
+            this.Draw();
         }
         else if (this.DragColumnWidth && this.DragColumnWidth.ClickData)    //列宽度拖拽
         {
@@ -135606,57 +135609,6 @@ function JSReportChartContainer(uielement)
         this.Draw();
     }
-    this.OnMoveDragHeader=function(x, y,e)
-    {
-        var chart=this.ChartPaint[0];
-        if (!chart) return;
-        var clickData=this.DragHeader.ClickData;
-        this.DragHeader.MoveToData=null;
-        if (!clickData.Header.IsFixed)  //固定列不能拖
-        {
-            var yHeader=this.DragHeader.ClickPoint.Y;
-            var moveData=chart.OnMouseDown(x,yHeader,e);
-            if (!moveData || !moveData.Header) return;
-            if (moveData.Header.IsFixed) return;
-            if (moveData.Header.Index== clickData.Header.Index) return;
-            this.DragHeader.MoveToData=moveData;
-            console.log(`[JSReportChartContainer::OnMoveDragHeader] Click[Index=${clickData.Header.Index}, Title=${clickData.Header.Column.Title}] => Move[Index=${moveData.Header.Index}, Title=${moveData.Header.Column.Title}]`);
-        }
-    }
-    this.ShowDragHeaderTooltip=function(x,y,e)
-    {
-        if (!this.DragHeader) return;
-        var drag=this.DragHeader;
-        if (!drag.ClickData || !drag.MovePoint) return;
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_HEADER_TOOLTIP);
-        if (event)
-        {
-            var sendData={ PreventDefault:false, e, X:x, Y:y, DragHeader:this.DragHeader, Tooltip:this.Tooltip };
-            event.Callback(event,sendData,this);
-            if (sendData.PreventDefault) return;
-        }
-        var title=drag.ClickData.Header.Column.Title;
-        this.Tooltip.className='jchart-chartdrawsvg-tooltip'; //ChartDrawSVG指标数据
-        this.Tooltip.style.position = "absolute";
-        this.Tooltip.style.left = e.clientX + "px";
-        this.Tooltip.style.top = e.clientY+ "px";
-        this.Tooltip.style.width = 100+"px";
-        this.Tooltip.style.height =null;
-        this.Tooltip.innerHTML=title;
-        this.Tooltip.style.display = "block";
-    }
-    this.HideTooltip=function()
-    {
-        if (this.Tooltip.style.display!="none") this.Tooltip.style.display = "none";
-    }
     this.DocOnMouseUp=function(e)
     {
         //清空事件
@@ -135693,6 +135645,12 @@ function JSReportChartContainer(uielement)
         this.DragMove=null;
         this.DragColumnWidth=null;
+        if (reportChart.DragHeader)
+        {
+            bRedraw=true;
+            reportChart.DragHeader=null;
+        }
         if (bRedraw) this.Draw();
         if (dragHeader)
@@ -137777,6 +137735,7 @@ function ChartReport()
     this.ShowSymbol=[];                 //显示的股票列表 { Index:序号(排序用), Symbol:股票代码 }
     this.DragRow;                       //拖拽行
+    this.DragHeader;                    //拖拽表头
     this.Tab;
     this.VScrollbar;
@@ -137984,6 +137943,11 @@ function ChartReport()
             Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom
         }
+        this.DragRowColor=g_JSChartResource.Report.DragRow.Color;
+        this.DragRowTextColor=g_JSChartResource.Report.DragRow.TextColor;
+        this.DragMoveRowColor=g_JSChartResource.Report.DragRow.MoveRowColor;
+        this.DragSrcRowColor=g_JSChartResource.Report.DragRow.SrcRowColor;
         //排序图标
         this.SortConfig=
         {
@@ -138403,6 +138367,7 @@ function ChartReport()
         this.ClipClient();
+        this.DrawDragHeaderBG();
         this.DrawHeader();
         this.DrawBody();
         this.Canvas.restore();
@@ -138420,6 +138385,8 @@ function ChartReport()
         this.DrawDragRow();
+        this.DrawDragHeader();
         if (this.VScrollbar)
         {
             var bottom=this.ChartBorder.GetBottom();
@@ -138430,6 +138397,60 @@ function ChartReport()
         this.SizeChange=false;
     }
+    this.DrawDragHeaderBG=function()
+    {
+        if (!this.DragHeader) return;
+        var left=this.RectClient.Left;
+        var right=this.RectClient.Right;
+        var top=this.RectClient.Top;
+        var bottom=top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
+        //竖线
+        var columnLeft=left;
+        for(var i=0;i<this.FixedColumn && i<this.Column.length; ++i)
+        {
+            var item=this.Column[i];
+            columnLeft+=item.Width;
+        }
+        for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i)
+        {
+            var item=this.Column[i];
+            if (this.DragHeader)
+            {
+                if (this.DragHeader.ClickData)
+                {
+                    var clickData=this.DragHeader.ClickData;
+                    if (clickData.Header.Index==i)
+                    {
+                        var rtBG={ Left:columnLeft,Top:top, Bottom:bottom, Right:columnLeft+item.Width };
+                        rtBG.Width=rtBG.Right-rtBG.Left;
+                        rtBG.Height=rtBG.Bottom-rtBG.Top;
+                        this.Canvas.fillStyle=this.DragSrcRowColor;
+                        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                    }
+                }
+                if (this.DragHeader.MoveToData)
+                {
+                    var moveToData=this.DragHeader.MoveToData;
+                    if (moveToData.Header.Index==i)
+                    {
+                        var rtBG={ Left:columnLeft,Top:top, Bottom:bottom, Right:columnLeft+item.Width };
+                        rtBG.Width=rtBG.Right-rtBG.Left;
+                        rtBG.Height=rtBG.Bottom-rtBG.Top;
+                        this.Canvas.fillStyle=this.DragMoveRowColor;
+                        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                    }
+                }
+            }
+            columnLeft+=item.Width;
+        }
+    }
     //更新缓存变量
     this.UpdateCacheData=function()
     {
@@ -138591,7 +138612,8 @@ function ChartReport()
             if (!item.Title || item.Title.length<=0) continue;
             var text=item.Title;
             itemWidth=this.Canvas.measureText(text).width;
-            if (item.Sort>0) itemWidth+this.SortConfig.Size*pixelRatio;
+            if (item.Sort>0) itemWidth+=this.SortConfig.Size*pixelRatio;
             itemWidth+=(4+this.HeaderMergin.Left+this.HeaderMergin.Right);
             if (item.Width<itemWidth) item.Width=itemWidth;
         }
@@ -138623,7 +138645,7 @@ function ChartReport()
         this.IsShowAllColumn=(subWidth<reportWidth);
     }
-    this.DrawHeaderItem=function(column, rtCell, index)
+    this.DrawHeaderItem=function(column, rtCell, index, option)
     {
         if (column.HeaderBGColor)     //背景色
         {
@@ -138667,12 +138689,18 @@ function ChartReport()
         //图标
         if (column.Icon) lastItem.Icon=column.Icon;
+        if (option)
+        {
+            if (option.HeaderColor) drawInfo.HeaderColor=option.HeaderColor;
+        }
         this.DrawHeaderText(column, drawInfo);
     }
     this.DrawHeaderText=function(column, drawInfo)
     {
-        if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
+        if (drawInfo.HeaderColor) this.Canvas.fillStyle=drawInfo.HeaderColor;
+        else if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
         else this.Canvas.fillStyle=this.HeaderColor;
         var pixelRatio=GetDevicePixelRatio();
@@ -141379,7 +141407,7 @@ function ChartReport()
     }
-    this.OnDrawgRow=function(x, y, e) //Type: 5=顶部  6=空白行 2=行 7=底部
+    this.OnDragRow=function(x, y, e) //Type: 5=顶部  6=空白行 2=行 7=底部
     {
         if (!this.Data) return null;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
@@ -141415,6 +141443,26 @@ function ChartReport()
         return { Type:7 };
     }
+    this.OnDragHeader=function(x,y,e)   //Type:1=行 2=左边  3=右边 4=空白 5=固定行
+    {
+        if (!this.IsShowHeader) return null;
+        var left=this.RectClient.Left;
+        var right=this.RectClient.Right;
+        var top=this.RectClient.Top;
+        var bottom=top+this.HeaderHeight;
+        if (x<left) return { Type:2 };
+        else if (x>right) return { Type:3 };
+        var cell=this.PtInItem(x,top+2,top,bottom);
+        if (!cell) return { Type:4 };
+        if (cell.IsFixed) return { Type:5 }
+        return { Type:1, Header:cell };
+    }
     this.OnClickButton=function(x, y, e, status)
     {
         if (e.button!=0) return false;
@@ -141683,6 +141731,48 @@ function ChartReport()
     }
+    this.DrawDragHeader=function()
+    {
+        if (!this.DragHeader) return;
+        var drag=this.DragHeader;
+        var clickData=drag.ClickData;
+        var rtHeader=clickData.Header.Rect;
+        var headerWidth=rtHeader.Right-rtHeader.Left;
+        var rtRow={ Left:drag.MovePoint.X-headerWidth/2, Top:this.RectClient.Top+this.HeaderHeight, Width:headerWidth };
+        rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
+        rtRow.Right=rtRow.Left+rtRow.Width;
+        rtRow.Height=rtRow.Bottom-rtRow.Top;
+        //背景
+        this.Canvas.fillStyle=this.DragRowColor;
+        this.Canvas.fillRect(rtRow.Left, rtRow.Top, rtRow.Width, rtRow.Height);
+        //文字
+        var cellHeader={ Left:rtRow.Left, Top:rtRow.Top, Right:rtRow.Right, Width:rtRow.Width, Height:this.HeaderHeight };
+        cellHeader.Bottom=cellHeader.Top+cellHeader.Height;
+        this.DrawHeaderItem(clickData.Header.Column, cellHeader, clickData.Header.Index, { HeaderColor:this.DragRowTextColor });
+        var textTop=cellHeader.Bottom+this.FixedRowHeight*this.FixedRowCount;
+        this.Canvas.font=this.ItemFont;
+        var dataCount=this.GetAllRowCount();
+        for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
+        {
+            var symbol=this.Data.Data[i];
+            var data= { Symbol:symbol , Stock:null, Block:null };
+            if (this.GetStockDataCallback) data.Stock=this.GetStockDataCallback(symbol);
+            if (this.GetBlockDataCallback) data.Block=this.GetBlockDataCallback(symbol);
+            if (this.GetFlashBGDataCallback) data.FlashBG=this.GetFlashBGDataCallback(symbol, Date.now());
+            data.Decimal=GetfloatPrecision(symbol); //小数位数
+            var item=this.Column[clickData.Header.Index];
+            this.DrawItem(i, data, item, cellHeader.Left, textTop, 3);
+            textTop+=this.RowHeight;
+        }
+    }
     this.GetTooltipData=function(x,y)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect)) return null;
@@ -145943,7 +146033,7 @@ function ScrollBarBGChart()
-var HQCHART_VERSION="1.1.14607";
+var HQCHART_VERSION="1.1.14612";
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js CHANGED Viewed

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

package/src/jscommon/umychart.vue/umychart.vue.js CHANGED Viewed

@@ -133474,14 +133474,6 @@ function JSReportChartContainer(uielement)
     this.Canvas=uielement.getContext("2d");         //画布
-    this.Tooltip=document.createElement("div");
-    this.Tooltip.className='jsreport-tooltip';
-    this.Tooltip.style.background=g_JSChartResource.TooltipBGColor;
-    this.Tooltip.style.opacity=g_JSChartResource.TooltipAlpha;
-    this.Tooltip.style["pointer-events"]="none";
-    this.Tooltip.id=Guid();
-    uielement.parentNode.appendChild(this.Tooltip);
     this.Symbol;    //板块代码
     this.Name;      //板块名称
     this.NetworkFilter;                                 //数据回调接口
@@ -135522,7 +135514,7 @@ function JSReportChartContainer(uielement)
             if (reportChart)
             {
-                var moveRow=reportChart.OnDrawgRow(x,y,e);
+                var moveRow=reportChart.OnDragRow(x,y,e);
                 if (moveRow )
                 {
                     if (moveRow.Type==2)
@@ -135595,6 +135587,8 @@ function JSReportChartContainer(uielement)
             var yMove=e.clientY-this.DragHeader.Click.Y;
             if ( Math.abs(yMove)<=1 && Math.abs(xMove)<=1) return;
+            var reportChart=this.GetReportChart();
+            var clickData=this.DragHeader.ClickData;
             this.DragHeader.LastMove.X=e.clientX;
             this.DragHeader.LastMove.Y=e.clientY;
             if (!this.DragHeader.MovePoint)
@@ -135607,8 +135601,17 @@ function JSReportChartContainer(uielement)
                 this.DragHeader.MovePoint.Y=y;
             }
-            this.OnMoveDragHeader(x,y,e);
-            this.ShowDragHeaderTooltip(x,y,e);
+            var moveData=reportChart.OnDragHeader(x,y,e);
+            if (!moveData) return;
+            if (moveData.Type!=1) return;
+            if (moveData.Header.Index!=clickData.Header.Index)
+            {
+                this.DragHeader.MoveToData=moveData;
+            }
+            reportChart.DragHeader=this.DragHeader;
+            this.Draw();
         }
         else if (this.DragColumnWidth && this.DragColumnWidth.ClickData)    //列宽度拖拽
         {
@@ -135650,57 +135653,6 @@ function JSReportChartContainer(uielement)
         this.Draw();
     }
-    this.OnMoveDragHeader=function(x, y,e)
-    {
-        var chart=this.ChartPaint[0];
-        if (!chart) return;
-        var clickData=this.DragHeader.ClickData;
-        this.DragHeader.MoveToData=null;
-        if (!clickData.Header.IsFixed)  //固定列不能拖
-        {
-            var yHeader=this.DragHeader.ClickPoint.Y;
-            var moveData=chart.OnMouseDown(x,yHeader,e);
-            if (!moveData || !moveData.Header) return;
-            if (moveData.Header.IsFixed) return;
-            if (moveData.Header.Index== clickData.Header.Index) return;
-            this.DragHeader.MoveToData=moveData;
-            console.log(`[JSReportChartContainer::OnMoveDragHeader] Click[Index=${clickData.Header.Index}, Title=${clickData.Header.Column.Title}] => Move[Index=${moveData.Header.Index}, Title=${moveData.Header.Column.Title}]`);
-        }
-    }
-    this.ShowDragHeaderTooltip=function(x,y,e)
-    {
-        if (!this.DragHeader) return;
-        var drag=this.DragHeader;
-        if (!drag.ClickData || !drag.MovePoint) return;
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAG_HEADER_TOOLTIP);
-        if (event)
-        {
-            var sendData={ PreventDefault:false, e, X:x, Y:y, DragHeader:this.DragHeader, Tooltip:this.Tooltip };
-            event.Callback(event,sendData,this);
-            if (sendData.PreventDefault) return;
-        }
-        var title=drag.ClickData.Header.Column.Title;
-        this.Tooltip.className='jchart-chartdrawsvg-tooltip'; //ChartDrawSVG指标数据
-        this.Tooltip.style.position = "absolute";
-        this.Tooltip.style.left = e.clientX + "px";
-        this.Tooltip.style.top = e.clientY+ "px";
-        this.Tooltip.style.width = 100+"px";
-        this.Tooltip.style.height =null;
-        this.Tooltip.innerHTML=title;
-        this.Tooltip.style.display = "block";
-    }
-    this.HideTooltip=function()
-    {
-        if (this.Tooltip.style.display!="none") this.Tooltip.style.display = "none";
-    }
     this.DocOnMouseUp=function(e)
     {
         //清空事件
@@ -135737,6 +135689,12 @@ function JSReportChartContainer(uielement)
         this.DragMove=null;
         this.DragColumnWidth=null;
+        if (reportChart.DragHeader)
+        {
+            bRedraw=true;
+            reportChart.DragHeader=null;
+        }
         if (bRedraw) this.Draw();
         if (dragHeader)
@@ -137821,6 +137779,7 @@ function ChartReport()
     this.ShowSymbol=[];                 //显示的股票列表 { Index:序号(排序用), Symbol:股票代码 }
     this.DragRow;                       //拖拽行
+    this.DragHeader;                    //拖拽表头
     this.Tab;
     this.VScrollbar;
@@ -138028,6 +137987,11 @@ function ChartReport()
             Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom
         }
+        this.DragRowColor=g_JSChartResource.Report.DragRow.Color;
+        this.DragRowTextColor=g_JSChartResource.Report.DragRow.TextColor;
+        this.DragMoveRowColor=g_JSChartResource.Report.DragRow.MoveRowColor;
+        this.DragSrcRowColor=g_JSChartResource.Report.DragRow.SrcRowColor;
         //排序图标
         this.SortConfig=
         {
@@ -138447,6 +138411,7 @@ function ChartReport()
         this.ClipClient();
+        this.DrawDragHeaderBG();
         this.DrawHeader();
         this.DrawBody();
         this.Canvas.restore();
@@ -138464,6 +138429,8 @@ function ChartReport()
         this.DrawDragRow();
+        this.DrawDragHeader();
         if (this.VScrollbar)
         {
             var bottom=this.ChartBorder.GetBottom();
@@ -138474,6 +138441,60 @@ function ChartReport()
         this.SizeChange=false;
     }
+    this.DrawDragHeaderBG=function()
+    {
+        if (!this.DragHeader) return;
+        var left=this.RectClient.Left;
+        var right=this.RectClient.Right;
+        var top=this.RectClient.Top;
+        var bottom=top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
+        //竖线
+        var columnLeft=left;
+        for(var i=0;i<this.FixedColumn && i<this.Column.length; ++i)
+        {
+            var item=this.Column[i];
+            columnLeft+=item.Width;
+        }
+        for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i)
+        {
+            var item=this.Column[i];
+            if (this.DragHeader)
+            {
+                if (this.DragHeader.ClickData)
+                {
+                    var clickData=this.DragHeader.ClickData;
+                    if (clickData.Header.Index==i)
+                    {
+                        var rtBG={ Left:columnLeft,Top:top, Bottom:bottom, Right:columnLeft+item.Width };
+                        rtBG.Width=rtBG.Right-rtBG.Left;
+                        rtBG.Height=rtBG.Bottom-rtBG.Top;
+                        this.Canvas.fillStyle=this.DragSrcRowColor;
+                        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                    }
+                }
+                if (this.DragHeader.MoveToData)
+                {
+                    var moveToData=this.DragHeader.MoveToData;
+                    if (moveToData.Header.Index==i)
+                    {
+                        var rtBG={ Left:columnLeft,Top:top, Bottom:bottom, Right:columnLeft+item.Width };
+                        rtBG.Width=rtBG.Right-rtBG.Left;
+                        rtBG.Height=rtBG.Bottom-rtBG.Top;
+                        this.Canvas.fillStyle=this.DragMoveRowColor;
+                        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                    }
+                }
+            }
+            columnLeft+=item.Width;
+        }
+    }
     //更新缓存变量
     this.UpdateCacheData=function()
     {
@@ -138635,7 +138656,8 @@ function ChartReport()
             if (!item.Title || item.Title.length<=0) continue;
             var text=item.Title;
             itemWidth=this.Canvas.measureText(text).width;
-            if (item.Sort>0) itemWidth+this.SortConfig.Size*pixelRatio;
+            if (item.Sort>0) itemWidth+=this.SortConfig.Size*pixelRatio;
             itemWidth+=(4+this.HeaderMergin.Left+this.HeaderMergin.Right);
             if (item.Width<itemWidth) item.Width=itemWidth;
         }
@@ -138667,7 +138689,7 @@ function ChartReport()
         this.IsShowAllColumn=(subWidth<reportWidth);
     }
-    this.DrawHeaderItem=function(column, rtCell, index)
+    this.DrawHeaderItem=function(column, rtCell, index, option)
     {
         if (column.HeaderBGColor)     //背景色
         {
@@ -138711,12 +138733,18 @@ function ChartReport()
         //图标
         if (column.Icon) lastItem.Icon=column.Icon;
+        if (option)
+        {
+            if (option.HeaderColor) drawInfo.HeaderColor=option.HeaderColor;
+        }
         this.DrawHeaderText(column, drawInfo);
     }
     this.DrawHeaderText=function(column, drawInfo)
     {
-        if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
+        if (drawInfo.HeaderColor) this.Canvas.fillStyle=drawInfo.HeaderColor;
+        else if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
         else this.Canvas.fillStyle=this.HeaderColor;
         var pixelRatio=GetDevicePixelRatio();
@@ -141423,7 +141451,7 @@ function ChartReport()
     }
-    this.OnDrawgRow=function(x, y, e) //Type: 5=顶部  6=空白行 2=行 7=底部
+    this.OnDragRow=function(x, y, e) //Type: 5=顶部  6=空白行 2=行 7=底部
     {
         if (!this.Data) return null;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
@@ -141459,6 +141487,26 @@ function ChartReport()
         return { Type:7 };
     }
+    this.OnDragHeader=function(x,y,e)   //Type:1=行 2=左边  3=右边 4=空白 5=固定行
+    {
+        if (!this.IsShowHeader) return null;
+        var left=this.RectClient.Left;
+        var right=this.RectClient.Right;
+        var top=this.RectClient.Top;
+        var bottom=top+this.HeaderHeight;
+        if (x<left) return { Type:2 };
+        else if (x>right) return { Type:3 };
+        var cell=this.PtInItem(x,top+2,top,bottom);
+        if (!cell) return { Type:4 };
+        if (cell.IsFixed) return { Type:5 }
+        return { Type:1, Header:cell };
+    }
     this.OnClickButton=function(x, y, e, status)
     {
         if (e.button!=0) return false;
@@ -141727,6 +141775,48 @@ function ChartReport()
     }
+    this.DrawDragHeader=function()
+    {
+        if (!this.DragHeader) return;
+        var drag=this.DragHeader;
+        var clickData=drag.ClickData;
+        var rtHeader=clickData.Header.Rect;
+        var headerWidth=rtHeader.Right-rtHeader.Left;
+        var rtRow={ Left:drag.MovePoint.X-headerWidth/2, Top:this.RectClient.Top+this.HeaderHeight, Width:headerWidth };
+        rtRow.Bottom=rtRow.Top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;
+        rtRow.Right=rtRow.Left+rtRow.Width;
+        rtRow.Height=rtRow.Bottom-rtRow.Top;
+        //背景
+        this.Canvas.fillStyle=this.DragRowColor;
+        this.Canvas.fillRect(rtRow.Left, rtRow.Top, rtRow.Width, rtRow.Height);
+        //文字
+        var cellHeader={ Left:rtRow.Left, Top:rtRow.Top, Right:rtRow.Right, Width:rtRow.Width, Height:this.HeaderHeight };
+        cellHeader.Bottom=cellHeader.Top+cellHeader.Height;
+        this.DrawHeaderItem(clickData.Header.Column, cellHeader, clickData.Header.Index, { HeaderColor:this.DragRowTextColor });
+        var textTop=cellHeader.Bottom+this.FixedRowHeight*this.FixedRowCount;
+        this.Canvas.font=this.ItemFont;
+        var dataCount=this.GetAllRowCount();
+        for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
+        {
+            var symbol=this.Data.Data[i];
+            var data= { Symbol:symbol , Stock:null, Block:null };
+            if (this.GetStockDataCallback) data.Stock=this.GetStockDataCallback(symbol);
+            if (this.GetBlockDataCallback) data.Block=this.GetBlockDataCallback(symbol);
+            if (this.GetFlashBGDataCallback) data.FlashBG=this.GetFlashBGDataCallback(symbol, Date.now());
+            data.Decimal=GetfloatPrecision(symbol); //小数位数
+            var item=this.Column[clickData.Header.Index];
+            this.DrawItem(i, data, item, cellHeader.Left, textTop, 3);
+            textTop+=this.RowHeight;
+        }
+    }
     this.GetTooltipData=function(x,y)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect)) return null;
@@ -156655,7 +156745,7 @@ function HQChartScriptWorker()
-var HQCHART_VERSION="1.1.14607";
+var HQCHART_VERSION="1.1.14612";
 function PrintHQChartVersion()
 {