hqchart 1.1.12488 → 1.1.12493

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.
Files changed (6) hide show
  1. package/lib/umychart.vue.js +15 -14
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.js +28 -13
  4. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +29 -14
  5. package/src/jscommon/umychart.version.js +1 -1
  6. package/src/jscommon/umychart.vue/umychart.vue.js +29 -14
package/lib/umychart.vue.js CHANGED
@@ -1,4 +1,4 @@
1
- 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _promise=require('babel-runtime/core-js/promise');var _promise2=_interopRequireDefault(_promise);var _log=require('babel-runtime/core-js/math/log10');var _log2=_interopRequireDefault(_log);var _defineProperties=require('babel-runtime/core-js/object/define-properties');var _defineProperties2=_interopRequireDefault(_defineProperties);var _create=require('babel-runtime/core-js/object/create');var _create2=_interopRequireDefault(_create);var _from=require('babel-runtime/core-js/array/from');var _from2=_interopRequireDefault(_from);var _typeof2=require('babel-runtime/helpers/typeof');var _typeof3=_interopRequireDefault(_typeof2);var _defineProperty2=require('babel-runtime/helpers/defineProperty');var _defineProperty3=_interopRequireDefault(_defineProperty2);var _set=require('babel-runtime/core-js/set');var _set2=_interopRequireDefault(_set);var _stringify=require('babel-runtime/core-js/json/stringify');var _stringify2=_interopRequireDefault(_stringify);var _getIterator2=require('babel-runtime/core-js/get-iterator');var _getIterator3=_interopRequireDefault(_getIterator2);var _map=require('babel-runtime/core-js/map');var _map2=_interopRequireDefault(_map);var _jsChartInit$jsChartS;var _jquery=require('jquery');var _jquery2=_interopRequireDefault(_jquery);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}//日志输出类
1
+ 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _promise=require('babel-runtime/core-js/promise');var _promise2=_interopRequireDefault(_promise);var _log=require('babel-runtime/core-js/math/log10');var _log2=_interopRequireDefault(_log);var _defineProperties=require('babel-runtime/core-js/object/define-properties');var _defineProperties2=_interopRequireDefault(_defineProperties);var _create=require('babel-runtime/core-js/object/create');var _create2=_interopRequireDefault(_create);var _from=require('babel-runtime/core-js/array/from');var _from2=_interopRequireDefault(_from);var _typeof2=require('babel-runtime/helpers/typeof');var _typeof3=_interopRequireDefault(_typeof2);var _set=require('babel-runtime/core-js/set');var _set2=_interopRequireDefault(_set);var _defineProperty2=require('babel-runtime/helpers/defineProperty');var _defineProperty3=_interopRequireDefault(_defineProperty2);var _stringify=require('babel-runtime/core-js/json/stringify');var _stringify2=_interopRequireDefault(_stringify);var _getIterator2=require('babel-runtime/core-js/get-iterator');var _getIterator3=_interopRequireDefault(_getIterator2);var _map=require('babel-runtime/core-js/map');var _map2=_interopRequireDefault(_map);var _jsChartInit$jsChartS;var _jquery=require('jquery');var _jquery2=_interopRequireDefault(_jquery);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}//日志输出类
2
2
  var JSConsole={Chart:{Log:console.log,Warn:console.warn},//图形日志
3
3
  Complier:{Log:console.log,Warn:console.warn},//编译器日志
4
4
  JSTable:{Log:console.log,Warn:console.warn//表格日志
@@ -1760,9 +1760,9 @@ return true;};this.DocOnMouseUp=function(e){//清空事件
1760
1760
  document.onmousemove=null;document.onmouseup=null;var IsMinuteChart=this.ClassName=="MinuteChartContainer"||this.ClassName=="MinuteChartHScreenContainer"?true:false;var isDragSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Index>=0;var isDragSubSelectRect=this.RectSelectDrag&&this.RectSelectDrag.Type==4;var bClearDrawPicture=true;if(this.CurrentChartDrawPicture){var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status==2||drawPicture.Status==1||drawPicture.Status==3){drawPicture.PointStatus=drawPicture.Status;if(this.FinishChartDrawPicturePoint())this.DrawDynamicInfo();else bClearDrawPicture=false;}else if(drawPicture.Status==20){if(this.FinishMoveChartDrawPicture())this.DrawDynamicInfo();}}else if(this.IndexChartDrag&&this.IndexChartDrag.SelectedChart){var chartMove=this.GetExtendChartByClassName("DragMovePaint");if(chartMove&&chartMove.Chart)chartMove.Chart.Clear();if(!this.OnDragChart(this.IndexChartDrag))this.DrawDynamicInfo();this.UIElement.style.cursor="default";}else if(this.CustomChartDrag){var sendData={e:e,ChartDrag:this.CustomChartDrag,Drag:this.MouseDrag};this.TryMouseUp_CustomChartDrag(sendData);}else if(isDragSelectRect)//区间选择拖动范围
1761
1761
  {if(this.OnDragSelectRectMouseUp)this.OnDragSelectRectMouseUp(e);}else if(isDragSubSelectRect){if(this.OnDragSubSelectRectMouseUp)this.OnDragSubSelectRectMouseUp(e);}else if(IsMinuteChart){if(this.OnMinuteSelectRectMouseUp)this.OnMinuteSelectRectMouseUp(e);}else if(this.DragMode==2)//区间选择
1762
1762
  {var drag=this.MouseDrag;drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;var selectData=new SelectRectData();var pixelTatio=GetDevicePixelRatio();//区间起始位置 结束位子
1763
- selectData.XStart=(drag.Click.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YStart=(drag.Click.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.XEnd=(drag.LastMove.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.JSChartContainer=this;selectData.Stock={Symbol:this.Symbol,Name:this.Name};if(!this.BorderDrag&&this.GetSelectRectData(selectData)){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);var paint=this.GetRectSelectPaint();var isShowMenu=true;if(event&&event.Callback){var data={X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
1763
+ selectData.XStart=(drag.Click.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YStart=(drag.Click.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.XEnd=(drag.LastMove.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.JSChartContainer=this;selectData.Stock={Symbol:this.Symbol,Name:this.Name};if(!this.BorderDrag&&this.GetSelectRectData(selectData)){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);var paint=this.GetRectSelectPaint();var isShowMenu=true;if(event&&event.Callback){var data=(0,_defineProperty3.default)({X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
1764
1764
  RectSelectPaint:paint,//区间选择背景
1765
- IsShowMenu:true};event.Callback(event,data,this);isShowMenu=data.IsShowMenu;}if(IsMinuteChart)//分时图直接显示显示区间选择
1765
+ IsShowMenu:true,e:e},'e',e);event.Callback(event,data,this);isShowMenu=data.IsShowMenu;}if(IsMinuteChart)//分时图直接显示显示区间选择
1766
1766
  {this.HideSelectRect();this.UpdateSelectRect(selectData.Start,selectData.End);}else{if(isShowMenu&&this.SelectRectRightMenu){e.data={Chart:this,X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
1767
1767
  RectSelectPaint:paint//区间选择背景
1768
1768
  };this.SelectRectRightMenu.DoModal(e);}}}else{this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICKUP_CHART_PAINT,this.ClickDownPoint,e);}}else{this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICKUP_CHART_PAINT,this.ClickDownPoint,e);this.ClickEvent(e);}//清空数据
@@ -3841,14 +3841,15 @@ this.KLineDrawType=0;this.ClassName='ChartVolStick';this.PtInChart=this.PtInBar;
3841
3841
  y=yBottom-height;if(this.KLineDrawType==6)//完全空心柱
3842
3842
  {this.Canvas.strokeStyle=barColor.Color;this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(y),ToFixedRect(dataWidth),height);this.Canvas.stroke();}else if(bUp&&(this.KLineDrawType==1||this.KLineDrawType==2||this.KLineDrawType==3))//空心柱子
3843
3843
  {this.Canvas.strokeStyle=this.UpColor;this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(left),ToFixedPoint(y),ToFixedRect(dataWidth),height);this.Canvas.stroke();}else{this.Canvas.fillRect(ToFixedRect(left),y,ToFixedRect(dataWidth),height);}}}else//太细了直接话线
3844
- {var preKItem=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;var x=left+(right-left)/2;}if(x>chartright)break;if(isMinute){var barColor=this.GetMinuteBarColor(kItem,preKItem);//分时图颜色单独计算
3845
- }else{var barColor=this.GetBarColor(kItem);}this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
3844
+ {var preKItem=null;var barColor=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;var x=left+(right-left)/2;}if(x>chartright)break;if(isMinute)barColor=this.GetMinuteBarColor(kItem,preKItem);//分时图颜色单独计算
3845
+ else barColor=this.GetBarColor(kItem);this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
3846
3846
  this.Canvas.beginPath();this.Canvas.moveTo(ToFixedPoint(x),y);this.Canvas.lineTo(ToFixedPoint(x),yBottom);this.Canvas.stroke();preKItem=kItem;}}};this.HScreenDraw=function()//横屏画法
3847
- {var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartBottom=border.BottomEx;var xPointCount=this.ChartFrame.XPointCount;var lockRect=this.GetLockRect();if(lockRect)chartBottom=lockRect.Top;var yBottom=this.ChartFrame.GetYFromData(0);if(dataWidth>=4){yBottom=ToFixedRect(yBottom);for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartBottom)break;var y=this.ChartFrame.GetYFromData(value);var barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.fillStyle=barColor.Color;var height=ToFixedRect(y-yBottom);//高度调整为整数
3847
+ {var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartBottom=border.BottomEx;var xPointCount=this.ChartFrame.XPointCount;var lockRect=this.GetLockRect();if(lockRect)chartBottom=lockRect.Top;var isMinute=this.IsMinuteFrame();var yBottom=this.ChartFrame.GetYFromData(0);if(dataWidth>=4){yBottom=ToFixedRect(yBottom);for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartBottom)break;var y=this.ChartFrame.GetYFromData(value);var barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.fillStyle=barColor.Color;var height=ToFixedRect(y-yBottom);//高度调整为整数
3848
3848
  if(bUp&&(this.KLineDrawType==1||this.KLineDrawType==2||this.KLineDrawType==3))//空心柱子
3849
3849
  {this.Canvas.strokeStyle=this.UpColor;this.Canvas.beginPath();this.Canvas.rect(ToFixedPoint(yBottom),ToFixedPoint(left),height,ToFixedRect(dataWidth));this.Canvas.stroke();}else{this.Canvas.fillRect(yBottom,ToFixedRect(left),height,ToFixedRect(dataWidth));}}}else//太细了直接话线
3850
- {for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);var x=this.ChartFrame.GetXFromIndex(j);if(x>chartBottom)break;var barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
3851
- this.Canvas.beginPath();this.Canvas.moveTo(y,ToFixedPoint(x));this.Canvas.lineTo(yBottom,ToFixedPoint(x));this.Canvas.stroke();}}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=null;range.Max=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(!IFrameSplitOperator.IsNumber(range.Max)||range.Max<value)range.Max=value;if(!IFrameSplitOperator.IsNumber(range.Min)||range.Min>value)range.Min=value;}if(range.Max>0&&range.Min>0)range.Min=0;else if(range.Max<0&&range.Min<0)range.Max=0;return range;};this.GetBarColor=function(kItem){if(kItem.Close>=kItem.Open)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
3850
+ {var preKItem=null;var barColor=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var value=this.Data.Data[i];var kItem=this.HistoryData.Data[i];if(value==null||kItem==null)continue;var y=this.ChartFrame.GetYFromData(value);if(isMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;var x=left+(right-left)/2;}if(x>chartBottom)break;if(isMinute)barColor=this.GetMinuteBarColor(kItem,preKItem);//分时图颜色单独计算
3851
+ else barColor=this.GetBarColor(kItem);var bUp=barColor.IsUp;this.Canvas.strokeStyle=barColor.Color;//var x=this.ChartFrame.GetXFromIndex(j);
3852
+ this.Canvas.beginPath();this.Canvas.moveTo(y,ToFixedPoint(x));this.Canvas.lineTo(yBottom,ToFixedPoint(x));this.Canvas.stroke();preKItem=kItem;}}};this.GetMaxMin=function(){var xPointCount=this.ChartFrame.XPointCount;var range={};range.Min=null;range.Max=null;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j){var value=this.Data.Data[i];if(!IFrameSplitOperator.IsNumber(range.Max)||range.Max<value)range.Max=value;if(!IFrameSplitOperator.IsNumber(range.Min)||range.Min>value)range.Min=value;}if(range.Max>0&&range.Min>0)range.Min=0;else if(range.Max<0&&range.Min<0)range.Max=0;return range;};this.GetBarColor=function(kItem){if(kItem.Close>=kItem.Open)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
3852
3853
  else return{Color:this.DownColor,IsUp:false};};this.GetMinuteBarColor=function(kItem,preItem){var prePrice=kItem.YClose;if(preItem)prePrice=preItem.Close;if(kItem.Close>=prePrice)return{Color:this.UpColor,IsUp:true};//颜色, 是否是上涨
3853
3854
  else return{Color:this.DownColor,IsUp:false};};this.GetItemData=function(indexData){if(!indexData)return null;if(!IFrameSplitOperator.IsNumber(indexData.Index))return null;if(!this.HistoryData||!IFrameSplitOperator.IsNonEmptyArray(this.HistoryData.Data))return null;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var index=indexData.Index;if(index<0||index>=this.Data.Data.length||index>=this.HistoryData.Data.length)return null;var item=this.Data.Data[index];var kItem=this.HistoryData.Data[index];return[{Value:item,Color:this.GetBarColor(kItem).Color,Name:this.Name}];};}// VERTLINE(HIGH>=HHV(HIGH,20),1)表示在创20天新高画垂直虚线。
3854
3855
  // 支持横屏
@@ -7419,8 +7420,8 @@ this.OnDragMode_One=function(moveData,e){var drag=this.MouseDrag;var moveSetp=mo
7419
7420
  {if(moveSetp<5)return;var obj={X:e.clientX,Y:e.clientY,PointIndex:this.RectSelectDrag.Index,Name:"MoveRectSelectLine"};if(this.MoveRectSelectPoint(obj)){drag.LastMove.X=e.clientX;this.Draw();}}else{if(moveSetp<5&&yMoveSetp<5)return;if(!this.EnableSelectRect)return;this.UIElement.style.cursor="default";var x=drag.Click.X-uielement.getBoundingClientRect().left;var y=drag.Click.Y-uielement.getBoundingClientRect().top;var x2=e.clientX-uielement.getBoundingClientRect().left;var y2=e.clientY-uielement.getBoundingClientRect().top;this.ShowSelectRect(x,y,x2,y2);drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;}};this.OnMinuteSelectRectMouseUp=function(e){var drag=this.MouseDrag;drag.LastMove.X=e.clientX;drag.LastMove.Y=e.clientY;var selectData=new SelectRectData();var pixelTatio=GetDevicePixelRatio();//区间起始位置 结束位子
7420
7421
  selectData.XStart=(drag.Click.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YStart=(drag.Click.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.XEnd=(drag.LastMove.X-uielement.getBoundingClientRect().left)*pixelTatio;selectData.YEnd=(drag.LastMove.Y-uielement.getBoundingClientRect().top)*pixelTatio;selectData.JSChartContainer=this;selectData.Stock={Symbol:this.Symbol,Name:this.Name};if(this.EnableSelectRect&&!this.BorderDrag&&this.GetSelectRectData(selectData)){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);var paint=this.GetRectSelectPaint();var isShowDialog=true;//是否显示内置区间选择框
7421
7422
  if(event&&event.Callback){var data={X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
7422
- RectSelectPaint:paint//区间选择背景
7423
- };event.Callback(event,data,this);isShowDialog=false;//外部调用了区间选择事件，不弹框
7423
+ RectSelectPaint:paint,//区间选择背景
7424
+ e:e};event.Callback(event,data,this);isShowDialog=false;//外部调用了区间选择事件，不弹框
7424
7425
  }if(isShowDialog&&this.SelectRectDialog){e.data={Chart:this,X:drag.LastMove.X-uielement.getBoundingClientRect().left,Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,SelectData:selectData,//区间选择的数据
7425
7426
  RectSelectPaint:paint//区间选择背景
7426
7427
  };this.SelectRectDialog.DoModal(e);}else{this.HideSelectRect();this.UpdateSelectRect(selectData.Start,selectData.End);}}else{this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICKUP_CHART_PAINT,this.ClickDownPoint,e);this.ClickEvent(e);}};this.OnDragSelectRectMouseUp=function(e){var paint=this.GetRectSelectPaint();if(!paint)return;var selectData=paint.GetSelectRectData();if(!selectData)return;var pixelTatio=GetDevicePixelRatio();var corssCursor=this.ChartCorssCursor;//十字光标
@@ -7467,7 +7468,7 @@ if(!corssCursor||corssCursor.Status==0)return;if(!IFrameSplitOperator.IsNumber(c
7467
7468
  {var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN_SELECT_RECT_FIRST);if(event&&event.Callback){var data={X:corssCursor.LastPoint.X/pixelTatio,Y:corssCursor.LastPoint.Y/pixelTatio,Item:item,Index:index,RectSelectPaint:paint,//区间选择背景
7468
7469
  e:e};event.Callback(event,data,this);}}else if(pointCount==2)//第2个位置
7469
7470
  {var selectData=paint.GetSelectRectData();var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN_SELECT_RECT);if(event&&event.Callback){var data={X:corssCursor.LastPoint.X/pixelTatio,Y:corssCursor.LastPoint.Y/pixelTatio,SelectData:selectData,//区间选择的数据
7470
- RectSelectPaint:pain,//区间选择背景
7471
+ RectSelectPaint:paint,//区间选择背景
7471
7472
  e:e};event.Callback(event,data,this);}if(this.SelectRectDialog){e.data={Chart:this,X:corssCursor.LastPoint.X/pixelTatio,Y:corssCursor.LastPoint.Y/pixelTatio,SelectData:selectData,//区间选择的数据
7472
7473
  RectSelectPaint:paint//区间选择背景
7473
7474
  };this.SelectRectDialog.DoModal(e);}}this.Draw();};//注册鼠标右键事件
@@ -10562,7 +10563,7 @@ case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_REPAY://卖出信息-偿还量
10562
10563
  case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_NET://卖出信息-融券净卖出
10563
10564
  var sellData=marginData.sell;if(!sellData)continue;if(!this.IsNumber(sellData.balance)||!this.IsNumber(sellData.volume)||!this.IsNumber(sellData.repay)||!this.IsNumber(sellData.net))continue;indexData.Value=buyData.balance;var indexData2=new SingleData();indexData2.Date=item.date;indexData2.Value=buyData.volume;var indexData3=new SingleData();indexData3.Date=item.date;indexData3.Value=buyData.repay;var indexData4=new SingleData();indexData4.Date=item.date;indexData4.Value=buyData.net;aryData.push(indexData);aryData2.push(indexData2);aryData3.push(indexData3);aryData4.push(indexData4);break;default:continue;}}var allData=[];if(jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BALANCE||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_RATE){allData.push({JobID:jobID,Data:aryData});}else if(jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_BALANCE||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_AMOUNT||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_REPAY||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_NET){allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_BALANCE,Data:aryData});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_AMOUNT,Data:aryData2});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_REPAY,Data:aryData3});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BUY_NET,Data:aryData4});}else if(jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_BALANCE||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_VOLUME||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_REPAY||jobID===JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_NET){allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_BALANCE,Data:aryData});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_VOLUME,Data:aryData2});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_REPAY,Data:aryData3});allData.push({JobID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_SELL_NET,Data:aryData4});}for(var _i126 in allData){var aryFixedData=this.SourceData.GetFittingData(allData[_i126].Data);var bindData=new ChartData();bindData.Data=aryFixedData;bindData.Period=this.Period;//周期
10564
10565
  if(bindData.Period>0)//周期数据
10565
- {var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data=bindData.GetValue();this.MarginData.set(allData[_i126].JobID,_data);}};this.GetNewsAnalysisCacheData=function(id,node){var jobID=JS_EXECUTE_JOB_ID.GetNewsAnalysisID(id);if(!jobID)this.Execute.ThrowUnexpectedNode(node,'不支持NEWS('+id+')');if(this.NewsAnalysisData.has(jobID))return this.NewsAnalysisData.get(jobID);return[];};this.GetHKToSHSZData=function(job){var args=job.Args;var code=this.Symbol;if(args.length>0){var item=args[0];if(item.Type==Syntax.Literal){code=item.Value;}else if(item.Type==Syntax.Identifier)//变量 !!只支持默认的变量值
10566
+ {var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data2=bindData.GetValue();this.MarginData.set(allData[_i126].JobID,_data2);}};this.GetNewsAnalysisCacheData=function(id,node){var jobID=JS_EXECUTE_JOB_ID.GetNewsAnalysisID(id);if(!jobID)this.Execute.ThrowUnexpectedNode(node,'不支持NEWS('+id+')');if(this.NewsAnalysisData.has(jobID))return this.NewsAnalysisData.get(jobID);return[];};this.GetHKToSHSZData=function(job){var args=job.Args;var code=this.Symbol;if(args.length>0){var item=args[0];if(item.Type==Syntax.Literal){code=item.Value;}else if(item.Type==Syntax.Identifier)//变量 !!只支持默认的变量值
10566
10567
  {var isFind=false;for(var j in this.Arguments){var argItem=this.Arguments[j];if(argItem.Name==item.Name){code=argItem.Value;isFind=true;break;}}if(!isFind){var token=job.Token;this.Execute.ErrorHandler.ThrowError(token.Index,token.Line,0,'HK2SHSZ() Error: can\'t read '+item.Name);}}}job.Symbol=code;if(code==1||code==2||code==3)//下载全市场数据
10567
10568
  this.GetHKToSHSZMarketData(code,job);else this.GetHKToSHSZStockData(code,job);//下载个股数据
10568
10569
  };this.GetHKToSHSZStockData=function(symbol,job){if(this.HKToSHSZData.has(symbol))return this.Execute.RunNextJob();var upperSymbol=symbol.toLowerCase();//代码小写
@@ -10577,7 +10578,7 @@ JSNetwork.HttpRequest({url:url,type:"get",dataType:"json",async:true,success:fun
10577
10578
  var SZValue=data.hk2sz[i]*1000000;//单位是百万
10578
10579
  var total=SHValue+SZValue;var itemSHSZData=new SingleData();itemSHSZData.Date=date;itemSHSZData.Value=total;var itemSHData=new SingleData();itemSHData.Date=date;itemSHData.Value=SHValue;var itemSZData=new SingleData();itemSZData.Date=date;itemSZData.Value=SZValue;arySHSZData.push(itemSHSZData);arySHData.push(itemSHData);arySZData.push(itemSZData);}var allData=[{Data:arySHSZData,ID:1},{Data:arySHData,ID:2},{Data:arySZData,ID:3}];for(var _i127 in allData){var aryFixedData=this.Data.GetFittingData(allData[_i127].Data);var bindData=new ChartData();bindData.Data=aryFixedData;bindData.Period=this.Period;//周期
10579
10580
  if(bindData.Period>0)//周期数据
10580
- {var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data2=bindData.GetValue();this.HKToSHSZData.set(allData[_i127].ID,_data2);}};this.RecvMulitMinuteHKToSHSZData=function(data,job)//多日分时图北上资金
10581
+ {var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}var _data3=bindData.GetValue();this.HKToSHSZData.set(allData[_i127].ID,_data3);}};this.RecvMulitMinuteHKToSHSZData=function(data,job)//多日分时图北上资金
10581
10582
  {if(!data.data||data.data.length<=0)return;var arySHSZData=[],arySHData=[],arySZData=[];for(var i=0,j=0;i<this.Data.Data.length&&j<data.data.length;){arySHSZData[i]=null;arySHData[i]=null;arySZData[i]=null;var item=this.Data.Data[i];var dateTime=item.DateTime;//日期加时间
10582
10583
  if(!dateTime){++i;continue;}var aryValue=dateTime.split(' ');if(aryValue.length!=2){++i;continue;}var date=parseInt(aryValue[0]);var day=data.data[j];if(!day.minute||day.minute.length<=0){++j;continue;}if(day.date>date){++i;continue;}else if(day.date<date){++j;continue;}for(var k in day.minute){var timeItem=day.minute[k];var SHValue=timeItem[1];var SZValue=timeItem[2];var total=SHValue+SZValue;arySHSZData[i]=total;arySHData[i]=SHValue;arySZData[i]=SZValue;++i;}++j;}var allData=[{Data:arySHSZData,ID:1},{Data:arySHData,ID:2},{Data:arySZData,ID:3}];for(var i in allData){var item=allData[i];this.HKToSHSZData.set(item.ID,item.Data);}};//北上资金函数
10583
10584
  this.GetHKToSHSZCacheData=function(code,node){//if (!this.HKToSHSZData.has(code)) this.Execute.ThrowUnexpectedNode(node,`不支持HK2SHSZ(${code})`);
@@ -12490,7 +12491,7 @@ function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventL
12490
12491
  hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.ExecuteScript(item,data);}}};this.OnExecuteFinish=function(data,indexInfo,jsExectute){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT};postMessage(message);};this.OnExecuteError=function(error,indexInfo){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
12491
12492
  * 版本信息输出
12492
12493
  *
12493
- */var HQCHART_VERSION="1.1.12487";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();//把给外界调用的方法暴露出来
12494
+ */var HQCHART_VERSION="1.1.12492";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();//把给外界调用的方法暴露出来
12494
12495
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
12495
12496
  // BaseIndex:BaseIndex,
12496
12497
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "hqchart",
3
3
  "description": "stock chart",
4
4
  "author": "jones2000",
5
- "version": "1.1.12488",
5
+ "version": "1.1.12493",
6
6
  "main": "lib/main.js",
7
7
  "private": false,
8
8
  "license": "Apache License 2.0",
package/src/jscommon/umychart.js CHANGED
@@ -3842,7 +3842,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
3842
3842
  Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
3843
3843
  SelectData:selectData, //区间选择的数据
3844
3844
  RectSelectPaint:paint, //区间选择背景
3845
- IsShowMenu:true
3845
+ IsShowMenu:true,
3846
+ e,e
3846
3847
  };
3847
3848
  event.Callback(event,data,this);
3848
3849
  isShowMenu=data.IsShowMenu;
@@ -29064,6 +29065,7 @@ function ChartVolStick()
29064
29065
  else //太细了直接话线
29065
29066
  {
29066
29067
  var preKItem=null;
29068
+ var barColor=null;
29067
29069
  for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
29068
29070
  {
29069
29071
  var value=this.Data.Data[i];
@@ -29084,14 +29086,8 @@ function ChartVolStick()
29084
29086
 
29085
29087
  if (x>chartright) break;
29086
29088
 
29087
- if (isMinute)
29088
- {
29089
- var barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
29090
- }
29091
- else
29092
- {
29093
- var barColor=this.GetBarColor(kItem);
29094
- }
29089
+ if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
29090
+ else barColor=this.GetBarColor(kItem);
29095
29091
 
29096
29092
  this.Canvas.strokeStyle=barColor.Color;
29097
29093
 
@@ -29117,6 +29113,7 @@ function ChartVolStick()
29117
29113
  var lockRect=this.GetLockRect();
29118
29114
  if (lockRect) chartBottom=lockRect.Top;
29119
29115
 
29116
+ var isMinute=this.IsMinuteFrame();
29120
29117
  var yBottom=this.ChartFrame.GetYFromData(0);
29121
29118
 
29122
29119
  if (dataWidth>=4)
@@ -29153,6 +29150,8 @@ function ChartVolStick()
29153
29150
  }
29154
29151
  else //太细了直接话线
29155
29152
  {
29153
+ var preKItem=null;
29154
+ var barColor=null;
29156
29155
  for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
29157
29156
  {
29158
29157
  var value=this.Data.Data[i];
@@ -29160,10 +29159,23 @@ function ChartVolStick()
29160
29159
  if (value==null || kItem==null) continue;
29161
29160
 
29162
29161
  var y=this.ChartFrame.GetYFromData(value);
29163
- var x=this.ChartFrame.GetXFromIndex(j);
29162
+
29163
+ if (isMinute)
29164
+ {
29165
+ var x=this.ChartFrame.GetXFromIndex(j);
29166
+ }
29167
+ else
29168
+ {
29169
+ var left=xOffset;
29170
+ var right=xOffset+dataWidth;
29171
+ var x=left+(right-left)/2;
29172
+ }
29173
+
29164
29174
  if (x>chartBottom) break;
29165
29175
 
29166
- var barColor=this.GetBarColor(kItem);
29176
+ if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
29177
+ else barColor=this.GetBarColor(kItem);
29178
+
29167
29179
  var bUp=barColor.IsUp;
29168
29180
  this.Canvas.strokeStyle=barColor.Color;
29169
29181
 
@@ -29172,6 +29184,8 @@ function ChartVolStick()
29172
29184
  this.Canvas.moveTo(y,ToFixedPoint(x));
29173
29185
  this.Canvas.lineTo(yBottom,ToFixedPoint(x));
29174
29186
  this.Canvas.stroke();
29187
+
29188
+ preKItem=kItem;
29175
29189
  }
29176
29190
  }
29177
29191
  }
@@ -70566,7 +70580,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
70566
70580
  X:drag.LastMove.X-uielement.getBoundingClientRect().left,
70567
70581
  Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
70568
70582
  SelectData:selectData, //区间选择的数据
70569
- RectSelectPaint:paint //区间选择背景
70583
+ RectSelectPaint:paint, //区间选择背景
70584
+ e:e
70570
70585
  };
70571
70586
  event.Callback(event,data,this);
70572
70587
  isShowDialog=false; //外部调用了区间选择事件，不弹框
@@ -71581,7 +71596,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
71581
71596
  X:corssCursor.LastPoint.X/pixelTatio,
71582
71597
  Y:corssCursor.LastPoint.Y/pixelTatio,
71583
71598
  SelectData:selectData, //区间选择的数据
71584
- RectSelectPaint:pain, //区间选择背景
71599
+ RectSelectPaint:paint, //区间选择背景
71585
71600
  e:e,
71586
71601
  };
71587
71602
  event.Callback(event,data,this);
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -7922,7 +7922,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7922
7922
  Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
7923
7923
  SelectData:selectData, //区间选择的数据
7924
7924
  RectSelectPaint:paint, //区间选择背景
7925
- IsShowMenu:true
7925
+ IsShowMenu:true,
7926
+ e,e
7926
7927
  };
7927
7928
  event.Callback(event,data,this);
7928
7929
  isShowMenu=data.IsShowMenu;
@@ -33144,6 +33145,7 @@ function ChartVolStick()
33144
33145
  else //太细了直接话线
33145
33146
  {
33146
33147
  var preKItem=null;
33148
+ var barColor=null;
33147
33149
  for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
33148
33150
  {
33149
33151
  var value=this.Data.Data[i];
@@ -33164,14 +33166,8 @@ function ChartVolStick()
33164
33166
 
33165
33167
  if (x>chartright) break;
33166
33168
 
33167
- if (isMinute)
33168
- {
33169
- var barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
33170
- }
33171
- else
33172
- {
33173
- var barColor=this.GetBarColor(kItem);
33174
- }
33169
+ if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
33170
+ else barColor=this.GetBarColor(kItem);
33175
33171
 
33176
33172
  this.Canvas.strokeStyle=barColor.Color;
33177
33173
 
@@ -33197,6 +33193,7 @@ function ChartVolStick()
33197
33193
  var lockRect=this.GetLockRect();
33198
33194
  if (lockRect) chartBottom=lockRect.Top;
33199
33195
 
33196
+ var isMinute=this.IsMinuteFrame();
33200
33197
  var yBottom=this.ChartFrame.GetYFromData(0);
33201
33198
 
33202
33199
  if (dataWidth>=4)
@@ -33233,6 +33230,8 @@ function ChartVolStick()
33233
33230
  }
33234
33231
  else //太细了直接话线
33235
33232
  {
33233
+ var preKItem=null;
33234
+ var barColor=null;
33236
33235
  for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
33237
33236
  {
33238
33237
  var value=this.Data.Data[i];
@@ -33240,10 +33239,23 @@ function ChartVolStick()
33240
33239
  if (value==null || kItem==null) continue;
33241
33240
 
33242
33241
  var y=this.ChartFrame.GetYFromData(value);
33243
- var x=this.ChartFrame.GetXFromIndex(j);
33242
+
33243
+ if (isMinute)
33244
+ {
33245
+ var x=this.ChartFrame.GetXFromIndex(j);
33246
+ }
33247
+ else
33248
+ {
33249
+ var left=xOffset;
33250
+ var right=xOffset+dataWidth;
33251
+ var x=left+(right-left)/2;
33252
+ }
33253
+
33244
33254
  if (x>chartBottom) break;
33245
33255
 
33246
- var barColor=this.GetBarColor(kItem);
33256
+ if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
33257
+ else barColor=this.GetBarColor(kItem);
33258
+
33247
33259
  var bUp=barColor.IsUp;
33248
33260
  this.Canvas.strokeStyle=barColor.Color;
33249
33261
 
@@ -33252,6 +33264,8 @@ function ChartVolStick()
33252
33264
  this.Canvas.moveTo(y,ToFixedPoint(x));
33253
33265
  this.Canvas.lineTo(yBottom,ToFixedPoint(x));
33254
33266
  this.Canvas.stroke();
33267
+
33268
+ preKItem=kItem;
33255
33269
  }
33256
33270
  }
33257
33271
  }
@@ -74646,7 +74660,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
74646
74660
  X:drag.LastMove.X-uielement.getBoundingClientRect().left,
74647
74661
  Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
74648
74662
  SelectData:selectData, //区间选择的数据
74649
- RectSelectPaint:paint //区间选择背景
74663
+ RectSelectPaint:paint, //区间选择背景
74664
+ e:e
74650
74665
  };
74651
74666
  event.Callback(event,data,this);
74652
74667
  isShowDialog=false; //外部调用了区间选择事件，不弹框
@@ -75661,7 +75676,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
75661
75676
  X:corssCursor.LastPoint.X/pixelTatio,
75662
75677
  Y:corssCursor.LastPoint.Y/pixelTatio,
75663
75678
  SelectData:selectData, //区间选择的数据
75664
- RectSelectPaint:pain, //区间选择背景
75679
+ RectSelectPaint:paint, //区间选择背景
75665
75680
  e:e,
75666
75681
  };
75667
75682
  event.Callback(event,data,this);
@@ -128047,7 +128062,7 @@ function ScrollBarBGChart()
128047
128062
 
128048
128063
 
128049
128064
 
128050
- var HQCHART_VERSION="1.1.12487";
128065
+ var HQCHART_VERSION="1.1.12492";
128051
128066
 
128052
128067
  function PrintHQChartVersion()
128053
128068
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.12487";
8
+ var HQCHART_VERSION="1.1.12492";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -7966,7 +7966,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
7966
7966
  Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
7967
7967
  SelectData:selectData, //区间选择的数据
7968
7968
  RectSelectPaint:paint, //区间选择背景
7969
- IsShowMenu:true
7969
+ IsShowMenu:true,
7970
+ e,e
7970
7971
  };
7971
7972
  event.Callback(event,data,this);
7972
7973
  isShowMenu=data.IsShowMenu;
@@ -33188,6 +33189,7 @@ function ChartVolStick()
33188
33189
  else //太细了直接话线
33189
33190
  {
33190
33191
  var preKItem=null;
33192
+ var barColor=null;
33191
33193
  for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
33192
33194
  {
33193
33195
  var value=this.Data.Data[i];
@@ -33208,14 +33210,8 @@ function ChartVolStick()
33208
33210
 
33209
33211
  if (x>chartright) break;
33210
33212
 
33211
- if (isMinute)
33212
- {
33213
- var barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
33214
- }
33215
- else
33216
- {
33217
- var barColor=this.GetBarColor(kItem);
33218
- }
33213
+ if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
33214
+ else barColor=this.GetBarColor(kItem);
33219
33215
 
33220
33216
  this.Canvas.strokeStyle=barColor.Color;
33221
33217
 
@@ -33241,6 +33237,7 @@ function ChartVolStick()
33241
33237
  var lockRect=this.GetLockRect();
33242
33238
  if (lockRect) chartBottom=lockRect.Top;
33243
33239
 
33240
+ var isMinute=this.IsMinuteFrame();
33244
33241
  var yBottom=this.ChartFrame.GetYFromData(0);
33245
33242
 
33246
33243
  if (dataWidth>=4)
@@ -33277,6 +33274,8 @@ function ChartVolStick()
33277
33274
  }
33278
33275
  else //太细了直接话线
33279
33276
  {
33277
+ var preKItem=null;
33278
+ var barColor=null;
33280
33279
  for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
33281
33280
  {
33282
33281
  var value=this.Data.Data[i];
@@ -33284,10 +33283,23 @@ function ChartVolStick()
33284
33283
  if (value==null || kItem==null) continue;
33285
33284
 
33286
33285
  var y=this.ChartFrame.GetYFromData(value);
33287
- var x=this.ChartFrame.GetXFromIndex(j);
33286
+
33287
+ if (isMinute)
33288
+ {
33289
+ var x=this.ChartFrame.GetXFromIndex(j);
33290
+ }
33291
+ else
33292
+ {
33293
+ var left=xOffset;
33294
+ var right=xOffset+dataWidth;
33295
+ var x=left+(right-left)/2;
33296
+ }
33297
+
33288
33298
  if (x>chartBottom) break;
33289
33299
 
33290
- var barColor=this.GetBarColor(kItem);
33300
+ if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem); //分时图颜色单独计算
33301
+ else barColor=this.GetBarColor(kItem);
33302
+
33291
33303
  var bUp=barColor.IsUp;
33292
33304
  this.Canvas.strokeStyle=barColor.Color;
33293
33305
 
@@ -33296,6 +33308,8 @@ function ChartVolStick()
33296
33308
  this.Canvas.moveTo(y,ToFixedPoint(x));
33297
33309
  this.Canvas.lineTo(yBottom,ToFixedPoint(x));
33298
33310
  this.Canvas.stroke();
33311
+
33312
+ preKItem=kItem;
33299
33313
  }
33300
33314
  }
33301
33315
  }
@@ -74690,7 +74704,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
74690
74704
  X:drag.LastMove.X-uielement.getBoundingClientRect().left,
74691
74705
  Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
74692
74706
  SelectData:selectData, //区间选择的数据
74693
- RectSelectPaint:paint //区间选择背景
74707
+ RectSelectPaint:paint, //区间选择背景
74708
+ e:e
74694
74709
  };
74695
74710
  event.Callback(event,data,this);
74696
74711
  isShowDialog=false; //外部调用了区间选择事件，不弹框
@@ -75705,7 +75720,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
75705
75720
  X:corssCursor.LastPoint.X/pixelTatio,
75706
75721
  Y:corssCursor.LastPoint.Y/pixelTatio,
75707
75722
  SelectData:selectData, //区间选择的数据
75708
- RectSelectPaint:pain, //区间选择背景
75723
+ RectSelectPaint:paint, //区间选择背景
75709
75724
  e:e,
75710
75725
  };
75711
75726
  event.Callback(event,data,this);
@@ -128200,7 +128215,7 @@ function HQChartScriptWorker()
128200
128215
 
128201
128216
 
128202
128217
 
128203
- var HQCHART_VERSION="1.1.12487";
128218
+ var HQCHART_VERSION="1.1.12492";
128204
128219
 
128205
128220
  function PrintHQChartVersion()
128206
128221
  {