hqchart 1.1.12484 → 1.1.12488

package/lib/umychart.vue.js

@@ -7464,11 +7464,11 @@ if(this.PageInfo.Enable){var option={ID:JSCHART_OPERATOR_ID.OP_SCROLL_LEFT,Step:
 if(this.PageInfo.Enable){var option={ID:JSCHART_OPERATOR_ID.OP_SCROLL_RIGHT,Step:this.PageInfo.ShowDayCount};this.ChartOperator(option);}break;default:return;}//不让滚动条滚动
 if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnMarkRectSelect=function(e){var corssCursor=this.ChartCorssCursor;//十字光标
 if(!corssCursor||corssCursor.Status==0)return;if(!IFrameSplitOperator.IsNumber(corssCursor.CursorIndex))return;if(!this.SourceData||!this.SourceData.Data)return;var paint=this.GetRectSelectPaint();if(!paint)return;var cursorIndex=corssCursor.CursorIndex;JSConsole.Chart.Log("[MinuteChartContainer::OnMarkRectSelect] dataIndex",cursorIndex);var kData=this.SourceData;cursorIndex=parseInt(cursorIndex.toFixed(0));var index=cursorIndex+kData.DataOffset;if(index>=kData.Data.length)index=kData.Data.length-1;var item=kData.Data[index];JSConsole.Chart.Log("[MinuteChartContainer::OnMarkRectSelect] item",item);if(!this.SetRectSelectData(item))return;var pointCount=paint.GetPointCount();var pixelTatio=GetDevicePixelRatio();if(pointCount==1)//第1个位置
-{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//区间选择背景
-};event.Callback(event,data,this);}}else if(pointCount==2)//第2个位置
+{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,//区间选择背景
+e:e};event.Callback(event,data,this);}}else if(pointCount==2)//第2个位置
 {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,//区间选择的数据
-RectSelectPaint:paint//区间选择背景
-};event.Callback(event,data,this);}if(this.SelectRectDialog){e.data={Chart:this,X:corssCursor.LastPoint.X/pixelTatio,Y:corssCursor.LastPoint.Y/pixelTatio,SelectData:selectData,//区间选择的数据
+RectSelectPaint:pain,//区间选择背景
+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,//区间选择的数据
 RectSelectPaint:paint//区间选择背景
 };this.SelectRectDialog.DoModal(e);}}this.Draw();};//注册鼠标右键事件
 this.OnRightMenu=function(x,y,e){if(this.RightMenu){var frameId=this.Frame.PtInFrame(x,y);e.data={Chart:this,FrameID:frameId};this.RightMenu.DoModal(e);}var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CONTEXT_MENU);if(event){var frameId=this.Frame.PtInFrame(x,y);var data={X:x,Y:y,Event:e,FrameID:frameId};event.Callback(event,data,this);}};this.OnWheel=function(e){JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);};this.OnDoubleClick=function(x,y,e){JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick]",e);if(this.ClickChartTimer!=null){clearTimeout(this.ClickChartTimer);this.ClickChartTimer=null;}var selectedChart;//图形选中
@@ -12490,7 +12490,7 @@ function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventL
 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);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12483";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.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();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12484",
+  "version": "1.1.12488",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -71564,7 +71564,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     Y:corssCursor.LastPoint.Y/pixelTatio,
                     Item:item,
                     Index:index,
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e,
                 };
                 event.Callback(event,data,this);
             }
@@ -71580,7 +71581,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     X:corssCursor.LastPoint.X/pixelTatio,
                     Y:corssCursor.LastPoint.Y/pixelTatio,
                     SelectData:selectData,   //区间选择的数据
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:pain,    //区间选择背景
+                    e:e,
                 };
                 event.Callback(event,data,this);
             }

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -75644,7 +75644,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     Y:corssCursor.LastPoint.Y/pixelTatio,
                     Item:item,
                     Index:index,
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e,
                 };
                 event.Callback(event,data,this);
             }
@@ -75660,7 +75661,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     X:corssCursor.LastPoint.X/pixelTatio,
                     Y:corssCursor.LastPoint.Y/pixelTatio,
                     SelectData:selectData,   //区间选择的数据
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:pain,    //区间选择背景
+                    e:e,
                 };
                 event.Callback(event,data,this);
             }
@@ -128045,7 +128047,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12483";
+var HQCHART_VERSION="1.1.12487";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12483";
+var HQCHART_VERSION="1.1.12487";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -75688,7 +75688,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     Y:corssCursor.LastPoint.Y/pixelTatio,
                     Item:item,
                     Index:index,
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:paint,    //区间选择背景
+                    e:e,
                 };
                 event.Callback(event,data,this);
             }
@@ -75704,7 +75705,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     X:corssCursor.LastPoint.X/pixelTatio,
                     Y:corssCursor.LastPoint.Y/pixelTatio,
                     SelectData:selectData,   //区间选择的数据
-                    RectSelectPaint:paint    //区间选择背景
+                    RectSelectPaint:pain,    //区间选择背景
+                    e:e,
                 };
                 event.Callback(event,data,this);
             }
@@ -128198,7 +128200,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12483";
+var HQCHART_VERSION="1.1.12487";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.chartpaint.wechat.js

@@ -7067,6 +7067,7 @@ function ChartVolStick()
         }
         else    //太细了直接话线
         {
+            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];
@@ -7088,7 +7089,15 @@ function ChartVolStick()
 
                 if (x > chartright) break;
 
-                var barColor=this.GetBarColor(kItem);
+                if (isMinute)
+                {
+                    var barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
+                }
+                else
+                {
+                    var barColor=this.GetBarColor(kItem);
+                }
+                
                 this.Canvas.strokeStyle=barColor.Color;
 
                 //var x = this.ChartFrame.GetXFromIndex(j);
@@ -7096,6 +7105,8 @@ function ChartVolStick()
                 this.Canvas.moveTo(ToFixedPoint(x), y);
                 this.Canvas.lineTo(ToFixedPoint(x), yBottom);
                 this.Canvas.stroke();
+
+                preKItem=kItem;
             }
         }
     }
@@ -7106,6 +7117,15 @@ function ChartVolStick()
         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 };  //颜色, 是否是上涨
+        else return { Color:this.DownColor, IsUp:false };
+    }
+
     this.HScreenDraw = function () //横屏画法
     {
         var dataWidth = this.ChartFrame.DataWidth;

package/src/jscommon/umychart.wechat/umychart.complier.wechat.js

@@ -10039,6 +10039,7 @@ function JSSymbolData(ast,option,jsExecute)
     this.GetSymbolCacheData=function(dataName)
     {
         if (!this.Data) return new Array();
+        var upperSymbol=this.Symbol.toUpperCase();
 
         switch(dataName)
         {
@@ -10047,6 +10048,8 @@ function JSSymbolData(ast,option,jsExecute)
                 return this.Data.GetClose();
             case 'VOL':
             case 'V':
+                if (MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol) && this.DataType==HQ_DATA_TYPE.KLINE_ID) //!! A股K线量单位时股，分时图单位还是手
+                    return this.Data.GetVol(100);   //A股的 把股转成手
                 return this.Data.GetVol();
             case 'OPEN':
             case 'O':

package/src/jscommon/umychart.wechat/umychart.version.wechat.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12464";
+var HQCHART_VERSION="1.1.12485";
 
 function PrintHQChartVersion()
 {