hqchart 1.1.13911 → 1.1.13921

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

@@ -4942,6 +4942,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
             if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
             if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
+            if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
         }
 
         if (option.MinuteInfo) chart.CreateMinuteInfo(option.MinuteInfo);
@@ -9424,6 +9425,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DrawDrawPictureXYCoordinate(); //绘制画图工具 X,Y轴刻度信息
         
+        var bDrawDialogTooltip=false;
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
         if (this.LastPoint.X!=null || this.LastPoint.Y!=null)
         {
@@ -9468,7 +9470,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.ChartCorssCursor.Canvas=this.Canvas;
                 }
 
-                this.DrawTooltipDialog();
+                bDrawDialogTooltip=true;
             }
 
             ptPosition=this.Frame.PtInFrame(this.LastPoint.X, this.LastPoint.Y);
@@ -9549,6 +9551,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var frame=this.LastMouseStatus.MouseOnToolbar.Frame;
             if (frame && frame.DrawToolbarTooltip) frame.DrawToolbarTooltip(this.LastMouseStatus.MouseOnToolbar);
         }
+
+
+        if (bDrawDialogTooltip) this.DrawTooltipDialog();
        
         //发送图形状态给外部
         if (this.mapEvent.has(JSCHART_EVENT_ID.CHART_STATUS))
@@ -9874,7 +9879,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         this.DrawDrawPictureXYCoordinate();
-
+        var bDrawDialogTooltip=false;
         if (this.ChartCorssCursor)
         {
             this.ChartCorssCursor.LastPoint=this.LastPoint;
@@ -9919,7 +9924,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.ChartCorssCursor.Canvas=this.Canvas;
             }
 
-            this.DrawTooltipDialog();
+            bDrawDialogTooltip=true;
         }
 
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
@@ -10014,6 +10019,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.OffscreenToShowCanvas();
 
+        if (bDrawDialogTooltip) this.DrawTooltipDialog();
+
         ++this.TouchDrawCount;
     }
 
@@ -37000,7 +37007,8 @@ function ChartVolStick()
     this.ClassName='ChartVolStick';
 
     this.BarWidth;                  //固定宽度 目前只支持宽度为1
-    this.BarType;                   //柱子状态 1=实心 0=空心 2=涨实跌空 如果设置了这个属性， 属性KLineDrawType无效
+    this.BarType;                   //柱子状态 1=实心 0=空心 2=涨实跌空 如果设置了这个属性， 属性KLineDrawType无效 
+    this.BarColorType=0;            //0=柱子颜色跟K线走  1=正upcolor 负downcolor
     this.PtInChart=this.PtInBar;
     this.DrawSelectedStatus=this.DrawLinePoint;
 
@@ -37047,7 +37055,7 @@ function ChartVolStick()
                 if (right>chartright) break;
 
                 var y=this.ChartFrame.GetYFromData(value);
-                var barColor=this.GetBarColor(kItem);
+                var barColor=this.GetBarColor(kItem,value);
                 var bUp=barColor.IsUp;
                 
                    
@@ -37095,7 +37103,7 @@ function ChartVolStick()
                 if (x>chartright) break;
 
                 if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                else barColor=this.GetBarColor(kItem);
+                else barColor=this.GetBarColor(kItem, value);
                 
                 this.Canvas.strokeStyle=barColor.Color;
                 
@@ -37140,7 +37148,7 @@ function ChartVolStick()
                 if (right>chartBottom) break;
 
                 var y=this.ChartFrame.GetYFromData(value);
-                var barColor=this.GetBarColor(kItem);
+                var barColor=this.GetBarColor(kItem, value);
                 var bUp=barColor.IsUp;
                 
                 var height=ToFixedRect(y-yBottom);  //高度调整为整数
@@ -37186,7 +37194,7 @@ function ChartVolStick()
                 if (x>chartBottom) break;
 
                 if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                else barColor=this.GetBarColor(kItem);
+                else barColor=this.GetBarColor(kItem,value);
 
                 var bUp=barColor.IsUp;
                 this.Canvas.strokeStyle=barColor.Color;
@@ -37226,8 +37234,14 @@ function ChartVolStick()
         return range;
     }
 
-    this.GetBarColor=function(kItem)
+    this.GetBarColor=function(kItem, value)
     {
+        if (this.BarColorType===1)  //更具正负决定柱子颜色
+        {
+            if (value>=0) return { Color:this.UpColor, IsUp:true };  //颜色, 是否是上涨
+            else return { Color:this.DownColor, IsUp:false };
+        }
+
         if (kItem.Close>=kItem.Open) return { Color:this.UpColor, IsUp:true };  //颜色, 是否是上涨
         else return { Color:this.DownColor, IsUp:false };
     }
@@ -46221,7 +46235,7 @@ function KLineTooltipPaint()
         }
 
         if (this.HQChart.CurrentChartDrawPicture) return false;   //画图工具操作的时候 不显示
-
+       
         return true;
     }
 
@@ -47053,6 +47067,8 @@ function MinuteLeftTooltipPaint()
         var pt=this.HQChart.LastPoint;
         if (!pt) return false;
 
+        if (this.HQChart.ChartCorssCursor && !this.HQChart.ChartCorssCursor.IsShowCorss) return false;
+
         return this.HQChart.IsMouseOnClient(pt.X, pt.Y);
     }
 
@@ -72966,7 +72982,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)"            //持仓
     }
 
     //弹幕
@@ -74907,7 +74923,7 @@ function JSChartLocalization()
         ['DivTooltip-Amount', {CN:'金额:', EN:'Amount:', TC:'金額'}],
         ['DivTooltip-Exchange', {CN:'换手:', EN:'Exchange:', TC:'換手'}],
         ['DivTooltip-Position', {CN:'持仓:', EN:'Position:', TC:'持倉'}],
-        ['DivTooltip-Price', {CN:'价格:', EN:'Open:', TC:'價格'}],
+        ['DivTooltip-Price', {CN:'价格:', EN:'Price:', TC:'價格'}],
 
         ['DialogTooltip-Date', {CN:'日期', EN:'Date', TC:'日期'}],
         ['DialogTooltip-Time', {CN:'时间', EN:'Time', TC:'時間'}],
@@ -74916,12 +74932,18 @@ function JSChartLocalization()
         ['DialogTooltip-Low', {CN:'最低价', EN:'Low', TC:'最低價'}],
         ['DialogTooltip-Close', {CN:'收盘价', EN:'Close', TC:'收盤價'}],
         ['DialogTooltip-Increase', {CN:'涨幅', EN:'Increase', TC:'漲幅'}],
+        ['DialogTooltip-Risefall', {CN:'涨跌', EN:'Risefall', TC:'漲跌'}],
         ['DialogTooltip-Vol', {CN:'成交量', EN:'Volume', TC:'數量'}],
         ['DialogTooltip-Amount', {CN:'成交额', EN:'Amount', TC:'金額'}],
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
-        ['DialogTooltip-Price', {CN:'价格', EN:'Open', TC:'價格'}],
+        ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['DialogTooltip-YClose', {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:'匹配量'}],
 
         //走势图PC tooltip
         ['PCTooltip-Date', {CN:'日期', EN:'Date', TC:"日期"}],
@@ -84925,6 +84947,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         var keyID = e.keyCode ? e.keyCode :e.which;
 
+        var draw=false;
+        if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
+        {
+            var sendData={ e:e, KeyID:keyID, Draw:false, PreventDefault:false };
+            this.ChartCorssCursor.OnKeyDown(sendData);
+            draw=sendData.Draw;
+        }
+
         switch(keyID)
         {
             case 37: //left
@@ -85030,10 +85060,20 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     this.ChartOperator(option);
                 }
                 break;
+            case 27:
+                if (this.CurrentChartDrawPicture)
+                {
+                    var drawPicture=this.CurrentChartDrawPicture;
+                    if (drawPicture.Status!=20) //画布移动的时候不能取消
+                        this.CurrentChartDrawPicture=null;
+                }
+                break;
             default:
                 return;
         }
 
+        if (draw) this.DrawDynamicInfo();
+
         //不让滚动条滚动
         if(e.preventDefault) e.preventDefault();
         else e.returnValue = false;
@@ -88980,6 +89020,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return null;
     }
+
+    this.DrawTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return;
+
+        this.UpdateTooltipDialog();
+    }
+
+    this.UpdateTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return false;
+        if (!this.ChartCorssCursor) return false;
+
+        var minuteItem=null;    //{ Type:0=连续交易 1=集合竞价, Data:数据 }
+        if (this.ChartCorssCursor.ClientPos>=0)
+        {
+            var titlePaint=this.TitlePaint[0];
+            if (titlePaint && titlePaint.PointInfo)
+            {
+                var pointInfo=titlePaint.PointInfo;
+                if ((pointInfo.ClientPos==2 || pointInfo.ClientPos==3 ||  (pointInfo.ClientPos>=200&& pointInfo.ClientPos<=299) || (pointInfo.ClientPos>=300&& pointInfo.ClientPos<=399)))
+                {
+                    var auctionData=titlePaint.GetCurrentAuctionData();
+                    if (!auctionData) return;
+                    minuteItem={ Type:1, Data:auctionData };
+                }
+                else
+                {
+                    var minuteData=titlePaint.GetCurrentKLineData();
+                    if (!minuteData) return;
+                    minuteItem={ Type:0, Data:minuteData };
+                }
+            }
+            
+        }
+
+        var sendData=
+        { 
+            ClientPos:this.ChartCorssCursor.ClientPos,  //位置
+            IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
+            MinItem:minuteItem, 
+            Symbol:this.Symbol, Name:this.Name,
+        };
+
+
+        this.DialogTooltip.Update(sendData);
+
+        return true;
+    }
 }
 
 //盘前数据
@@ -120160,6 +120249,7 @@ function ScriptIndex(name,script,args,option)
         if (varItem.UpColor) chart.UpColor=varItem.UpColor;
         if (varItem.DownColor) chart.DownColor=varItem.DownColor;
         if (IFrameSplitOperator.IsNumber(varItem.StickType)) chart.BarType=varItem.StickType;
+        if (IFrameSplitOperator.IsNumber(varItem.BarColorType)) chart.BarColorType=varItem.BarColorType;
         if (varItem.LineWidth) 
         {
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
@@ -120171,9 +120261,21 @@ function ScriptIndex(name,script,args,option)
         chart.HistoryData=hisData;
         this.ReloadChartResource(hqChart,windowIndex,chart);
 
-        var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
-        hqChart.TitlePaint[titleIndex].Data[id]=titleData;
-        this.SetTitleData(titleData,chart);
+        if (varItem.IsShowTitle===false)    //NOTEXT 不绘制标题
+        {
+
+        }
+        else if (IFrameSplitOperator.IsString(varItem.Name) && varItem.Name.indexOf("NOTEXT")==0) //标题中包含NOTEXT不绘制标题
+        {
+
+        }
+        else
+        {
+            var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
+            hqChart.TitlePaint[titleIndex].Data[id]=titleData;
+            this.SetTitleData(titleData,chart);
+        }
+        
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
@@ -122119,6 +122221,7 @@ function OverlayScriptIndex(name,script,args,option)
         if (varItem.UpColor) chart.UpColor=varItem.UpColor;
         if (varItem.DownColor) chart.DownColor=varItem.DownColor;
         if (IFrameSplitOperator.IsNumber(varItem.StickType)) chart.BarType=varItem.StickType;
+        if (IFrameSplitOperator.IsNumber(varItem.BarColorType)) chart.BarColorType=varItem.BarColorType;
         if (varItem.LineWidth) 
         {
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
@@ -123547,6 +123650,8 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                 if (IFrameSplitOperator.IsBool(item.isDotLine)) outVarItem.IsDotLine = item.isDotLine;
                 if (IFrameSplitOperator.IsNonEmptyArray(item.lineDash)) outVarItem.LineDash=item.lineDash;
                 if (IFrameSplitOperator.IsBool(item.isSingleLine))  outVarItem.IsSingleLine=item.isSingleLine;
+                if (IFrameSplitOperator.IsNumber(item.StickType)) outVarItem.StickType=item.StickType;
+                if (IFrameSplitOperator.IsNumber(item.BarColorType)) outVarItem.BarColorType=item.BarColorType;
 
                 result.push(outVarItem);
             }
@@ -125289,7 +125394,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)"            //持仓
         },
         
         //走势图 信息地雷
@@ -143160,7 +143265,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=18;
 
     this.AryData=[];
     this.AryText=[];
@@ -143278,22 +143383,41 @@ function JSDialogTooltip()
     this.Update=function(data)
     {
         if (!this.DivDialog ||  !this.TitleBox) return;
-        if (!data.KItem || !data.IsShowCorss || data.ClientPos<0) return;
+        if ((!data.KItem && !data.MinItem) || !data.IsShowCorss || data.ClientPos<0) return;
 
         this.LanguageID=this.HQChart.LanguageID;
-        this.TitleBox.DivName.innerText=data.Name;
-
-        var strKItem=JSON.stringify(data.KItem);
-        if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+        
+        if (this.HQChart.ClassName=='KLineChartContainer')
         {
-            this.KItemCache= JSON.parse(strKItem);
-            this.KItemCacheID=strKItem;
-            this.UpdateTableDOM();
+            var strKItem=JSON.stringify(data.KItem);
+            if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+            {
+                this.KItemCache= JSON.parse(strKItem);
+                this.KItemCacheID=strKItem;
+                this.UpdateTableDOM();
+            }
+            else
+            {
+                //JSConsole.Chart.Log(`[JSDialogTooltip::Update] save as KItemCache and  KItem`);
+            }
+        }
+        else if (this.HQChart.ClassName=='MinuteChartContainer')
+        {
+            var strKItem=JSON.stringify(data.MinItem);
+            if (this.KItemCacheID!=strKItem)    //数据变动的才更新
+            {
+                this.KItemCache= JSON.parse(strKItem);
+                this.KItemCacheID=strKItem;
+                this.UpdateTableDOM();
+            }
         }
         else
         {
-            //JSConsole.Chart.Log(`[JSDialogTooltip::Update] save as KItemCache and  KItem`);
+            return;
         }
+        
+        this.TitleBox.DivName.innerText=data.Name;
+
        
         if (!this.IsShow()) this.Show();
     }
@@ -143302,7 +143426,12 @@ function JSDialogTooltip()
     {
         if (!this.KItemCache) return;
 
-        this.AryText=this.GetFormatKlineTooltipText(this.KItemCache);
+        if (this.HQChart.ClassName=='KLineChartContainer')
+            this.AryText=this.GetFormatKlineTooltipText(this.KItemCache);
+        else if (this.HQChart.ClassName=='MinuteChartContainer')
+            this.AryText=this.GetFormatMinuteTooltipText(this.KItemCache);
+        else
+            return;
 
         var index=0;
         for(index=0;index<this.AryText.length && index<this.MaxRowCount;++index)
@@ -143401,101 +143530,89 @@ function JSDialogTooltip()
     this.GetFormatKlineTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
-
+        var upperSymbol=this.HQChart.Symbol.toUpperCase();
         //日期
-        var dateItem=
-        { 
-            Title:g_JSChartLocalization.GetText('DialogTooltip-Date',this.LanguageID), 
-            Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY/MM/DD/W"),
-            Color:this.DateTimeColor
-        }
+        var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' );
 
         //时间
         var timeItem=null;
-        var timeFormat=null;
-        if (ChartData.IsMinutePeriod(this.HQChart.Period,true)) timeFormat='HH:MM'; // 分钟周期
-        else if (ChartData.IsSecondPeriod(this.HQChart.Period)) timeFormat='HH:MM:SS';
-        else if (ChartData.IsMilliSecondPeriod(this.HQChart.Period)) timeFormat='HH:MM:SS.fff';
+        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,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,yClose,'DialogTooltip-Increase'),
+            this.FormatAmplitude(data.High,data.Low,yClose,'DialogTooltip-Amplitude'),
+        ];
 
-        if (timeFormat)
+        if (timeItem) aryText.unshift(timeItem);
+        aryText.unshift(dateItem);
+
+        //换手率
+        if (MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol) && data.FlowCapital>0)
         {
-            timeItem=
-            { 
-                Title:g_JSChartLocalization.GetText('DialogTooltip-Time',this.LanguageID), 
-                Text:IFrameSplitOperator.FormatTimeString(data.Time,timeFormat),
-                Color:this.DateTimeColor
-            }
+            aryText.push(this.FormatExchange(data.Vol,data.FlowCapital,'DialogTooltip-Exchange' ));
         }
 
-        //涨幅
-        var increaseItem=
-        {
-            Title:g_JSChartLocalization.GetText('DialogTooltip-Increase',this.LanguageID), 
-            Text:"--.--",
-            Color:this.TitleColor
-        };
-        if (IFrameSplitOperator.IsNumber(data.YClose) && IFrameSplitOperator.IsNumber(data.Close))
+        //持仓量
+        if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol))
         {
-            var value=(data.Close-data.YClose)/data.YClose;
-            increaseItem.Text=`${(value*100).toFixed(2)}%`;
-            increaseItem.Color=this.GetColor(value,0);
+            aryText.push(this.FormatPosition(data.Position,'DialogTooltip-Position'));
+            aryText.push(this.ForamtYClose(data.YClose, defaultfloatPrecision, 'DialogTooltip-YClose'));
         }
 
-        //涨幅
-        var amplitudeItem=
+        return aryText;
+    },
+
+    this.GetFormatMinuteTooltipText=function(data)
+    {
+        var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
+
+        if (data.Type==0) //连续交易
         {
-            Title:g_JSChartLocalization.GetText('DialogTooltip-Amplitude',this.LanguageID), 
-            Text:"--.--",
-            Color:this.TitleColor
+            var item=data.Data;
+            if (!item) item={ };
+
+            var aryText=
+            [
+                this.ForamtDate(item.Date,"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.FormatRisefall(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Risefall'),
+                this.FormatIncrease(item.Close,item.YClose,'DialogTooltip-Increase'),
+                this.FormatVol(item.Vol,'DialogTooltip-Vol' ),
+                this.FormatAmount(item.Amount,'DialogTooltip-Amount' ),
+            ];
+
+            return aryText;
         }
-        if (IFrameSplitOperator.IsNumber(data.YClose) && IFrameSplitOperator.IsNumber(data.High) && IFrameSplitOperator.IsNumber(data.Low))
+        else if (data.Type==1)  //集合竞价
         {
-            var value=(data.High-data.Low)/data.YClose;
-            amplitudeItem.Text=`${(value*100).toFixed(2)}%`;
-            amplitudeItem.Color=this.GetColor(value,0);
-        }
+            var item=data.Data.Data;
+            if (!item) item={ Vol:[] };
 
-        var aryText=
-        [
-            { 
-                Title:g_JSChartLocalization.GetText('DialogTooltip-Open',this.LanguageID), 
-                Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
-                Color:this.GetPriceColor(data.Open,data.YClose),
-            },
-            {
-                Title:g_JSChartLocalization.GetText('DialogTooltip-High',this.LanguageID),
-                Text:IFrameSplitOperator.IsNumber(data.High)? data.High.toFixed(defaultfloatPrecision):'--',
-                Color:this.GetPriceColor(data.High,data.YClose)
-            },
-            {
-                Title:g_JSChartLocalization.GetText('DialogTooltip-Low',this.LanguageID),
-                Text:IFrameSplitOperator.IsNumber(data.Low)? data.Low.toFixed(defaultfloatPrecision):'--',
-                Color:this.GetPriceColor(data.Low,data.YClose)
-            },
-            {
-                Title:g_JSChartLocalization.GetText('DialogTooltip-Close',this.LanguageID),
-                Text:IFrameSplitOperator.IsNumber(data.Close)? data.Close.toFixed(defaultfloatPrecision):'--',
-                Color:this.GetPriceColor(data.Close,data.YClose)
-            },
-            {
-                Title:g_JSChartLocalization.GetText('DialogTooltip-Vol',this.LanguageID),
-                Text:IFrameSplitOperator.IsNumber(data.Vol)? IFrameSplitOperator.FormatValueString(data.Vol,2,this.LanguageID):'--',
-                Color:this.VolColor
-            },
-            {
-                Title:g_JSChartLocalization.GetText('DialogTooltip-Amount',this.LanguageID),
-                Text:IFrameSplitOperator.IsNumber(data.Amount)? IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--',
-                Color:this.AmountColor
-            },
-            increaseItem,
-            amplitudeItem
-        ];
+            var timeForamt="HH:MM:SS";
+            if (item.Ver===1) timeForamt="HH:MM"
+            var aryText=
+            [
+                this.ForamtDate(item.Date,"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.FormatVol(item.Vol[0],'DialogTooltip-AC-Vol' ),
+            ];
 
-        if (timeItem) aryText.unshift(timeItem);
-        aryText.unshift(dateItem);
+            return aryText;
+        }
 
-        return aryText;
-    },
+        return [];
+    }
 
     this.GetColor=function(price,yClose)
     {
@@ -143543,8 +143660,215 @@ function JSDialogTooltip()
         if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
 
         this.UpdateTableDOM();
+    },
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////
+    //数据格式化
+    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID, this.LanguageID),
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price)) return item;
+
+        item.Text=price.toFixed(defaultfloatPrecision);
+        item.Color=this.GetColor(price, yClose);
+
+        return item;
     }
 
+    this.FormatVol=function(vol, TitleID)
+    {
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            Text:'--',
+            Color:this.VolColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(vol)) return item;
+
+        item.Text=IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID);
+        
+        return item;
+    }
+
+    this.FormatAmount=function(amount, TitleID)
+    {
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            Text:'--',
+            Color:this.AmountColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(amount)) return item;
+
+        item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);
+        
+        return item;
+    }
+
+    this.FormatIncrease=function(price, yClose, TitleID)
+    {
+        //涨幅
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var value=(price-yClose)/yClose;
+        item.Text=`${(value*100).toFixed(2)}%`;
+        item.Color=this.GetColor(value,0);
+
+        return item;
+    }
+
+    this.FormatRisefall=function(price, yClose, defaultfloatPrecision, TitleID)
+    {
+        //涨跌
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var value=price-yClose;
+        item.Text=`${value.toFixed(defaultfloatPrecision)}`;
+        item.Color=this.GetColor(value,0);
+
+        return item;
+    }
+
+    this.FormatAmplitude=function(high, low, yClose, TitleID)
+    {
+        //涨幅
+        var item=
+        {
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:"--.--",
+            Color:this.TitleColor
+        };
+
+
+        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+
+        var value=(high-low)/yClose;
+        item.Text=`${(value*100).toFixed(2)}%`;
+        item.Color=this.GetColor(value,0);
+        
+        return item;
+    }
+
+    this.ForamtDate=function(date, format, TitleID)
+    {
+        //日期
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText('DialogTooltip-Date',this.LanguageID), 
+            Text:"----/--/--",
+            Color:this.DateTimeColor
+        }
+
+        if (!IFrameSplitOperator.IsNumber(date)) return item;
+
+        item.Text=IFrameSplitOperator.FormatDateString(date,format);
+
+        return item;
+    }
+
+    this.FormatTime=function(time, period, format, TitleID)
+    {
+        //时间
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--:--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(time)) return item;
+        if (!format)
+        {
+            format="HH:MM";
+            if (ChartData.IsMinutePeriod(period,true)) timeFormat='HH:MM'; // 分钟周期
+            else if (ChartData.IsSecondPeriod(period)) timeFormat='HH:MM:SS';
+            else if (ChartData.IsMilliSecondPeriod(period)) timeFormat='HH:MM:SS.fff';
+        }
+
+        item.Text=IFrameSplitOperator.FormatTimeString(time,format);
+
+        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.ForamtYClose=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;
+    }
+
+
 }///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
 //
@@ -143666,7 +143990,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13910";
+var HQCHART_VERSION="1.1.13920";
 
 function PrintHQChartVersion()
 {