hqchart 1.1.12418 → 1.1.12420

package/lib/umychart.vue.js

@@ -1309,7 +1309,8 @@ Complier:{Log:console.log,Warn:console.warn//编译器日志
 }};}function JSChart(divElement,bOffscreen,bCacheCanvas){this.DivElement=divElement;this.DivToolElement=null;//工具条
 this.JSChartContainer;//画图控件
 //h5 canvas
-this.CanvasElement=document.createElement("canvas");this.CanvasElement.className='jschart-drawing';this.CanvasElement.id=Guid();this.CanvasElement.setAttribute("tabindex",0);if(this.CanvasElement.style){this.CanvasElement.style.outline='none';this.CanvasElement.style.position="absolute";}if(divElement.hasChildNodes()){JSConsole.Chart.Log("[JSChart::JSChart] divElement hasChildNodes",divElement.childNodes);}divElement.appendChild(this.CanvasElement);//离屏
+this.CanvasElement=document.createElement("canvas");this.CanvasElement.className='jschart-drawing';this.CanvasElement.id=Guid();this.CanvasElement.setAttribute("tabindex",0);if(this.CanvasElement.style){this.CanvasElement.style.outline='none';//this.CanvasElement.style.position="absolute"; //外部自己设置
+}if(divElement.hasChildNodes()){JSConsole.Chart.Log("[JSChart::JSChart] divElement hasChildNodes",divElement.childNodes);}divElement.appendChild(this.CanvasElement);//离屏
 this.OffscreenCanvasElement;if(bOffscreen==true)this.OffscreenCanvasElement=document.createElement("canvas");//图形缓存
 this.CacheCanvasElement=null;if(bCacheCanvas)this.CacheCanvasElement=document.createElement("canvas");//改参数div
 this.ModifyIndexDialog=new ModifyIndexDialog(divElement);this.ChangeIndexDialog=new ChangeIndexDialog(divElement);this.MinuteDialog=new MinuteDialog(divElement);//额外的画布
@@ -1594,7 +1595,8 @@ ON_CREATE_FRAME:105,ON_DELETE_FRAME:106,ON_SIZE_FRAME:107,ON_TOUCH_SCROLL_UP_DOW
 ON_RECV_REALTIME_DATA:109,//实时数据
 ON_CUSTOM_OVERLAY_TOOLBAR:110,//自定义叠加指标按钮
 //绘图之前的事件
-ON_BEFORE_DRAW:111,ON_BEFORE_DRAW_DYNAMIC_INFO:112};var JSCHART_OPERATOR_ID={OP_SCROLL_LEFT:1,//往左移动
+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};var JSCHART_OPERATOR_ID={OP_SCROLL_LEFT:1,//往左移动
 OP_SCROLL_RIGHT:2,//往右移动
 OP_ZOOM_OUT:3,//缩小
 OP_ZOOM_IN:4,//放大
@@ -1698,7 +1700,8 @@ this.EnableIndexChartDrag=false;this.GlobalOption={IsValueFullRange:false,IsDisp
 this.VerticalDrag;//通过X轴左右拖动数据(手势才有)
 this.EnableVerticalDrag=false;//十字光标长留(手势才有)
 this.ClickModel={IsShowCorssCursor:false};this.EnableClickModel=false;//标题栏显示最新数据
-this.DisplayLatestOption={Timer:null,Enable:false,DelayTime:60*1000*3,LastPoint:null};this.DrawDynamicInfoOption={Timer:null,Enable:false,DelayTime:10};//obj={ Element:, Canvas: }
+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){if(!obj||!obj.Element||!obj.Canvas)return;this.CorssCursorElement=obj.Element;this.CorssCursorCanvas=obj.Canvas;};this.StopDisplayLatest=function(){this.GlobalOption.IsDisplayLatest=false;if(this.DisplayLatestOption.Timer){clearTimeout(this.DisplayLatestOption.Timer);this.DisplayLatestOption.Timer=null;}};this.StartStopDisplayLatest=function(){var _this2=this;this.StopDisplayLatest();if(!this.DisplayLatestOption.Enable)return;this.DisplayLatestOption.Timer=setTimeout(function(){if(_this2.DisplayLatest){JSConsole.Chart.Log('[JSChartContainer:StartStopDisplayLatest] call this.DisplayLatest()');_this2.DisplayLatest();}},this.DisplayLatestOption.DelayTime);};this.StopDrawDynamicInfo=function(){if(this.DrawDynamicInfoOption.Timer){clearTimeout(this.DrawDynamicInfoOption.Timer);this.DrawDynamicInfoOption.Timer=null;}};this.ChartDestroy=function()//销毁
 {this.IsDestroy=true;this.StopAutoUpdate();if(this.GetLatestVersionTimer!=null){clearTimeout(this.GetLatestVersionTimer);this.GetLatestVersionTimer=null;}};this.ChartDestory=this.ChartDestroy;//老版本写错了,需要兼容下
 this.GetLatestVersionTimer=null;//获取最新版本
@@ -1727,15 +1730,15 @@ var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);var titleChart=t
 if(titleChart)titleChart.OnMouseMoveEvent=null;this.StartStopDisplayLatest();};this.IsMouseOnClient=function(x,y){var rect={Left:this.Frame.ChartBorder.GetLeft(),Top:this.Frame.ChartBorder.GetTop(),Width:this.Frame.ChartBorder.GetWidth(),Height:this.Frame.ChartBorder.GetHeight()};rect.Right=rect.Left+rect.Width;rect.Bottom=rect.Top+rect.Height;if(x>=rect.Left&&x<=rect.Right&&y>=rect.Top&&y<=rect.Bottom)return true;return false;};this.UIOnContextMenu=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;if(typeof this.OnRightMenu=='function')this.OnRightMenu(x,y,e);//右键菜单事件
 return false;};this.UIOnDblClick=function(e){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;this.OnDoubleClick(x,y,e);};//是否在拖拽Y轴上
 this.TryYDrag=function(x,y){if(!this.EnableYDrag)return null;if(!this.EnableYDrag.Left&&!this.EnableYDrag.Right)return null;if(!this.Frame||!this.Frame.PtInFrameY)return null;var dragY=this.Frame.PtInFrameY(x,y);if(!dragY||dragY.Index<0||dragY.IsOverlay==true)return null;if(dragY.Left&&this.EnableYDrag.Left&&this.Frame.IsEnableDragY(dragY.Index)){return dragY;}if(dragY.Right&&this.EnableYDrag.Right&&this.Frame.IsEnableDragY(dragY.Index)){return dragY;}return null;};//是否可以上下拖拽
-this.TryUpDownDrag=function(x,y){var windowIndex=this.Frame.PtInFrame(x,y);if(windowIndex<0)return null;var item=this.Frame.SubFrame[windowIndex];if(!item||!item.Frame)return null;var frame=item.Frame;if(!frame.YSplitOperator||!frame.YSplitOperator.FixedYMaxMin)return null;return{Index:windowIndex,X:x,Y:y};};this.TryRectSelectDrag=function(x,y){var paint=this.GetRectSelectPaint();if(!paint)return null;if(paint.GetPointCount()<=0)return null;var item=paint.PtInPaint(x,y);return{Item:item,X:x,Y:y};};this.TryClickCrossCursor=function(x,y,e){if(!this.ChartCorssCursor)return;var button=this.ChartCorssCursor.PtInButton(x,y);if(!button)return false;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CROSSCURSOR_RIGHT);if(event&&event.Callback){var sendData={Button:button,e:e};event.Callback(event,sendData,this);}return true;};this.TryClickButton=function(x,y,e){var button=this.Frame.PtInButtons(x,y);if(button&&this.ClickFrameButton){this.ClickFrameButton(button,e);return true;}button=this.PtInExtendChartButtons(x,y);if(button&&this.ClickExtendChartButton){this.ClickExtendChartButton(button,e);return true;}button=this.PtInDrawPictureButtons(x,y);if(button&&this.ClickDrawPictureButton){this.ClickDrawPictureButton(button,e);return true;}button=this.PtInTitleButtons(x,y);if(button&&this.ClickTitleButton){this.ClickTitleButton(button,e);return true;}return false;};this.UIOnMouseDown=function(e){var _this5=this;this.MoveOnChartDrawPicture=null;if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;this.ClickDownPoint={X:e.clientX,Y:e.clientY};this.IsOnTouch=true;this.BorderDrag=null;this.YDrag=null;this.UpDownDrag=null;this.RectSelectDrag=null;this.IndexChartDrag=null;var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;if(this.TryClickButton(x,y,e)){return;}if(this.TryClickCrossCursor(x,y,e)){return;}if(this.TryClickChartTooltipData&&this.TryClickChartTooltipData(x,y,e))//预留给外部点击图标什么用的
+this.TryUpDownDrag=function(x,y){var windowIndex=this.Frame.PtInFrame(x,y);if(windowIndex<0)return null;var item=this.Frame.SubFrame[windowIndex];if(!item||!item.Frame)return null;var frame=item.Frame;if(!frame.YSplitOperator||!frame.YSplitOperator.FixedYMaxMin)return null;return{Index:windowIndex,X:x,Y:y};};this.TryRectSelectDrag=function(x,y){var paint=this.GetRectSelectPaint();if(!paint)return null;if(paint.GetPointCount()<=0)return null;var item=paint.PtInPaint(x,y);return{Item:item,X:x,Y:y};};this.TryClickCrossCursor=function(x,y,e){if(!this.ChartCorssCursor)return;var button=this.ChartCorssCursor.PtInButton(x,y);if(!button)return false;var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CROSSCURSOR_RIGHT);if(event&&event.Callback){var sendData={Button:button,e:e};event.Callback(event,sendData,this);}return true;};this.TryClickButton=function(x,y,e){var button=this.Frame.PtInButtons(x,y);if(button&&this.ClickFrameButton){this.ClickFrameButton(button,e);return true;}button=this.PtInExtendChartButtons(x,y);if(button&&this.ClickExtendChartButton){this.ClickExtendChartButton(button,e);return true;}button=this.PtInDrawPictureButtons(x,y);if(button&&this.ClickDrawPictureButton){this.ClickDrawPictureButton(button,e);return true;}button=this.PtInTitleButtons(x,y);if(button&&this.ClickTitleButton){this.ClickTitleButton(button,e);return true;}return false;};this.UIOnMouseDown=function(e){var _this5=this;this.MoveOnChartDrawPicture=null;if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;this.ClickDownPoint={X:e.clientX,Y:e.clientY};this.IsOnTouch=true;this.BorderDrag=null;this.YDrag=null;this.UpDownDrag=null;this.RectSelectDrag=null;this.IndexChartDrag=null;this.CustomChartDrag=null;var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;if(this.TryClickButton(x,y,e)){return;}if(this.TryClickCrossCursor(x,y,e)){return;}if(this.TryClickChartTooltipData&&this.TryClickChartTooltipData(x,y,e))//预留给外部点击图标什么用的
 {return;}if(this.TryClickLock){//JSConsole.Chart.Log('[uielement.onmousedown] left, top ',e.clientX, e.clientY, this.getBoundingClientRect().left,this.getBoundingClientRect().top);
 if(this.TryClickLock(x,y))return;}this.HideSelectRect();if(this.SelectRectRightMenu)this.SelectRectRightMenu.Hide();if(this.ChartPictureMenu)this.ChartPictureMenu.Hide();var paint=this.GetRectSelectPaint();if(paint&&paint.GetPointCount()>0){var item=paint.PtInPaint(x,y);if(item){if(item.Type==4){this.UIElement.style.cursor="pointer";var obj={X:e.clientX};if(this.GetXDataIndex(obj)){this.RectSelectDrag={DataIndex:obj.DataIndex,Type:item.Type,X:e.clientX};JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] drag sub rect select ",obj);}}else{this.UIElement.style.cursor="ew-resize";this.RectSelectDrag={Index:item.PointIndex,Type:item.Type};JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] drag rect select ",item);}}}if(!this.RectSelectDrag&&this.ClearRectSelect(false))this.Draw();if(this.EnableBorderDrag&&this.Frame){var dragBorder=this.Frame.PtInFrameBorder(x,y);if(dragBorder&&dragBorder.Index>=0){this.UIElement.style.cursor="n-resize";this.BorderDrag={Index:dragBorder.Index};JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] DragBorder ",dragBorder);}}//拖拽Y轴缩放
-if(!this.BorderDrag){var dragY=this.TryYDrag(x,y);if(dragY){this.UIElement.style.cursor=dragY.Position==0?"n-resize":"row-resize";this.YDrag=dragY;JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] dragY ",dragY);}else{var dragUpDown=this.TryUpDownDrag(x,y);if(dragUpDown){this.UIElement.style.cursor="pointer";this.UpDownDrag=dragUpDown;JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] dragUpDown ",dragUpDown);}}}if(this.DragMode==0)return;var drag={"Click":{},"LastMove":{},//最后移动的位置
+if(!this.BorderDrag){var dragY=this.TryYDrag(x,y);if(dragY){this.UIElement.style.cursor=dragY.Position==0?"n-resize":"row-resize";this.YDrag=dragY;JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] dragY ",dragY);}else{var dragUpDown=this.TryUpDownDrag(x,y);if(dragUpDown){this.UIElement.style.cursor="pointer";this.UpDownDrag=dragUpDown;JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] dragUpDown ",dragUpDown);}}}var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);if(event&&event.Callback){var sendData={ChartDrag:null,X:x,Y:y,Cusrsor:null};event.Callback(event,sendData,this);this.CustomChartDrag=sendData.ChartDrag;if(sendData.Cusrsor)this.UIElement.style.cursor=sendData.Cusrsor;}if(this.DragMode==0)return;var drag={"Click":{},"LastMove":{},//最后移动的位置
 CurrentMove:{}//当前的移动
 };drag.Click.X=e.clientX;drag.Click.Y=e.clientY;drag.Click.IsInFrameBottom=this.Frame.PtInFrameBottom(x,y);//是否点击在X轴上
 drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;this.MouseDrag=drag;var drawPictureActive=this.GetActiveDrawPicture();//上一次选中的
 var selectedChart={Chart:this.SelectedChart.Selected.Chart,Identify:this.SelectedChart.Selected.Identify};//上一次选中的图形
-this.SelectChartDrawPicture=null;if(this.BorderDrag){}else if(this.YDrag||this.RectSelectDrag){}else if(this.CurrentChartDrawPicture)//画图工具模式
+this.SelectChartDrawPicture=null;if(this.BorderDrag){}else if(this.YDrag||this.RectSelectDrag||this.CustomChartDrag){}else if(this.CurrentChartDrawPicture)//画图工具模式
 {this.UpDownDrag=null;//画图优先
 var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status==2)this.SetChartDrawPictureThirdPoint(drag.Click.X,drag.Click.Y);else{this.SetChartDrawPictureFirstPoint(drag.Click.X,drag.Click.Y);//只有1个点 直接完成
 if(this.FinishChartDrawPicturePoint()){if(drawPicture.IsDrawMain)this.Draw();else this.DrawDynamicInfo();}}if(drawPictureActive.Select.Guid&&(!this.CurrentChartDrawPicture||drawPictureActive.Select.Guid!=this.CurrentChartDrawPicture.Guid)){if(drawPictureActive.Select.Chart.IsDrawMain)this.Draw();}}else//是否在画图工具上
@@ -12463,7 +12466,7 @@ this.AreaColor=g_JSChartResource.ScrollBar.BGChart.AreaColor;//面积图颜色
 };this.Draw=function(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;this.Canvas.save();if(this.LineWidth>0)this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();var bottom=this.ChartBorder.GetBottom();this.Canvas.strokeStyle=this.Color;var bFirstPoint=true;var drawCount=0,x,y;var firstPoint={};for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;x=this.ChartFrame.GetXFromIndex(i);y=this.ChartFrame.GetYFromData(value);if(bFirstPoint){this.Canvas.beginPath();this.Canvas.moveTo(x,y);bFirstPoint=false;firstPoint={X:x,Y:y};}else{this.Canvas.lineTo(x,y);}++drawCount;}if(drawCount>0){this.Canvas.stroke();this.Canvas.lineTo(x,bottom);this.Canvas.lineTo(firstPoint.X,bottom);this.Canvas.closePath();this.Canvas.fillStyle=this.AreaColor;this.Canvas.fill();}this.Canvas.restore();};this.GetMaxMin=function(){var range={Max:null,Min:null};if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return range;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;if(range.Max==null||range.Max<value)range.Max=value;if(range.Min==null||range.Min>value)range.Min=value;}return range;};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12417";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12419";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12418",
+  "version": "1.1.12420",
   "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())
     {
@@ -2484,6 +2484,11 @@ 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,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -2802,6 +2807,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)
@@ -3150,6 +3156,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 +3247,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
+        if (event && event.Callback)
+        {
+            var sendData={ ChartDrag:null, X:x, Y:y, Cusrsor:null };
+            event.Callback(event, sendData, this);
+            this.CustomChartDrag=sendData.ChartDrag;
+
+            if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+        }
+
         if(this.DragMode==0) return;
 
         var drag=
@@ -3264,7 +3281,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
 
         }
-        else if (this.YDrag  || this.RectSelectDrag)
+        else if (this.YDrag  || this.RectSelectDrag || this.CustomChartDrag)
         {
 
         }

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())
     {
@@ -6564,6 +6564,11 @@ 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,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6882,6 +6887,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)
@@ -7230,6 +7236,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 +7327,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
+        if (event && event.Callback)
+        {
+            var sendData={ ChartDrag:null, X:x, Y:y, Cusrsor:null };
+            event.Callback(event, sendData, this);
+            this.CustomChartDrag=sendData.ChartDrag;
+
+            if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+        }
+
         if(this.DragMode==0) return;
 
         var drag=
@@ -7344,7 +7361,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
 
         }
-        else if (this.YDrag  || this.RectSelectDrag)
+        else if (this.YDrag  || this.RectSelectDrag || this.CustomChartDrag)
         {
 
         }
@@ -127519,7 +127536,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12417";
+var HQCHART_VERSION="1.1.12419";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12417";
+var HQCHART_VERSION="1.1.12419";
 
 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())
     {
@@ -6608,6 +6608,11 @@ 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,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6926,6 +6931,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)
@@ -7274,6 +7280,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 +7371,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
+        if (event && event.Callback)
+        {
+            var sendData={ ChartDrag:null, X:x, Y:y, Cusrsor:null };
+            event.Callback(event, sendData, this);
+            this.CustomChartDrag=sendData.ChartDrag;
+
+            if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+        }
+
         if(this.DragMode==0) return;
 
         var drag=
@@ -7388,7 +7405,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
 
         }
-        else if (this.YDrag  || this.RectSelectDrag)
+        else if (this.YDrag  || this.RectSelectDrag || this.CustomChartDrag)
         {
 
         }
@@ -127563,7 +127580,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12417";
+var HQCHART_VERSION="1.1.12419";
 
 function PrintHQChartVersion()
 {