hqchart 1.1.13915 → 1.1.13928

package/src/jscommon/umychart.testdata.js

@@ -1331,6 +1331,10 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
         arySymbol.push(symbolItem);
     }
 
+    arySymbol.push( { Symbol:"ICL8.cfe", Name:"中证主连", ShortSymbol:"ICL8", Spell:"ICL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"ICL8.cfe", Type:0 }  } );
+    arySymbol.push( { Symbol:"IML8.cfe", Name:"中千主连", ShortSymbol:"IML8", Spell:"IML8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IML8.cfe", Type:0 }  } );
+    arySymbol.push( { Symbol:"IFL8.cfe", Name:"沪深主连", ShortSymbol:"IFL8", Spell:"IFL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IFL8.cfe", Type:0 }  } );
+
     arySymbol.push( { Symbol:"01", Name:"分时成交明细", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" , Data:{ PageName:"分时成交明细", Type:2 }} );
     arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
     arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
@@ -1339,6 +1343,13 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
     arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)",Data:{ Index:"RSI", Type:1 }}  );
     arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MA", Type:1 } } );
     arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"BOLL", Type:1 } } );
+    arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KD", Type:1 } } );
+    arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MARSI", Type:1 } } );
+    arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"VMACD", Type:1 } } );
+    arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"AMO", Type:1 } } );
+    arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
     
     callback(arySymbol);
 }
@@ -1381,6 +1392,15 @@ HQData.GetM1KLineDataBySymbol=function(symbol)
         case "399006.sz":
             data=SZ_399006_M1_KLINE;
             break;
+        case "ICL8.cfe":
+            data=CFE_ICL8_M1_KLINE;
+            break;
+        case "IML8.cfe":
+            data=CFE_IML8_M1_KLINE;
+            break;
+        case "IFL8.cfe":
+            data=CFE_IFL8_M1_KLINE;
+            break;
         default:
             data=SZ_000001_M1_KLINE;
             break;
@@ -1421,6 +1441,15 @@ HQData.GetDayKLineDataBySymbol=function(symbol)
         case "399006.sz":
             data=SZ_399006_DAY_KLINE;
             break;
+        case "ICL8.cfe":
+            data=CFE_ICL8_DAY_KLINE;
+            break;
+        case "IML8.cfe":
+            data=CFE_IML8_DAY_KLINE;
+            break;
+        case "IFL8.cfe":
+            data=CFE_IFL8_DAY_KLINE;
+            break;
         default:
             data=SZ_000001_DAY_KLINE;
             break;

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

@@ -6552,6 +6552,8 @@ var JSCHART_EVENT_ID=
     ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156,   //日盘夜盘的分界线
     ON_CUSTOM_MINUTE_BG:157,                    //自定义分时图背景颜色
     ON_CLICK_HORIZONTAL_LABEL:158,              //点击Y轴刻度标签
+
+    ON_FORMAT_DIALOG_TOOLTIP_TEXT:159,          //格式化Tooltip对话框显示文字
 }
 
 var JSCHART_OPERATOR_ID=
@@ -7104,6 +7106,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+
+        if (this.DialogTooltip)
+        {
+            this.DialogTooltip.Destroy();
+            this.DialogTooltip=null;
+        }
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -13982,6 +13990,71 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
     }
+
+    this.UpdateWindowIndexV2=function(aryIndex)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
+
+        var aryID=[];
+        for(var i=0;i<this.WindowIndex.length;++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+            if (!item.ID) continue;
+
+            if (aryIndex.find((element)=>{ return element.ID==item.ID;} ))
+            {
+                aryID.push(i);
+            }
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryID)) return false;
+
+        if (this.IsKLineContainer())    //K线
+        {
+            var bindData=new ChartData();
+            bindData.Data=this.SourceData.Data;
+            bindData.Period=this.Period;
+            bindData.Right=this.Right;
+
+            if (this.IsApiPeriod)
+            {
+    
+            }
+            else
+            {
+                if (bindData.Right>0)    //复权
+                {
+                    var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
+                    bindData.Data=rightData;
+                }
+    
+                if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据
+                {
+                    var periodData=bindData.GetPeriodData(bindData.Period);
+                    bindData.Data=periodData;
+                }
+            }
+        }
+        else if (this.IsMinuteContainer()) //分时图
+        {
+            var bindData=this.SourceData;
+        }
+        else
+        {
+            return;
+        }
+
+       
+        for(var i=0;i<aryID.length;++i)
+        {
+            this.BindIndexData(aryID[i],bindData)
+        }
+
+        this.UpdataDataoffset();           //更新数据偏移
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Draw();
+    }
 }
 
 function GetDevicePixelRatio()
@@ -72938,7 +73011,7 @@ function JSChartResource()
         AmountColor:"rgb(79, 79, 79)",      //成交金额
         DateTimeColor:'rgb(60,60,60)',
         TurnoverRateColor:'rgb(43,54,69)',       //换手率
-        PositionColor:"rgb(43,54,69)"            //持仓
+        PositionColor:"rgb(255,0,255)"            //持仓
     }
 
     //弹幕
@@ -74894,6 +74967,7 @@ function JSChartLocalization()
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
         ['DialogTooltip-Price', {CN:'价格', EN:'Price', 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:'匹配均價'}],
@@ -125349,7 +125423,7 @@ function GetBlackStyle()
             AmountColor:"rgb(210,210,210)",      //成交金额
             DateTimeColor:'rgb(210,210,210)',
             TurnoverRateColor:'rgb(43,54,69)',       //换手率
-            PositionColor:"rgb(43,54,69)"            //持仓
+            PositionColor:"rgb(255,0,255)"            //持仓
         },
         
         //走势图 信息地雷
@@ -138793,7 +138867,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13914";
+var HQCHART_VERSION="1.1.13927";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -56863,6 +56863,10 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
         arySymbol.push(symbolItem);
     }
 
+    arySymbol.push( { Symbol:"ICL8.cfe", Name:"中证主连", ShortSymbol:"ICL8", Spell:"ICL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"ICL8.cfe", Type:0 }  } );
+    arySymbol.push( { Symbol:"IML8.cfe", Name:"中千主连", ShortSymbol:"IML8", Spell:"IML8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IML8.cfe", Type:0 }  } );
+    arySymbol.push( { Symbol:"IFL8.cfe", Name:"沪深主连", ShortSymbol:"IFL8", Spell:"IFL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"IFL8.cfe", Type:0 }  } );
+
     arySymbol.push( { Symbol:"01", Name:"分时成交明细", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" , Data:{ PageName:"分时成交明细", Type:2 }} );
     arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
     arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
@@ -56871,6 +56875,13 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
     arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)",Data:{ Index:"RSI", Type:1 }}  );
     arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MA", Type:1 } } );
     arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"BOLL", Type:1 } } );
+    arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KD", Type:1 } } );
+    arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MARSI", Type:1 } } );
+    arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"VMACD", Type:1 } } );
+    arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"AMO", Type:1 } } );
+    arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
     
     callback(arySymbol);
 }
@@ -56913,6 +56924,15 @@ HQData.GetM1KLineDataBySymbol=function(symbol)
         case "399006.sz":
             data=SZ_399006_M1_KLINE;
             break;
+        case "ICL8.cfe":
+            data=CFE_ICL8_M1_KLINE;
+            break;
+        case "IML8.cfe":
+            data=CFE_IML8_M1_KLINE;
+            break;
+        case "IFL8.cfe":
+            data=CFE_IFL8_M1_KLINE;
+            break;
         default:
             data=SZ_000001_M1_KLINE;
             break;
@@ -56953,6 +56973,15 @@ HQData.GetDayKLineDataBySymbol=function(symbol)
         case "399006.sz":
             data=SZ_399006_DAY_KLINE;
             break;
+        case "ICL8.cfe":
+            data=CFE_ICL8_DAY_KLINE;
+            break;
+        case "IML8.cfe":
+            data=CFE_IML8_DAY_KLINE;
+            break;
+        case "IFL8.cfe":
+            data=CFE_IFL8_DAY_KLINE;
+            break;
         default:
             data=SZ_000001_DAY_KLINE;
             break;

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

@@ -6596,6 +6596,8 @@ var JSCHART_EVENT_ID=
     ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156,   //日盘夜盘的分界线
     ON_CUSTOM_MINUTE_BG:157,                    //自定义分时图背景颜色
     ON_CLICK_HORIZONTAL_LABEL:158,              //点击Y轴刻度标签
+
+    ON_FORMAT_DIALOG_TOOLTIP_TEXT:159,          //格式化Tooltip对话框显示文字
 }
 
 var JSCHART_OPERATOR_ID=
@@ -7148,6 +7150,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+
+        if (this.DialogTooltip)
+        {
+            this.DialogTooltip.Destroy();
+            this.DialogTooltip=null;
+        }
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -14026,6 +14034,71 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
     }
+
+    this.UpdateWindowIndexV2=function(aryIndex)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
+
+        var aryID=[];
+        for(var i=0;i<this.WindowIndex.length;++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+            if (!item.ID) continue;
+
+            if (aryIndex.find((element)=>{ return element.ID==item.ID;} ))
+            {
+                aryID.push(i);
+            }
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryID)) return false;
+
+        if (this.IsKLineContainer())    //K线
+        {
+            var bindData=new ChartData();
+            bindData.Data=this.SourceData.Data;
+            bindData.Period=this.Period;
+            bindData.Right=this.Right;
+
+            if (this.IsApiPeriod)
+            {
+    
+            }
+            else
+            {
+                if (bindData.Right>0)    //复权
+                {
+                    var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
+                    bindData.Data=rightData;
+                }
+    
+                if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据
+                {
+                    var periodData=bindData.GetPeriodData(bindData.Period);
+                    bindData.Data=periodData;
+                }
+            }
+        }
+        else if (this.IsMinuteContainer()) //分时图
+        {
+            var bindData=this.SourceData;
+        }
+        else
+        {
+            return;
+        }
+
+       
+        for(var i=0;i<aryID.length;++i)
+        {
+            this.BindIndexData(aryID[i],bindData)
+        }
+
+        this.UpdataDataoffset();           //更新数据偏移
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Draw();
+    }
 }
 
 function GetDevicePixelRatio()
@@ -72982,7 +73055,7 @@ function JSChartResource()
         AmountColor:"rgb(79, 79, 79)",      //成交金额
         DateTimeColor:'rgb(60,60,60)',
         TurnoverRateColor:'rgb(43,54,69)',       //换手率
-        PositionColor:"rgb(43,54,69)"            //持仓
+        PositionColor:"rgb(255,0,255)"            //持仓
     }
 
     //弹幕
@@ -74938,6 +75011,7 @@ function JSChartLocalization()
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
         ['DialogTooltip-Price', {CN:'价格', EN:'Price', 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:'匹配均價'}],
@@ -125393,7 +125467,7 @@ function GetBlackStyle()
             AmountColor:"rgb(210,210,210)",      //成交金额
             DateTimeColor:'rgb(210,210,210)',
             TurnoverRateColor:'rgb(43,54,69)',       //换手率
-            PositionColor:"rgb(43,54,69)"            //持仓
+            PositionColor:"rgb(255,0,255)"            //持仓
         },
         
         //走势图 信息地雷
@@ -143264,7 +143338,7 @@ function JSDialogTooltip()
     this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;
     this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
-    this.MaxRowCount=10;
+    this.MaxRowCount=25;
 
     this.AryData=[];
     this.AryText=[];
@@ -143426,7 +143500,7 @@ function JSDialogTooltip()
         if (!this.KItemCache) return;
 
         if (this.HQChart.ClassName=='KLineChartContainer')
-            this.AryText=this.GetFormatKlineTooltipText(this.KItemCache);
+            this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
         else if (this.HQChart.ClassName=='MinuteChartContainer')
             this.AryText=this.GetFormatMinuteTooltipText(this.KItemCache);
         else
@@ -143526,10 +143600,10 @@ function JSDialogTooltip()
     }
 
 
-    this.GetFormatKlineTooltipText=function(data)
+    this.GetFormatKLineTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
-
+        var upperSymbol=this.HQChart.Symbol.toUpperCase();
         //日期
         var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' );
 
@@ -143537,21 +143611,42 @@ function JSDialogTooltip()
         var timeItem=null;
         if (IFrameSplitOperator.IsNumber(data.Time)) timeItem=this.FormatTime(data.Time, this.HQChart.Period, null, 'DialogTooltip-Time');
         
+        var yClose=data.YClose; //昨收价|昨结算价
         var aryText=
         [
-            this.ForamtPrice(data.Open,data.YClose, defaultfloatPrecision,'DialogTooltip-Open'),
-            this.ForamtPrice(data.High,data.YClose, defaultfloatPrecision,'DialogTooltip-High'),
-            this.ForamtPrice(data.Low,data.YClose, defaultfloatPrecision,'DialogTooltip-Low'),
-            this.ForamtPrice(data.Close,data.YClose, defaultfloatPrecision,'DialogTooltip-Close'),
+            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.FormatVol(data.Vol,'DialogTooltip-Vol' ),
             this.FormatAmount(data.Amount,'DialogTooltip-Amount' ),
-            this.FormatIncrease(data.Close,data.YClose,'DialogTooltip-Increase'),
-            this.FormatAmplitude(data.High,data.Low,data.YClose,'DialogTooltip-Amplitude'),
+            this.FormatIncrease(data.Close,yClose,'DialogTooltip-Increase'),
+            this.FormatAmplitude(data.High,data.Low,yClose,'DialogTooltip-Amplitude'),
         ];
 
         if (timeItem) aryText.unshift(timeItem);
         aryText.unshift(dateItem);
 
+        //换手率
+        if (MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol) && data.FlowCapital>0)
+        {
+            aryText.push(this.FormatExchange(data.Vol,data.FlowCapital,'DialogTooltip-Exchange' ));
+        }
+
+        //持仓量 结算价
+        if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol))
+        {
+            aryText.push(this.FormatPosition(data.Position,'DialogTooltip-Position'));
+            aryText.push(this.ForamtFClose(data.FClose, defaultfloatPrecision, 'DialogTooltip-FClose'));
+        }
+
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP_TEXT);
+        if (event && event.Callback)
+        {
+            var sendData={ AryText:aryText, Data:data, Symbol:this.HQChart.Symbol, HQChart:this.HQChart, IsKLine:true };
+            event.Callback(event, sendData, this);
+        }
+
         return aryText;
     },
 
@@ -143559,12 +143654,13 @@ function JSDialogTooltip()
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
 
+        var aryText=[];
         if (data.Type==0) //连续交易
         {
             var item=data.Data;
             if (!item) item={ };
 
-            var aryText=
+            aryText=
             [
                 this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' ),
                 this.FormatTime(item.Time, null, "HH:MM", 'DialogTooltip-Time'),
@@ -143574,8 +143670,6 @@ function JSDialogTooltip()
                 this.FormatVol(item.Vol,'DialogTooltip-Vol' ),
                 this.FormatAmount(item.Amount,'DialogTooltip-Amount' ),
             ];
-
-            return aryText;
         }
         else if (data.Type==1)  //集合竞价
         {
@@ -143584,7 +143678,7 @@ function JSDialogTooltip()
 
             var timeForamt="HH:MM:SS";
             if (item.Ver===1) timeForamt="HH:MM"
-            var aryText=
+            aryText=
             [
                 this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' ),
                 this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
@@ -143592,11 +143686,20 @@ function JSDialogTooltip()
                 this.FormatIncrease(item.Price,item.YClose,'DialogTooltip-AC-Increase'),
                 this.FormatVol(item.Vol[0],'DialogTooltip-AC-Vol' ),
             ];
+        }
+        else
+        {
 
-            return aryText;
         }
 
-        return [];
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP_TEXT);
+        if (event && event.Callback)
+        {
+            var sendData={ AryText:aryText, Data:data, Symbol:this.HQChart.Symbol, HQChart:this.HQChart, IsMinute:true };
+            event.Callback(event, sendData, this);
+        }
+
+        return aryText
     }
 
     this.GetColor=function(price,yClose)
@@ -143678,7 +143781,7 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(vol)) return item;
 
-        item.Text=IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID);
+        item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);
         
         return item;
     }
@@ -143798,6 +143901,62 @@ function JSDialogTooltip()
         return item;
     }
 
+    //换手率 成交量/流通股本
+    this.FormatExchange=function(vol, flowCapital, TitleID)
+    {
+        //换手率
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(vol) || !IFrameSplitOperator.IsNumber(flowCapital) || flowCapital==0) return item;
+
+        var value=vol/flowCapital*100;
+        item.Text=value.toFixed(2)+'%';
+
+        return item;
+    }
+
+
+    //持仓
+    this.FormatPosition=function(position, TitleID)
+    {
+        //持仓
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.PositionColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(position)) return item;
+
+        item.Text=position.toFixed(0);
+
+        return item;
+    }
+
+    //结算价
+    this.ForamtFClose=function(value, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(value)) return item;
+
+        item.Text=value.toFixed(defaultfloatPrecision);
+
+        return item;
+    }
+
+
 }///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
 //
@@ -143919,7 +144078,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13914";
+var HQCHART_VERSION="1.1.13927";
 
 function PrintHQChartVersion()
 {