hqchart 1.1.15043 → 1.1.15051

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

@@ -5326,11 +5326,19 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
                 if (i==0)
                 {
-                    if (IFrameSplitOperator.IsNumber(item.RightTextFormat)) 
+                    if (IFrameSplitOperator.IsNumber(item.RightTextFormat))     //废弃
                     {
-                        subFrame.YSplitOperator.RightTextFormat=item.RightTextFormat;
+                        subFrame.YSplitOperator.RightTextConfig.Format=item.RightTextFormat;
                         if (item.RightTextFormat==2) subFrame.MultiTextFormat=1;
                     }
+
+                    if (item.RightText) //主图右侧坐标设置
+                    {
+                        var subItem=item.RightText;
+                        if (IFrameSplitOperator.IsNumber(subItem.Format)) subFrame.YSplitOperator.RightTextConfig.Format=subItem.Format;
+                        if (subItem.Format==2) subFrame.MultiTextFormat=1;
+                        if (subItem.Percentage && IFrameSplitOperator.IsNumber(subItem.Percentage.Dec)) subFrame.YSplitOperator.RightTextConfig.Percentage.Dec=subItem.Percentage.Dec;
+                    }
                 }
             }
 
@@ -5582,6 +5590,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             {
                 var item=option.Frame[i];
                 if (!chart.Frame.SubFrame[i]) continue;
+                var subFrame=chart.Frame.SubFrame[i].Frame;
                 if (item.SplitCount) chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitCount=item.SplitCount;
                 if (item.StringFormat) chart.Frame.SubFrame[i].Frame.YSplitOperator.StringFormat=item.StringFormat;
                 if (IFrameSplitOperator.IsNumber(item.SplitType)) 
@@ -5601,7 +5610,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 }
                 if (item.Height>=0) chart.Frame.SubFrame[i].Height = item.Height;
                 if (item.Custom) chart.Frame.SubFrame[i].Frame.YSplitOperator.Custom=item.Custom;
-                if (item.RightTextFormat>0) chart.Frame.SubFrame[i].Frame.YSplitOperator.RightTextFormat=item.RightTextFormat;
+               
                 if (IFrameSplitOperator.IsNumber(item.TitleHeight)) chart.Frame.SubFrame[i].Frame.ChartBorder.TitleHeight=item.TitleHeight;
                 if (IFrameSplitOperator.IsNumber(item.BorderLine)) chart.Frame.SubFrame[i].Frame.BorderLine=item.BorderLine;
                 if (IFrameSplitOperator.IsBool(item.EnableRemoveZero)) chart.Frame.SubFrame[i].Frame.YSplitOperator.EnableRemoveZero=item.EnableRemoveZero;
@@ -5609,6 +5618,11 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowXLine)) chart.Frame.SubFrame[i].Frame.IsShowXLine=item.IsShowXLine;
                 if (IFrameSplitOperator.IsBool(item.IsShowYLine)) chart.Frame.SubFrame[i].Frame.IsShowYLine=item.IsShowYLine;
                 if (IFrameSplitOperator.IsNumber(item.YTextBaseline)) chart.Frame.SubFrame[i].Frame.YTextBaseline=item.YTextBaseline;
+
+                if (i==0)
+                {
+                    if (IFrameSplitOperator.IsNumber(item.RightTextFormat)) subFrame.YSplitOperator.RightTextConfig.Format=item.RightTextFormat;
+                }
             }
         }
 
@@ -14172,6 +14186,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         drawPicture.PointMagnetKLine();
         drawPicture.Status=10;  //完成
+        drawPicture.Period=this.Period;
         drawPicture.PointToValue();
 
         if (this.ChartDrawStorage) this.ChartDrawStorage.SaveDrawData(drawPicture);
@@ -60921,7 +60936,8 @@ function FrameSplitMinutePriceY()
     this.DefaultSplitType=0;
     this.LimitPrice;                    //{Max: Min:} 涨跌停价
     this.Custom;
-    this.RightTextFormat=0;           //右边刻度显示模式 0=百分比  1=价格 2=价格 | 百分比
+    //this.RightTextFormat=0;           //右边刻度显示模式 0=百分比  1=价格 2=价格 | 百分比  !!! 废弃， 用下面的格式
+    this.RightTextConfig={ Percentage:{ Dec:2 }, Format:0  }   //Percentage:{ Dec: 百分比小数位数 }, Format: 0=百分比  1=价格 2=价格 | 百分比
 
     this.BeforeOpenData;
     this.IsBeforeData=false;
@@ -61383,8 +61399,10 @@ function FrameSplitMinutePriceY()
 
             if (this.IsShowRightText) 
             {
-                if (this.RightTextFormat==1) coordinate.Message[1]=strPrice;
-                else coordinate.Message[1]='0.00%'; //百分比
+                var value=0;
+                var dec=this.RightTextConfig.Percentage.Dec;
+                if (this.RightTextConfig.Format==1) coordinate.Message[1]=strPrice;
+                else coordinate.Message[1]=`${value.toFixed(dec)}%`; //百分比
             }
 
             this.Frame.HorizontalInfo.push(coordinate);
@@ -61470,15 +61488,17 @@ function FrameSplitMinutePriceY()
             var per=(price/this.YClose-1)*100;
             if (per>0) coordinate.TextColor=g_JSChartResource.UpTextColor;
             else if (per<0) coordinate.TextColor=g_JSChartResource.DownTextColor;
-            var strPer=`${IFrameSplitOperator.FormatValueString(per,2)}%`;
+
+            var dec=this.RightTextConfig.Percentage.Dec;
+            var strPer=`${IFrameSplitOperator.FormatValueString(per,dec)}%`;
 
             if (this.IsShowRightText) 
             {
-                if (this.RightTextFormat==1)  
+                if (this.RightTextConfig.Format==1)  
                 {
                     coordinate.Message[1]=strPrice;
                 }
-                else if (this.RightTextFormat==2) //价格/百分比
+                else if (this.RightTextConfig.Format==2) //价格/百分比
                 {
                     coordinate.Message[1]=[ {Text:strPrice}, {Text:"/"}, { Text:strPer} ];
                 }
@@ -68776,7 +68796,7 @@ function IChartDrawPicture()
         }
     }
 
-    this.GetkData=function()
+    this.GetKData=function()
     {
         if (!this.Frame) return null;
         var data=this.Frame.Data;
@@ -68788,7 +68808,7 @@ function IChartDrawPicture()
     //周期变动 X重新定位
     this.ChangePeriod=function(period)
     {
-        var kData=this.GetkData();
+        var kData=this.GetKData();
         if (!kData) return;
 
         var aryDateTime=[];
@@ -68858,7 +68878,7 @@ function IChartDrawPicture()
 
     this.UpdateXValue=function()    //通过datetime更新x的索引
     {
-        var data=this.GetkData();
+        var data=this.GetKData();
         if (!data) return false;
 
         var aryDateTime=[];
@@ -80667,8 +80687,8 @@ function ChartDrawStorage()
         {
             JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] Insert: symbol, drawPicture, data', symbol, drawPicture,data);
             var stockItem={ Symbol:symbol,  MapPicture:new Map() } ;
-            stockItem.set(data.Guid, data);
-            this.DrawDataV2.set(symbol,newData);
+            stockItem.MapPicture.set(data.Guid, data);
+            this.DrawDataV2.set(symbol,stockItem);
         }
 
         JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] All draw data： ', this.DrawDataV2);
@@ -157056,6 +157076,8 @@ var JS_DRAWTOOL_MENU_ID=
     CMD_ZOOM_OUT_FONT_ID:12, //字体缩小
     CMD_MODIFY_TEXT_ID:13,  //随机生成文字内容
     CMD_ADVANCED_SETTING_ID:14, //高级设置
+
+    CMD_CROSS_PERIOD_ID:15, //跨周期
 };
 
 function JSDialogDrawTool()
@@ -157178,6 +157200,7 @@ function JSDialogDrawTool()
         AryTool:
         [
             { Title:"选中", ClassName:'hqchart_drawtool icon-arrow', Type:1, Data:{ID:JS_DRAWTOOL_MENU_ID.CMD_SELECTED_ID} },
+            { Title:"跨周期", ClassName: 'hqchart_drawtool icon-kuazhouqi', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CROSS_PERIOD_ID }},
             { Title:'尺子', ClassName: 'hqchart_drawtool icon-ruler', Type:0, Data:{ ID:"尺子" } },
             { Title:"磁铁", ClassName:'hqchart_drawtool icon-xifu', Type:2, Data:{ID:JS_DRAWTOOL_MENU_ID.CMD_ENABLE_MAGNET_ID} },
             { Title:"点击切换颜色", ClassName: 'hqchart_drawtool icon-fangkuai', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
@@ -157337,12 +157360,15 @@ function JSDialogDrawTool()
             this.ClearCurrnetDrawPicture();
             this.EnableEraseChart(false);
         }
+        else if (type==2 && id==JS_DRAWTOOL_MENU_ID.CMD_CROSS_PERIOD_ID)
+        {
+            this.EnableCrossPeriod(data);
+        }
         else if (type==2 && id==JS_DRAWTOOL_MENU_ID.CMD_ENABLE_MAGNET_ID)
         {
             this.ChangeMagnet(data);
         }
         else if (type==0)
-    
         {
             this.ClearAllSelectedChart();
             this.EnableEraseChart(false);
@@ -157365,6 +157391,26 @@ function JSDialogDrawTool()
         }
     }
 
+    this.EnableCrossPeriod=function(data)
+    {
+        if (!this.HQChart) return;
+        if (!this.HQChart.ChartDrawStorage) return;
+
+        this.HQChart.ChartDrawStorage.EnableCrossPeriod=!this.HQChart.ChartDrawStorage.EnableCrossPeriod;
+        var enable=this.HQChart.ChartDrawStorage.EnableCrossPeriod;
+
+        if (enable) 
+        {
+            data.Span.classList.remove("UMyChart_DrawTool_Span");
+            data.Span.classList.add("UMyChart_DrawTool_Span_Selected");
+        }
+        else 
+        {
+            data.Span.classList.remove("UMyChart_DrawTool_Span_Selected");
+            data.Span.classList.add("UMyChart_DrawTool_Span");
+        }
+    }
+
     this.CreateToolGroup=function(tbody)
     {
         var trDom=document.createElement("tr");
@@ -157410,6 +157456,14 @@ function JSDialogDrawTool()
         {
             spanDom.style['color']=this.LineColor;
         }
+        else if (item.Type==2 && item.Data.ID==JS_DRAWTOOL_MENU_ID.CMD_CROSS_PERIOD_ID)
+        {
+            if (this.HQChart && this.HQChart.ChartDrawStorage && this.HQChart.ChartDrawStorage.EnableCrossPeriod)
+            {
+                data.Span.classList.remove("UMyChart_DrawTool_Span");
+                data.Span.classList.add("UMyChart_DrawTool_Span_Selected");
+            }
+        }
         
         tdDom.onmousedown=(e)=> { this.OnClickItem(e, data); };   //点击
 
@@ -165141,7 +165195,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15042";
+var HQCHART_VERSION="1.1.15050";
 
 function PrintHQChartVersion()
 {