hqchart 1.1.14081 → 1.1.14093
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/lib/umychart.vue.js +83 -85
- package/package.json +1 -1
- package/src/jscommon/umychart.DialogSearchIndex.js +429 -5
- package/src/jscommon/umychart.TReport.js +2 -2
- package/src/jscommon/umychart.js +120 -269
- package/src/jscommon/umychart.resource/css/tools.css +126 -0
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +121 -270
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +552 -277
|
@@ -3978,9 +3978,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
3978
3978
|
this.CacheCanvasElement=null;
|
|
3979
3979
|
if (bCacheCanvas) this.CacheCanvasElement=document.createElement("canvas");
|
|
3980
3980
|
|
|
3981
|
-
//改参数div
|
|
3982
|
-
this.ModifyIndexDialog=new ModifyIndexDialog(divElement);
|
|
3983
|
-
|
|
3984
3981
|
//额外的画布
|
|
3985
3982
|
this.MapExtraCanvasElement=new Map(); //key=画布名字, value={ Element:, Canvas:}
|
|
3986
3983
|
|
|
@@ -4213,9 +4210,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4213
4210
|
if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
|
|
4214
4211
|
if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
|
|
4215
4212
|
|
|
4216
|
-
//创建改参数div
|
|
4217
|
-
chart.ModifyIndexDialog=this.ModifyIndexDialog;
|
|
4218
|
-
|
|
4219
4213
|
var pixelRatio=GetDevicePixelRatio();
|
|
4220
4214
|
|
|
4221
4215
|
//右键菜单
|
|
@@ -4665,9 +4659,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4665
4659
|
{
|
|
4666
4660
|
var chart=new CustomKLineChartContainer(this.CanvasElement);
|
|
4667
4661
|
|
|
4668
|
-
//创建改参数div
|
|
4669
|
-
chart.ModifyIndexDialog=this.ModifyIndexDialog;
|
|
4670
|
-
|
|
4671
4662
|
//右键菜单
|
|
4672
4663
|
if (IFrameSplitOperator.IsBool(option.IsShowRightMenu)) chart.IsShowRightMenu=option.IsShowRightMenu;
|
|
4673
4664
|
|
|
@@ -4768,8 +4759,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4768
4759
|
if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
|
|
4769
4760
|
if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
|
|
4770
4761
|
|
|
4771
|
-
chart.ModifyIndexDialog=this.ModifyIndexDialog;
|
|
4772
|
-
|
|
4773
4762
|
var pixelRatio=GetDevicePixelRatio();
|
|
4774
4763
|
|
|
4775
4764
|
var windowsCount=2;
|
|
@@ -5348,9 +5337,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
5348
5337
|
if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
|
|
5349
5338
|
if (option.IsApiPeriod==true) chart.IsApiPeriod=option.IsApiPeriod;
|
|
5350
5339
|
|
|
5351
|
-
//创建改参数div
|
|
5352
|
-
chart.ModifyIndexDialog=this.ModifyIndexDialog;
|
|
5353
|
-
|
|
5354
5340
|
if (option.ScriptError) chart.ScriptErrorCallback=option.ScriptError;
|
|
5355
5341
|
|
|
5356
5342
|
if (option.KLine) //k线图的属性设置
|
|
@@ -5648,6 +5634,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
5648
5634
|
if (option.SelectRectDialog && option.SelectRectDialog.Enable)
|
|
5649
5635
|
chart.InitalSelectRectDialog(option.SelectRectDialog);
|
|
5650
5636
|
|
|
5637
|
+
if (option.ModifyIndexParamDialog && option.ModifyIndexParamDialog.Enable)
|
|
5638
|
+
chart.InitalModifyIndexParamDialog(option.ModifyIndexParamDialog);
|
|
5639
|
+
|
|
5651
5640
|
if (option.SearchIndexDialog && option.SearchIndexDialog.Enable)
|
|
5652
5641
|
chart.InitalSearchIndexDialog(option.SearchIndexDialog);
|
|
5653
5642
|
|
|
@@ -6746,6 +6735,9 @@ var JSCHART_MENU_ID=
|
|
|
6746
6735
|
|
|
6747
6736
|
CMD_DIALOG_TOOLTIP_ATTRIBUTE:65, //修改K线信息框属性 Ary:[{ Enable:, Style:}, ]
|
|
6748
6737
|
CMD_KLINE_TOOLTIP_ATTRIBUTE:66, //修改K线提示框属性 Ary:[{ Enable:true/false, EnableKeyDown:true/false}]
|
|
6738
|
+
|
|
6739
|
+
CMD_MODIFY_INDEX_PARAM:67, //指标删除修改 [windowIndex, ]
|
|
6740
|
+
CMD_MODIFY_OVERLAY_INDEX_PARAM:68, //叠加指标修改 [windowIndex, ID ]
|
|
6749
6741
|
}
|
|
6750
6742
|
|
|
6751
6743
|
|
|
@@ -6974,6 +6966,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
6974
6966
|
this.DialogSelectRect; //区间统计
|
|
6975
6967
|
this.FloatTooltip; //浮动tooltip信息
|
|
6976
6968
|
this.DialogSearchIndex; //指标搜索
|
|
6969
|
+
this.DialogModifyIndexParam; //指标参数修改
|
|
6977
6970
|
|
|
6978
6971
|
|
|
6979
6972
|
this.ClearStockCache=function()
|
|
@@ -7043,6 +7036,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7043
7036
|
this.DialogSearchIndex.Create();
|
|
7044
7037
|
}
|
|
7045
7038
|
|
|
7039
|
+
this.InitalModifyIndexParamDialog=function(option)
|
|
7040
|
+
{
|
|
7041
|
+
if (this.DialogModifyIndexParam) return;
|
|
7042
|
+
|
|
7043
|
+
this.DialogModifyIndexParam=new JSDialogModifyIndexParam();
|
|
7044
|
+
this.DialogModifyIndexParam.Inital(this, option);
|
|
7045
|
+
this.DialogModifyIndexParam.Create();
|
|
7046
|
+
}
|
|
7047
|
+
|
|
7046
7048
|
this.ShowChangeIndexDialog=function(data)
|
|
7047
7049
|
{
|
|
7048
7050
|
if (!data) return;
|
|
@@ -7062,6 +7064,46 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7062
7064
|
this.DialogSearchIndex.SetOpData(data);
|
|
7063
7065
|
this.DialogSearchIndex.Show();
|
|
7064
7066
|
}
|
|
7067
|
+
|
|
7068
|
+
//添加指标窗口
|
|
7069
|
+
this.ShowAddIndexWindowDialog=function(option)
|
|
7070
|
+
{
|
|
7071
|
+
if (!this.DialogSearchIndex) return;
|
|
7072
|
+
var data=option;
|
|
7073
|
+
if (!data) data={ };
|
|
7074
|
+
|
|
7075
|
+
data.OpType=3;
|
|
7076
|
+
|
|
7077
|
+
data.Title=`增加指标窗口`;
|
|
7078
|
+
this.DialogSearchIndex.SetOpData(data);
|
|
7079
|
+
this.DialogSearchIndex.Show();
|
|
7080
|
+
}
|
|
7081
|
+
|
|
7082
|
+
this.ShowModifyIndexParamDialog=function(data)
|
|
7083
|
+
{
|
|
7084
|
+
if (!this.DialogModifyIndexParam) return;
|
|
7085
|
+
|
|
7086
|
+
if (data.Type==1)
|
|
7087
|
+
{
|
|
7088
|
+
var indexScript=this.WindowIndex[data.WindowIndex];
|
|
7089
|
+
if (!indexScript) return;
|
|
7090
|
+
|
|
7091
|
+
data.IndexScript=indexScript;
|
|
7092
|
+
data.Title=`[${indexScript.Name}]参数修改 窗口[${data.WindowIndex+1}]`;
|
|
7093
|
+
}
|
|
7094
|
+
else if (data.Type==2)
|
|
7095
|
+
{
|
|
7096
|
+
var overlayIndex=this.GetOverlayIndexByIdentify(data.Identify);
|
|
7097
|
+
if (!overlayIndex || !overlayIndex.OverlayItem.Script) return;
|
|
7098
|
+
var indexScript=overlayIndex.OverlayItem.Script;
|
|
7099
|
+
|
|
7100
|
+
data.IndexScript=indexScript;
|
|
7101
|
+
data.Title=`[${indexScript.Name}]参数修改 叠加窗口[${data.WindowIndex+1}]`;
|
|
7102
|
+
}
|
|
7103
|
+
|
|
7104
|
+
this.DialogModifyIndexParam.SetIndexData(data);
|
|
7105
|
+
this.DialogModifyIndexParam.Show();
|
|
7106
|
+
}
|
|
7065
7107
|
|
|
7066
7108
|
|
|
7067
7109
|
this.DrawSelectRectDialog=function()
|
|
@@ -13937,6 +13979,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13937
13979
|
if (IFrameSplitOperator.IsBool(option.Enable)) this.KLineTooltipConfig.Enable=option.Enable;
|
|
13938
13980
|
if (IFrameSplitOperator.IsBool(option.EnableKeyDown)) this.KLineTooltipConfig.EnableKeyDown=option.EnableKeyDown;
|
|
13939
13981
|
break;
|
|
13982
|
+
case JSCHART_MENU_ID.CMD_MODIFY_INDEX_PARAM:
|
|
13983
|
+
if (param==null) return false;
|
|
13984
|
+
var sendData={ e:null, WindowIndex:param, Type:1 }
|
|
13985
|
+
this.ShowModifyIndexParamDialog(sendData);
|
|
13986
|
+
break;
|
|
13987
|
+
case JSCHART_MENU_ID.CMD_MODIFY_OVERLAY_INDEX_PARAM:
|
|
13988
|
+
if (param==null) return false;
|
|
13989
|
+
if (!aryArgs[1]) return false;
|
|
13990
|
+
var sendData={ e:null, WindowIndex:param, Type:2, Identify:aryArgs[1] };
|
|
13991
|
+
this.ShowModifyIndexParamDialog(sendData);
|
|
13992
|
+
break;
|
|
13940
13993
|
}
|
|
13941
13994
|
}
|
|
13942
13995
|
|
|
@@ -13950,6 +14003,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13950
14003
|
return data;
|
|
13951
14004
|
}
|
|
13952
14005
|
|
|
14006
|
+
this.GetModifyIndexMenuData=function(windowIndex)
|
|
14007
|
+
{
|
|
14008
|
+
var data= { Name:"参数修改", Data:{ ID: JSCHART_MENU_ID.CMD_MODIFY_INDEX_PARAM, Args:[windowIndex] } };
|
|
14009
|
+
return data;
|
|
14010
|
+
}
|
|
14011
|
+
|
|
13953
14012
|
this.GetShowOverlayIndexMenuData=function(indexGuid, showType)
|
|
13954
14013
|
{
|
|
13955
14014
|
var overlay=this.GetOverlayIndexByIdentify(indexGuid);
|
|
@@ -13961,6 +14020,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
13961
14020
|
return data;
|
|
13962
14021
|
}
|
|
13963
14022
|
|
|
14023
|
+
this.GetModifyOverlayIndexMenuData=function(indexGuid)
|
|
14024
|
+
{
|
|
14025
|
+
var overlay=this.GetOverlayIndexByIdentify(indexGuid);
|
|
14026
|
+
if (!overlay) return null;
|
|
14027
|
+
|
|
14028
|
+
var data= { Name:"参数修改", Data:{ ID: JSCHART_MENU_ID.CMD_MODIFY_OVERLAY_INDEX_PARAM, Args:[overlay.WindowIndex,indexGuid] } };
|
|
14029
|
+
return data;
|
|
14030
|
+
}
|
|
14031
|
+
|
|
13964
14032
|
this.GetShowOverlayIndexYAxisMenuData=function(indexGuid, showType)
|
|
13965
14033
|
{
|
|
13966
14034
|
var overlay=this.GetOverlayIndexByIdentify(indexGuid);
|
|
@@ -17837,7 +17905,6 @@ function MinuteFrame()
|
|
|
17837
17905
|
this.ExportData=g_JSChartResource.MinuteToolbar.ExportData; //是否显示'导出数据'菜单
|
|
17838
17906
|
this.OverlayIndex=g_JSChartResource.MinuteToolbar.OverlayIndex; //是否显示叠加指标
|
|
17839
17907
|
|
|
17840
|
-
this.ModifyIndexEvent; //改参数 点击事件
|
|
17841
17908
|
this.ToolbarRect=null; //保存工具条的位置
|
|
17842
17909
|
this.IsShowPositionTitle=false; //是否显示持仓标题
|
|
17843
17910
|
|
|
@@ -20266,7 +20333,6 @@ function KLineFrame()
|
|
|
20266
20333
|
|
|
20267
20334
|
this.SelBorderColor=g_JSChartResource.SelFrameBorderColor;
|
|
20268
20335
|
|
|
20269
|
-
this.ModifyIndexEvent; //改参数 点击事件
|
|
20270
20336
|
this.ToolbarRect=null; //保存工具条的位置
|
|
20271
20337
|
this.ReDrawToolbar=false;
|
|
20272
20338
|
|
|
@@ -37986,6 +38052,13 @@ function ChartStickLine()
|
|
|
37986
38052
|
return (this.BarType==1 || this.BarType==-1);
|
|
37987
38053
|
}
|
|
37988
38054
|
|
|
38055
|
+
this.CalculateBarHeight=function(y,y2)
|
|
38056
|
+
{
|
|
38057
|
+
var barHeight=Math.abs(y-y2);
|
|
38058
|
+
if (barHeight<=0) barHeight=1;
|
|
38059
|
+
return barHeight;
|
|
38060
|
+
}
|
|
38061
|
+
|
|
37989
38062
|
this.Draw=function()
|
|
37990
38063
|
{
|
|
37991
38064
|
if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
|
|
@@ -38125,7 +38198,7 @@ function ChartStickLine()
|
|
|
38125
38198
|
}
|
|
38126
38199
|
else
|
|
38127
38200
|
{
|
|
38128
|
-
this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(
|
|
38201
|
+
this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(this.CalculateBarHeight(y,y2)));
|
|
38129
38202
|
}
|
|
38130
38203
|
}
|
|
38131
38204
|
}
|
|
@@ -38152,9 +38225,14 @@ function ChartStickLine()
|
|
|
38152
38225
|
else
|
|
38153
38226
|
{
|
|
38154
38227
|
if (isHScreen)
|
|
38228
|
+
{
|
|
38155
38229
|
this.Canvas.fillRect(ToFixedRect(Math.min(y,y2)),ToFixedRect(xOffset),ToFixedRect(Math.abs(y-y2)),ToFixedRect(dataWidth));
|
|
38230
|
+
}
|
|
38156
38231
|
else
|
|
38157
|
-
|
|
38232
|
+
{
|
|
38233
|
+
this.Canvas.fillRect(ToFixedRect(xOffset),ToFixedRect(Math.min(y,y2)),ToFixedRect(dataWidth),ToFixedRect(this.CalculateBarHeight(y,y2)));
|
|
38234
|
+
}
|
|
38235
|
+
|
|
38158
38236
|
}
|
|
38159
38237
|
}
|
|
38160
38238
|
else
|
|
@@ -38170,8 +38248,9 @@ function ChartStickLine()
|
|
|
38170
38248
|
{
|
|
38171
38249
|
var xFix=parseInt(x.toString())+0.5;
|
|
38172
38250
|
this.Canvas.beginPath();
|
|
38173
|
-
this.Canvas.moveTo(xFix,y);
|
|
38174
|
-
this.Canvas.lineTo(xFix,y2);
|
|
38251
|
+
this.Canvas.moveTo(xFix,y);
|
|
38252
|
+
if (Math.abs(y-y2)>0) this.Canvas.lineTo(xFix,y2);
|
|
38253
|
+
else this.Canvas.lineTo(xFix,y+1); //太窄了,就画一个像素的宽度
|
|
38175
38254
|
this.Canvas.stroke();
|
|
38176
38255
|
}
|
|
38177
38256
|
}
|
|
@@ -73240,6 +73319,17 @@ function JSChartResource()
|
|
|
73240
73319
|
InputTextColor:"rgb(0,0,0)"
|
|
73241
73320
|
};
|
|
73242
73321
|
|
|
73322
|
+
this.DialogModifyIndexParam=
|
|
73323
|
+
{
|
|
73324
|
+
BGColor:'rgb(250,250,250)', //背景色
|
|
73325
|
+
BorderColor:'rgb(20,20,20)', //边框颜色
|
|
73326
|
+
TitleColor:'rgb(250,250,250)', //标题颜色
|
|
73327
|
+
TitleBGColor:"rgb(200, 66, 69)", //标题背景颜色
|
|
73328
|
+
|
|
73329
|
+
ParamNameColor:"rgb(0,0,0)", //数值名称
|
|
73330
|
+
InputTextColor:"rgb(0,0,0)"
|
|
73331
|
+
};
|
|
73332
|
+
|
|
73243
73333
|
//弹幕
|
|
73244
73334
|
this.Barrage= {
|
|
73245
73335
|
Font:16*GetDevicePixelRatio() +'px 微软雅黑', //字体
|
|
@@ -77402,8 +77492,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
77402
77492
|
frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
|
|
77403
77493
|
frame.GlobalOption=this.GlobalOption;
|
|
77404
77494
|
|
|
77405
|
-
if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal; //绑定菜单事件
|
|
77406
|
-
|
|
77407
77495
|
frame.HorizontalMax=20;
|
|
77408
77496
|
frame.HorizontalMin=10;
|
|
77409
77497
|
|
|
@@ -77486,8 +77574,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
77486
77574
|
frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
|
|
77487
77575
|
frame.GlobalOption=this.GlobalOption;
|
|
77488
77576
|
|
|
77489
|
-
if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal; //绑定菜单事件
|
|
77490
|
-
|
|
77491
77577
|
frame.HorizontalMax=20;
|
|
77492
77578
|
frame.HorizontalMin=10;
|
|
77493
77579
|
frame.YSplitOperator=new FrameSplitY();
|
|
@@ -83472,9 +83558,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
83472
83558
|
{
|
|
83473
83559
|
var id=button.IndexID;
|
|
83474
83560
|
var frame=button.Frame;
|
|
83475
|
-
|
|
83476
|
-
|
|
83477
|
-
frame.ModifyIndexEvent(e);
|
|
83561
|
+
var sendData={ e:e, WindowIndex:frame.Identify, Type:2, Identify:id };
|
|
83562
|
+
this.ShowModifyIndexParamDialog(sendData);
|
|
83478
83563
|
}
|
|
83479
83564
|
else if (button.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW)
|
|
83480
83565
|
{
|
|
@@ -83495,9 +83580,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
83495
83580
|
else if (button.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM)
|
|
83496
83581
|
{
|
|
83497
83582
|
var frame=button.Frame;
|
|
83498
|
-
|
|
83499
|
-
|
|
83500
|
-
frame.ModifyIndexEvent(e);
|
|
83583
|
+
var sendData={ e:e, WindowIndex:frame.Identify, Type:1 }
|
|
83584
|
+
this.ShowModifyIndexParamDialog(sendData);
|
|
83501
83585
|
}
|
|
83502
83586
|
else if (button.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX)
|
|
83503
83587
|
{
|
|
@@ -84309,9 +84393,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
84309
84393
|
{
|
|
84310
84394
|
var id=button.IndexID;
|
|
84311
84395
|
var frame=button.Frame;
|
|
84312
|
-
|
|
84313
|
-
|
|
84314
|
-
|
|
84396
|
+
var sendData={ e:e, WindowIndex:frame.Identify, Type:2, Identify:id };
|
|
84397
|
+
this.ShowModifyIndexParamDialog(sendData);
|
|
84398
|
+
|
|
84315
84399
|
}
|
|
84316
84400
|
else if (button.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW)
|
|
84317
84401
|
{
|
|
@@ -84327,9 +84411,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
84327
84411
|
else if (button.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM)
|
|
84328
84412
|
{
|
|
84329
84413
|
var frame=button.Frame;
|
|
84330
|
-
|
|
84331
|
-
|
|
84332
|
-
frame.ModifyIndexEvent(e);
|
|
84414
|
+
var sendData={ e:e, WindowIndex:frame.Identify, Type:1 }
|
|
84415
|
+
this.ShowModifyIndexParamDialog(sendData);
|
|
84333
84416
|
}
|
|
84334
84417
|
else if (button.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX)
|
|
84335
84418
|
{
|
|
@@ -86096,7 +86179,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
86096
86179
|
|
|
86097
86180
|
if (i>=2)
|
|
86098
86181
|
{
|
|
86099
|
-
|
|
86182
|
+
|
|
86100
86183
|
}
|
|
86101
86184
|
|
|
86102
86185
|
var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
|
|
@@ -86183,12 +86266,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
86183
86266
|
frame.GlobalOption=this.GlobalOption;
|
|
86184
86267
|
frame.HQChart=this;
|
|
86185
86268
|
frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
|
|
86186
|
-
|
|
86187
|
-
|
|
86188
|
-
if (id>=2)
|
|
86189
|
-
{
|
|
86190
|
-
if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal; //绑定菜单事件
|
|
86191
|
-
}
|
|
86192
86269
|
|
|
86193
86270
|
var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
|
|
86194
86271
|
frame.HorizontalMax=DEFAULT_HORIZONTAL[0];
|
|
@@ -91761,8 +91838,6 @@ function KLineChartHScreenContainer(uielement)
|
|
|
91761
91838
|
frame.Identify=i; //窗口序号
|
|
91762
91839
|
frame.RightSpaceCount=this.RightSpaceCount; //右边
|
|
91763
91840
|
|
|
91764
|
-
if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal; //绑定菜单事件
|
|
91765
|
-
|
|
91766
91841
|
frame.HorizontalMax=20;
|
|
91767
91842
|
frame.HorizontalMin=10;
|
|
91768
91843
|
|
|
@@ -94367,230 +94442,6 @@ function IDivDialog(divElement)
|
|
|
94367
94442
|
}
|
|
94368
94443
|
}
|
|
94369
94444
|
|
|
94370
|
-
|
|
94371
|
-
//修改指标
|
|
94372
|
-
function ModifyIndexDialog(divElement)
|
|
94373
|
-
{
|
|
94374
|
-
this.newMethod=IDivDialog; //派生
|
|
94375
|
-
this.newMethod(divElement);
|
|
94376
|
-
delete this.newMethod;
|
|
94377
|
-
|
|
94378
|
-
this.Title={ ID:Guid() }; //标题
|
|
94379
|
-
this.ParamList={ID:Guid() }; //参数列表 class='parameter-content'
|
|
94380
|
-
this.ParamData=[]; //{ ID:参数ID, Value:参数值}
|
|
94381
|
-
this.Identify;
|
|
94382
|
-
this.HQChart;
|
|
94383
|
-
this.IsOverlay=false; //是否是叠加指标
|
|
94384
|
-
|
|
94385
|
-
this.IndexScript;
|
|
94386
|
-
|
|
94387
|
-
//创建
|
|
94388
|
-
this.Create=function()
|
|
94389
|
-
{
|
|
94390
|
-
this.ID=Guid();
|
|
94391
|
-
|
|
94392
|
-
var div=document.createElement('div');
|
|
94393
|
-
div.className='jchart-modifyindex-box';
|
|
94394
|
-
div.id=this.ID;
|
|
94395
|
-
div.innerHTML=
|
|
94396
|
-
"<div class='parameter'>\
|
|
94397
|
-
<div class='parameter-header'>\
|
|
94398
|
-
<span></span>\
|
|
94399
|
-
<strong id='close' class='icon iconfont icon-close'></strong>\
|
|
94400
|
-
</div>\
|
|
94401
|
-
<div class='parameter-content'><input/>MA</div>\
|
|
94402
|
-
<div class='parameter-footer'>\
|
|
94403
|
-
<button class='submit' >确定</button>\
|
|
94404
|
-
<button class='cancel' >取消</button>\
|
|
94405
|
-
</div>\
|
|
94406
|
-
</div>";
|
|
94407
|
-
|
|
94408
|
-
this.DivElement.appendChild(div);
|
|
94409
|
-
|
|
94410
|
-
//确定按钮
|
|
94411
|
-
$("#"+this.ID+" .submit").click(
|
|
94412
|
-
{
|
|
94413
|
-
divBox:this,
|
|
94414
|
-
},
|
|
94415
|
-
function(event)
|
|
94416
|
-
{
|
|
94417
|
-
event.data.divBox.Hide();
|
|
94418
|
-
});
|
|
94419
|
-
|
|
94420
|
-
//给一个id 后面查找方便
|
|
94421
|
-
var titleElement=div.getElementsByTagName('span')[0];
|
|
94422
|
-
titleElement.id=this.Title.ID;
|
|
94423
|
-
|
|
94424
|
-
var paramListElement=div.getElementsByClassName('parameter-content')[0];
|
|
94425
|
-
paramListElement.id=this.ParamList.ID;
|
|
94426
|
-
}
|
|
94427
|
-
|
|
94428
|
-
//设置标题
|
|
94429
|
-
this.SetTitle=function(title)
|
|
94430
|
-
{
|
|
94431
|
-
$("#"+this.Title.ID).html(title);
|
|
94432
|
-
}
|
|
94433
|
-
|
|
94434
|
-
//清空参数
|
|
94435
|
-
this.ClearParamList=function()
|
|
94436
|
-
{
|
|
94437
|
-
$("#"+this.ParamList.ID).empty();
|
|
94438
|
-
this.ParamData=[];
|
|
94439
|
-
}
|
|
94440
|
-
|
|
94441
|
-
this.BindParam=function()
|
|
94442
|
-
{
|
|
94443
|
-
for(var i=0; i<this.IndexScript.Arguments.length; ++i)
|
|
94444
|
-
{
|
|
94445
|
-
var item=this.IndexScript.Arguments[i];
|
|
94446
|
-
if (item.Name==null || isNaN(item.Value)) break;
|
|
94447
|
-
|
|
94448
|
-
var guid=Guid();
|
|
94449
|
-
var param = '<input class="row-line" id="'+guid+'" value="'+item.Value+'" type="number" step="1"/>'+ item.Name +'<br>';
|
|
94450
|
-
$("#"+this.ParamList.ID).append(param);
|
|
94451
|
-
|
|
94452
|
-
this.ParamData.push({ID:guid,Value:item.Value});
|
|
94453
|
-
}
|
|
94454
|
-
|
|
94455
|
-
//绑定参数修改事件
|
|
94456
|
-
var self=this;
|
|
94457
|
-
for(var i=0; i<this.ParamData.length; ++i)
|
|
94458
|
-
{
|
|
94459
|
-
var item=this.ParamData[i];
|
|
94460
|
-
$("#"+item.ID).mouseup(
|
|
94461
|
-
{
|
|
94462
|
-
ParamIndex:i //参数序号
|
|
94463
|
-
},
|
|
94464
|
-
function(event)
|
|
94465
|
-
{
|
|
94466
|
-
var value = parseInt($(this).val()); //获取当前操作的input属性值,转化为整型
|
|
94467
|
-
if (!IFrameSplitOperator.IsNumber(value))
|
|
94468
|
-
{
|
|
94469
|
-
alert("参数不能为空");
|
|
94470
|
-
return;
|
|
94471
|
-
}
|
|
94472
|
-
var chart=self.HQChart;
|
|
94473
|
-
var identify=self.Identify;
|
|
94474
|
-
var paramIndex=event.data.ParamIndex;
|
|
94475
|
-
var script=self.IndexScript;
|
|
94476
|
-
var isOverlay=self.IsOverlay;
|
|
94477
|
-
|
|
94478
|
-
script.Arguments[paramIndex].Value = value; //为参数属性重新赋值
|
|
94479
|
-
if (isOverlay) chart.UpdateOverlayIndex(identify);
|
|
94480
|
-
else chart.UpdateWindowIndex(identify); //调用更新窗口指标函数,参数用来定位窗口
|
|
94481
|
-
}
|
|
94482
|
-
)
|
|
94483
|
-
|
|
94484
|
-
$("#"+item.ID).keyup(
|
|
94485
|
-
{
|
|
94486
|
-
ParamIndex:i //参数序号
|
|
94487
|
-
},
|
|
94488
|
-
function(event)
|
|
94489
|
-
{
|
|
94490
|
-
var value = parseInt($(this).val()); //获取当前操作的input属性值,转化为整型
|
|
94491
|
-
if (!IFrameSplitOperator.IsNumber(value))
|
|
94492
|
-
{
|
|
94493
|
-
alert("参数不能为空");
|
|
94494
|
-
return;
|
|
94495
|
-
}
|
|
94496
|
-
var chart=self.HQChart;
|
|
94497
|
-
var identify=self.Identify;
|
|
94498
|
-
var paramIndex=event.data.ParamIndex;
|
|
94499
|
-
var script=self.IndexScript;
|
|
94500
|
-
var isOverlay=self.IsOverlay;
|
|
94501
|
-
|
|
94502
|
-
script.Arguments[paramIndex].Value = value; //为参数属性重新赋值
|
|
94503
|
-
if (isOverlay) chart.UpdateOverlayIndex(identify);
|
|
94504
|
-
else chart.UpdateWindowIndex(identify); //调用更新窗口指标函数,参数用来定位窗口
|
|
94505
|
-
}
|
|
94506
|
-
)
|
|
94507
|
-
}
|
|
94508
|
-
}
|
|
94509
|
-
|
|
94510
|
-
//绑定取消事件
|
|
94511
|
-
this.BindCancel=function()
|
|
94512
|
-
{
|
|
94513
|
-
//取消按钮事件
|
|
94514
|
-
var self=this;
|
|
94515
|
-
var test=$("#"+this.ID+" .cancel");
|
|
94516
|
-
$("#"+this.ID+" .cancel").unbind("click").click(
|
|
94517
|
-
function(event)
|
|
94518
|
-
{
|
|
94519
|
-
var chart=self.HQChart;
|
|
94520
|
-
var identify=self.Identify;
|
|
94521
|
-
self.RestoreParam();
|
|
94522
|
-
var isOverlay=self.IsOverlay;
|
|
94523
|
-
if (isOverlay) chart.UpdateOverlayIndex(identify);
|
|
94524
|
-
else chart.UpdateWindowIndex(identify);
|
|
94525
|
-
self.IndexScript=null;
|
|
94526
|
-
self.Hide();
|
|
94527
|
-
}
|
|
94528
|
-
);
|
|
94529
|
-
|
|
94530
|
-
//关闭和取消是一样的
|
|
94531
|
-
$("#"+this.ID+" #close").unbind("click").click(
|
|
94532
|
-
function(event)
|
|
94533
|
-
{
|
|
94534
|
-
var chart=self.HQChart;
|
|
94535
|
-
var identify=self.Identify;
|
|
94536
|
-
var isOverlay=self.IsOverlay;
|
|
94537
|
-
self.RestoreParam();
|
|
94538
|
-
if (isOverlay) chart.UpdateOverlayIndex(identify);
|
|
94539
|
-
else chart.UpdateWindowIndex(identify);
|
|
94540
|
-
self.IndexScript=null;
|
|
94541
|
-
self.Hide();
|
|
94542
|
-
}
|
|
94543
|
-
);
|
|
94544
|
-
}
|
|
94545
|
-
|
|
94546
|
-
//还原参数
|
|
94547
|
-
this.RestoreParam=function()
|
|
94548
|
-
{
|
|
94549
|
-
if (!this.IndexScript) return;
|
|
94550
|
-
|
|
94551
|
-
for(var i=0; i<this.ParamData.length; ++i)
|
|
94552
|
-
{
|
|
94553
|
-
var item=this.ParamData[i];
|
|
94554
|
-
this.IndexScript.Arguments[i].Value=item.Value;
|
|
94555
|
-
}
|
|
94556
|
-
}
|
|
94557
|
-
|
|
94558
|
-
//显示
|
|
94559
|
-
this.DoModal=function(event)
|
|
94560
|
-
{
|
|
94561
|
-
var chart=event.data.Chart;
|
|
94562
|
-
var identify=event.data.Identify;
|
|
94563
|
-
var dialog=chart.ModifyIndexDialog;
|
|
94564
|
-
var isOverlay=event.data.IsOverlay===true;
|
|
94565
|
-
|
|
94566
|
-
if(!dialog) return;
|
|
94567
|
-
|
|
94568
|
-
if (dialog.ID==null) dialog.Create(); //第1次 需要创建div
|
|
94569
|
-
dialog.Identify=identify;
|
|
94570
|
-
dialog.HQChart=chart;
|
|
94571
|
-
dialog.IsOverlay=isOverlay
|
|
94572
|
-
|
|
94573
|
-
if (isOverlay)
|
|
94574
|
-
{
|
|
94575
|
-
var overlayIndex=chart.GetOverlayIndexByIdentify(identify);
|
|
94576
|
-
if (!overlayIndex || !overlayIndex.OverlayItem.Script) return;
|
|
94577
|
-
dialog.IndexScript=overlayIndex.OverlayItem.Script;
|
|
94578
|
-
dialog.SetTitle(dialog.IndexScript.Name+" 叠加指标参数设置"); //设置标题
|
|
94579
|
-
}
|
|
94580
|
-
else
|
|
94581
|
-
{
|
|
94582
|
-
dialog.IndexScript=chart.WindowIndex[identify];
|
|
94583
|
-
dialog.SetTitle(dialog.IndexScript.Name+" 指标参数设置"); //设置标题
|
|
94584
|
-
}
|
|
94585
|
-
|
|
94586
|
-
dialog.ClearParamList(); //清空参数
|
|
94587
|
-
dialog.BindParam(chart,identify); //绑定参数
|
|
94588
|
-
dialog.BindCancel(); //绑定取消和关闭事件
|
|
94589
|
-
|
|
94590
|
-
dialog.Show();//显示, 在css里调整居中
|
|
94591
|
-
}
|
|
94592
|
-
}
|
|
94593
|
-
|
|
94594
94445
|
//等待动画窗口
|
|
94595
94446
|
function WaitDialog(divElement)
|
|
94596
94447
|
{
|
|
@@ -139275,7 +139126,7 @@ function ScrollBarBGChart()
|
|
|
139275
139126
|
|
|
139276
139127
|
|
|
139277
139128
|
|
|
139278
|
-
var HQCHART_VERSION="1.1.
|
|
139129
|
+
var HQCHART_VERSION="1.1.14092";
|
|
139279
139130
|
|
|
139280
139131
|
function PrintHQChartVersion()
|
|
139281
139132
|
{
|