hqchart 1.1.13928 → 1.1.13944

package/package.json

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

package/src/jscommon/umychart.DialogTooltip.js

@@ -16,6 +16,7 @@ function JSDialogTooltip()
     this.DivDialog=null;
     this.DragTitle=null;
     this.TitleBox=null; //{ DivTitle, DivName, DivName }
+    this.Style=0;       //0=一行一个， 1=2行一个
 
     this.HQChart=null;
 
@@ -41,10 +42,16 @@ function JSDialogTooltip()
 
     this.KItemCache=null;
     this.KItemCacheID=null;
+    this.LastValueCache=null;    //最后的鼠标位置对应的数值
+    this.LastValueCacheID=null;
 
-    this.Inital=function(hqchart)
+    this.Inital=function(hqchart, option)
     {
-       this.HQChart=hqchart;
+        this.HQChart=hqchart;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+        }
     }
 
     this.Destroy=function()
@@ -107,36 +114,78 @@ function JSDialogTooltip()
         table.appendChild(tbody);
 
         this.AryData=[];
-        for(var i=0;i<this.MaxRowCount;++i)
+        if (this.Style==1)
         {
-            var rowItem={ Tr:null, TitleSpan:null, TextSpan:null };
-
-            var trDom=document.createElement("tr");
-            trDom.className='UMyChart_Tooltip_Group_Tr';
-            tbody.appendChild(trDom);
-            rowItem.Tr=trDom;
-
-            var tdDom=document.createElement("td");
-            tdDom.className="UMyChart_Tooltip_Title_Td";   //标题
-            trDom.appendChild(tdDom);
-
-            var spanDom=document.createElement("span");
-            spanDom.className='UMyChart_Tooltip_Title_Span';
-            spanDom.innerText='标题';
-            tdDom.appendChild(spanDom);
-            rowItem.TitleSpan=spanDom;
-
-            var tdDom=document.createElement("td");
-            tdDom.className="UMyChart_Tooltip_Text_Td";    //数值
-            trDom.appendChild(tdDom);
-
-            var spanDom=document.createElement("span");
-            spanDom.className='UMyChart_Tooltip_Text_Span';
-            spanDom.innerText='数值';
-            tdDom.appendChild(spanDom);
-            rowItem.TextSpan=spanDom;
-
-            this.AryData.push(rowItem);
+            for(var i=0;i<this.MaxRowCount;++i)
+            {
+                var rowItem={ Tr:null, TitleSpan:null, TextSpan:null, Tr2:null };
+
+                var trDom=document.createElement("tr");
+                trDom.className='UMyChart_Tooltip_Group_Tr';
+                tbody.appendChild(trDom);
+                rowItem.Tr=trDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Text_Sinlge_Td";   //标题
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Title_Left_Span';
+                spanDom.innerText='标题';
+                tdDom.appendChild(spanDom);
+                rowItem.TitleSpan=spanDom;
+
+                var trDom=document.createElement("tr");
+                trDom.className='UMyChart_Tooltip_Group_Tr';
+                tbody.appendChild(trDom);
+                rowItem.Tr2=trDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Text_Sinlge_Td";    //数值
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Text_Span';
+                spanDom.innerText='数值';
+                tdDom.appendChild(spanDom);
+                rowItem.TextSpan=spanDom;
+
+                this.AryData.push(rowItem);
+            }
+        }
+        else
+        {
+            for(var i=0;i<this.MaxRowCount;++i)
+            {
+                var rowItem={ Tr:null, TitleSpan:null, TextSpan:null };
+
+                var trDom=document.createElement("tr");
+                trDom.className='UMyChart_Tooltip_Group_Tr';
+                tbody.appendChild(trDom);
+                rowItem.Tr=trDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Title_Td";   //标题
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Title_Span';
+                spanDom.innerText='标题';
+                tdDom.appendChild(spanDom);
+                rowItem.TitleSpan=spanDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Text_Td";    //数值
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Text_Span';
+                spanDom.innerText='数值';
+                tdDom.appendChild(spanDom);
+                rowItem.TextSpan=spanDom;
+
+                this.AryData.push(rowItem);
+            }
         }
         
 
@@ -159,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
@@ -173,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();
             }
         }
@@ -213,12 +288,14 @@ function JSDialogTooltip()
             item.TextSpan.innerText=outItem.Text;
             item.TextSpan.style.color=outItem.Color;
             item.Tr.style.display="";
+            if (item.Tr2) item.Tr2.style.display="";
         }
 
         for( ; index<this.MaxRowCount; ++index)
         {
             var item=this.AryData[index];
             item.Tr.style.display="none";
+            if (item.Tr2) item.Tr2.style.display="none";
         }
     }
 
@@ -300,6 +377,9 @@ function JSDialogTooltip()
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
         var upperSymbol=this.HQChart.Symbol.toUpperCase();
+        var priceFormat=0;
+        if (this.Style==1) priceFormat=1;
+
         //日期
         var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' );
 
@@ -310,18 +390,45 @@ function JSDialogTooltip()
         var yClose=data.YClose; //昨收价|昨结算价
         var aryText=
         [
-            this.ForamtPrice(data.Open,yClose, defaultfloatPrecision,'DialogTooltip-Open'),
-            this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'DialogTooltip-High'),
-            this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'DialogTooltip-Low'),
-            this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'DialogTooltip-Close'),
+            this.ForamtPrice(data.Open,yClose, defaultfloatPrecision,'DialogTooltip-Open',priceFormat),
+            this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'DialogTooltip-High',priceFormat),
+            this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'DialogTooltip-Low',priceFormat),
+            this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'DialogTooltip-Close',priceFormat),
             this.FormatVol(data.Vol,'DialogTooltip-Vol' ),
             this.FormatAmount(data.Amount,'DialogTooltip-Amount' ),
-            this.FormatIncrease(data.Close,yClose,'DialogTooltip-Increase'),
-            this.FormatAmplitude(data.High,data.Low,yClose,'DialogTooltip-Amplitude'),
+            this.FormatIncrease(data.Close,yClose,defaultfloatPrecision,'DialogTooltip-Increase',priceFormat),
+            this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'DialogTooltip-Amplitude',priceFormat),
         ];
 
-        if (timeItem) aryText.unshift(timeItem);
-        aryText.unshift(dateItem);
+        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);
+            var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD",'DialogTooltip-Date' );
+            aryText.unshift(dateItem);
+        }
+        else
+        {
+            if (timeItem) aryText.unshift(timeItem);
+            aryText.unshift(dateItem);
+        }
+
+        
 
         //换手率
         if (MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol) && data.FlowCapital>0)
@@ -349,7 +456,6 @@ function JSDialogTooltip()
     this.GetFormatMinuteTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
-
         var aryText=[];
         if (data.Type==0) //连续交易
         {
@@ -358,14 +464,31 @@ function JSDialogTooltip()
 
             aryText=
             [
-                this.ForamtDate(item.Date,"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'),
+                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,'DialogTooltip-Increase'),
+                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)  //集合竞价
         {
@@ -376,10 +499,10 @@ function JSDialogTooltip()
             if (item.Ver===1) timeForamt="HH:MM"
             aryText=
             [
-                this.ForamtDate(item.Date,"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'),
-                this.FormatIncrease(item.Price,item.YClose,'DialogTooltip-AC-Increase'),
+                this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
+                this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
                 this.FormatVol(item.Vol[0],'DialogTooltip-AC-Vol' ),
             ];
         }
@@ -448,8 +571,8 @@ function JSDialogTooltip()
 
 
     /////////////////////////////////////////////////////////////////////////////////////////////
-    //数据格式化
-    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)
+    //数据格式化 format=0  点差+涨幅 1=涨幅
+    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID, format)
     {
         var item=
         { 
@@ -460,12 +583,44 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(price)) return item;
 
-        item.Text=price.toFixed(defaultfloatPrecision);
+        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;
+            item.Text=`${price.toFixed(defaultfloatPrecision)}(${value.toFixed(2)}%)`;
+        }
+        else
+        {
+            item.Text=price.toFixed(defaultfloatPrecision);
+        }
+
+        
         item.Color=this.GetColor(price, yClose);
 
         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=
@@ -498,7 +653,7 @@ function JSDialogTooltip()
         return item;
     }
 
-    this.FormatIncrease=function(price, yClose, TitleID)
+    this.FormatIncrease=function(price, yClose, defaultfloatPrecision, TitleID, fromat)
     {
         //涨幅
         var item=
@@ -510,8 +665,19 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
 
+      
+
+        var diffValue=price-yClose;
         var value=(price-yClose)/yClose;
-        item.Text=`${(value*100).toFixed(2)}%`;
+        if (fromat==1)
+        {
+            item.Text=`${(value*100).toFixed(2)}%`;
+        }
+        else
+        {
+            item.Text=`${diffValue.toFixed(defaultfloatPrecision)}(${(value*100).toFixed(2)}%)`;
+        }
+       
         item.Color=this.GetColor(value,0);
 
         return item;
@@ -536,9 +702,9 @@ function JSDialogTooltip()
         return item;
     }
 
-    this.FormatAmplitude=function(high, low, yClose, TitleID)
+    this.FormatAmplitude=function(high, low, yClose, defaultfloatPrecision, TitleID, fromat)
     {
-        //涨幅
+        //振幅
         var item=
         {
             Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
@@ -549,8 +715,10 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
 
+        var diffValue=high-low;
         var value=(high-low)/yClose;
-        item.Text=`${(value*100).toFixed(2)}%`;
+        if (fromat==1) item.Text=`${(value*100).toFixed(2)}%`;
+        else item.Text=`${diffValue.toFixed(defaultfloatPrecision)}(${(value*100).toFixed(2)}%)`;
         item.Color=this.GetColor(value,0);
         
         return item;