hqchart 1.1.15070 → 1.1.15076
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
CHANGED
|
@@ -4865,7 +4865,8 @@ this.LockID;//锁ID
|
|
|
4865
4865
|
this.Callback;//回调
|
|
4866
4866
|
this.IndexName;//指标名字
|
|
4867
4867
|
this.MinWidth=null;//最小宽度
|
|
4868
|
-
this.Draw=function(isDraw){this.LockRect=null;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(this.ChartFrame.IsHScreen===true){this.HScreenDraw(isDraw);return;}var xOffset=this.ChartBorder.GetRight();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetRight();var xPointCount=this.ChartFrame.XPointCount;for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetLeft())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();var lHeight=this.ChartBorder.GetBottom()-this.ChartBorder.GetTop();var lWidth=this.ChartBorder.GetRight()-lLeft;if(this.MinWidth>10&&lWidth<this.MinWidth){lWidth=this.MinWidth;lLeft=this.ChartBorder.GetRight()-lWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();}if(isDraw){
|
|
4868
|
+
this.Draw=function(isDraw){this.LockRect=null;if(this.NotSupportMessage){this.DrawNotSupportmessage();return;}if(this.ChartFrame.IsHScreen===true){this.HScreenDraw(isDraw);return;}var xOffset=this.ChartBorder.GetRight();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetRight();var xPointCount=this.ChartFrame.XPointCount;for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetLeft())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();var lHeight=this.ChartBorder.GetBottom()-this.ChartBorder.GetTop();var lWidth=this.ChartBorder.GetRight()-lLeft;if(this.MinWidth>10&&lWidth<this.MinWidth){lWidth=this.MinWidth;lLeft=this.ChartBorder.GetRight()-lWidth;if(lLeft<this.ChartBorder.GetLeft())lLeft=this.ChartBorder.GetLeft();}if(isDraw){var rtBG={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Height:lHeight};rtBG.Right=rtBG.Width+rtBG.Left;rtBG.Bottom=rtBG.Height+rtBG.Top;//上下渐变
|
|
4869
|
+
var bgColor=this.SetFillStyle(this.BGColor,rtBG.Left,rtBG.Top,rtBG.Left,rtBG.Bottom);this.Canvas.fillStyle=bgColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);var xCenter=rtBG.Left+rtBG.Width/2;var yCenter=rtBG.Top+lHeight/2;this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,xCenter,yCenter);}this.LockRect={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Heigh:lHeight};//保存上锁区域
|
|
4869
4870
|
};this.HScreenDraw=function(isDraw){var xOffset=this.ChartBorder.GetBottom();var lOffsetWidth=0;if(this.ChartFrame.Data!=null){var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+2.0;var chartright=this.ChartBorder.GetBottom();var xPointCount=this.ChartFrame.XPointCount;//求最后1个数据的位置
|
|
4870
4871
|
for(var i=this.ChartFrame.Data.DataOffset,j=0;i<this.ChartFrame.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var data=this.ChartFrame.Data.Data[i];if(data.Open==null||data.High==null||data.Low==null||data.Close==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;}lOffsetWidth=(dataWidth+distanceWidth)*this.LockCount;}if(lOffsetWidth==0){lOffsetWidth=(xOffset-this.ChartBorder.GetTop())*this.WidthDiv;}var lLeft=xOffset-lOffsetWidth;if(lLeft<this.ChartBorder.GetTop())lLeft=this.ChartBorder.GetTop();var lHeight=this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();var lWidth=this.ChartBorder.GetBottom()-lLeft;this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(this.ChartBorder.GetLeft(),lLeft,lHeight,lWidth);var xCenter=this.ChartBorder.GetLeft()+lHeight/2;var yCenter=lLeft+lWidth/2;this.Canvas.save();this.Canvas.translate(xCenter,yCenter);this.Canvas.rotate(90*Math.PI/180);this.Canvas.textAlign='center';this.Canvas.textBaseline='middle';this.Canvas.fillStyle=this.TextColor;this.Canvas.font=this.Font;this.Canvas.fillText(this.Title,0,0);this.Canvas.restore();this.LockRect={Left:this.ChartBorder.GetLeft(),Top:lLeft,Width:lHeight,Heigh:lWidth};//保存上锁区域
|
|
4871
4872
|
};//x,y是否在上锁区域
|
|
@@ -5159,7 +5160,7 @@ this.NotSupportMessage="不支持筹码图";this.Buttons=[];this.DefaultButton=C
|
|
|
5159
5160
|
this.LongButton=CloneData(g_JSChartResource.StockChip.LongButton);//远期筹码分布图
|
|
5160
5161
|
this.RecentButton=CloneData(g_JSChartResource.StockChip.RecentButton);//近期筹码分布图
|
|
5161
5162
|
this.CloseButton=CloneData(g_JSChartResource.StockChip.CloseButton);//关闭按钮
|
|
5162
|
-
this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);this.DAY_COLOR=[['rgb(255,0,0)','rgb(255,128,128)','rgb(255,0,128)','rgb(255,100,0)','rgb(192,128,0)','rgb(255,192,0)'],['rgb(120,80,225)','rgb(160,160,225)','rgb(80,80,255)','rgb(120,120,255)','rgb(32,64,192)','rgb(0,64,128)']];this.SetOption=function(option){if(!option)return;if(option.ShowType>0)this.ShowType=option.ShowType;if(option.IsShowX)this.IsShowX=option.IsShowX;if(option.ShowXCount>0)this.ShowXCount=option.ShowXCount;if(option.Width>
|
|
5163
|
+
this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);this.DAY_COLOR=[['rgb(255,0,0)','rgb(255,128,128)','rgb(255,0,128)','rgb(255,100,0)','rgb(192,128,0)','rgb(255,192,0)'],['rgb(120,80,225)','rgb(160,160,225)','rgb(80,80,255)','rgb(120,120,255)','rgb(32,64,192)','rgb(0,64,128)']];this.SetOption=function(option){if(!option)return;if(option.ShowType>0)this.ShowType=option.ShowType;if(option.IsShowX)this.IsShowX=option.IsShowX;if(option.ShowXCount>0)this.ShowXCount=option.ShowXCount;if(option.Width>50)this.Width=option.Width*GetDevicePixelRatio();if(option.CalculateType>0)this.CalculateType=option.CalculateType;if(IFrameSplitOperator.IsNumber(option.PriceZoom))this.PriceZoom=option.PriceZoom;};this.ReloadResource=function(resource){this.PenBorder=g_JSChartResource.FrameBorderPen;this.Font=g_JSChartResource.StockChip.Font;this.InfoColor=g_JSChartResource.StockChip.InfoColor;this.DayInfoColor=g_JSChartResource.StockChip.DayInfoColor;this.DefaultButton=CloneData(g_JSChartResource.StockChip.DefaultButton);//默认筹码分布图
|
|
5163
5164
|
this.LongButton=CloneData(g_JSChartResource.StockChip.LongButton);//远期筹码分布图
|
|
5164
5165
|
this.RecentButton=CloneData(g_JSChartResource.StockChip.RecentButton);//近期筹码分布图
|
|
5165
5166
|
this.CloseButton=CloneData(g_JSChartResource.StockChip.CloseButton);this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);};this.Draw=function(){this.PixelRatio=GetDevicePixelRatio();var left=ToFixedPoint(this.ChartBorder.GetRight()+this.Left);var top=ToFixedPoint(this.ChartBorder.GetTop());var right=ToFixedPoint(left+this.Width-1*this.PixelRatio);var bottom=ToFixedPoint(this.ChartBorder.GetBottom());var width=right-left;var height=bottom-top;this.ClientRect={Left:left,Top:top,Width:width,Height:height};if(ChartData.IsTickPeriod(this.HQChart.Period))//分笔图没有筹码
|
|
@@ -6513,10 +6514,10 @@ this.IsPointInLine=function(x,y,option){if(!this.LinePoint)return-1;var lineWidt
|
|
|
6513
6514
|
return -1;
|
|
6514
6515
|
*/};//0-10 鼠标对应的点索引 100=鼠标在正个图形上 -1 鼠标不在图形上
|
|
6515
6516
|
this.IsPointIn_XYValue_Line=function(x,y,option){if(this.Status!=10)return-1;var value=this.IsPointInXYValue(x,y,option);if(value>=0)return value;value=this.IsPointInLine(x,y,option);if(value>=0)return 100;return-1;};this.DrawLine=function(ptStart,ptEnd,isDottedline){if(isDottedline)this.Canvas.setLineDash([5,10]);this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(ptStart.X,ptStart.Y);this.Canvas.lineTo(ptEnd.X,ptEnd.Y);this.Canvas.stroke();if(isDottedline)this.Canvas.setLineDash([]);};this.CreateLineData=function(ptStart,ptEnd){var line={Start:new Point(),End:new Point()};line.Start.Y=ptStart.Y;line.Start.X=ptStart.X;line.End.Y=ptEnd.Y;line.End.X=ptEnd.X;return line;};//导出成存储格式
|
|
6516
|
-
this.ExportStorageData=function(){var storageData={ClassName:this.ClassName,Symbol:this.Symbol,Guid:this.Guid,Period:this.Period,Value:[],FrameID:this.Frame.Identify,LineColor:this.LineColor,AreaColor:this.AreaColor,LineWidth:this.LineWidth,Right:this.Right,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate};for(var i=0;i<this.Value.length;++i){var item=this.Value[i];storageData.Value.push({XValue:item.XValue,YValue:item.YValue,DateTime:item.DateTime});}if(this.Text)storageData.Text=this.Text;//如果有文本, 也导出
|
|
6517
|
+
this.ExportStorageData=function(){var storageData={ClassName:this.ClassName,Symbol:this.Symbol,Guid:this.Guid,Period:this.Period,Value:[],FrameID:this.Frame.Identify,LineColor:this.LineColor,AreaColor:this.AreaColor,LineWidth:this.LineWidth,Right:this.Right,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate,EnableCtrlMove:this.EnableCtrlMove};for(var i=0;i<this.Value.length;++i){var item=this.Value[i];storageData.Value.push({XValue:item.XValue,YValue:item.YValue,DateTime:item.DateTime});}if(this.Text)storageData.Text=this.Text;//如果有文本, 也导出
|
|
6517
6518
|
if(this.FontOption)storageData.FontOption=this.FontOption;//字体也导出
|
|
6518
6519
|
return storageData;};//导出基础的配置 不包含点
|
|
6519
|
-
this.ExportBaseData=function(){var data={ClassName:this.ClassName,Guid:this.Guid,FrameID:this.Frame.Identify,Symbol:this.Symbol,Period:this.Period,Right:this.Right,LineColor:this.LineColor,LineWidth:this.LineWidth,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate};if(this.AreaColor)data.AreaColor=this.AreaColor;if(this.Text)data.Text=this.Text;//如果有文本, 也导出
|
|
6520
|
+
this.ExportBaseData=function(){var data={ClassName:this.ClassName,Guid:this.Guid,FrameID:this.Frame.Identify,Symbol:this.Symbol,Period:this.Period,Right:this.Right,LineColor:this.LineColor,LineWidth:this.LineWidth,EnableSave:this.EnableSave,IsShowYCoordinate:this.IsShowYCoordinate,EnableCtrlMove:this.EnableCtrlMove};if(this.AreaColor)data.AreaColor=this.AreaColor;if(this.Text)data.Text=this.Text;//如果有文本, 也导出
|
|
6520
6521
|
if(this.FontOption){data.FontOption={};this.SetFont(data.FontOption,this.FontOption);//字体也导出
|
|
6521
6522
|
}return data;};this.IsFrameMinSize=function()//框架是否是最小化模式
|
|
6522
6523
|
{return this.Frame&&this.Frame.IsMinSize;};this.PointRange=function(aryPoint){if(!IFrameSplitOperator.IsNonEmptyArray(aryPoint))return null;if(aryPoint.length==1){var data={Points:[{X:aryPoint[0].X,Y:aryPoint[0].Y}]};return data;}else{var xMax=aryPoint[0].X;var xMin=xMax;var yMax=aryPoint[0].Y;var yMin=yMax;var aryData=[{X:aryPoint[0].X,Y:aryPoint[0].Y}];for(var i=1;i<aryPoint.length;++i){if(xMax<aryPoint[i].X)xMax=aryPoint[i].X;if(xMin>aryPoint[i].X)xMin=aryPoint[i].X;if(yMax<aryPoint[i].Y)yMax=aryPoint[i].Y;if(yMin>aryPoint[i].Y)yMin=aryPoint[i].Y;aryData.push({X:aryPoint[i].X,Y:aryPoint[i].Y});}var data={X:{Max:{X:xMax},Min:{X:xMin}},Y:{Max:{Y:yMax},Min:{Y:yMin}},Points:aryData//所有的点
|
|
@@ -10111,7 +10112,7 @@ function FuturesTimeData(){this.TIME_SPLIT=[//ID=0 9:00-10:15,10:31-11:30,13:31-
|
|
|
10111
10112
|
[{Value:931,Text:'9:30'},{Value:1030,Text:'10:30'},{Value:1301,Text:'13:00'},{Value:1400,Text:'14:00'},{Value:1500,Text:'15:00'}],Min://最小模式
|
|
10112
10113
|
[{Value:931,Text:'9:30'},{Value:1301,Text:'13:00'},{Value:1500,Text:'15:00'}]}}];this.MAP_TWOWORDS=new _map2.default([//大连商品交易所
|
|
10113
10114
|
[MARKET_SUFFIX_NAME.DCE+'-JD',{Time:0,Decimal:0,Name:"鸡蛋"}],[MARKET_SUFFIX_NAME.DCE+'-FB',{Time:0,Decimal:2,Name:"纤板"}],[MARKET_SUFFIX_NAME.DCE+'-BB',{Time:0,Decimal:2,Name:"胶板"}],[MARKET_SUFFIX_NAME.DCE+'-PP',{Time:6,Decimal:0,Name:"丙烯"}],[MARKET_SUFFIX_NAME.DCE+'-JM',{Time:6,Decimal:1,Name:'焦煤'}],[MARKET_SUFFIX_NAME.DCE+'-EG',{Time:6,Decimal:0,Name:'乙二醇'}],[MARKET_SUFFIX_NAME.DCE+'-EB',{Time:6,Decimal:0,Name:'苯乙烯'}],[MARKET_SUFFIX_NAME.DCE+'-CS',{Time:6,Decimal:0,Name:'淀粉'}],[MARKET_SUFFIX_NAME.DCE+'-PG',{Time:6,Decimal:0,Name:'液化气'}],[MARKET_SUFFIX_NAME.DCE+'-RR',{Time:6,Decimal:0,Name:'梗米'}],[MARKET_SUFFIX_NAME.DCE+'-LH',{Time:0,Decimal:0,Name:'生猪'}],//上期所
|
|
10114
|
-
[MARKET_SUFFIX_NAME.SHFE+'-CU',{Time:4,Decimal:0,Name:"
|
|
10115
|
+
[MARKET_SUFFIX_NAME.SHFE+'-CU',{Time:4,Decimal:0,Name:"沪铜"}],[MARKET_SUFFIX_NAME.SHFE+'-AL',{Time:4,Decimal:0,Name:"沪铝"}],[MARKET_SUFFIX_NAME.SHFE+'-NI',{Time:4,Decimal:0,Name:"沪镍"}],[MARKET_SUFFIX_NAME.SHFE+'-SN',{Time:4,Decimal:0,Name:'沪锡'}],[MARKET_SUFFIX_NAME.SHFE+'-ZN',{Time:4,Decimal:0,Name:"沪锌"}],[MARKET_SUFFIX_NAME.SHFE+'-PB',{Time:4,Decimal:0,Name:'沪铅'}],[MARKET_SUFFIX_NAME.SHFE+'-RU',{Time:6,Decimal:0,Name:"天然橡胶"}],[MARKET_SUFFIX_NAME.SHFE+'-FU',{Time:6,Decimal:0,Name:"燃料油"}],[MARKET_SUFFIX_NAME.SHFE+'-RB',{Time:6,Decimal:0,Name:"螺纹钢"}],[MARKET_SUFFIX_NAME.SHFE+'-BU',{Time:6,Decimal:0,Name:'石油沥青'}],[MARKET_SUFFIX_NAME.SHFE+'-HC',{Time:6,Decimal:0,Name:"热轧卷板"}],[MARKET_SUFFIX_NAME.SHFE+'-SP',{Time:6,Decimal:0,Name:"纸浆"}],[MARKET_SUFFIX_NAME.SHFE+'-WR',{Time:0,Decimal:0,Name:"线材"}],[MARKET_SUFFIX_NAME.SHFE+'-AG',{Time:5,Decimal:0,Name:"白银"}],[MARKET_SUFFIX_NAME.SHFE+'-AU',{Time:5,Decimal:2,Name:"黄金"}],[MARKET_SUFFIX_NAME.SHFE+'-SS',{Time:4,Decimal:0,Name:'不锈钢'}],[MARKET_SUFFIX_NAME.SHFE+'-AO',{Time:4,Decimal:0,Name:'氧化铝'}],[MARKET_SUFFIX_NAME.SHFE+'-BR',{Time:6,Decimal:0,Name:'合成橡胶'}],[MARKET_SUFFIX_NAME.SHFE+'-AD',{Time:4,Decimal:0,Name:"铝合金"}],//上期所-能源
|
|
10115
10116
|
[MARKET_SUFFIX_NAME.SHFE+'-NR',{Time:6,Decimal:1,Name:'20号胶'}],[MARKET_SUFFIX_NAME.SHFE+'-SC',{Time:5,Decimal:1,Name:'原油'}],[MARKET_SUFFIX_NAME.SHFE+'-LU',{Time:6,Decimal:0,Name:'低硫燃油'}],[MARKET_SUFFIX_NAME.SHFE+'-BC',{Time:4,Decimal:0,Name:'国际铜'}],[MARKET_SUFFIX_NAME.SHFE+'-EC',{Time:0,Decimal:0,Name:'集运指数'}],//郑州期货交易所
|
|
10116
10117
|
[MARKET_SUFFIX_NAME.CZCE+'-CF',{Time:6,Decimal:0,Name:"棉花"}],[MARKET_SUFFIX_NAME.CZCE+'-SR',{Time:6,Decimal:0,Name:"白糖"}],[MARKET_SUFFIX_NAME.CZCE+'-MA',{Time:6,Decimal:0,Name:"甲醇"}],[MARKET_SUFFIX_NAME.CZCE+'-ZC',{Time:6,Decimal:1,Name:'动力煤'}],[MARKET_SUFFIX_NAME.CZCE+'-TA',{Time:6,Decimal:0,Name:"精对苯二甲酸(PTA)"}],[MARKET_SUFFIX_NAME.CZCE+'-RM',{Time:6,Decimal:0,Name:'菜籽粕'}],[MARKET_SUFFIX_NAME.CZCE+'-OI',{Time:6,Decimal:0,Name:"菜籽油"}],[MARKET_SUFFIX_NAME.CZCE+'-ME',{Time:3,Decimal:0,Name:"甲醇(老)"}],[MARKET_SUFFIX_NAME.CZCE+'-FG',{Time:6,Decimal:0,Name:'平板玻璃'}],[MARKET_SUFFIX_NAME.CZCE+'-WS',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-WT',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-GN',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-RO',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-RS',{Time:0,Decimal:0,Name:"菜籽"}],[MARKET_SUFFIX_NAME.CZCE+'-ER',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-RI',{Time:0,Decimal:0,Name:"早籼稻"}],[MARKET_SUFFIX_NAME.CZCE+'-WH',{Time:0,Decimal:0,Name:"强麦"}],[MARKET_SUFFIX_NAME.CZCE+'-AP',{Time:0,Decimal:0,Name:"苹果"}],[MARKET_SUFFIX_NAME.CZCE+'-PM',{Time:0,Decimal:0,Name:"普麦"}],[MARKET_SUFFIX_NAME.CZCE+'-QM',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-TC',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-JR',{Time:0,Decimal:0,Name:"粳稻"}],[MARKET_SUFFIX_NAME.CZCE+'-LR',{Time:0,Decimal:0,Name:"晚籼稻"}],[MARKET_SUFFIX_NAME.CZCE+'-SF',{Time:0,Decimal:0,Name:"硅铁"}],[MARKET_SUFFIX_NAME.CZCE+'-SM',{Time:0,Decimal:0,Name:"锰硅"}],[MARKET_SUFFIX_NAME.CZCE+'-CJ',{Time:0,Decimal:2,Name:"红枣"}],[MARKET_SUFFIX_NAME.CZCE+'-CY',{Time:6,Decimal:0,Name:"棉纱"}],[MARKET_SUFFIX_NAME.CZCE+'-UR',{Time:0,Decimal:0,Name:"尿素"}],[MARKET_SUFFIX_NAME.CZCE+'-SA',{Time:6,Decimal:0,Name:"纯碱"}],[MARKET_SUFFIX_NAME.CZCE+'-PF',{Time:6,Decimal:0,Name:"短纤"}],[MARKET_SUFFIX_NAME.CZCE+'-PK',{Time:0,Decimal:0,Name:"花生"}],[MARKET_SUFFIX_NAME.CZCE+'-PR',{Time:6,Decimal:0,Name:"瓶片"}],//中期所
|
|
10117
10118
|
[MARKET_SUFFIX_NAME.CFFEX+'-TF',{Time:1,Decimal:3,Name:"二债"}],[MARKET_SUFFIX_NAME.CFFEX+'-TS',{Time:1,Decimal:3,Name:"五债"}],[MARKET_SUFFIX_NAME.CFFEX+'-IH',{Time:2,Decimal:1,Name:'上证股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IC',{Time:2,Decimal:1,Name:'中证股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IF',{Time:2,Decimal:1,Name:'沪深股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IM',{Time:2,Decimal:1,Name:'中证1000股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IO',{Time:2,Decimal:1,Name:'沪深300股指期权'}],[MARKET_SUFFIX_NAME.CFFEX+'-MO',{Time:2,Decimal:1,Name:'中证1000股指期权'}],[MARKET_SUFFIX_NAME.CFFEX+'-HO',{Time:2,Decimal:1,Name:'上证50股指期权'}],//广州期货交易所
|
|
@@ -15337,7 +15338,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15337
15338
|
this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
|
|
15338
15339
|
* 版本信息输出
|
|
15339
15340
|
*
|
|
15340
|
-
*/var HQCHART_VERSION="1.1.
|
|
15341
|
+
*/var HQCHART_VERSION="1.1.15075";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
15341
15342
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15342
15343
|
// BaseIndex:BaseIndex,
|
|
15343
15344
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -47774,10 +47774,17 @@ function ChartLock()
|
|
|
47774
47774
|
|
|
47775
47775
|
if (isDraw)
|
|
47776
47776
|
{
|
|
47777
|
-
this.
|
|
47778
|
-
|
|
47779
|
-
|
|
47780
|
-
|
|
47777
|
+
var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
|
|
47778
|
+
rtBG.Right=rtBG.Width+rtBG.Left;
|
|
47779
|
+
rtBG.Bottom=rtBG.Height+rtBG.Top;
|
|
47780
|
+
|
|
47781
|
+
//上下渐变
|
|
47782
|
+
var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
|
|
47783
|
+
this.Canvas.fillStyle =bgColor;
|
|
47784
|
+
this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
|
|
47785
|
+
|
|
47786
|
+
var xCenter = rtBG.Left + rtBG.Width / 2;
|
|
47787
|
+
var yCenter = rtBG.Top + lHeight / 2;
|
|
47781
47788
|
this.Canvas.textAlign = 'center';
|
|
47782
47789
|
this.Canvas.textBaseline = 'middle';
|
|
47783
47790
|
this.Canvas.fillStyle = this.TextColor;
|
|
@@ -47821,6 +47828,7 @@ function ChartLock()
|
|
|
47821
47828
|
if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
|
|
47822
47829
|
var lHeight = this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
|
|
47823
47830
|
var lWidth = this.ChartBorder.GetBottom() - lLeft;
|
|
47831
|
+
|
|
47824
47832
|
this.Canvas.fillStyle = this.BGColor;
|
|
47825
47833
|
this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
|
|
47826
47834
|
|
|
@@ -49471,7 +49479,7 @@ function StockChip()
|
|
|
49471
49479
|
if (option.ShowType>0) this.ShowType=option.ShowType;
|
|
49472
49480
|
if (option.IsShowX) this.IsShowX=option.IsShowX;
|
|
49473
49481
|
if (option.ShowXCount>0) this.ShowXCount=option.ShowXCount;
|
|
49474
|
-
if (option.Width>
|
|
49482
|
+
if (option.Width>50) this.Width=option.Width*GetDevicePixelRatio();
|
|
49475
49483
|
if (option.CalculateType>0) this.CalculateType=option.CalculateType;
|
|
49476
49484
|
if (IFrameSplitOperator.IsNumber(option.PriceZoom)) this.PriceZoom=option.PriceZoom;
|
|
49477
49485
|
}
|
|
@@ -65380,7 +65388,7 @@ function IChartDrawPicture()
|
|
|
65380
65388
|
Symbol:this.Symbol, Guid:this.Guid, Period:this.Period,Value:[] ,
|
|
65381
65389
|
FrameID:this.Frame.Identify, LineColor:this.LineColor, AreaColor:this.AreaColor,
|
|
65382
65390
|
LineWidth:this.LineWidth, Right:this.Right, EnableSave:this.EnableSave,
|
|
65383
|
-
IsShowYCoordinate:this.IsShowYCoordinate
|
|
65391
|
+
IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove
|
|
65384
65392
|
};
|
|
65385
65393
|
|
|
65386
65394
|
for(var i=0; i<this.Value.length; ++i)
|
|
@@ -65404,7 +65412,7 @@ function IChartDrawPicture()
|
|
|
65404
65412
|
Symbol:this.Symbol, Period:this.Period,Right:this.Right,
|
|
65405
65413
|
LineColor:this.LineColor,
|
|
65406
65414
|
LineWidth:this.LineWidth,
|
|
65407
|
-
EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate
|
|
65415
|
+
EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove,
|
|
65408
65416
|
};
|
|
65409
65417
|
|
|
65410
65418
|
if (this.AreaColor) data.AreaColor=this.AreaColor;
|
|
@@ -103511,9 +103519,9 @@ function FuturesTimeData()
|
|
|
103511
103519
|
[MARKET_SUFFIX_NAME.DCE + '-LH', {Time:0,Decimal:0,Name:'生猪'}],
|
|
103512
103520
|
|
|
103513
103521
|
//上期所
|
|
103514
|
-
[MARKET_SUFFIX_NAME.SHFE + '-CU', {Time:4,Decimal:0,Name:"
|
|
103515
|
-
[MARKET_SUFFIX_NAME.SHFE + '-AL', {Time:4,Decimal:0,Name:"
|
|
103516
|
-
[MARKET_SUFFIX_NAME.SHFE + '-NI', {Time:4,Decimal:0,Name:"
|
|
103522
|
+
[MARKET_SUFFIX_NAME.SHFE + '-CU', {Time:4,Decimal:0,Name:"沪铜"}],
|
|
103523
|
+
[MARKET_SUFFIX_NAME.SHFE + '-AL', {Time:4,Decimal:0,Name:"沪铝"}],
|
|
103524
|
+
[MARKET_SUFFIX_NAME.SHFE + '-NI', {Time:4,Decimal:0,Name:"沪镍"}],
|
|
103517
103525
|
[MARKET_SUFFIX_NAME.SHFE + '-SN', {Time:4,Decimal:0,Name:'沪锡'}],
|
|
103518
103526
|
[MARKET_SUFFIX_NAME.SHFE + '-ZN', {Time:4,Decimal:0,Name:"沪锌"}],
|
|
103519
103527
|
[MARKET_SUFFIX_NAME.SHFE + '-PB', {Time:4,Decimal:0,Name:'沪铅'}],
|
|
@@ -103529,6 +103537,7 @@ function FuturesTimeData()
|
|
|
103529
103537
|
[MARKET_SUFFIX_NAME.SHFE + '-SS', {Time:4,Decimal:0,Name:'不锈钢'}],
|
|
103530
103538
|
[MARKET_SUFFIX_NAME.SHFE + '-AO', {Time:4,Decimal:0,Name:'氧化铝'}],
|
|
103531
103539
|
[MARKET_SUFFIX_NAME.SHFE + '-BR', {Time:6,Decimal:0,Name:'合成橡胶'}],
|
|
103540
|
+
[MARKET_SUFFIX_NAME.SHFE + '-AD', {Time:4,Decimal:0,Name:"铝合金"}],
|
|
103532
103541
|
|
|
103533
103542
|
//上期所-能源
|
|
103534
103543
|
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
|
|
@@ -51870,10 +51870,17 @@ function ChartLock()
|
|
|
51870
51870
|
|
|
51871
51871
|
if (isDraw)
|
|
51872
51872
|
{
|
|
51873
|
-
this.
|
|
51874
|
-
|
|
51875
|
-
|
|
51876
|
-
|
|
51873
|
+
var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
|
|
51874
|
+
rtBG.Right=rtBG.Width+rtBG.Left;
|
|
51875
|
+
rtBG.Bottom=rtBG.Height+rtBG.Top;
|
|
51876
|
+
|
|
51877
|
+
//上下渐变
|
|
51878
|
+
var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
|
|
51879
|
+
this.Canvas.fillStyle =bgColor;
|
|
51880
|
+
this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
|
|
51881
|
+
|
|
51882
|
+
var xCenter = rtBG.Left + rtBG.Width / 2;
|
|
51883
|
+
var yCenter = rtBG.Top + lHeight / 2;
|
|
51877
51884
|
this.Canvas.textAlign = 'center';
|
|
51878
51885
|
this.Canvas.textBaseline = 'middle';
|
|
51879
51886
|
this.Canvas.fillStyle = this.TextColor;
|
|
@@ -51917,6 +51924,7 @@ function ChartLock()
|
|
|
51917
51924
|
if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
|
|
51918
51925
|
var lHeight = this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
|
|
51919
51926
|
var lWidth = this.ChartBorder.GetBottom() - lLeft;
|
|
51927
|
+
|
|
51920
51928
|
this.Canvas.fillStyle = this.BGColor;
|
|
51921
51929
|
this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
|
|
51922
51930
|
|
|
@@ -53567,7 +53575,7 @@ function StockChip()
|
|
|
53567
53575
|
if (option.ShowType>0) this.ShowType=option.ShowType;
|
|
53568
53576
|
if (option.IsShowX) this.IsShowX=option.IsShowX;
|
|
53569
53577
|
if (option.ShowXCount>0) this.ShowXCount=option.ShowXCount;
|
|
53570
|
-
if (option.Width>
|
|
53578
|
+
if (option.Width>50) this.Width=option.Width*GetDevicePixelRatio();
|
|
53571
53579
|
if (option.CalculateType>0) this.CalculateType=option.CalculateType;
|
|
53572
53580
|
if (IFrameSplitOperator.IsNumber(option.PriceZoom)) this.PriceZoom=option.PriceZoom;
|
|
53573
53581
|
}
|
|
@@ -69476,7 +69484,7 @@ function IChartDrawPicture()
|
|
|
69476
69484
|
Symbol:this.Symbol, Guid:this.Guid, Period:this.Period,Value:[] ,
|
|
69477
69485
|
FrameID:this.Frame.Identify, LineColor:this.LineColor, AreaColor:this.AreaColor,
|
|
69478
69486
|
LineWidth:this.LineWidth, Right:this.Right, EnableSave:this.EnableSave,
|
|
69479
|
-
IsShowYCoordinate:this.IsShowYCoordinate
|
|
69487
|
+
IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove
|
|
69480
69488
|
};
|
|
69481
69489
|
|
|
69482
69490
|
for(var i=0; i<this.Value.length; ++i)
|
|
@@ -69500,7 +69508,7 @@ function IChartDrawPicture()
|
|
|
69500
69508
|
Symbol:this.Symbol, Period:this.Period,Right:this.Right,
|
|
69501
69509
|
LineColor:this.LineColor,
|
|
69502
69510
|
LineWidth:this.LineWidth,
|
|
69503
|
-
EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate
|
|
69511
|
+
EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove,
|
|
69504
69512
|
};
|
|
69505
69513
|
|
|
69506
69514
|
if (this.AreaColor) data.AreaColor=this.AreaColor;
|
|
@@ -107607,9 +107615,9 @@ function FuturesTimeData()
|
|
|
107607
107615
|
[MARKET_SUFFIX_NAME.DCE + '-LH', {Time:0,Decimal:0,Name:'生猪'}],
|
|
107608
107616
|
|
|
107609
107617
|
//上期所
|
|
107610
|
-
[MARKET_SUFFIX_NAME.SHFE + '-CU', {Time:4,Decimal:0,Name:"
|
|
107611
|
-
[MARKET_SUFFIX_NAME.SHFE + '-AL', {Time:4,Decimal:0,Name:"
|
|
107612
|
-
[MARKET_SUFFIX_NAME.SHFE + '-NI', {Time:4,Decimal:0,Name:"
|
|
107618
|
+
[MARKET_SUFFIX_NAME.SHFE + '-CU', {Time:4,Decimal:0,Name:"沪铜"}],
|
|
107619
|
+
[MARKET_SUFFIX_NAME.SHFE + '-AL', {Time:4,Decimal:0,Name:"沪铝"}],
|
|
107620
|
+
[MARKET_SUFFIX_NAME.SHFE + '-NI', {Time:4,Decimal:0,Name:"沪镍"}],
|
|
107613
107621
|
[MARKET_SUFFIX_NAME.SHFE + '-SN', {Time:4,Decimal:0,Name:'沪锡'}],
|
|
107614
107622
|
[MARKET_SUFFIX_NAME.SHFE + '-ZN', {Time:4,Decimal:0,Name:"沪锌"}],
|
|
107615
107623
|
[MARKET_SUFFIX_NAME.SHFE + '-PB', {Time:4,Decimal:0,Name:'沪铅'}],
|
|
@@ -107625,6 +107633,7 @@ function FuturesTimeData()
|
|
|
107625
107633
|
[MARKET_SUFFIX_NAME.SHFE + '-SS', {Time:4,Decimal:0,Name:'不锈钢'}],
|
|
107626
107634
|
[MARKET_SUFFIX_NAME.SHFE + '-AO', {Time:4,Decimal:0,Name:'氧化铝'}],
|
|
107627
107635
|
[MARKET_SUFFIX_NAME.SHFE + '-BR', {Time:6,Decimal:0,Name:'合成橡胶'}],
|
|
107636
|
+
[MARKET_SUFFIX_NAME.SHFE + '-AD', {Time:4,Decimal:0,Name:"铝合金"}],
|
|
107628
107637
|
|
|
107629
107638
|
//上期所-能源
|
|
107630
107639
|
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
|
|
@@ -153699,7 +153708,7 @@ function ScrollBarBGChart()
|
|
|
153699
153708
|
|
|
153700
153709
|
|
|
153701
153710
|
|
|
153702
|
-
var HQCHART_VERSION="1.1.
|
|
153711
|
+
var HQCHART_VERSION="1.1.15075";
|
|
153703
153712
|
|
|
153704
153713
|
function PrintHQChartVersion()
|
|
153705
153714
|
{
|
|
@@ -51914,10 +51914,17 @@ function ChartLock()
|
|
|
51914
51914
|
|
|
51915
51915
|
if (isDraw)
|
|
51916
51916
|
{
|
|
51917
|
-
this.
|
|
51918
|
-
|
|
51919
|
-
|
|
51920
|
-
|
|
51917
|
+
var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
|
|
51918
|
+
rtBG.Right=rtBG.Width+rtBG.Left;
|
|
51919
|
+
rtBG.Bottom=rtBG.Height+rtBG.Top;
|
|
51920
|
+
|
|
51921
|
+
//上下渐变
|
|
51922
|
+
var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
|
|
51923
|
+
this.Canvas.fillStyle =bgColor;
|
|
51924
|
+
this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
|
|
51925
|
+
|
|
51926
|
+
var xCenter = rtBG.Left + rtBG.Width / 2;
|
|
51927
|
+
var yCenter = rtBG.Top + lHeight / 2;
|
|
51921
51928
|
this.Canvas.textAlign = 'center';
|
|
51922
51929
|
this.Canvas.textBaseline = 'middle';
|
|
51923
51930
|
this.Canvas.fillStyle = this.TextColor;
|
|
@@ -51961,6 +51968,7 @@ function ChartLock()
|
|
|
51961
51968
|
if (lLeft < this.ChartBorder.GetTop()) lLeft = this.ChartBorder.GetTop();
|
|
51962
51969
|
var lHeight = this.ChartBorder.GetRight()-this.ChartBorder.GetLeft();
|
|
51963
51970
|
var lWidth = this.ChartBorder.GetBottom() - lLeft;
|
|
51971
|
+
|
|
51964
51972
|
this.Canvas.fillStyle = this.BGColor;
|
|
51965
51973
|
this.Canvas.fillRect(this.ChartBorder.GetLeft(), lLeft,lHeight,lWidth);
|
|
51966
51974
|
|
|
@@ -53611,7 +53619,7 @@ function StockChip()
|
|
|
53611
53619
|
if (option.ShowType>0) this.ShowType=option.ShowType;
|
|
53612
53620
|
if (option.IsShowX) this.IsShowX=option.IsShowX;
|
|
53613
53621
|
if (option.ShowXCount>0) this.ShowXCount=option.ShowXCount;
|
|
53614
|
-
if (option.Width>
|
|
53622
|
+
if (option.Width>50) this.Width=option.Width*GetDevicePixelRatio();
|
|
53615
53623
|
if (option.CalculateType>0) this.CalculateType=option.CalculateType;
|
|
53616
53624
|
if (IFrameSplitOperator.IsNumber(option.PriceZoom)) this.PriceZoom=option.PriceZoom;
|
|
53617
53625
|
}
|
|
@@ -69520,7 +69528,7 @@ function IChartDrawPicture()
|
|
|
69520
69528
|
Symbol:this.Symbol, Guid:this.Guid, Period:this.Period,Value:[] ,
|
|
69521
69529
|
FrameID:this.Frame.Identify, LineColor:this.LineColor, AreaColor:this.AreaColor,
|
|
69522
69530
|
LineWidth:this.LineWidth, Right:this.Right, EnableSave:this.EnableSave,
|
|
69523
|
-
IsShowYCoordinate:this.IsShowYCoordinate
|
|
69531
|
+
IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove
|
|
69524
69532
|
};
|
|
69525
69533
|
|
|
69526
69534
|
for(var i=0; i<this.Value.length; ++i)
|
|
@@ -69544,7 +69552,7 @@ function IChartDrawPicture()
|
|
|
69544
69552
|
Symbol:this.Symbol, Period:this.Period,Right:this.Right,
|
|
69545
69553
|
LineColor:this.LineColor,
|
|
69546
69554
|
LineWidth:this.LineWidth,
|
|
69547
|
-
EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate
|
|
69555
|
+
EnableSave:this.EnableSave, IsShowYCoordinate:this.IsShowYCoordinate, EnableCtrlMove:this.EnableCtrlMove,
|
|
69548
69556
|
};
|
|
69549
69557
|
|
|
69550
69558
|
if (this.AreaColor) data.AreaColor=this.AreaColor;
|
|
@@ -107651,9 +107659,9 @@ function FuturesTimeData()
|
|
|
107651
107659
|
[MARKET_SUFFIX_NAME.DCE + '-LH', {Time:0,Decimal:0,Name:'生猪'}],
|
|
107652
107660
|
|
|
107653
107661
|
//上期所
|
|
107654
|
-
[MARKET_SUFFIX_NAME.SHFE + '-CU', {Time:4,Decimal:0,Name:"
|
|
107655
|
-
[MARKET_SUFFIX_NAME.SHFE + '-AL', {Time:4,Decimal:0,Name:"
|
|
107656
|
-
[MARKET_SUFFIX_NAME.SHFE + '-NI', {Time:4,Decimal:0,Name:"
|
|
107662
|
+
[MARKET_SUFFIX_NAME.SHFE + '-CU', {Time:4,Decimal:0,Name:"沪铜"}],
|
|
107663
|
+
[MARKET_SUFFIX_NAME.SHFE + '-AL', {Time:4,Decimal:0,Name:"沪铝"}],
|
|
107664
|
+
[MARKET_SUFFIX_NAME.SHFE + '-NI', {Time:4,Decimal:0,Name:"沪镍"}],
|
|
107657
107665
|
[MARKET_SUFFIX_NAME.SHFE + '-SN', {Time:4,Decimal:0,Name:'沪锡'}],
|
|
107658
107666
|
[MARKET_SUFFIX_NAME.SHFE + '-ZN', {Time:4,Decimal:0,Name:"沪锌"}],
|
|
107659
107667
|
[MARKET_SUFFIX_NAME.SHFE + '-PB', {Time:4,Decimal:0,Name:'沪铅'}],
|
|
@@ -107669,6 +107677,7 @@ function FuturesTimeData()
|
|
|
107669
107677
|
[MARKET_SUFFIX_NAME.SHFE + '-SS', {Time:4,Decimal:0,Name:'不锈钢'}],
|
|
107670
107678
|
[MARKET_SUFFIX_NAME.SHFE + '-AO', {Time:4,Decimal:0,Name:'氧化铝'}],
|
|
107671
107679
|
[MARKET_SUFFIX_NAME.SHFE + '-BR', {Time:6,Decimal:0,Name:'合成橡胶'}],
|
|
107680
|
+
[MARKET_SUFFIX_NAME.SHFE + '-AD', {Time:4,Decimal:0,Name:"铝合金"}],
|
|
107672
107681
|
|
|
107673
107682
|
//上期所-能源
|
|
107674
107683
|
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
|
|
@@ -165579,7 +165588,7 @@ function HQChartScriptWorker()
|
|
|
165579
165588
|
|
|
165580
165589
|
|
|
165581
165590
|
|
|
165582
|
-
var HQCHART_VERSION="1.1.
|
|
165591
|
+
var HQCHART_VERSION="1.1.15075";
|
|
165583
165592
|
|
|
165584
165593
|
function PrintHQChartVersion()
|
|
165585
165594
|
{
|