hqchart 1.1.14183 → 1.1.14193

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

@@ -4556,9 +4556,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false;
             if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData)) chart.IsTitleShowLatestData=item.IsTitleShowLatestData;
 
-            if (item.ShowPostion)   //显示位置高级配置
+            if (item.ShowPosition || item.ShowPostion)   //显示位置高级配置
             {
                 var subItem=item.ShowPostion;
+                if (item.ShowPosition) subItem=item.ShowPosition;
                 if (!chartTitle.ShowPositionConfig) chartTitle.ShowPositionConfig={ Margin:{ } };
                 if (IFrameSplitOperator.IsNumber(subItem.Type)) chartTitle.ShowPositionConfig.Type=subItem.Type;
                 if (subItem.Margin) 
@@ -5069,9 +5070,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if(IFrameSplitOperator.IsBool(item.IsAlwaysShowLastData)) chart.TitlePaint[0].IsAlwaysShowLastData=item.IsAlwaysShowLastData;
             if(IFrameSplitOperator.IsNumber(item.ShowLastDataFormat)) chart.TitlePaint[0].ShowLastDataFormat=item.ShowLastDataFormat;
             if (item.TimeFormat) chart.TitlePaint[0].TimeFormat=item.TimeFormat;
-            if (item.ShowPostion)   //显示位置高级配置
+            if (item.ShowPostion || item.ShowPosition)   //显示位置高级配置
             {
                 var subItem=item.ShowPostion;
+                if (item.ShowPosition) subItem=item.ShowPosition;
                 if (!chartTitle.ShowPositionConfig) chartTitle.ShowPositionConfig={ Margin:{ } };
                 if (IFrameSplitOperator.IsNumber(subItem.Type)) chartTitle.ShowPositionConfig.Type=subItem.Type;
                 if (subItem.Margin) 
@@ -6798,6 +6800,7 @@ var JSCHART_MENU_ID=
     CMD_ENABLE_POP_MINUTE_CHART_ID:40,  //双击弹分时图
 
     CMD_CHANGE_INFO_POSITION_ID:41,     //修改信息地雷位置
+    CMD_CHIP_CHART_SETTING_ID:42,       //筹码图设置
 
 
     CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
@@ -13899,6 +13902,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             case JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:
                 if (this.DeleteStockChipChart) this.DeleteStockChipChart();
                 break;
+            case JSCHART_MENU_ID.CMD_CHIP_CHART_SETTING_ID:
+                var stockChip=this.GetStockChipChart();
+                if (!stockChip) return;
+                if (param!=null) 
+                {
+                    stockChip.Chart.ShowType=param;
+                    this.SetSizeChange(true);
+                    this.Draw();
+                }
+                break;
             case JSCHART_MENU_ID.CMD_ENABLE_SELECT_RECT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam))
                     this.EnableSelectRect=srcParam;
@@ -47812,7 +47825,7 @@ function StockChip()
     this.ShowType=0;    //0=所有筹码  1=周期前  2=周期内
     this.IsDynamic=true;
     this.ClientRect={};
-    this.Font=g_JSChartResource.TitleFont;
+    this.Font=g_JSChartResource.StockChip.Font;
     this.InfoColor=g_JSChartResource.StockChip.InfoColor;
     this.DayInfoColor=g_JSChartResource.StockChip.DayInfoColor;
     this.LineHeight=16;
@@ -47851,7 +47864,7 @@ function StockChip()
     this.ReloadResource=function(resource)
     {
         this.PenBorder=g_JSChartResource.FrameBorderPen;
-        this.Font=g_JSChartResource.TitleFont;
+        this.Font=g_JSChartResource.StockChip.Font;
         this.InfoColor=g_JSChartResource.StockChip.InfoColor;
         this.DayInfoColor=g_JSChartResource.StockChip.DayInfoColor;
 
@@ -58535,7 +58548,7 @@ function DynamicKLineTitlePainting()
     this.IsShowSettingInfo=true;    //是否显示设置信息(周期 复权)
     this.IsShowDateTime=true;       //是否显示日期
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
-    this.ShowPositionConfig={ Margin:{ Bottom:2 } };        //显示位置高级配置 { Type:1 左对齐, Margin:{ Left, Right, Bottom } }
+    this.ShowPositionConfig={ Margin:{ Bottom:2, Left:2 } };        //显示位置高级配置 { Type:1 左对齐, Margin:{ Left, Right, Bottom } }
     this.OnDrawEvent;
     this.OnMouseMoveEvent;
     this.HQChart;
@@ -58783,7 +58796,7 @@ function DynamicKLineTitlePainting()
         }
         else
         {
-            var left=this.Frame.ChartBorder.GetLeft();
+            var left=this.Frame.ChartBorder.Left;
             if (this.ShowPositionConfig)
             {
                 var item=this.ShowPositionConfig;
@@ -59499,43 +59512,29 @@ function DynamicMinuteTitlePainting()
         var isHScreen=this.Frame.IsHScreen===true;
         var border=this.Frame.GetBorder();
         var pixelRatio=GetDevicePixelRatio();
-        var left=border.Left;
-        var bottom=border.Top-this.Frame.ChartBorder.Top/2;
+        var left=this.GetLeft(isHScreen);
+        var right=this.GetRight(isHScreen);
+        var bottom=this.GetBottom(isHScreen);
         var bDraw=true;
         if (isHScreen) 
         {
             if (this.Frame.ChartBorder.Right<5*pixelRatio) return;
-            var left=2;
-            var bottom=this.Frame.ChartBorder.Right/2;    //上下居中显示
-            var xText=border.ChartWidth;
-            var yText=border.Top;
+            var xText=bottom;
+            var yText=left;
             this.Canvas.translate(xText, yText);
             this.Canvas.rotate(90 * Math.PI / 180);
+            left=bottom=0;
         }
         else
         {
-            if (this.Frame.ChartBorder.Top<5) bDraw=false;
+            if (this.Frame.ChartBorder.Top<5*pixelRatio) bDraw=false;
         }
 
         this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.font=this.Font;
 
-        if (this.TitleBaseLine==0)  //上
-        {
-            this.Canvas.textBaseline="top";
-            bottom=2*pixelRatio;
-        }
-        else if (this.TitleBaseLine==2) //下
-        {
-            this.Canvas.textBaseline="bottom";
-            var bottom=border.Top
-        }
-        else    //中
-        {
-            this.Canvas.textBaseline="middle";
-        }
-
-        var position = { Left: left, Bottom: bottom, IsHScreen: isHScreen };
+        var position = { Left: left, Bottom: bottom, MaxRight:right, IsHScreen: isHScreen };
         var auctionData=this.GetCurrentAuctionData();
         var titleData=this.FormatCallAuctionTitle(auctionData);
 
@@ -59672,48 +59671,33 @@ function DynamicMinuteTitlePainting()
         if (!callAuctionItem) return;
 
         var item=callAuctionItem.Data;
-        var dataVersion=callAuctionItem.Ver;
-
         var isHScreen=this.Frame.IsHScreen===true;
+        var pixelRatio=GetDevicePixelRatio();
         var border=this.Frame.GetBorder();
+        var left=this.GetLeft(isHScreen);
+        var right=this.GetRight(isHScreen);
+        var bottom =this.GetBottom(isHScreen);
 
-        var left=border.Left;
-        var bottom=border.Top-this.Frame.ChartBorder.Top/2;
-        //var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
         var bDraw=true;
         if (isHScreen) 
         {
-            var left=2;
-            var bottom=this.Frame.ChartBorder.Right/2;    //上下居中显示
-            var xText=border.ChartWidth;
-            var yText=border.Top;
+            if (this.Frame.ChartBorder.Right<5*pixelRatio) return;
+            var xText=bottom;
+            var yText=left;
             this.Canvas.translate(xText, yText);
             this.Canvas.rotate(90 * Math.PI / 180);
+            left=bottom=0; //旋转以后 位置调整0
         }
         else
         {
-            if (this.Frame.ChartBorder.Top<5) bDraw=false;
+            if (this.Frame.ChartBorder.Top<5*pixelRatio) bDraw=false;
         }
 
         this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.font=this.Font;
 
-        if (this.TitleBaseLine==0)  //上
-        {
-            this.Canvas.textBaseline="top";
-            bottom=2*GetDevicePixelRatio();
-        }
-        else if (this.TitleBaseLine==2) //下
-        {
-            this.Canvas.textBaseline="bottom";
-            var bottom=border.Top
-        }
-        else    //中
-        {
-            this.Canvas.textBaseline="middle";
-        }
-
-        var position = { Left: left, Bottom: bottom, IsHScreen: isHScreen };
+        var position = { Left: left, Bottom: bottom, MaxRight:right, IsHScreen: isHScreen };
         var titleData=this.FormatCallAuctionTitle(callAuctionItem);
 
         if (bDraw && titleData && IFrameSplitOperator.IsNonEmptyArray(titleData.AryText))
@@ -59724,91 +59708,6 @@ function DynamicMinuteTitlePainting()
                 if (!this.DrawText(item.Text,item.Color,position)) break;
             }
         }
-
-        /*
-        if(bDraw && this.IsShowName)
-        {
-            if (!this.DrawText(this.Name,this.NameColor,position)) return;
-        }
-
-        var time=item.Time;
-        var strTime;
-        if (dataVersion==1.0) strTime=IFrameSplitOperator.FormatTimeString(time,"HH:MM");
-        else strTime=IFrameSplitOperator.FormatTimeString(time,"HH:MM:SS");
-        var strDate=IFrameSplitOperator.FormatDateString(item.Date);
-        strTime=`${strDate} ${strTime}`;
-        
-        if (bDraw && this.IsShowTime && strTime )
-        {
-            if (!this.DrawText(strTime,this.DateTimeColor,position)) return;
-        }
-
-        //匹配价
-        if (bDraw && item && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Price"))
-        {
-            var color=this.GetColor(item.Price,this.YClose);
-            var filedName='MTitle-AC-Price';
-            if (this.BeforeOpenData && this.BeforeOpenData.Ver==1.0) filedName="MTitle-Close";
-            var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);
-            if (!this.DrawText(text,color,position)) return;
-        }
-
-        //竞价涨幅
-        if (bDraw && item && IFrameSplitOperator.IsPlusNumber(this.YClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
-        {
-            var value=(item.Price-this.YClose)/this.YClose*100;
-            var color=this.GetColor(value,0);
-            var filedName='MTitle-AC-Increase';
-            if (this.BeforeOpenData && this.BeforeOpenData.Ver==1.0) filedName="MTitle-Increase";
-            var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+value.toFixed(2)+"%";
-            if (!this.DrawText(text,color,position)) return;
-        }
-
-        if (dataVersion==3.0)
-        {
-            if (bDraw && item && IFrameSplitOperator.IsNumber(item.AvPrice) && this.CallAuctionShowTitle.has("MTitle-AC-AvPrice"))
-            {
-                var color=this.GetColor(item.Price,this.YClose);
-                var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
-                if (!this.DrawText(text,color,position)) return;
-            }
-        }
-
-        //匹配量
-        if (bDraw && IFrameSplitOperator.IsNumber(item.Vol[0]) && this.CallAuctionShowTitle.has("MTitle-AC-Vol"))
-        {
-            var filedName='MTitle-AC-Vol';
-            if (this.BeforeOpenData && this.BeforeOpenData.Ver==1.0) filedName="MTitle-Vol";
-            var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[0],2);
-            if (!this.DrawText(text,this.VolColor,position)) return;
-        }
-        
-        //未匹配量
-        if (bDraw && IFrameSplitOperator.IsNumber(item.Vol[1]) && this.CallAuctionShowTitle.has("MTitle-AC-NotMatchVol"))
-        {
-            var text=g_JSChartLocalization.GetText('MTitle-AC-NotMatchVol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[1],2);
-            if (!this.DrawText(text,this.VolColor,position)) return;
-        }
-
-        if (bDraw)
-        {
-            if (item.ExtendData && IFrameSplitOperator.IsNonEmptyArray(item.ExtendData.Amount))
-            {
-                var aryAmount=item.ExtendData.Amount;
-                if (IFrameSplitOperator.IsNumber(aryAmount[0]) && this.CallAuctionShowTitle.has("MTitle-AC-Amount"))  //匹配量金额
-                {
-                    var text=g_JSChartLocalization.GetText('MTitle-AC-Amount',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(aryAmount[0],2);
-                    if (!this.DrawText(text,this.AmountColor,position)) return;
-                }
-
-                if (IFrameSplitOperator.IsNumber(aryAmount[1]) && this.CallAuctionShowTitle.has("MTitle-AC-NotMatchAmount")) //未匹配量金额
-                {
-                    var text=g_JSChartLocalization.GetText('MTitle-AC-NotMatchAmount',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(aryAmount[1],2);
-                    if (!this.DrawText(text,this.AmountColor,position)) return;
-                }
-            }
-        }
-        */
     }
 
     this.DrawLastDataItem=function()
@@ -74286,6 +74185,7 @@ function JSChartResource()
     {
         InfoColor:'rgb(0,0,0)', //文字颜色
         DayInfoColor:'rgb(255,255,255)', //周期颜色内文字颜色
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
 
         DefaultButton:
         {
@@ -75232,6 +75132,7 @@ function JSChartResource()
             var item=style.StockChip;
             if (item.InfoColor) this.StockChip.InfoColor=item.InfoColor;
             if (item.DayInfoColor) this.StockChip.DayInfoColor=item.DayInfoColor;
+            if (item.Font) this.StockChip.Font=item.Font;
 
             if (item.DefaultButton) T_SetButtonStyle(item.DefaultButton, this.StockChip.DefaultButton);
             if (item.LongButton) T_SetButtonStyle(item.LongButton, this.StockChip.LongButton);
@@ -84742,6 +84643,8 @@ KLineChartContainer.JsonDataToRealtimeData=function(data, symbol)
     if (IFrameSplitOperator.IsBool(stock.isvirtual)) item.IsVirtual=stock.isvirtual;  //虚拟数据
     if (IFrameSplitOperator.IsBool(stock.isnontrade)) item.IsNonTrade=stock.isnontrade;  //虚拟数据
 
+    if (IFrameSplitOperator.IsNumber(stock.flowCapital)) item.FlowCapital=stock.flowCapital;   //流通股本
+
     return item;
 }
 
@@ -132458,9 +132361,10 @@ function ChartReport()
             if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
             if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
             if (IFrameSplitOperator.IsBool(item.IsDrawCallback)) colItem.IsDrawCallback=item.IsDrawCallback;
+            else colItem.IsDrawCallback=false;
+
             if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;    //小数位数
             if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
-            else colItem.IsDrawCallback=false;
             if (item.Icon) colItem.Icon=item.Icon;
             if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.EnableChartTooltip=item.EnableChartTooltip;
 
@@ -149732,7 +149636,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14182";
+var HQCHART_VERSION="1.1.14192";
 
 function PrintHQChartVersion()
 {