hqchart 1.1.12418 → 1.1.12425

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12418",
+  "version": "1.1.12425",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -36,7 +36,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     if (this.CanvasElement.style) 
     {
         this.CanvasElement.style.outline='none';
-        this.CanvasElement.style.position="absolute";
+        //this.CanvasElement.style.position="absolute"; //外部自己设置
     }
     if(divElement.hasChildNodes())
     {
@@ -253,6 +253,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.Type==="历史K线图横屏") chart=new KLineChartHScreenContainer(this.CanvasElement);
         else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);
 
+        chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
+
         var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);
         if (extraElement) chart.SetCorssCursorElement(extraElement);
 
@@ -755,6 +757,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.Type==="分钟走势图横屏") chart=new MinuteChartHScreenContainer(this.CanvasElement);
         else chart=new MinuteChartContainer(this.CanvasElement, this.OffscreenCanvasElement, this.CacheCanvasElement);
 
+        chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
+
         if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
@@ -2484,6 +2488,12 @@ var JSCHART_EVENT_ID=
     //绘图之前的事件
     ON_BEFORE_DRAW:111,                 
     ON_BEFORE_DRAW_DYNAMIC_INFO:112,
+
+    //自定义图形拖拽
+    ON_CUSTOM_DRAG_MOUSE_DOWN:113,
+    ON_CUSTOM_DRAG_DOC_MOUSE_MOVE:114,
+    ON_CUSTOM_DRAG_DOC_MOUSE_UP:115,
+    ON_CUSTOM_DRAG_MOUSE_MOVE:116,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -2802,6 +2812,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DisplayLatestOption={ Timer:null, Enable: false, DelayTime:60*1000*3, LastPoint:null };
     this.DrawDynamicInfoOption={ Timer:null, Enable:false , DelayTime:10 };
 
+    this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
@@ -2972,6 +2983,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.BorderDrag) return;
         if (this.YDrag) return;
         if (this.IndexChartDrag) return;
+        if (this.CustomChartDrag) return;
         //if (this.RectSelectDrag) return;
 
         /*
@@ -3137,6 +3149,52 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.TryMouseMove_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_MOVE);
+        if (!event || !event.Callback) return false;
+
+        return event.Callback(event, sendData, this);
+    }
+
+    this.TryClick_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
+        if (!event || !event.Callback) return false;
+
+        sendData.ChartDrag=null;
+        sendData.Cusrsor=null;
+
+        event.Callback(event, sendData, this);
+        this.CustomChartDrag=sendData.ChartDrag;
+
+        if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+    }
+
+    this.TryDragMove_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_MOVE);
+        if (!event || !event.Callback) return;
+
+        var e=sendData.e;
+        var drag=sendData.Drag;
+        if(Math.abs(drag.LastMove.Y-e.clientY)<2 &&  Math.abs(drag.LastMove.X-e.clientX)<2) return;
+
+        if (event.Callback(event, sendData, this))
+        {
+            drag.LastMove.X=e.clientX;
+            drag.LastMove.Y=e.clientY;
+        }
+    }
+
+    this.TryMouseUp_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_UP);
+        if (!event || !event.Callback) return;
+
+        event.Callback(event, sendData, this);
+    }
+
     this.UIOnMouseDown=function(e)
     {
         this.MoveOnChartDrawPicture=null;
@@ -3150,6 +3208,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpDownDrag=null;
         this.RectSelectDrag=null;
         this.IndexChartDrag=null;
+        this.CustomChartDrag=null;  
 
         var pixelTatio = GetDevicePixelRatio();
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
@@ -3240,6 +3299,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        var sendData={ X:x, Y:y, e:e };
+        if (this.TryClick_CustomChartDrag(sendData))
+        {
+
+        }
+
         if(this.DragMode==0) return;
 
         var drag=
@@ -3264,7 +3329,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
 
         }
-        else if (this.YDrag  || this.RectSelectDrag)
+        else if (this.YDrag  || this.RectSelectDrag || this.CustomChartDrag)
         {
 
         }
@@ -3490,6 +3555,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
+        else if (this.CustomChartDrag)
+        {
+            var pixelTatio = GetDevicePixelRatio();
+            var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+            var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+            var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
+            this.TryDragMove_CustomChartDrag(sendData);
+        }
         else if (this.CurrentChartDrawPicture)
         {
             var drawPicture=this.CurrentChartDrawPicture;
@@ -3719,6 +3792,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
             this.UIElement.style.cursor="default";
         }
+        else if (this.CustomChartDrag)
+        {
+            var sendData={ e:e, ChartDrag:this.CustomChartDrag, Drag:this.MouseDrag };
+            this.TryMouseUp_CustomChartDrag(sendData);
+        }
         else if (isDragSelectRect)  //区间选择拖动范围
         {
             if (this.OnDragSelectRectMouseUp) this.OnDragSelectRectMouseUp(e);
@@ -3811,6 +3889,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpDownDrag=null;
         this.RectSelectDrag=null;
         this.IndexChartDrag=null;
+        this.CustomChartDrag=null;
         if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
     }
 
@@ -5707,6 +5786,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] drag rect select ",item);
             }
         }
+
+        
+        var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
+        if (this.TryMouseMove_CustomChartDrag(sendData))
+        {
+            if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
+        }
         
         var bDrawPicture=false; //是否正在画图
         if (this.CurrentChartDrawPicture)

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

@@ -4116,7 +4116,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     if (this.CanvasElement.style) 
     {
         this.CanvasElement.style.outline='none';
-        this.CanvasElement.style.position="absolute";
+        //this.CanvasElement.style.position="absolute"; //外部自己设置
     }
     if(divElement.hasChildNodes())
     {
@@ -4333,6 +4333,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.Type==="历史K线图横屏") chart=new KLineChartHScreenContainer(this.CanvasElement);
         else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);
 
+        chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
+
         var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);
         if (extraElement) chart.SetCorssCursorElement(extraElement);
 
@@ -4835,6 +4837,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.Type==="分钟走势图横屏") chart=new MinuteChartHScreenContainer(this.CanvasElement);
         else chart=new MinuteChartContainer(this.CanvasElement, this.OffscreenCanvasElement, this.CacheCanvasElement);
 
+        chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
+
         if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
@@ -6564,6 +6568,12 @@ var JSCHART_EVENT_ID=
     //绘图之前的事件
     ON_BEFORE_DRAW:111,                 
     ON_BEFORE_DRAW_DYNAMIC_INFO:112,
+
+    //自定义图形拖拽
+    ON_CUSTOM_DRAG_MOUSE_DOWN:113,
+    ON_CUSTOM_DRAG_DOC_MOUSE_MOVE:114,
+    ON_CUSTOM_DRAG_DOC_MOUSE_UP:115,
+    ON_CUSTOM_DRAG_MOUSE_MOVE:116,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6882,6 +6892,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DisplayLatestOption={ Timer:null, Enable: false, DelayTime:60*1000*3, LastPoint:null };
     this.DrawDynamicInfoOption={ Timer:null, Enable:false , DelayTime:10 };
 
+    this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
@@ -7052,6 +7063,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.BorderDrag) return;
         if (this.YDrag) return;
         if (this.IndexChartDrag) return;
+        if (this.CustomChartDrag) return;
         //if (this.RectSelectDrag) return;
 
         /*
@@ -7217,6 +7229,52 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.TryMouseMove_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_MOVE);
+        if (!event || !event.Callback) return false;
+
+        return event.Callback(event, sendData, this);
+    }
+
+    this.TryClick_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
+        if (!event || !event.Callback) return false;
+
+        sendData.ChartDrag=null;
+        sendData.Cusrsor=null;
+
+        event.Callback(event, sendData, this);
+        this.CustomChartDrag=sendData.ChartDrag;
+
+        if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+    }
+
+    this.TryDragMove_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_MOVE);
+        if (!event || !event.Callback) return;
+
+        var e=sendData.e;
+        var drag=sendData.Drag;
+        if(Math.abs(drag.LastMove.Y-e.clientY)<2 &&  Math.abs(drag.LastMove.X-e.clientX)<2) return;
+
+        if (event.Callback(event, sendData, this))
+        {
+            drag.LastMove.X=e.clientX;
+            drag.LastMove.Y=e.clientY;
+        }
+    }
+
+    this.TryMouseUp_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_UP);
+        if (!event || !event.Callback) return;
+
+        event.Callback(event, sendData, this);
+    }
+
     this.UIOnMouseDown=function(e)
     {
         this.MoveOnChartDrawPicture=null;
@@ -7230,6 +7288,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpDownDrag=null;
         this.RectSelectDrag=null;
         this.IndexChartDrag=null;
+        this.CustomChartDrag=null;  
 
         var pixelTatio = GetDevicePixelRatio();
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
@@ -7320,6 +7379,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        var sendData={ X:x, Y:y, e:e };
+        if (this.TryClick_CustomChartDrag(sendData))
+        {
+
+        }
+
         if(this.DragMode==0) return;
 
         var drag=
@@ -7344,7 +7409,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
 
         }
-        else if (this.YDrag  || this.RectSelectDrag)
+        else if (this.YDrag  || this.RectSelectDrag || this.CustomChartDrag)
         {
 
         }
@@ -7570,6 +7635,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
+        else if (this.CustomChartDrag)
+        {
+            var pixelTatio = GetDevicePixelRatio();
+            var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+            var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+            var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
+            this.TryDragMove_CustomChartDrag(sendData);
+        }
         else if (this.CurrentChartDrawPicture)
         {
             var drawPicture=this.CurrentChartDrawPicture;
@@ -7799,6 +7872,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
             this.UIElement.style.cursor="default";
         }
+        else if (this.CustomChartDrag)
+        {
+            var sendData={ e:e, ChartDrag:this.CustomChartDrag, Drag:this.MouseDrag };
+            this.TryMouseUp_CustomChartDrag(sendData);
+        }
         else if (isDragSelectRect)  //区间选择拖动范围
         {
             if (this.OnDragSelectRectMouseUp) this.OnDragSelectRectMouseUp(e);
@@ -7891,6 +7969,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpDownDrag=null;
         this.RectSelectDrag=null;
         this.IndexChartDrag=null;
+        this.CustomChartDrag=null;
         if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
     }
 
@@ -9787,6 +9866,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] drag rect select ",item);
             }
         }
+
+        
+        var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
+        if (this.TryMouseMove_CustomChartDrag(sendData))
+        {
+            if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
+        }
         
         var bDrawPicture=false; //是否正在画图
         if (this.CurrentChartDrawPicture)
@@ -127519,7 +127605,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12417";
+var HQCHART_VERSION="1.1.12424";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -4160,7 +4160,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     if (this.CanvasElement.style) 
     {
         this.CanvasElement.style.outline='none';
-        this.CanvasElement.style.position="absolute";
+        //this.CanvasElement.style.position="absolute"; //外部自己设置
     }
     if(divElement.hasChildNodes())
     {
@@ -4377,6 +4377,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.Type==="历史K线图横屏") chart=new KLineChartHScreenContainer(this.CanvasElement);
         else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);
 
+        chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
+
         var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);
         if (extraElement) chart.SetCorssCursorElement(extraElement);
 
@@ -4879,6 +4881,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.Type==="分钟走势图横屏") chart=new MinuteChartHScreenContainer(this.CanvasElement);
         else chart=new MinuteChartContainer(this.CanvasElement, this.OffscreenCanvasElement, this.CacheCanvasElement);
 
+        chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
+
         if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
@@ -6608,6 +6612,12 @@ var JSCHART_EVENT_ID=
     //绘图之前的事件
     ON_BEFORE_DRAW:111,                 
     ON_BEFORE_DRAW_DYNAMIC_INFO:112,
+
+    //自定义图形拖拽
+    ON_CUSTOM_DRAG_MOUSE_DOWN:113,
+    ON_CUSTOM_DRAG_DOC_MOUSE_MOVE:114,
+    ON_CUSTOM_DRAG_DOC_MOUSE_UP:115,
+    ON_CUSTOM_DRAG_MOUSE_MOVE:116,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6926,6 +6936,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DisplayLatestOption={ Timer:null, Enable: false, DelayTime:60*1000*3, LastPoint:null };
     this.DrawDynamicInfoOption={ Timer:null, Enable:false , DelayTime:10 };
 
+    this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
@@ -7096,6 +7107,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.BorderDrag) return;
         if (this.YDrag) return;
         if (this.IndexChartDrag) return;
+        if (this.CustomChartDrag) return;
         //if (this.RectSelectDrag) return;
 
         /*
@@ -7261,6 +7273,52 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.TryMouseMove_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_MOVE);
+        if (!event || !event.Callback) return false;
+
+        return event.Callback(event, sendData, this);
+    }
+
+    this.TryClick_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
+        if (!event || !event.Callback) return false;
+
+        sendData.ChartDrag=null;
+        sendData.Cusrsor=null;
+
+        event.Callback(event, sendData, this);
+        this.CustomChartDrag=sendData.ChartDrag;
+
+        if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+    }
+
+    this.TryDragMove_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_MOVE);
+        if (!event || !event.Callback) return;
+
+        var e=sendData.e;
+        var drag=sendData.Drag;
+        if(Math.abs(drag.LastMove.Y-e.clientY)<2 &&  Math.abs(drag.LastMove.X-e.clientX)<2) return;
+
+        if (event.Callback(event, sendData, this))
+        {
+            drag.LastMove.X=e.clientX;
+            drag.LastMove.Y=e.clientY;
+        }
+    }
+
+    this.TryMouseUp_CustomChartDrag=function(sendData)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_UP);
+        if (!event || !event.Callback) return;
+
+        event.Callback(event, sendData, this);
+    }
+
     this.UIOnMouseDown=function(e)
     {
         this.MoveOnChartDrawPicture=null;
@@ -7274,6 +7332,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpDownDrag=null;
         this.RectSelectDrag=null;
         this.IndexChartDrag=null;
+        this.CustomChartDrag=null;  
 
         var pixelTatio = GetDevicePixelRatio();
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
@@ -7364,6 +7423,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        var sendData={ X:x, Y:y, e:e };
+        if (this.TryClick_CustomChartDrag(sendData))
+        {
+
+        }
+
         if(this.DragMode==0) return;
 
         var drag=
@@ -7388,7 +7453,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
 
         }
-        else if (this.YDrag  || this.RectSelectDrag)
+        else if (this.YDrag  || this.RectSelectDrag || this.CustomChartDrag)
         {
 
         }
@@ -7614,6 +7679,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
         }
+        else if (this.CustomChartDrag)
+        {
+            var pixelTatio = GetDevicePixelRatio();
+            var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+            var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+            var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
+            this.TryDragMove_CustomChartDrag(sendData);
+        }
         else if (this.CurrentChartDrawPicture)
         {
             var drawPicture=this.CurrentChartDrawPicture;
@@ -7843,6 +7916,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
             this.UIElement.style.cursor="default";
         }
+        else if (this.CustomChartDrag)
+        {
+            var sendData={ e:e, ChartDrag:this.CustomChartDrag, Drag:this.MouseDrag };
+            this.TryMouseUp_CustomChartDrag(sendData);
+        }
         else if (isDragSelectRect)  //区间选择拖动范围
         {
             if (this.OnDragSelectRectMouseUp) this.OnDragSelectRectMouseUp(e);
@@ -7935,6 +8013,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpDownDrag=null;
         this.RectSelectDrag=null;
         this.IndexChartDrag=null;
+        this.CustomChartDrag=null;
         if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
     }
 
@@ -9831,6 +9910,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] drag rect select ",item);
             }
         }
+
+        
+        var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
+        if (this.TryMouseMove_CustomChartDrag(sendData))
+        {
+            if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
+        }
         
         var bDrawPicture=false; //是否正在画图
         if (this.CurrentChartDrawPicture)
@@ -127563,7 +127649,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12417";
+var HQCHART_VERSION="1.1.12424";
 
 function PrintHQChartVersion()
 {