hqchart 1.1.12503 → 1.1.12505

package/lib/umychart.vue.js

@@ -5249,15 +5249,103 @@ this.newMethod();delete this.newMethod;this.ClassName="HistoryDataStringFormat";
 this.LineHeight=g_JSChartResource.PCTooltip.LineHeight;//单行高度
 this.Width=157;//宽度
 this.Height=this.LineHeight*5;//高度
-this.Operator=function(){var data=this.Value.Data;if(!data)return false;this.Width=157;if(this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID)this.Width=180;var date=new Date(parseInt(data.Date/10000),data.Date/100%100-1,data.Date%100);var strDate=IFrameSplitOperator.FormatDateString(data.Date);var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);if(ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true))// 分钟周期
-{title2=IFrameSplitOperator.FormatTimeString(data.Time);}else if(ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period)||isTickPeriod){title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');}var upperSymbol=this.Symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
-var increase=null;if(data.YClose>0)increase=(data.Close-data.YClose)/data.YClose*100;if(isTickPeriod){var strText="<span class='tooltip-title'>"+strDate+"&nbsp&nbsp"+title2+"</span>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.GetColor(data.Open,data.YClose)+";'>"+data.Open.toFixed(defaultfloatPrecision)+"</span><br/>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID)+"</span>"+(increase==null?"<span class='tooltip-num' style='color:"+this.GetColor(0,0)+";'>"+'--'+"</span><br/>":"<span class='tooltip-num' style='color:"+this.GetColor(increase,0)+";'>"+increase.toFixed(2)+'%'+"</span><br/>");this.LineCount=4;}else if(data.IsNonTrade)//非交易日就显示日期
-{var strText='<span class=\'tooltip-title\'>'+strDate+'&nbsp&nbsp'+title2+'</span>';this.LineCount=2;}else{var vol=data.Vol;if(upperSymbol&&MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol))vol/=100;//A股统一转成手
+this.Operator=function(){var data=this.Value.Data;if(!data)return false;this.Width=157;if(this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID)this.Width=180;var titleData=this.GetFormatTitle(data);if(!titleData)return false;var outData=this.GenerateTitleHtml(titleData);if(!outData)return false;this.Text=outData.Html;this.Height=outData.LineCount*this.LineHeight;return true;/*
+        var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
+        var strDate=IFrameSplitOperator.FormatDateString(data.Date);
+        var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
+        var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
+        if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time);
+        }
+        else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
+        }
+
+        var upperSymbol=this.Symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+        var increase=null;
+        if (data.YClose>0) increase=(data.Close-data.YClose)/data.YClose*100;
+        if (isTickPeriod)
+        {
+            var strText=
+            "<span class='tooltip-title'>"+strDate+"&nbsp&nbsp"+title2+"</span>"+
+            "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID)+"</span>"+
+            "<span class='tooltip-num' style='color:"+this.GetColor(data.Open,data.YClose)+";'>"+data.Open.toFixed(defaultfloatPrecision)+"</span><br/>"+
+            "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID)+"</span>"+
+            (increase==null? "<span class='tooltip-num' style='color:"+this.GetColor(0,0)+";'>"+'--'+"</span><br/>" :
+            "<span class='tooltip-num' style='color:"+this.GetColor(increase,0)+";'>"+increase.toFixed(2)+'%'+"</span><br/>");
+
+            this.LineCount=4;
+        }
+        else if (data.IsNonTrade)   //非交易日就显示日期
+        {
+            var strText= `<span class='tooltip-title'>${strDate}&nbsp&nbsp${title2}</span>`;
+            this.LineCount=2;
+        }
+        else
+        {
+            var vol=data.Vol;
+            if (upperSymbol && MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) vol/=100; //A股统一转成手
+            var eventUnchangeKLine=null;    //定制平盘K线颜色事件
+            if (this.GetEventCallback) eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);
+            var strText=
+                "<span class='tooltip-title'>"+strDate+"&nbsp&nbsp"+title2+"</span>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID)+"</span>"+
+                "<span class='tooltip-num' style='color:"+this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine)+";'>"+ (IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--') +"</span><br/>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID)+"</span>"+
+                "<span class='tooltip-num' style='color:"+this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)+";'>"+ (IFrameSplitOperator.IsNumber(data.High)? data.High.toFixed(defaultfloatPrecision):'--') +"</span><br/>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID)+"</span>"+
+                "<span class='tooltip-num' style='color:"+this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)+";'>"+ (IFrameSplitOperator.IsNumber(data.Low)? data.Low.toFixed(defaultfloatPrecision):'--') +"</span><br/>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID)+"</span>"+
+                "<span class='tooltip-num' style='color:"+this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)+";'>"+ (IFrameSplitOperator.IsNumber(data.Close)? data.Close.toFixed(defaultfloatPrecision):'--') +"</span><br/>"+
+                //"<span style='color:"+this.YClose+";font:微软雅黑;font-size:12px'>&nbsp;前收: "+IFrameSplitOperator.FormatValueString(data.YClose,2)+"</span><br/>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID)+"</span>"+
+                "<span class='tooltip-num' style='color:"+this.VolColor+";'>"+ (IFrameSplitOperator.IsNumber(vol)? IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--') +"</span><br/>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID)+"</span>"+
+                "<span class='tooltip-num' style='color:"+this.AmountColor+";'>"+ (IFrameSplitOperator.IsNumber(data.Amount)? IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--') +"</span><br/>"+
+                "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID)+"</span>"+
+                (increase==null? "<span class='tooltip-num' style='color:"+this.GetColor(0,0)+";'>"+'--'+"</span><br/>" :
+                "<span class='tooltip-num' style='color:"+this.GetColor(increase,0)+";'>"+increase.toFixed(2)+'%'+"</span><br/>");
+
+            this.LineCount=8;
+
+            if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol) && data.FlowCapital>0)  //换手率
+            {
+                var value=data.Vol/data.FlowCapital*100;
+                strText+= "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID)+"</span>" +
+                    "<span class='tooltip-num' style='color:"+this.TurnoverRateColor+";'>"+value.toFixed(2)+'%'+"</span><br/>";
+                ++this.LineCount;
+            }
+
+            if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol) && IFrameSplitOperator.IsNumber(data.Position))
+            {
+                strText+= "<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID)+"</span>" +
+                    "<span class='tooltip-num' style='color:"+this.PositionColor+";'>"+data.Position+"</span><br/>";
+                ++this.LineCount;
+            }
+
+            //叠加股票
+            if (this.Value.ChartPaint.Name=="Overlay-KLine")
+            {
+                var title="<span style='color:rgb(0,0,0);font:微软雅黑;font-size:12px;text-align:center;display: block;'>"+this.Value.ChartPaint.Title+"</span>";
+                strText=title+strText;
+                ++this.LineCount;
+            }
+        }
+
+        this.Text=strText;
+
+        this.Height=this.LineCount*this.LineHeight;
+        return true;
+        */};this.GenerateTitleHtml=function(data){var lineCount=0;var strHtml="",text;if(data.Name){text='<span style=\'color:rgb(0,0,0);font:\u5FAE\u8F6F\u96C5\u9ED1;font-size:12px;text-align:center;display: block;\'>'+data.Name+'</span>';strHtml+=text;++lineCount;}if(data.Title){text='<span class=\'tooltip-title\'>'+data.Title+'</span>';strHtml+=text;++lineCount;}if(IFrameSplitOperator.IsNonEmptyArray(data.AryText)){for(var i=0;i<data.AryText.length;++i){var item=data.AryText[i];if(i>0)strHtml+='<br/>';var text='<span class=\'tooltip-con\'>'+item.Title+'</span><span class=\'tooltip-num\' style=\'color:'+item.Color+';\'>'+item.Text+'</span>';strHtml+=text;++lineCount;}}return{Html:strHtml,LineCount:lineCount};};this.GetFormatTitle=function(data){if(!data)return null;var upperSymbol=this.Symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+var date=new Date(parseInt(data.Date/10000),data.Date/100%100-1,data.Date%100);var strDate=IFrameSplitOperator.FormatDateString(data.Date);var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);if(ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true))// 分钟周期
+{title2=IFrameSplitOperator.FormatTimeString(data.Time);}else if(ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period)||isTickPeriod){title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');}var result={AryText:null,Title:strDate+'&nbsp&nbsp'+title2,Name:null};if(isTickPeriod){var aryText=[{Title:g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID),Text:IFrameSplitOperator.IsNumber(data.Open)?data.Open.toFixed(defaultfloatPrecision):'--',Color:this.GetColor(data.Open,data.YClose)}];if(IFrameSplitOperator.IsNumber(data.YClose)){var increase=(data.Close-data.YClose)/data.YClose*100;var item={Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),Text:increase.toFixed(2)+'%',Color:this.GetColor(increase,0)};aryText.push(item);}result.AryText=aryText;}else if(data.IsNonTrade){}else{var vol=data.Vol;if(upperSymbol&&MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol))vol/=100;//A股统一转成手
 var eventUnchangeKLine=null;//定制平盘K线颜色事件
-if(this.GetEventCallback)eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);var strText="<span class='tooltip-title'>"+strDate+"&nbsp&nbsp"+title2+"</span>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine)+";'>"+(IFrameSplitOperator.IsNumber(data.Open)?data.Open.toFixed(defaultfloatPrecision):'--')+"</span><br/>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)+";'>"+(IFrameSplitOperator.IsNumber(data.High)?data.High.toFixed(defaultfloatPrecision):'--')+"</span><br/>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)+";'>"+(IFrameSplitOperator.IsNumber(data.Low)?data.Low.toFixed(defaultfloatPrecision):'--')+"</span><br/>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)+";'>"+(IFrameSplitOperator.IsNumber(data.Close)?data.Close.toFixed(defaultfloatPrecision):'--')+"</span><br/>"+//"<span style='color:"+this.YClose+";font:微软雅黑;font-size:12px'>&nbsp;前收: "+IFrameSplitOperator.FormatValueString(data.YClose,2)+"</span><br/>"+
-"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.VolColor+";'>"+(IFrameSplitOperator.IsNumber(vol)?IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--')+"</span><br/>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.AmountColor+";'>"+(IFrameSplitOperator.IsNumber(data.Amount)?IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--')+"</span><br/>"+"<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID)+"</span>"+(increase==null?"<span class='tooltip-num' style='color:"+this.GetColor(0,0)+";'>"+'--'+"</span><br/>":"<span class='tooltip-num' style='color:"+this.GetColor(increase,0)+";'>"+increase.toFixed(2)+'%'+"</span><br/>");this.LineCount=8;if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol)&&data.FlowCapital>0)//换手率
-{var value=data.Vol/data.FlowCapital*100;strText+="<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.TurnoverRateColor+";'>"+value.toFixed(2)+'%'+"</span><br/>";++this.LineCount;}if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)&&IFrameSplitOperator.IsNumber(data.Position)){strText+="<span class='tooltip-con'>"+g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID)+"</span>"+"<span class='tooltip-num' style='color:"+this.PositionColor+";'>"+data.Position+"</span><br/>";++this.LineCount;}//叠加股票
-if(this.Value.ChartPaint.Name=="Overlay-KLine"){var title="<span style='color:rgb(0,0,0);font:微软雅黑;font-size:12px;text-align:center;display: block;'>"+this.Value.ChartPaint.Title+"</span>";strText=title+strText;++this.LineCount;}}this.Text=strText;this.Height=this.LineCount*this.LineHeight;return true;};this.GetColor=function(price,yclse){if(price>yclse)return this.UpColor;else if(price<yclse)return this.DownColor;else return this.UnchagneColor;};this.GetPriceColor=function(titleName,price,yClose,item,event){var color=this.GetColor(price,yClose);if(price==yClose&&event&&event.Callback){var sendData={Item:item,TitleName:titleName,DefaultColor:color,TitleColor:null,ClassName:this.ClassName};event.Callback(event,sendData);if(sendData.TitleColor)color=sendData.TitleColor;}return color;};}//K线信息地雷提示信息格式
+if(this.GetEventCallback)eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);var aryText=[{Title:g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID),Text:IFrameSplitOperator.IsNumber(data.Open)?data.Open.toFixed(defaultfloatPrecision):'--',Color:this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine)},{Title:g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID),Text:IFrameSplitOperator.IsNumber(data.High)?data.High.toFixed(defaultfloatPrecision):'--',Color:this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)},{Title:g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID),Text:IFrameSplitOperator.IsNumber(data.Low)?data.Low.toFixed(defaultfloatPrecision):'--',Color:this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)},{Title:g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID),Text:IFrameSplitOperator.IsNumber(data.Close)?data.Close.toFixed(defaultfloatPrecision):'--',Color:this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)},{Title:g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID),Text:IFrameSplitOperator.IsNumber(vol)?IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--',Color:this.VolColor},{Title:g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID),Text:IFrameSplitOperator.IsNumber(data.Amount)?IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--',Color:this.AmountColor}];if(IFrameSplitOperator.IsNumber(data.YClose)){var increase=(data.Close-data.YClose)/data.YClose*100;var item={Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),Text:increase.toFixed(2)+'%',Color:this.GetColor(increase,0)};aryText.push(item);}if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol)&&data.FlowCapital>0)//换手率
+{var value=data.Vol/data.FlowCapital*100;var item={Title:g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID),Text:value.toFixed(2)+'%',Color:this.TurnoverRateColor};aryText.push(item);}if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)&&IFrameSplitOperator.IsNumber(data.Position)){var item={Title:g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID),Text:''+data.Position,Color:this.PositionColor};}//叠加股票
+if(this.Value.ChartPaint.Name=="Overlay-KLine"){result.Name=this.Value.ChartPaint.Title;}result.AryText=aryText;}return result;};this.GetColor=function(price,yclse){if(price>yclse)return this.UpColor;else if(price<yclse)return this.DownColor;else return this.UnchagneColor;};this.GetPriceColor=function(titleName,price,yClose,item,event){var color=this.GetColor(price,yClose);if(price==yClose&&event&&event.Callback){var sendData={Item:item,TitleName:titleName,DefaultColor:color,TitleColor:null,ClassName:this.ClassName};event.Callback(event,sendData);if(sendData.TitleColor)color=sendData.TitleColor;}return color;};}//K线信息地雷提示信息格式
 function KLineInfoDataStringFormat(){this.newMethod=IChangeStringFormat;//派生
 this.newMethod();delete this.newMethod;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchagneColor=g_JSChartResource.UnchagneTextColor;this.Width=500;this.Operator=function(){if(!this.Value)return false;var infoList=this.Value.Data.Data;//数据
 var infoType=this.Value.Data.Type;//类型
@@ -12499,7 +12587,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.12502";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.12504";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.12503",
+  "version": "1.1.12505",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -47135,7 +47135,16 @@ function HistoryDataStringFormat()
 
         this.Width=157;
         if (this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID) this.Width=180;
+        var titleData=this.GetFormatTitle(data);
+        if (!titleData) return false;
+        var outData=this.GenerateTitleHtml(titleData);
+        if (!outData) return false;
 
+        this.Text=outData.Html;
+        this.Height=outData.LineCount*this.LineHeight;
+        return true;
+
+        /*
         var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
         var strDate=IFrameSplitOperator.FormatDateString(data.Date);
         var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
@@ -47225,6 +47234,178 @@ function HistoryDataStringFormat()
 
         this.Height=this.LineCount*this.LineHeight;
         return true;
+        */
+    }
+
+    this.GenerateTitleHtml=function(data)
+    {
+        var lineCount=0;
+        var strHtml="", text;
+        if (data.Name)
+        {
+            text=`<span style='color:rgb(0,0,0);font:微软雅黑;font-size:12px;text-align:center;display: block;'>${data.Name}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (data.Title)
+        {
+            text=`<span class='tooltip-title'>${data.Title}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(data.AryText))
+        {
+            for(var i=0;i<data.AryText.length;++i)
+            {
+                var item=data.AryText[i];
+                if (i>0) strHtml+='<br/>';
+                var text=`<span class='tooltip-con'>${item.Title}</span><span class='tooltip-num' style='color:${item.Color};'>${item.Text}</span>`;
+                strHtml+=text;
+                ++lineCount;
+            }
+        }
+
+        return { Html:strHtml, LineCount:lineCount };
+    }
+
+    this.GetFormatTitle=function(data)
+    {
+        if (!data) return null;
+
+        var upperSymbol=this.Symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+        var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
+        var strDate=IFrameSplitOperator.FormatDateString(data.Date);
+
+        var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
+        var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
+        if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time);
+        }
+        else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
+        }
+
+        var result={ AryText:null, Title:`${strDate}&nbsp&nbsp${title2}`, Name:null };
+        if (isTickPeriod)
+        {
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetColor(data.Open,data.YClose)
+                },
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            result.AryText=aryText;
+        }
+        else if (data.IsNonTrade)
+        {
+
+        }
+        else
+        {
+            var vol=data.Vol;
+            if (upperSymbol && MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) vol/=100; //A股统一转成手
+            var eventUnchangeKLine=null;    //定制平盘K线颜色事件
+            if (this.GetEventCallback) eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);
+
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine),
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.High)? data.High.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Low)? data.Low.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Close)? data.Close.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(vol)? IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--',
+                    Color:this.VolColor
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Amount)? IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--',
+                    Color:this.AmountColor
+                }
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol) && data.FlowCapital>0)  //换手率
+            {
+                var value=data.Vol/data.FlowCapital*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID),
+                    Text:`${value.toFixed(2)}%`,
+                    Color:this.TurnoverRateColor
+                }
+                aryText.push(item);
+            }
+
+            if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol) && IFrameSplitOperator.IsNumber(data.Position))
+            {
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID),
+                    Text:`${data.Position}`,
+                    Color:this.PositionColor
+                }
+            }
+
+            //叠加股票
+            if (this.Value.ChartPaint.Name=="Overlay-KLine")
+            {
+                result.Name=this.Value.ChartPaint.Title;
+            }
+
+            result.AryText=aryText;
+        }
+
+
+        return result;
     }
 
     this.GetColor=function(price,yclse)

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

@@ -51215,7 +51215,16 @@ function HistoryDataStringFormat()
 
         this.Width=157;
         if (this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID) this.Width=180;
+        var titleData=this.GetFormatTitle(data);
+        if (!titleData) return false;
+        var outData=this.GenerateTitleHtml(titleData);
+        if (!outData) return false;
 
+        this.Text=outData.Html;
+        this.Height=outData.LineCount*this.LineHeight;
+        return true;
+
+        /*
         var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
         var strDate=IFrameSplitOperator.FormatDateString(data.Date);
         var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
@@ -51305,6 +51314,178 @@ function HistoryDataStringFormat()
 
         this.Height=this.LineCount*this.LineHeight;
         return true;
+        */
+    }
+
+    this.GenerateTitleHtml=function(data)
+    {
+        var lineCount=0;
+        var strHtml="", text;
+        if (data.Name)
+        {
+            text=`<span style='color:rgb(0,0,0);font:微软雅黑;font-size:12px;text-align:center;display: block;'>${data.Name}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (data.Title)
+        {
+            text=`<span class='tooltip-title'>${data.Title}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(data.AryText))
+        {
+            for(var i=0;i<data.AryText.length;++i)
+            {
+                var item=data.AryText[i];
+                if (i>0) strHtml+='<br/>';
+                var text=`<span class='tooltip-con'>${item.Title}</span><span class='tooltip-num' style='color:${item.Color};'>${item.Text}</span>`;
+                strHtml+=text;
+                ++lineCount;
+            }
+        }
+
+        return { Html:strHtml, LineCount:lineCount };
+    }
+
+    this.GetFormatTitle=function(data)
+    {
+        if (!data) return null;
+
+        var upperSymbol=this.Symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+        var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
+        var strDate=IFrameSplitOperator.FormatDateString(data.Date);
+
+        var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
+        var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
+        if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time);
+        }
+        else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
+        }
+
+        var result={ AryText:null, Title:`${strDate}&nbsp&nbsp${title2}`, Name:null };
+        if (isTickPeriod)
+        {
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetColor(data.Open,data.YClose)
+                },
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            result.AryText=aryText;
+        }
+        else if (data.IsNonTrade)
+        {
+
+        }
+        else
+        {
+            var vol=data.Vol;
+            if (upperSymbol && MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) vol/=100; //A股统一转成手
+            var eventUnchangeKLine=null;    //定制平盘K线颜色事件
+            if (this.GetEventCallback) eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);
+
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine),
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.High)? data.High.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Low)? data.Low.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Close)? data.Close.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(vol)? IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--',
+                    Color:this.VolColor
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Amount)? IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--',
+                    Color:this.AmountColor
+                }
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol) && data.FlowCapital>0)  //换手率
+            {
+                var value=data.Vol/data.FlowCapital*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID),
+                    Text:`${value.toFixed(2)}%`,
+                    Color:this.TurnoverRateColor
+                }
+                aryText.push(item);
+            }
+
+            if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol) && IFrameSplitOperator.IsNumber(data.Position))
+            {
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID),
+                    Text:`${data.Position}`,
+                    Color:this.PositionColor
+                }
+            }
+
+            //叠加股票
+            if (this.Value.ChartPaint.Name=="Overlay-KLine")
+            {
+                result.Name=this.Value.ChartPaint.Title;
+            }
+
+            result.AryText=aryText;
+        }
+
+
+        return result;
     }
 
     this.GetColor=function(price,yclse)
@@ -128141,7 +128322,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12502";
+var HQCHART_VERSION="1.1.12504";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -51259,7 +51259,16 @@ function HistoryDataStringFormat()
 
         this.Width=157;
         if (this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID) this.Width=180;
+        var titleData=this.GetFormatTitle(data);
+        if (!titleData) return false;
+        var outData=this.GenerateTitleHtml(titleData);
+        if (!outData) return false;
 
+        this.Text=outData.Html;
+        this.Height=outData.LineCount*this.LineHeight;
+        return true;
+
+        /*
         var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
         var strDate=IFrameSplitOperator.FormatDateString(data.Date);
         var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
@@ -51349,6 +51358,178 @@ function HistoryDataStringFormat()
 
         this.Height=this.LineCount*this.LineHeight;
         return true;
+        */
+    }
+
+    this.GenerateTitleHtml=function(data)
+    {
+        var lineCount=0;
+        var strHtml="", text;
+        if (data.Name)
+        {
+            text=`<span style='color:rgb(0,0,0);font:微软雅黑;font-size:12px;text-align:center;display: block;'>${data.Name}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (data.Title)
+        {
+            text=`<span class='tooltip-title'>${data.Title}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(data.AryText))
+        {
+            for(var i=0;i<data.AryText.length;++i)
+            {
+                var item=data.AryText[i];
+                if (i>0) strHtml+='<br/>';
+                var text=`<span class='tooltip-con'>${item.Title}</span><span class='tooltip-num' style='color:${item.Color};'>${item.Text}</span>`;
+                strHtml+=text;
+                ++lineCount;
+            }
+        }
+
+        return { Html:strHtml, LineCount:lineCount };
+    }
+
+    this.GetFormatTitle=function(data)
+    {
+        if (!data) return null;
+
+        var upperSymbol=this.Symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+        var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
+        var strDate=IFrameSplitOperator.FormatDateString(data.Date);
+
+        var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
+        var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
+        if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time);
+        }
+        else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
+        }
+
+        var result={ AryText:null, Title:`${strDate}&nbsp&nbsp${title2}`, Name:null };
+        if (isTickPeriod)
+        {
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetColor(data.Open,data.YClose)
+                },
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            result.AryText=aryText;
+        }
+        else if (data.IsNonTrade)
+        {
+
+        }
+        else
+        {
+            var vol=data.Vol;
+            if (upperSymbol && MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) vol/=100; //A股统一转成手
+            var eventUnchangeKLine=null;    //定制平盘K线颜色事件
+            if (this.GetEventCallback) eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);
+
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine),
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.High)? data.High.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Low)? data.Low.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Close)? data.Close.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(vol)? IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--',
+                    Color:this.VolColor
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Amount)? IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--',
+                    Color:this.AmountColor
+                }
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol) && data.FlowCapital>0)  //换手率
+            {
+                var value=data.Vol/data.FlowCapital*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID),
+                    Text:`${value.toFixed(2)}%`,
+                    Color:this.TurnoverRateColor
+                }
+                aryText.push(item);
+            }
+
+            if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol) && IFrameSplitOperator.IsNumber(data.Position))
+            {
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID),
+                    Text:`${data.Position}`,
+                    Color:this.PositionColor
+                }
+            }
+
+            //叠加股票
+            if (this.Value.ChartPaint.Name=="Overlay-KLine")
+            {
+                result.Name=this.Value.ChartPaint.Title;
+            }
+
+            result.AryText=aryText;
+        }
+
+
+        return result;
     }
 
     this.GetColor=function(price,yclse)
@@ -128294,7 +128475,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12502";
+var HQCHART_VERSION="1.1.12504";
 
 function PrintHQChartVersion()
 {