hqchart 1.1.12420 → 1.1.12429
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.
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -253,6 +253,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
253
253
|
if (option.Type==="历史K线图横屏") chart=new KLineChartHScreenContainer(this.CanvasElement);
|
|
254
254
|
else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);
|
|
255
255
|
|
|
256
|
+
chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
|
|
257
|
+
|
|
256
258
|
var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);
|
|
257
259
|
if (extraElement) chart.SetCorssCursorElement(extraElement);
|
|
258
260
|
|
|
@@ -755,6 +757,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
755
757
|
if (option.Type==="分钟走势图横屏") chart=new MinuteChartHScreenContainer(this.CanvasElement);
|
|
756
758
|
else chart=new MinuteChartContainer(this.CanvasElement, this.OffscreenCanvasElement, this.CacheCanvasElement);
|
|
757
759
|
|
|
760
|
+
chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
|
|
761
|
+
|
|
758
762
|
if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
|
|
759
763
|
if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
|
|
760
764
|
|
|
@@ -2489,6 +2493,7 @@ var JSCHART_EVENT_ID=
|
|
|
2489
2493
|
ON_CUSTOM_DRAG_MOUSE_DOWN:113,
|
|
2490
2494
|
ON_CUSTOM_DRAG_DOC_MOUSE_MOVE:114,
|
|
2491
2495
|
ON_CUSTOM_DRAG_DOC_MOUSE_UP:115,
|
|
2496
|
+
ON_CUSTOM_DRAG_MOUSE_MOVE:116,
|
|
2492
2497
|
}
|
|
2493
2498
|
|
|
2494
2499
|
var JSCHART_OPERATOR_ID=
|
|
@@ -2978,6 +2983,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
2978
2983
|
if (this.BorderDrag) return;
|
|
2979
2984
|
if (this.YDrag) return;
|
|
2980
2985
|
if (this.IndexChartDrag) return;
|
|
2986
|
+
if (this.CustomChartDrag) return;
|
|
2981
2987
|
//if (this.RectSelectDrag) return;
|
|
2982
2988
|
|
|
2983
2989
|
/*
|
|
@@ -3143,6 +3149,52 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
3143
3149
|
return false;
|
|
3144
3150
|
}
|
|
3145
3151
|
|
|
3152
|
+
this.TryMouseMove_CustomChartDrag=function(sendData)
|
|
3153
|
+
{
|
|
3154
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_MOVE);
|
|
3155
|
+
if (!event || !event.Callback) return false;
|
|
3156
|
+
|
|
3157
|
+
return event.Callback(event, sendData, this);
|
|
3158
|
+
}
|
|
3159
|
+
|
|
3160
|
+
this.TryClick_CustomChartDrag=function(sendData)
|
|
3161
|
+
{
|
|
3162
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
|
|
3163
|
+
if (!event || !event.Callback) return false;
|
|
3164
|
+
|
|
3165
|
+
sendData.ChartDrag=null;
|
|
3166
|
+
sendData.Cusrsor=null;
|
|
3167
|
+
|
|
3168
|
+
event.Callback(event, sendData, this);
|
|
3169
|
+
this.CustomChartDrag=sendData.ChartDrag;
|
|
3170
|
+
|
|
3171
|
+
if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
|
|
3172
|
+
}
|
|
3173
|
+
|
|
3174
|
+
this.TryDragMove_CustomChartDrag=function(sendData)
|
|
3175
|
+
{
|
|
3176
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_MOVE);
|
|
3177
|
+
if (!event || !event.Callback) return;
|
|
3178
|
+
|
|
3179
|
+
var e=sendData.e;
|
|
3180
|
+
var drag=sendData.Drag;
|
|
3181
|
+
if(Math.abs(drag.LastMove.Y-e.clientY)<2 && Math.abs(drag.LastMove.X-e.clientX)<2) return;
|
|
3182
|
+
|
|
3183
|
+
if (event.Callback(event, sendData, this))
|
|
3184
|
+
{
|
|
3185
|
+
drag.LastMove.X=e.clientX;
|
|
3186
|
+
drag.LastMove.Y=e.clientY;
|
|
3187
|
+
}
|
|
3188
|
+
}
|
|
3189
|
+
|
|
3190
|
+
this.TryMouseUp_CustomChartDrag=function(sendData)
|
|
3191
|
+
{
|
|
3192
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_UP);
|
|
3193
|
+
if (!event || !event.Callback) return;
|
|
3194
|
+
|
|
3195
|
+
event.Callback(event, sendData, this);
|
|
3196
|
+
}
|
|
3197
|
+
|
|
3146
3198
|
this.UIOnMouseDown=function(e)
|
|
3147
3199
|
{
|
|
3148
3200
|
this.MoveOnChartDrawPicture=null;
|
|
@@ -3247,14 +3299,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
3247
3299
|
}
|
|
3248
3300
|
}
|
|
3249
3301
|
|
|
3250
|
-
var
|
|
3251
|
-
if (
|
|
3302
|
+
var sendData={ X:x, Y:y, e:e };
|
|
3303
|
+
if (this.TryClick_CustomChartDrag(sendData))
|
|
3252
3304
|
{
|
|
3253
|
-
var sendData={ ChartDrag:null, X:x, Y:y, Cusrsor:null };
|
|
3254
|
-
event.Callback(event, sendData, this);
|
|
3255
|
-
this.CustomChartDrag=sendData.ChartDrag;
|
|
3256
3305
|
|
|
3257
|
-
if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
|
|
3258
3306
|
}
|
|
3259
3307
|
|
|
3260
3308
|
if(this.DragMode==0) return;
|
|
@@ -3507,6 +3555,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
3507
3555
|
drag.LastMove.X=e.clientX;
|
|
3508
3556
|
drag.LastMove.Y=e.clientY;
|
|
3509
3557
|
}
|
|
3558
|
+
else if (this.CustomChartDrag)
|
|
3559
|
+
{
|
|
3560
|
+
var pixelTatio = GetDevicePixelRatio();
|
|
3561
|
+
var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
|
|
3562
|
+
var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
|
|
3563
|
+
var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
|
|
3564
|
+
this.TryDragMove_CustomChartDrag(sendData);
|
|
3565
|
+
}
|
|
3510
3566
|
else if (this.CurrentChartDrawPicture)
|
|
3511
3567
|
{
|
|
3512
3568
|
var drawPicture=this.CurrentChartDrawPicture;
|
|
@@ -3736,6 +3792,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
3736
3792
|
if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
|
|
3737
3793
|
this.UIElement.style.cursor="default";
|
|
3738
3794
|
}
|
|
3795
|
+
else if (this.CustomChartDrag)
|
|
3796
|
+
{
|
|
3797
|
+
var sendData={ e:e, ChartDrag:this.CustomChartDrag, Drag:this.MouseDrag };
|
|
3798
|
+
this.TryMouseUp_CustomChartDrag(sendData);
|
|
3799
|
+
}
|
|
3739
3800
|
else if (isDragSelectRect) //区间选择拖动范围
|
|
3740
3801
|
{
|
|
3741
3802
|
if (this.OnDragSelectRectMouseUp) this.OnDragSelectRectMouseUp(e);
|
|
@@ -3828,6 +3889,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
3828
3889
|
this.UpDownDrag=null;
|
|
3829
3890
|
this.RectSelectDrag=null;
|
|
3830
3891
|
this.IndexChartDrag=null;
|
|
3892
|
+
this.CustomChartDrag=null;
|
|
3831
3893
|
if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
|
|
3832
3894
|
}
|
|
3833
3895
|
|
|
@@ -5724,6 +5786,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
5724
5786
|
JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] drag rect select ",item);
|
|
5725
5787
|
}
|
|
5726
5788
|
}
|
|
5789
|
+
|
|
5790
|
+
|
|
5791
|
+
var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
|
|
5792
|
+
if (this.TryMouseMove_CustomChartDrag(sendData))
|
|
5793
|
+
{
|
|
5794
|
+
if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
|
|
5795
|
+
}
|
|
5727
5796
|
|
|
5728
5797
|
var bDrawPicture=false; //是否正在画图
|
|
5729
5798
|
if (this.CurrentChartDrawPicture)
|
|
@@ -64107,7 +64176,8 @@ function KLineChartContainer(uielement,OffscreenElement)
|
|
|
64107
64176
|
Y:corssCursor.LastPoint.Y/pixelTatio,
|
|
64108
64177
|
Item:item,
|
|
64109
64178
|
Index:index,
|
|
64110
|
-
RectSelectPaint:paint //区间选择背景
|
|
64179
|
+
RectSelectPaint:paint, //区间选择背景
|
|
64180
|
+
e:e,
|
|
64111
64181
|
};
|
|
64112
64182
|
event.Callback(event,data,this);
|
|
64113
64183
|
}
|
|
@@ -64125,7 +64195,8 @@ function KLineChartContainer(uielement,OffscreenElement)
|
|
|
64125
64195
|
Y:corssCursor.LastPoint.Y/pixelTatio,
|
|
64126
64196
|
SelectData:selectData, //区间选择的数据
|
|
64127
64197
|
RectSelectPaint:paint, //区间选择背景
|
|
64128
|
-
IsShowMenu:true
|
|
64198
|
+
IsShowMenu:true,
|
|
64199
|
+
e:e,
|
|
64129
64200
|
};
|
|
64130
64201
|
event.Callback(event,data,this);
|
|
64131
64202
|
isShowMenu=data.IsShowMenu;
|
|
@@ -4333,6 +4333,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4333
4333
|
if (option.Type==="历史K线图横屏") chart=new KLineChartHScreenContainer(this.CanvasElement);
|
|
4334
4334
|
else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);
|
|
4335
4335
|
|
|
4336
|
+
chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
|
|
4337
|
+
|
|
4336
4338
|
var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);
|
|
4337
4339
|
if (extraElement) chart.SetCorssCursorElement(extraElement);
|
|
4338
4340
|
|
|
@@ -4835,6 +4837,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4835
4837
|
if (option.Type==="分钟走势图横屏") chart=new MinuteChartHScreenContainer(this.CanvasElement);
|
|
4836
4838
|
else chart=new MinuteChartContainer(this.CanvasElement, this.OffscreenCanvasElement, this.CacheCanvasElement);
|
|
4837
4839
|
|
|
4840
|
+
chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
|
|
4841
|
+
|
|
4838
4842
|
if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
|
|
4839
4843
|
if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
|
|
4840
4844
|
|
|
@@ -6569,6 +6573,7 @@ var JSCHART_EVENT_ID=
|
|
|
6569
6573
|
ON_CUSTOM_DRAG_MOUSE_DOWN:113,
|
|
6570
6574
|
ON_CUSTOM_DRAG_DOC_MOUSE_MOVE:114,
|
|
6571
6575
|
ON_CUSTOM_DRAG_DOC_MOUSE_UP:115,
|
|
6576
|
+
ON_CUSTOM_DRAG_MOUSE_MOVE:116,
|
|
6572
6577
|
}
|
|
6573
6578
|
|
|
6574
6579
|
var JSCHART_OPERATOR_ID=
|
|
@@ -7058,6 +7063,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7058
7063
|
if (this.BorderDrag) return;
|
|
7059
7064
|
if (this.YDrag) return;
|
|
7060
7065
|
if (this.IndexChartDrag) return;
|
|
7066
|
+
if (this.CustomChartDrag) return;
|
|
7061
7067
|
//if (this.RectSelectDrag) return;
|
|
7062
7068
|
|
|
7063
7069
|
/*
|
|
@@ -7223,6 +7229,52 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7223
7229
|
return false;
|
|
7224
7230
|
}
|
|
7225
7231
|
|
|
7232
|
+
this.TryMouseMove_CustomChartDrag=function(sendData)
|
|
7233
|
+
{
|
|
7234
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_MOVE);
|
|
7235
|
+
if (!event || !event.Callback) return false;
|
|
7236
|
+
|
|
7237
|
+
return event.Callback(event, sendData, this);
|
|
7238
|
+
}
|
|
7239
|
+
|
|
7240
|
+
this.TryClick_CustomChartDrag=function(sendData)
|
|
7241
|
+
{
|
|
7242
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
|
|
7243
|
+
if (!event || !event.Callback) return false;
|
|
7244
|
+
|
|
7245
|
+
sendData.ChartDrag=null;
|
|
7246
|
+
sendData.Cusrsor=null;
|
|
7247
|
+
|
|
7248
|
+
event.Callback(event, sendData, this);
|
|
7249
|
+
this.CustomChartDrag=sendData.ChartDrag;
|
|
7250
|
+
|
|
7251
|
+
if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
|
|
7252
|
+
}
|
|
7253
|
+
|
|
7254
|
+
this.TryDragMove_CustomChartDrag=function(sendData)
|
|
7255
|
+
{
|
|
7256
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_MOVE);
|
|
7257
|
+
if (!event || !event.Callback) return;
|
|
7258
|
+
|
|
7259
|
+
var e=sendData.e;
|
|
7260
|
+
var drag=sendData.Drag;
|
|
7261
|
+
if(Math.abs(drag.LastMove.Y-e.clientY)<2 && Math.abs(drag.LastMove.X-e.clientX)<2) return;
|
|
7262
|
+
|
|
7263
|
+
if (event.Callback(event, sendData, this))
|
|
7264
|
+
{
|
|
7265
|
+
drag.LastMove.X=e.clientX;
|
|
7266
|
+
drag.LastMove.Y=e.clientY;
|
|
7267
|
+
}
|
|
7268
|
+
}
|
|
7269
|
+
|
|
7270
|
+
this.TryMouseUp_CustomChartDrag=function(sendData)
|
|
7271
|
+
{
|
|
7272
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_UP);
|
|
7273
|
+
if (!event || !event.Callback) return;
|
|
7274
|
+
|
|
7275
|
+
event.Callback(event, sendData, this);
|
|
7276
|
+
}
|
|
7277
|
+
|
|
7226
7278
|
this.UIOnMouseDown=function(e)
|
|
7227
7279
|
{
|
|
7228
7280
|
this.MoveOnChartDrawPicture=null;
|
|
@@ -7327,14 +7379,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7327
7379
|
}
|
|
7328
7380
|
}
|
|
7329
7381
|
|
|
7330
|
-
var
|
|
7331
|
-
if (
|
|
7382
|
+
var sendData={ X:x, Y:y, e:e };
|
|
7383
|
+
if (this.TryClick_CustomChartDrag(sendData))
|
|
7332
7384
|
{
|
|
7333
|
-
var sendData={ ChartDrag:null, X:x, Y:y, Cusrsor:null };
|
|
7334
|
-
event.Callback(event, sendData, this);
|
|
7335
|
-
this.CustomChartDrag=sendData.ChartDrag;
|
|
7336
7385
|
|
|
7337
|
-
if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
|
|
7338
7386
|
}
|
|
7339
7387
|
|
|
7340
7388
|
if(this.DragMode==0) return;
|
|
@@ -7587,6 +7635,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7587
7635
|
drag.LastMove.X=e.clientX;
|
|
7588
7636
|
drag.LastMove.Y=e.clientY;
|
|
7589
7637
|
}
|
|
7638
|
+
else if (this.CustomChartDrag)
|
|
7639
|
+
{
|
|
7640
|
+
var pixelTatio = GetDevicePixelRatio();
|
|
7641
|
+
var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
|
|
7642
|
+
var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
|
|
7643
|
+
var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
|
|
7644
|
+
this.TryDragMove_CustomChartDrag(sendData);
|
|
7645
|
+
}
|
|
7590
7646
|
else if (this.CurrentChartDrawPicture)
|
|
7591
7647
|
{
|
|
7592
7648
|
var drawPicture=this.CurrentChartDrawPicture;
|
|
@@ -7816,6 +7872,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7816
7872
|
if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
|
|
7817
7873
|
this.UIElement.style.cursor="default";
|
|
7818
7874
|
}
|
|
7875
|
+
else if (this.CustomChartDrag)
|
|
7876
|
+
{
|
|
7877
|
+
var sendData={ e:e, ChartDrag:this.CustomChartDrag, Drag:this.MouseDrag };
|
|
7878
|
+
this.TryMouseUp_CustomChartDrag(sendData);
|
|
7879
|
+
}
|
|
7819
7880
|
else if (isDragSelectRect) //区间选择拖动范围
|
|
7820
7881
|
{
|
|
7821
7882
|
if (this.OnDragSelectRectMouseUp) this.OnDragSelectRectMouseUp(e);
|
|
@@ -7908,6 +7969,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7908
7969
|
this.UpDownDrag=null;
|
|
7909
7970
|
this.RectSelectDrag=null;
|
|
7910
7971
|
this.IndexChartDrag=null;
|
|
7972
|
+
this.CustomChartDrag=null;
|
|
7911
7973
|
if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
|
|
7912
7974
|
}
|
|
7913
7975
|
|
|
@@ -9804,6 +9866,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
9804
9866
|
JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] drag rect select ",item);
|
|
9805
9867
|
}
|
|
9806
9868
|
}
|
|
9869
|
+
|
|
9870
|
+
|
|
9871
|
+
var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
|
|
9872
|
+
if (this.TryMouseMove_CustomChartDrag(sendData))
|
|
9873
|
+
{
|
|
9874
|
+
if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
|
|
9875
|
+
}
|
|
9807
9876
|
|
|
9808
9877
|
var bDrawPicture=false; //是否正在画图
|
|
9809
9878
|
if (this.CurrentChartDrawPicture)
|
|
@@ -68187,7 +68256,8 @@ function KLineChartContainer(uielement,OffscreenElement)
|
|
|
68187
68256
|
Y:corssCursor.LastPoint.Y/pixelTatio,
|
|
68188
68257
|
Item:item,
|
|
68189
68258
|
Index:index,
|
|
68190
|
-
RectSelectPaint:paint //区间选择背景
|
|
68259
|
+
RectSelectPaint:paint, //区间选择背景
|
|
68260
|
+
e:e,
|
|
68191
68261
|
};
|
|
68192
68262
|
event.Callback(event,data,this);
|
|
68193
68263
|
}
|
|
@@ -68205,7 +68275,8 @@ function KLineChartContainer(uielement,OffscreenElement)
|
|
|
68205
68275
|
Y:corssCursor.LastPoint.Y/pixelTatio,
|
|
68206
68276
|
SelectData:selectData, //区间选择的数据
|
|
68207
68277
|
RectSelectPaint:paint, //区间选择背景
|
|
68208
|
-
IsShowMenu:true
|
|
68278
|
+
IsShowMenu:true,
|
|
68279
|
+
e:e,
|
|
68209
68280
|
};
|
|
68210
68281
|
event.Callback(event,data,this);
|
|
68211
68282
|
isShowMenu=data.IsShowMenu;
|
|
@@ -127536,7 +127607,7 @@ function ScrollBarBGChart()
|
|
|
127536
127607
|
|
|
127537
127608
|
|
|
127538
127609
|
|
|
127539
|
-
var HQCHART_VERSION="1.1.
|
|
127610
|
+
var HQCHART_VERSION="1.1.12428";
|
|
127540
127611
|
|
|
127541
127612
|
function PrintHQChartVersion()
|
|
127542
127613
|
{
|
|
@@ -4377,6 +4377,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4377
4377
|
if (option.Type==="历史K线图横屏") chart=new KLineChartHScreenContainer(this.CanvasElement);
|
|
4378
4378
|
else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);
|
|
4379
4379
|
|
|
4380
|
+
chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
|
|
4381
|
+
|
|
4380
4382
|
var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);
|
|
4381
4383
|
if (extraElement) chart.SetCorssCursorElement(extraElement);
|
|
4382
4384
|
|
|
@@ -4879,6 +4881,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4879
4881
|
if (option.Type==="分钟走势图横屏") chart=new MinuteChartHScreenContainer(this.CanvasElement);
|
|
4880
4882
|
else chart=new MinuteChartContainer(this.CanvasElement, this.OffscreenCanvasElement, this.CacheCanvasElement);
|
|
4881
4883
|
|
|
4884
|
+
chart.GetExtraCanvas=(name)=>{ return this.GetExtraCanvas(name); }
|
|
4885
|
+
|
|
4882
4886
|
if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
|
|
4883
4887
|
if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
|
|
4884
4888
|
|
|
@@ -6613,6 +6617,7 @@ var JSCHART_EVENT_ID=
|
|
|
6613
6617
|
ON_CUSTOM_DRAG_MOUSE_DOWN:113,
|
|
6614
6618
|
ON_CUSTOM_DRAG_DOC_MOUSE_MOVE:114,
|
|
6615
6619
|
ON_CUSTOM_DRAG_DOC_MOUSE_UP:115,
|
|
6620
|
+
ON_CUSTOM_DRAG_MOUSE_MOVE:116,
|
|
6616
6621
|
}
|
|
6617
6622
|
|
|
6618
6623
|
var JSCHART_OPERATOR_ID=
|
|
@@ -7102,6 +7107,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7102
7107
|
if (this.BorderDrag) return;
|
|
7103
7108
|
if (this.YDrag) return;
|
|
7104
7109
|
if (this.IndexChartDrag) return;
|
|
7110
|
+
if (this.CustomChartDrag) return;
|
|
7105
7111
|
//if (this.RectSelectDrag) return;
|
|
7106
7112
|
|
|
7107
7113
|
/*
|
|
@@ -7267,6 +7273,52 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7267
7273
|
return false;
|
|
7268
7274
|
}
|
|
7269
7275
|
|
|
7276
|
+
this.TryMouseMove_CustomChartDrag=function(sendData)
|
|
7277
|
+
{
|
|
7278
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_MOVE);
|
|
7279
|
+
if (!event || !event.Callback) return false;
|
|
7280
|
+
|
|
7281
|
+
return event.Callback(event, sendData, this);
|
|
7282
|
+
}
|
|
7283
|
+
|
|
7284
|
+
this.TryClick_CustomChartDrag=function(sendData)
|
|
7285
|
+
{
|
|
7286
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_MOUSE_DOWN);
|
|
7287
|
+
if (!event || !event.Callback) return false;
|
|
7288
|
+
|
|
7289
|
+
sendData.ChartDrag=null;
|
|
7290
|
+
sendData.Cusrsor=null;
|
|
7291
|
+
|
|
7292
|
+
event.Callback(event, sendData, this);
|
|
7293
|
+
this.CustomChartDrag=sendData.ChartDrag;
|
|
7294
|
+
|
|
7295
|
+
if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
|
|
7296
|
+
}
|
|
7297
|
+
|
|
7298
|
+
this.TryDragMove_CustomChartDrag=function(sendData)
|
|
7299
|
+
{
|
|
7300
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_MOVE);
|
|
7301
|
+
if (!event || !event.Callback) return;
|
|
7302
|
+
|
|
7303
|
+
var e=sendData.e;
|
|
7304
|
+
var drag=sendData.Drag;
|
|
7305
|
+
if(Math.abs(drag.LastMove.Y-e.clientY)<2 && Math.abs(drag.LastMove.X-e.clientX)<2) return;
|
|
7306
|
+
|
|
7307
|
+
if (event.Callback(event, sendData, this))
|
|
7308
|
+
{
|
|
7309
|
+
drag.LastMove.X=e.clientX;
|
|
7310
|
+
drag.LastMove.Y=e.clientY;
|
|
7311
|
+
}
|
|
7312
|
+
}
|
|
7313
|
+
|
|
7314
|
+
this.TryMouseUp_CustomChartDrag=function(sendData)
|
|
7315
|
+
{
|
|
7316
|
+
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_DRAG_DOC_MOUSE_UP);
|
|
7317
|
+
if (!event || !event.Callback) return;
|
|
7318
|
+
|
|
7319
|
+
event.Callback(event, sendData, this);
|
|
7320
|
+
}
|
|
7321
|
+
|
|
7270
7322
|
this.UIOnMouseDown=function(e)
|
|
7271
7323
|
{
|
|
7272
7324
|
this.MoveOnChartDrawPicture=null;
|
|
@@ -7371,14 +7423,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7371
7423
|
}
|
|
7372
7424
|
}
|
|
7373
7425
|
|
|
7374
|
-
var
|
|
7375
|
-
if (
|
|
7426
|
+
var sendData={ X:x, Y:y, e:e };
|
|
7427
|
+
if (this.TryClick_CustomChartDrag(sendData))
|
|
7376
7428
|
{
|
|
7377
|
-
var sendData={ ChartDrag:null, X:x, Y:y, Cusrsor:null };
|
|
7378
|
-
event.Callback(event, sendData, this);
|
|
7379
|
-
this.CustomChartDrag=sendData.ChartDrag;
|
|
7380
7429
|
|
|
7381
|
-
if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
|
|
7382
7430
|
}
|
|
7383
7431
|
|
|
7384
7432
|
if(this.DragMode==0) return;
|
|
@@ -7631,6 +7679,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7631
7679
|
drag.LastMove.X=e.clientX;
|
|
7632
7680
|
drag.LastMove.Y=e.clientY;
|
|
7633
7681
|
}
|
|
7682
|
+
else if (this.CustomChartDrag)
|
|
7683
|
+
{
|
|
7684
|
+
var pixelTatio = GetDevicePixelRatio();
|
|
7685
|
+
var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
|
|
7686
|
+
var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
|
|
7687
|
+
var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
|
|
7688
|
+
this.TryDragMove_CustomChartDrag(sendData);
|
|
7689
|
+
}
|
|
7634
7690
|
else if (this.CurrentChartDrawPicture)
|
|
7635
7691
|
{
|
|
7636
7692
|
var drawPicture=this.CurrentChartDrawPicture;
|
|
@@ -7860,6 +7916,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7860
7916
|
if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
|
|
7861
7917
|
this.UIElement.style.cursor="default";
|
|
7862
7918
|
}
|
|
7919
|
+
else if (this.CustomChartDrag)
|
|
7920
|
+
{
|
|
7921
|
+
var sendData={ e:e, ChartDrag:this.CustomChartDrag, Drag:this.MouseDrag };
|
|
7922
|
+
this.TryMouseUp_CustomChartDrag(sendData);
|
|
7923
|
+
}
|
|
7863
7924
|
else if (isDragSelectRect) //区间选择拖动范围
|
|
7864
7925
|
{
|
|
7865
7926
|
if (this.OnDragSelectRectMouseUp) this.OnDragSelectRectMouseUp(e);
|
|
@@ -7952,6 +8013,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7952
8013
|
this.UpDownDrag=null;
|
|
7953
8014
|
this.RectSelectDrag=null;
|
|
7954
8015
|
this.IndexChartDrag=null;
|
|
8016
|
+
this.CustomChartDrag=null;
|
|
7955
8017
|
if (bClearDrawPicture===true) this.CurrentChartDrawPicture=null;
|
|
7956
8018
|
}
|
|
7957
8019
|
|
|
@@ -9848,6 +9910,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
9848
9910
|
JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] drag rect select ",item);
|
|
9849
9911
|
}
|
|
9850
9912
|
}
|
|
9913
|
+
|
|
9914
|
+
|
|
9915
|
+
var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
|
|
9916
|
+
if (this.TryMouseMove_CustomChartDrag(sendData))
|
|
9917
|
+
{
|
|
9918
|
+
if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
|
|
9919
|
+
}
|
|
9851
9920
|
|
|
9852
9921
|
var bDrawPicture=false; //是否正在画图
|
|
9853
9922
|
if (this.CurrentChartDrawPicture)
|
|
@@ -68231,7 +68300,8 @@ function KLineChartContainer(uielement,OffscreenElement)
|
|
|
68231
68300
|
Y:corssCursor.LastPoint.Y/pixelTatio,
|
|
68232
68301
|
Item:item,
|
|
68233
68302
|
Index:index,
|
|
68234
|
-
RectSelectPaint:paint //区间选择背景
|
|
68303
|
+
RectSelectPaint:paint, //区间选择背景
|
|
68304
|
+
e:e,
|
|
68235
68305
|
};
|
|
68236
68306
|
event.Callback(event,data,this);
|
|
68237
68307
|
}
|
|
@@ -68249,7 +68319,8 @@ function KLineChartContainer(uielement,OffscreenElement)
|
|
|
68249
68319
|
Y:corssCursor.LastPoint.Y/pixelTatio,
|
|
68250
68320
|
SelectData:selectData, //区间选择的数据
|
|
68251
68321
|
RectSelectPaint:paint, //区间选择背景
|
|
68252
|
-
IsShowMenu:true
|
|
68322
|
+
IsShowMenu:true,
|
|
68323
|
+
e:e,
|
|
68253
68324
|
};
|
|
68254
68325
|
event.Callback(event,data,this);
|
|
68255
68326
|
isShowMenu=data.IsShowMenu;
|
|
@@ -127580,7 +127651,7 @@ function ScrollBarBGChart()
|
|
|
127580
127651
|
|
|
127581
127652
|
|
|
127582
127653
|
|
|
127583
|
-
var HQCHART_VERSION="1.1.
|
|
127654
|
+
var HQCHART_VERSION="1.1.12428";
|
|
127584
127655
|
|
|
127585
127656
|
function PrintHQChartVersion()
|
|
127586
127657
|
{
|