hqchart 1.1.15198 → 1.1.15215

package/src/jscommon/umychart.DialogDrawTool.js

@@ -687,17 +687,17 @@ function JSDialogModifyDraw()
 
     this.AryButton=
     [
-        { Title:"修改图形颜色", ClassName: 'hqchart_drawtool icon-huabi', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
-        { Title:"修改字体颜色", ClassName: 'hqchart_drawtool icon-zitiyanse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID }},
-        { Title:"修改背景颜色", ClassName: 'hqchart_drawtool icon-zitibeijingse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID }},
-        { Title:"修改边框颜色", ClassName: 'hqchart_drawtool icon-biankuang', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BORDER_COLOR_ID }},
-        { Title:"字体放大", ClassName: 'hqchart_drawtool icon-zoomin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID }},
-        { Title:"字体缩小", ClassName: 'hqchart_drawtool icon-zoomout', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ZOOM_OUT_FONT_ID }},
-        { Title:"随机生成文字内容", ClassName: 'hqchart_drawtool icon-bianji', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_MODIFY_TEXT_ID }},
-        { Title:"高级设置", ClassName: 'hqchart_drawtool icon-setting', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ADVANCED_SETTING_ID }},
+        { Title:"修改图形颜色", ClassName: 'hqchart_drawtool icon-Vector UMyChart_Draw_Modify_Dialog_Button_Color_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
+        { Title:"修改字体颜色", ClassName: 'hqchart_drawtool icon-zitiyanse1 UMyChart_Draw_Modify_Dialog_Button_Color_Span ', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID }},
+        { Title:"修改背景颜色", ClassName: 'hqchart_drawtool icon-zitibeijingse UMyChart_Draw_Modify_Dialog_Button_Color_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID }},
+        { Title:"修改边框颜色", ClassName: 'hqchart_drawtool icon-biankuang UMyChart_Draw_Modify_Dialog_Button_Color_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BORDER_COLOR_ID }},
+        { Title:"字体放大", ClassName: 'hqchart_drawtool icon-zoomin UMyChart_Draw_Modify_Dialog_Button_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID }},
+        { Title:"字体缩小", ClassName: 'hqchart_drawtool icon-zoomout UMyChart_Draw_Modify_Dialog_Button_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ZOOM_OUT_FONT_ID }},
+        { Title:"随机生成文字内容", ClassName: 'hqchart_drawtool icon-bianji UMyChart_Draw_Modify_Dialog_Button_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_MODIFY_TEXT_ID }},
+        { Title:"高级设置", ClassName: 'hqchart_drawtool icon-setting UMyChart_Draw_Modify_Dialog_Button_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ADVANCED_SETTING_ID }},
 
         { Title:"上锁", ClassName: 'hqchart_drawtool icon-lock', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID }},
-        { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }},
+        { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin UMyChart_Draw_Modify_Dialog_Button_Span', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }},
     ];
 
     this.RestoreFocusDelay=800;
@@ -753,10 +753,9 @@ function JSDialogModifyDraw()
         spanTooltip.innerText=item.Title;
         divItem.appendChild(spanTooltip);
 
-
         var spanDom=document.createElement("span");
         spanDom.className=item.ClassName;
-        spanDom.classList.add("UMyChart_Draw_Modify_Dialog_Button_Span");
+        //spanDom.classList.add("UMyChart_Draw_Modify_Dialog_Button_Span");
         divItem.appendChild(spanDom);
        
 
@@ -770,23 +769,31 @@ function JSDialogModifyDraw()
         {
             case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID:
                 this.ColorButton=data;
+                var divColorBar=this.CreateColorBar(data);
+                divItem.appendChild(divColorBar);
                 var inputColor=this.CreateInputColor(data);
                 divItem.appendChild(inputColor);
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID:
                 this.BGColorButton=data;
+                var divColorBar=this.CreateColorBar(data);
+                divItem.appendChild(divColorBar);
                 var inputColor=this.CreateInputColor(data);
                 divItem.appendChild(inputColor);
                 divItem.style.display="none";
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID:
                 this.FontColorButton=data;
+                var divColorBar=this.CreateColorBar(data);
+                divItem.appendChild(divColorBar);
                 var inputColor=this.CreateInputColor(data);
                 divItem.appendChild(inputColor);
                 divItem.style.display="none";
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BORDER_COLOR_ID:
                 this.BorderColorButton=data;
+                var divColorBar=this.CreateColorBar(data);
+                divItem.appendChild(divColorBar);
                 var inputColor=this.CreateInputColor(data);
                 divItem.appendChild(inputColor);
                 divItem.style.display="none";
@@ -826,6 +833,16 @@ function JSDialogModifyDraw()
         return inputColor;
     }
 
+    //颜色块
+    this.CreateColorBar=function(data)
+    {
+        var divColor=document.createElement("div");
+        divColor.className="UMyChart_Draw_Modify_Dialog_Button_ColorBar_Div";
+        data.DivColorBar=divColor;
+
+        return divColor;
+    }
+
     this.OnClickButton=function(e, data)
     {
         console.log('[JSDialogModifyDraw::OnClickButton] ', data);
@@ -934,7 +951,7 @@ function JSDialogModifyDraw()
         if (data.Item.Data.ID==JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID)
         {
             this.ChartPicture.LineColor=color;
-            if (this.ColorButton) this.ColorButton.Span.style['color']=color;
+            if (this.ColorButton) this.ColorButton.DivColorBar.style['background-color']=color;
             if (this.HQChart.ChartDrawStorage) this.HQChart.ChartDrawStorage.SaveDrawData(this.ChartPicture);   //保存下
 
             this.HQChart.Draw();
@@ -944,7 +961,7 @@ function JSDialogModifyDraw()
             if (this.ChartPicture.ClassName=="ChartDrawNote") this.ChartPicture.NoteBorderColor=color;
             else this.ChartPicture.BorderColor=color;
         
-            if (this.BorderColorButton) this.BorderColorButton.Span.style['color']=color;
+            if (this.BorderColorButton) this.BorderColorButton.DivColorBar.style['background-color']=color;
             if (this.HQChart.ChartDrawStorage) this.HQChart.ChartDrawStorage.SaveDrawData(this.ChartPicture);   //保存下
 
             this.HQChart.Draw();
@@ -954,7 +971,7 @@ function JSDialogModifyDraw()
             if (this.ChartPicture.ClassName=="ChartDrawNote") this.ChartPicture.NoteTextColor=color;
             else this.ChartPicture.TextColor=color;
 
-            if (this.FontColorButton) this.FontColorButton.Span.style['color']=color;
+            if (this.FontColorButton) this.FontColorButton.DivColorBar.style['background-color']=color;
             if (this.HQChart.ChartDrawStorage) this.HQChart.ChartDrawStorage.SaveDrawData(this.ChartPicture);   //保存下
 
             this.HQChart.Draw();
@@ -965,7 +982,7 @@ function JSDialogModifyDraw()
             if (this.ChartPicture.ClassName=="ChartDrawNote") this.ChartPicture.NoteBGColor=color;
             else this.ChartPicture.BGColor=color;
 
-            if (this.BGColorButton) this.BGColorButton.Span.style['color']=color;
+            if (this.BGColorButton) this.BGColorButton.DivColorBar.style['background-color']=color;
             if (this.HQChart.ChartDrawStorage) this.HQChart.ChartDrawStorage.SaveDrawData(this.ChartPicture);   //保存下
 
             this.HQChart.Draw();
@@ -1167,7 +1184,7 @@ function JSDialogModifyDraw()
             this.ShowButton(item.Div, bShowLineColor?"inline":"none");
             if (bShowLineColor)
             {
-                item.Span.style['color']=chart.LineColor;
+                item.DivColorBar.style['background-color']=chart.LineColor;
             }
         }
 
@@ -1177,7 +1194,7 @@ function JSDialogModifyDraw()
             this.ShowButton(item.Div, bShowBGColor?"inline":"none");
             if (bShowBGColor)
             {
-                item.Span.style['color']=bgColor;
+                item.DivColorBar.style['background-color']=bgColor;
             }
         }
 
@@ -1187,7 +1204,7 @@ function JSDialogModifyDraw()
             this.ShowButton(item.Div, bShowFontColor?"inline":"none");
             if (bShowFontColor)
             {
-                item.Span.style['color']=fontColor;
+                item.DivColorBar.style['background-color']=fontColor;
             }
         }
 
@@ -1197,7 +1214,7 @@ function JSDialogModifyDraw()
             this.ShowButton(item.Div, bShowBorderColor?"inline":"none");
             if (bShowBorderColor)
             {
-                item.Span.style['color']=borderColor;
+                item.DivColorBar.style['background-color']=borderColor;
             }
         }
 

package/src/jscommon/umychart.DialogSearchIndex.js

@@ -104,9 +104,10 @@ function JSDialogSearchIndex()
 
         var right=left+this.DivDialog.offsetWidth;
         var bottom=top+ this.DivDialog.offsetHeight;
-        
+        var scrollPos=GetScrollPosition();
+
         if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
-        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+        if ((bottom+5)>=window.innerHeight+scrollPos.Top) top=(window.innerHeight-this.DivDialog.offsetHeight-5)+scrollPos.Top;
 
         this.DivDialog.style.left = left + 'px';
         this.DivDialog.style.top = top + 'px';
@@ -137,8 +138,9 @@ function JSDialogSearchIndex()
         if (!IFrameSplitOperator.IsNumber(x) || !IFrameSplitOperator.IsNumber(y))   //默认居中显示
         {
             var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+            var scrollPos=GetScrollPosition();
             x=rtClient.left+(rtClient.right-rtClient.left-this.DivDialog.offsetWidth)/2;
-            y=rtClient.top+(rtClient.bottom-rtClient.top-this.DivDialog.offsetHeight)/2;
+            y=rtClient.top+(rtClient.bottom-rtClient.top-this.DivDialog.offsetHeight)/2+scrollPos.Top;
         }
 
         this.InputDom.value="";
@@ -898,8 +900,9 @@ function JSDialogModifyIndexParam()
         if (!IFrameSplitOperator.IsNumber(x) || !IFrameSplitOperator.IsNumber(y))   //默认居中显示
         {
             var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+            var scrollPos=GetScrollPosition();
             x=rtClient.left+(rtClient.right-rtClient.left-this.DivDialog.offsetWidth)/2;
-            y=rtClient.top+(rtClient.bottom-rtClient.top-this.DivDialog.offsetHeight)/2;
+            y=rtClient.top+(rtClient.bottom-rtClient.top-this.DivDialog.offsetHeight)/2+scrollPos.Top;
         }
 
         this.DivDialog.style.visibility='visible';
@@ -966,9 +969,10 @@ function JSDialogModifyIndexParam()
 
         var right=left+this.DivDialog.offsetWidth;
         var bottom=top+ this.DivDialog.offsetHeight;
-        
+        var scrollPos=GetScrollPosition();
+
         if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
-        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+        if ((bottom+5)>=window.innerHeight+scrollPos.Top) top=(window.innerHeight-this.DivDialog.offsetHeight-5)+scrollPos.Top;
 
         this.DivDialog.style.left = left + 'px';
         this.DivDialog.style.top = top + 'px';

package/src/jscommon/umychart.DialogTooltip.js

@@ -518,6 +518,7 @@ function JSDialogTooltip()
     {
         if (!this.DragTitle) return;
 
+        var scrollPos=GetScrollPosition();
         var left = e.clientX - this.DragTitle.YOffset;
         var top = e.clientY - this.DragTitle.XOffset;
 
@@ -525,7 +526,7 @@ function JSDialogTooltip()
         var bottom=top+ this.DivDialog.offsetHeight;
         
         if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
-        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+        if ((bottom+5)>=(window.innerHeight+scrollPos.Top)) top=(window.innerHeight-this.DivDialog.offsetHeight-5)+scrollPos.Top;
 
         this.DivDialog.style.left = left + 'px';
         this.DivDialog.style.top = top + 'px';
@@ -547,8 +548,8 @@ function JSDialogTooltip()
         if (!this.DivDialog) return;
         if (!this.HQChart) return;
 
-       
-        var top=this.HQChart.Frame.ChartBorder.GetTop();
+        var scrollPos=GetScrollPosition();
+        var top=this.HQChart.Frame.ChartBorder.GetTop()+scrollPos.Top;
         var left=this.HQChart.Frame.ChartBorder.GetLeft();
         var rtClient=this.HQChart.UIElement.getBoundingClientRect();
 
@@ -1180,17 +1181,19 @@ function JSFloatTooltip()
         if (!this.HQChart) return;
 
         var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+        var scrollPos=GetScrollPosition();
         var yMove=0;
         if (option && IFrameSplitOperator.IsNumber(option.YMove)) yMove=option.YMove;
 
-        var left=x+rtClient.left,top=y+rtClient.top+yMove;
+        var left=x+rtClient.left,top=y+rtClient.top+yMove+scrollPos.Top;
         var right=left+this.DivDialog.offsetWidth;
         var bottom=top+this.DivDialog.offsetHeight;
         
         if ((right+5)>=window.innerWidth) left=left-this.DivDialog.offsetWidth;
-        if ((bottom+5)>=window.innerHeight) 
+        if ((bottom+5)>=window.innerHeight+scrollPos.Top) 
         {
             top=(y+rtClient.top)-this.DivDialog.offsetHeight;
+            top+=scrollPos.Top;
         }
        
         this.DivDialog.style.top = top + "px";
@@ -2414,6 +2417,7 @@ function JSSmallFloatTooltip()
         if (!this.DivDialog) return;
         if (!this.HQChart) return;
 
+        var scrollPos=GetScrollPosition();
         var rtClient=this.HQChart.UIElement.getBoundingClientRect();
         var yMove=0;
         if (option && IFrameSplitOperator.IsNumber(option.YMove)) yMove=option.YMove;

package/src/jscommon/umychart.PopMinuteChart.js

@@ -218,15 +218,15 @@ function JSPopMinuteChart()
             if (this.Minute.JSChart) this.Minute.JSChart.OnSize();
         }
 
-        
+        var scrollPos=GetScrollPosition();
 
         //超出窗口调整位置
         var height=this.DivDialog.offsetHeight;
         var width=this.DivDialog.offsetWidth;
         var xRight=window.innerWidth-5;
-        var ybottom=window.innerHeight-5;
+        var ybottom=window.innerHeight-5+scrollPos.Top;
         if (x+width>xRight) x=xRight-width;
-        if (y+height>ybottom) y=ybottom-height;
+        if (y+height>ybottom) y=(ybottom-height);
 
         this.DivDialog.style.visibility='visible';
         this.DivDialog.style.top = y + "px";
@@ -265,6 +265,7 @@ function JSPopMinuteChart()
     {
         if (!this.DragTitle) return;
 
+        var scrollPos=GetScrollPosition();
         var left = e.clientX - this.DragTitle.YOffset;
         var top = e.clientY - this.DragTitle.XOffset;
 
@@ -272,7 +273,7 @@ function JSPopMinuteChart()
         var bottom=top+ this.DivDialog.offsetHeight;
         
         if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
-        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+        if ((bottom+5)>=window.innerHeight+scrollPos.Top) top=(window.innerHeight-this.DivDialog.offsetHeight-5)+scrollPos.Top;
 
         this.DivDialog.style.left = left + 'px';
         this.DivDialog.style.top = top + 'px';

package/src/jscommon/umychart.js

@@ -476,6 +476,17 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsBool(item.Enable)) chart.FastSlideConfig.Enable=item.Enable;
         }
 
+        if (option.DataMove)
+        {
+            var item=option.DataMove;
+
+            var subItem=item.Touch;
+            if (subItem && IFrameSplitOperator.IsBool(subItem.EnableLR)) chart.DataMoveConfig.Touch.EnableLR=subItem.EnableLR;
+
+            var subItem=item.Mouse;
+            if (subItem && IFrameSplitOperator.IsBool(subItem.EnableLR)) chart.DataMoveConfig.Mouse.EnableLR=subItem.EnableLR;
+        }
+
         if (chart.ClassName=="KLineChartContainer")
         {
             if (!option.DragSelectRect)
@@ -3430,8 +3441,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         //SecondKeyID 1=shiftKey 2=ctrlKey 3=altKey
     this.AryHotKey=[];  //热键 { KeyID:87, SecondKeyID:1, CMD:JSCHART_MENU_ID.CMD_FULLSCREEN_SUMMARY_ID, Args:null, Description:"Alt+W	全屏区间统计" },
 
-    this.FastSlideConfig={ MinDistance:500, MinSpeed:3, MaxTime:250, Enable:false };       //快速滑动配置 MinDistance=最小的距离 MinSpeed=最小速度 MaxTime=最大间隔时间(ms)
-    this.KeyboardMove={ Timer:null, Delay:100 , PressTime:500, Enable:false, Event:null };   //键盘左右移动 PressTime=长按时间
+    this.FastSlideConfig={ MinDistance:500, MinSpeed:3, MaxTime:250, Enable:false };            //快速滑动配置 MinDistance=最小的距离 MinSpeed=最小速度 MaxTime=最大间隔时间(ms)
+    this.KeyboardMove={ Timer:null, Delay:100 , PressTime:500, Enable:false, Event:null };      //键盘左右移动 PressTime=长按时间
+    this.DataMoveConfig={ Touch:{ EnableLR: true}, Mouse:{ EnableLR:true } };                   //数据移动配置
 
     this.MapEventListenerCache=new Map();   //addEventListener 监听事件 key=type:"keydown|keyup ....", value:{ Callback:, Option: }
 
@@ -4932,7 +4944,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (this.DragMode==1 || isDragSelectRect || isDragSubSelectRect)  //数据上下左右拖拽 区间选择框左右拖动
         {
-            this.OnDragMode_One({X:moveSetp, Y:moveSetpY}, e);
+            if (this.DataMoveConfig.Mouse.EnableLR)
+                this.OnDragMode_One({X:moveSetp, Y:moveSetpY}, e);
         }
     }
 
@@ -6111,18 +6124,21 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     var oneStepWidth=this.GetMoveOneStepWidth();
                     if (moveSetp<oneStepWidth) return;
 
-                    if(this.DataMove(moveSetp,isLeft))
+                    if (this.DataMoveConfig.Touch.EnableLR)
                     {
-                        this.UpdataDataoffset();
-                        this.UpdatePointByCursorIndex();
-                        this.UpdateFrameMaxMin();
-                        this.ResetFrameXYSplit();
-                        this.Draw();
-                        this.OnKLinePageChange("OnTouchMove");
-                    }
-                    else
-                    {
-                        if (this.DragDownloadData) this.DragDownloadData();
+                        if(this.DataMove(moveSetp,isLeft))
+                        {
+                            this.UpdataDataoffset();
+                            this.UpdatePointByCursorIndex();
+                            this.UpdateFrameMaxMin();
+                            this.ResetFrameXYSplit();
+                            this.Draw();
+                            this.OnKLinePageChange("OnTouchMove");
+                        }
+                        else
+                        {
+                            if (this.DragDownloadData) this.DragDownloadData();
+                        }
                     }
 
                     drag.LastMove.X=touches[0].clientX;
@@ -10498,6 +10514,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(frameItem.IsShowIndexTitle)) frame.IsShowIndexTitle=frameItem.IsShowIndexTitle;
             if (frameItem.ClientBGColor) frame.ClientBGColor=frameItem.ClientBGColor;
 
+            if (frameItem.Toolbar)
+            {
+                var subItem=frameItem.Toolbar.Margin;
+                if (subItem && IFrameSplitOperator.IsNumber(subItem.Right)) frame.ToolbarConfig.Margin.Right=subItem.Right;
+            }
+
             //分时图属性
             if (IFrameSplitOperator.IsBool(frameItem.CloseBeforeButton)) frameItem.IsShowCloseButton=frameItem.CloseBeforeButton;
             if (frame.YSplitOperator.RightTextConfig)   //主图右侧坐标设置
@@ -13824,6 +13846,8 @@ function AverageWidthFrame()
     this.ExportDataButton=CloneData(g_JSChartResource.Buttons.ExportData);
     this.AddIndexWindowButton=CloneData(g_JSChartResource.Buttons.AddIndexWindow);
     this.IndexHelpButton=CloneData(g_JSChartResource.Buttons.IndexHelp);
+    
+    this.ToolbarConfig={ Margin:{ Right:3 } },
 
     this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);
 
@@ -13893,7 +13917,7 @@ function AverageWidthFrame()
         var border=this.GetBorder();
         if (this.IsHScreen)
         {
-            var y=border.Bottom-3;
+            var y=border.Bottom-this.ToolbarConfig.Margin.Right;
             var x=border.RightTitle+this.ChartBorder.TitleHeight/2;
 
             this.ToolbarCacheSize={ RToolbar:{ Right:y, Left:y }};  //相当于额 Top, Bottom
@@ -13932,7 +13956,7 @@ function AverageWidthFrame()
         }
         else
         {
-            var right=border.RightEx-3;
+            var right=border.RightEx-this.ToolbarConfig.Margin.Right;
             var left=border.Left;
             var yButton=border.Top+this.ChartBorder.TitleHeight/2;
 
@@ -66148,7 +66172,6 @@ IChartDrawPicture.ColorToRGBA=function(color,opacity)
     var reg = /^(rgb|RGB)/;
     if (reg.test(color)) 
     {
-        var strHex = "#";
         var aryColor = color.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");    // 把RGB的3个数值变成数组
         var r = parseInt(aryColor[0]);
         var g = parseInt(aryColor[1]);
@@ -105623,6 +105646,7 @@ function JSDivFrameToolbar()
         var pixelTatio = GetDevicePixelRatio();
         var frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;
         var border=frame.GetBorder();
+        var rtClient=this.HQChart.UIElement.getBoundingClientRect();
 
         var top=border.Top/pixelTatio;
         var right=border.RightEx/pixelTatio;
@@ -105655,10 +105679,13 @@ function JSDivFrameToolbar()
         if (!this.HQChart.JSToolbarTooltip) return;
         if (!item.Div) return;
 
+        
         var rtButton=item.Div.getBoundingClientRect();
         var rtHQChart=this.DivHQChart.getBoundingClientRect();
+        var left=rtButton.left;
+        var top=rtButton.bottom+2;
         var left=rtButton.left-rtHQChart.left;
-        var top=rtButton.bottom-rtHQChart.top+2;
+        var top=this.DivToolbar.offsetHeight+this.DivToolbar.offsetTop;
         this.HQChart.JSToolbarTooltip.Show(top, left, { Text:item.Tooltip.Text });
     }
 }

package/src/jscommon/umychart.popMenu.js

@@ -262,10 +262,11 @@ function JSPopMenu()
         if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
 
         //菜单在当前屏幕无法显示需要调整
+        var scrollPos=GetScrollPosition();
         var menuHeight=this.RootDOM.offsetHeight;
         var yMenuBottom=y+menuHeight;
-        var yBottom=window.innerHeight-15;
-        if (yMenuBottom>yBottom) y=yBottom-menuHeight;
+        var yBottom=window.innerHeight-15+scrollPos.Top;
+        if (yMenuBottom>yBottom) y=(yBottom-menuHeight)
 
         var menuWidth=this.RootDOM.offsetWidth;
         var yMenuRight=x+menuWidth;
@@ -342,10 +343,11 @@ function JSPopMenu()
             else
             {
                 var rtParent=trDom.getBoundingClientRect();
-                var x=rtParent.right, y=rtParent.top;
+                var scrollPos=GetScrollPosition();
+                var x=rtParent.right, y=rtParent.top+scrollPos.Top;
 
                 //菜单在当前屏幕无法显示需要调整
-                var yBottom=window.innerHeight-15;
+                var yBottom=window.innerHeight-15+scrollPos.Top;
                 var yRight=window.innerWidth-15;
                 var menuHeight=subMenu.offsetHeight;
                 var menuWidth=subMenu.offsetWidth;

package/src/jscommon/umychart.resource/css/tools.css

@@ -1129,6 +1129,7 @@ input[type="color"] {
     width:22px;
     user-select: none;
     border: 1px solid; 
+    padding: 1px;
     background-color:var(--HQChart-DialogModifyDraw-DragBGColor);
     border-color: var(--HQChart-DialogModifyDraw-DragBGColor);
 }
@@ -1153,12 +1154,28 @@ input[type="color"] {
     color:var(--HQChart-DialogModifyDraw-ButtonColor);
 }
 
+.UMyChart_Draw_Modify_Dialog_Button_ColorBar_Div
+{
+    margin-top: 2px;
+    height: 3px;
+    width: 22px;
+}
+
+.UMyChart_Draw_Modify_Dialog_Button_Color_Span
+{
+    font-size:17px;
+    margin-left: 2px;
+    color:var(--HQChart-DialogModifyDraw-ButtonColor);
+}
+
+
 .UMyChart_Draw_Modify_Dialog_Unlock_Button_Span
 {
     font-size:22px;
     color:var(--HQChart-DialogModifyDraw-UnlockButtonColor);
 }
 
+
 .UMyChart_Draw_Modify_Tooltip
 {
     position: absolute;
@@ -1166,14 +1183,14 @@ input[type="color"] {
     top: 30px;
     z-index: 2;
     width: 80px;
-    color: rgb(0,0,0);
+    color: var(--HQChart-DialogModifyDraw-Tooltip-Color);
     font-size: 12px;
     text-align: center;
-    background-color:rgb(250,250,250);
+    background-color:var(--HQChart-DialogModifyDraw-Tooltip-BGColor);
     border-radius: 2px;
     padding: 5px 5px 5px 5px;
     pointer-events: none;
-    border-color: rgb(169,169,169);
+    border-color: var(--HQChart-DialogModifyDraw-Tooltip-BorderColor);
     border-style:solid;
     border-width:1px;
     user-select: none;
@@ -1183,7 +1200,7 @@ input[type="color"] {
 {
     visibility:hidden;
     width:22px;
-    height:22px;
+    height:4px;
     position:absolute;
 }
 
@@ -1206,7 +1223,8 @@ input[type="color"] {
 
 .jschart_pop_minute_chart
 {
-    height:480px
+    height:480px;
+    position: relative;
 }
 
 .jschart_pop_minute_chart_Title_Div
@@ -2124,6 +2142,10 @@ input[type="color"] {
     --HQChart-DialogModifyDraw-ButtonBorderColor:rgb(20,20,20);
     --HQChart-DialogModifyDraw-UnlockButtonColor:rgb(220,220,220);
 
+    --HQChart-DialogModifyDraw-Tooltip-BGColor: rgb(250,250,250);
+    --HQChart-DialogModifyDraw-Tooltip-BorderColor: rgb(20,20,20);
+    --HQChart-DialogModifyDraw-Tooltip-Color: rgb(20,20,20);
+
     /*
         JSDialogSearchIndex
     */
@@ -2200,6 +2222,9 @@ input[type="color"] {
     --HQChart-DialogModifyDraw-ButtonBorderColor:rgb(20,20,20);
     --HQChart-DialogModifyDraw-UnlockButtonColor:rgb(220,220,220);
 
+    --HQChart-DialogModifyDraw-Tooltip-BGColor: rgb(250,250,250);
+    --HQChart-DialogModifyDraw-Tooltip-BorderColor: rgb(20,20,20);
+    --HQChart-DialogModifyDraw-Tooltip-Color: rgb(20,20,20);
 
     /*
         JSDialogSearchIndex
@@ -2272,6 +2297,9 @@ input[type="color"] {
     --HQChart-DialogModifyDraw-ButtonBorderColor:rgb(170,170,170);
     --HQChart-DialogModifyDraw-UnlockButtonColor:rgb(60,60,60);
 
+    --HQChart-DialogModifyDraw-Tooltip-BGColor: rgb(38,38,38);
+    --HQChart-DialogModifyDraw-Tooltip-BorderColor: rgb(170,170,170);
+    --HQChart-DialogModifyDraw-Tooltip-Color: rgb(210,210,210);
 
      /*
         JSDialogSearchIndex