hqchart 1.1.13933 → 1.1.13944

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13933",
+  "version": "1.1.13944",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogTooltip.js

@@ -42,6 +42,8 @@ function JSDialogTooltip()
 
     this.KItemCache=null;
     this.KItemCacheID=null;
+    this.LastValueCache=null;    //最后的鼠标位置对应的数值
+    this.LastValueCacheID=null;
 
     this.Inital=function(hqchart, option)
     {
@@ -206,10 +208,23 @@ function JSDialogTooltip()
         if (this.HQChart.ClassName=='KLineChartContainer')
         {
             var strKItem=JSON.stringify(data.KItem);
+            var strLastValue=JSON.stringify(data.LastValue);
+            var bUpdata=false;
             if (this.KItemCacheID!=strKItem)    //数据变动的才更新
             {
                 this.KItemCache= JSON.parse(strKItem);
                 this.KItemCacheID=strKItem;
+                bUpdata=true;
+            }
+            if (data.LastValue && data.LastValue.Y && IFrameSplitOperator.IsNumber(data.LastValue.Y.Value) && this.LastValueCacheID!=strLastValue)
+            {
+                this.LastValueCache=JSON.parse(strLastValue);
+                this.LastValueCacheID=strLastValue;
+                bUpdata=true;
+            }
+            
+            if (bUpdata) 
+            {
                 this.UpdateTableDOM();
             }
             else
@@ -220,10 +235,23 @@ function JSDialogTooltip()
         else if (this.HQChart.ClassName=='MinuteChartContainer')
         {
             var strKItem=JSON.stringify(data.MinItem);
+            var strLastValue=JSON.stringify(data.LastValue);
+            var bUpdata=false;
             if (this.KItemCacheID!=strKItem)    //数据变动的才更新
             {
                 this.KItemCache= JSON.parse(strKItem);
                 this.KItemCacheID=strKItem;
+                bUpdata=true;
+            }
+            if (data.LastValue && data.LastValue.Y && IFrameSplitOperator.IsNumber(data.LastValue.Y.Value) && this.LastValueCacheID!=strLastValue)
+            {
+                this.LastValueCache=JSON.parse(strLastValue);
+                this.LastValueCacheID=strLastValue;
+                bUpdata=true;
+            }
+
+            if (bUpdata)
+            {
                 this.UpdateTableDOM();
             }
         }
@@ -372,6 +400,22 @@ function JSDialogTooltip()
             this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'DialogTooltip-Amplitude',priceFormat),
         ];
 
+        if (this.LastValueCache && this.LastValueCache.Y)
+        {
+            var item=this.LastValueCache.Y;
+            var rowItem=null;
+            if (item.Extend.FrameID==0)
+            {
+                rowItem=this.ForamtPrice(item.Value,null, defaultfloatPrecision,'DialogTooltip-Value',2);
+            }
+            else
+            {
+                rowItem=this.ForamtValue(item.Value, 2,'DialogTooltip-Value');
+            }
+
+            if (rowItem) aryText.unshift(rowItem);
+        }
+
         if (this.Style==1)
         {
             if (timeItem) aryText.unshift(timeItem);
@@ -420,14 +464,31 @@ function JSDialogTooltip()
 
             aryText=
             [
-                this.ForamtDate(item.Date,this.Style==1?"YYYY/MM/DD":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
                 this.FormatTime(item.Time, null, "HH:MM", 'DialogTooltip-Time'),
                 this.ForamtPrice(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Price', 1),
+                this.ForamtPrice(item.AvPrice,item.YClose, defaultfloatPrecision,'DialogTooltip-AvPrice', 1),
                 this.FormatRisefall(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Risefall'),
                 this.FormatIncrease(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Increase', 1),
                 this.FormatVol(item.Vol,'DialogTooltip-Vol' ),
                 this.FormatAmount(item.Amount,'DialogTooltip-Amount' ),
             ];
+
+            if (this.LastValueCache && this.LastValueCache.Y)
+            {
+                var item=this.LastValueCache.Y;
+                var rowItem=null;
+                if (item.Extend.FrameID==0)
+                {
+                    rowItem=this.ForamtPrice(item.Value,null, defaultfloatPrecision,'DialogTooltip-Value',2);
+                }
+                else
+                {
+                    rowItem=this.ForamtValue(item.Value, 2,'DialogTooltip-Value');
+                }
+    
+                if (rowItem) aryText.splice(2,0,rowItem);
+            }
         }
         else if (data.Type==1)  //集合竞价
         {
@@ -438,7 +499,7 @@ function JSDialogTooltip()
             if (item.Ver===1) timeForamt="HH:MM"
             aryText=
             [
-                this.ForamtDate(item.Date,this.Style==1?"YYYY/MM/DD":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
                 this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
                 this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
                 this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
@@ -510,7 +571,7 @@ function JSDialogTooltip()
 
 
     /////////////////////////////////////////////////////////////////////////////////////////////
-    //数据格式化
+    //数据格式化 format=0  点差+涨幅 1=涨幅
     this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID, format)
     {
         var item=
@@ -522,6 +583,13 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(price)) return item;
 
+        if (format==2)
+        {
+            item.Text=price.toFixed(defaultfloatPrecision);
+            item.Color=this.TitleColor;
+            return item;
+        }
+
         if (IFrameSplitOperator.IsNumber(yClose) && format!=1)
         {
             var value=(price-yClose)/yClose*100;
@@ -538,6 +606,21 @@ function JSDialogTooltip()
         return item;
     }
 
+    this.ForamtValue=function(value, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            Text:'--',
+            Color:this.TitleColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(value)) return item;
+
+        item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);
+        return item;
+    }
+
     this.FormatVol=function(vol, TitleID)
     {
         var item=

package/src/jscommon/umychart.js

@@ -50821,6 +50821,7 @@ function ChartCorssCursor()
     this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
     this.TextHeight=20;                                         //文本字体高度
     this.LastPoint;
+    this.LastValue; //{ Y:{ Value:, Extend: } }
     this.CursorIndex;
     this.IsOnlyDrawKLine=false;                                 //是否只能画在K线上 (手机端)
     this.IsOnlyDrawMinute=false;                                //是否只能画在走势图价格线上
@@ -51052,6 +51053,7 @@ function ChartCorssCursor()
     {
         this.Status=0;
         this.RightButton.Rect=null;
+        this.LastValue=null;
 
         if (!this.LastPoint) return;
 
@@ -51204,6 +51206,8 @@ function ChartCorssCursor()
         var yValue=this.Frame.GetYData(y,yValueExtend);
         if ( (this.IsOnlyDrawMinute || this.IsShowClose) && this.Close != null) yValue=this.Close;
 
+        this.LastValue={ Y:{ Value:yValue, Extend:yValueExtend }};  //缓存十字光标对应的数值
+
         //this.StringFormatX.Value=xValue;
         this.StringFormatX.Value=this.CursorIndex;
         this.StringFormatX.Point={X:x, Y:y};
@@ -71090,12 +71094,14 @@ function JSChartLocalization()
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
         ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['DialogTooltip-AvPrice', {CN:'均价', EN:'AVPrice:', TC:'均價'}],
         ['DialogTooltip-FClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
         ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
         ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
         ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
         ['DialogTooltip-AC-Increase', {CN:'竞价涨幅', EN:'Increase', TC:'競價漲幅'}],
         ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
+        ['DialogTooltip-Value', {CN:'数值', EN:'Value', TC:'数值'}],
 
         //走势图PC tooltip
         ['PCTooltip-Date', {CN:'日期', EN:'Date', TC:"日期"}],
@@ -79420,6 +79426,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
             KItem:kItem, 
             Symbol:this.Symbol, Name:this.Name,
+            LastValue:this.ChartCorssCursor.LastValue,
         };
 
 
@@ -80886,11 +80893,38 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.MouseDrag=drag;
                 this.PhoneTouchInfo={ Start:{X:touches[0].clientX, Y:touches[0].clientY }, End:{ X:touches[0].clientX, Y:touches[0].clientY } };
                 this.SelectChartDrawPicture=null;
+
+                var bStartTimer=true;   //长按计时开始
+                if (this.EnableClickModel)
+                {
+                    if (this.ClickModel.IsShowCorssCursor==true) bStartTimer=false;
+                    else bStartTimer= true;
+                } 
+
+                if (bStartTimer)
+                {
+                    this.StopDragTimer();
+                    this.DragTimer = setTimeout(()=>{
+                        this.IsPress=true;
+                        if (drag.Click.X == drag.LastMove.X && drag.Click.Y == drag.LastMove.Y)     //手指没有移动，出现十字光标
+                        {
+                            this.MouseDrag = null;
+                            //移动十字光标
+                            var x = drag.Click.X;
+                            var y = drag.Click.Y;
+                            if (this.EnableClickModel===true) this.ClickModel.IsShowCorssCursor=true;
+                            self.MoveCorssCursor(drag.Click,e);//移动十字光标
+                        }
     
-                if (this.EnableScrollUpDown==false)
-                    T_ShowCorssCursor();    //移动十字光标
-                else if (this.IsClickShowCorssCursor)
-                    T_ShowCorssCursor(); 
+                    }, this.PressTime);
+                }
+                else if (!this.EnableClickModel)
+                {
+                    if (this.EnableScrollUpDown==false)
+                        T_ShowCorssCursor();    //移动十字光标
+                    else if (this.IsClickShowCorssCursor)
+                        T_ShowCorssCursor(); 
+                }
             }
 
             if (this.EnableZoomIndexWindow)
@@ -84604,6 +84638,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.OnTouchFinished=function()
     {
+        if (this.EnableClickModel===true)
+        {
+            if (this.ClickModel.IsShowCorssCursor==true && this.TouchDrawCount>0) return;
+
+            this.ClickModel.IsShowCorssCursor=false;
+            this.DrawDynamicInfo();
+            return;
+        }
+
         if (this.CorssCursorTouchEnd===true)    //手势离开十字光标消失
         {
             this.DrawDynamicInfo();
@@ -85232,6 +85275,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
             MinItem:minuteItem, 
             Symbol:this.Symbol, Name:this.Name,
+            LastValue:this.ChartCorssCursor.LastValue,
         };
 
 

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

@@ -54746,6 +54746,7 @@ function ChartCorssCursor()
     this.XRangeBGColor=g_JSChartResource.CorssCursorXRangeBGColor;
     this.TextHeight=20;                                         //文本字体高度
     this.LastPoint;
+    this.LastValue; //{ Y:{ Value:, Extend: } }
     this.CursorIndex;
     this.IsOnlyDrawKLine=false;                                 //是否只能画在K线上 (手机端)
     this.IsOnlyDrawMinute=false;                                //是否只能画在走势图价格线上
@@ -54977,6 +54978,7 @@ function ChartCorssCursor()
     {
         this.Status=0;
         this.RightButton.Rect=null;
+        this.LastValue=null;
 
         if (!this.LastPoint) return;
 
@@ -55129,6 +55131,8 @@ function ChartCorssCursor()
         var yValue=this.Frame.GetYData(y,yValueExtend);
         if ( (this.IsOnlyDrawMinute || this.IsShowClose) && this.Close != null) yValue=this.Close;
 
+        this.LastValue={ Y:{ Value:yValue, Extend:yValueExtend }};  //缓存十字光标对应的数值
+
         //this.StringFormatX.Value=xValue;
         this.StringFormatX.Value=this.CursorIndex;
         this.StringFormatX.Point={X:x, Y:y};
@@ -75015,12 +75019,14 @@ function JSChartLocalization()
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
         ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['DialogTooltip-AvPrice', {CN:'均价', EN:'AVPrice:', TC:'均價'}],
         ['DialogTooltip-FClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
         ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
         ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
         ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
         ['DialogTooltip-AC-Increase', {CN:'竞价涨幅', EN:'Increase', TC:'競價漲幅'}],
         ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
+        ['DialogTooltip-Value', {CN:'数值', EN:'Value', TC:'数值'}],
 
         //走势图PC tooltip
         ['PCTooltip-Date', {CN:'日期', EN:'Date', TC:"日期"}],
@@ -83345,6 +83351,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
             KItem:kItem, 
             Symbol:this.Symbol, Name:this.Name,
+            LastValue:this.ChartCorssCursor.LastValue,
         };
 
 
@@ -84811,11 +84818,38 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.MouseDrag=drag;
                 this.PhoneTouchInfo={ Start:{X:touches[0].clientX, Y:touches[0].clientY }, End:{ X:touches[0].clientX, Y:touches[0].clientY } };
                 this.SelectChartDrawPicture=null;
+
+                var bStartTimer=true;   //长按计时开始
+                if (this.EnableClickModel)
+                {
+                    if (this.ClickModel.IsShowCorssCursor==true) bStartTimer=false;
+                    else bStartTimer= true;
+                } 
+
+                if (bStartTimer)
+                {
+                    this.StopDragTimer();
+                    this.DragTimer = setTimeout(()=>{
+                        this.IsPress=true;
+                        if (drag.Click.X == drag.LastMove.X && drag.Click.Y == drag.LastMove.Y)     //手指没有移动，出现十字光标
+                        {
+                            this.MouseDrag = null;
+                            //移动十字光标
+                            var x = drag.Click.X;
+                            var y = drag.Click.Y;
+                            if (this.EnableClickModel===true) this.ClickModel.IsShowCorssCursor=true;
+                            self.MoveCorssCursor(drag.Click,e);//移动十字光标
+                        }
     
-                if (this.EnableScrollUpDown==false)
-                    T_ShowCorssCursor();    //移动十字光标
-                else if (this.IsClickShowCorssCursor)
-                    T_ShowCorssCursor(); 
+                    }, this.PressTime);
+                }
+                else if (!this.EnableClickModel)
+                {
+                    if (this.EnableScrollUpDown==false)
+                        T_ShowCorssCursor();    //移动十字光标
+                    else if (this.IsClickShowCorssCursor)
+                        T_ShowCorssCursor(); 
+                }
             }
 
             if (this.EnableZoomIndexWindow)
@@ -88529,6 +88563,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.OnTouchFinished=function()
     {
+        if (this.EnableClickModel===true)
+        {
+            if (this.ClickModel.IsShowCorssCursor==true && this.TouchDrawCount>0) return;
+
+            this.ClickModel.IsShowCorssCursor=false;
+            this.DrawDynamicInfo();
+            return;
+        }
+
         if (this.CorssCursorTouchEnd===true)    //手势离开十字光标消失
         {
             this.DrawDynamicInfo();
@@ -89157,6 +89200,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
             MinItem:minuteItem, 
             Symbol:this.Symbol, Name:this.Name,
+            LastValue:this.ChartCorssCursor.LastValue,
         };
 
 
@@ -139040,7 +139084,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13932";
+var HQCHART_VERSION="1.1.13943";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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