hqchart 1.1.15138 → 1.1.15152

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

@@ -6571,6 +6571,13 @@ JSChart.SetStyle=function(option)
     if (option) g_JSChartResource.SetStyle(option);
 }
 
+
+//CSS风格
+JSChart.SetCSSStyle=function(styleID)
+{
+    document.documentElement.setAttribute('hqchart_style', styleID);
+}
+
 //value { EN:'', CH:'' }
 JSChart.SetTextResource=function(key,value)
 {
@@ -6996,6 +7003,8 @@ var JSCHART_EVENT_ID=
     ON_FORMAT_COUNTDOWN_TEXT:177,       //倒计时
     ON_CLICK_INDEX_LOCK:178,            //点击指标锁
     ON_CORSSCURSOR_STATUS_CHANGE:179,   //十字光标状态改变
+
+    ON_FORMAT_DRAW_HLINE_LABEL:180,     //画图工具-水平线(ChartDrawPictureHorizontalLine)格式化标签文字
 }
 
 var JSCHART_OPERATOR_ID=
@@ -10535,6 +10544,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         chartItem.Canvas=canvas;    //叠加图形
                     }
                 }
+
+                if (item.Frame.LockPaint)
+                {
+                    item.Frame.LockPaint.Canvas=canvas;
+                }
             }
         }
 
@@ -68660,7 +68674,7 @@ function IChartDrawPicture()
     this.PointType=g_JSChartResource.DrawPicture.PointType;         // 0=圆点  1=方框 2= 空心圆
     this.IsShowPoint=g_JSChartResource.DrawPicture.IsShowPoint;     //是否始终显示点
     this.LimitFrameID;   //限制在指定窗口绘图
-    
+    this.CacheData;     //数据缓存
 
     //接口函数
     this.SetLastPoint=null; //this.SetLastPoint=function(obj)  obj={X:,Y:}
@@ -71012,9 +71026,9 @@ function ChartDrawPictureHorizontalLine()
 
     this.LabelConfig=
     { 
-        Left:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
-        Right:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 } },
-        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)", BGColor:null
+        Left:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 }, LineOffset:null, Text:null },
+        Right:{ IsShow:true, Margin:{ Left:5, Top:4, Bottom:2, Right:5 }, LineOffset:null, Text:null },
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, TextColor:"rgb(255,255,255)", BGColor:null,
     };
 
     this.InsideLabelConfig=
@@ -71113,6 +71127,9 @@ function ChartDrawPictureHorizontalLine()
             left=this.Frame.ChartBorder.GetTop();
             right=this.Frame.ChartBorder.GetBottom();
         }
+
+        
+
         this.ClipFrame();
 
         this.Canvas.strokeStyle=this.LineColor;
@@ -71152,6 +71169,8 @@ function ChartDrawPictureHorizontalLine()
         //画点
         this.DrawPoint(drawPoint);
 
+        this.FormatLabelTextEvent(drawPoint);
+        
         //显示价格
         this.DrawInsideLabel(drawPoint[0])
 
@@ -71159,6 +71178,16 @@ function ChartDrawPictureHorizontalLine()
 
         this.DrawValueLabel(drawPoint[0]);
     }
+
+    this.FormatLabelTextEvent=function(point)
+    {
+        if (!this.HQChart) return;
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DRAW_HLINE_LABEL);
+        if (!event || !event.Callback) return;
+
+        var sendData={ ID:this.Guid, LabelConfig:this.LabelConfig, InsideLabelConfig:this.InsideLabelConfig };
+        event.Callback(event, sendData, this);
+    }
  
     this.DrawValueLabel=function(point)
     {
@@ -71166,6 +71195,8 @@ function ChartDrawPictureHorizontalLine()
         if (this.Frame.IsHScreen) return;   //不支持横屏
 
         var y=point.Y;
+        var yFixed=ToFixedPoint2(this.LineWidth,y);
+
         var yValue=this.Frame.GetYData(y);
         var text=yValue.toFixed(2);
 
@@ -71174,12 +71205,27 @@ function ChartDrawPictureHorizontalLine()
 
         this.Canvas.font=config.Font;
         var textHeight=this.Canvas.measureText("擎").width;
-        var textWidth=this.Canvas.measureText(text).width;
 
         if (config.Left.IsShow && this.Frame.ChartBorder.Left>5)
         {
+            var leftText=text;
+            if (config.Left.Text) leftText=config.Left.Text;
+            var textWidth=this.Canvas.measureText(leftText).width;
+            var left=border.Left;
+            if (IFrameSplitOperator.IsNumber(config.Left.LineOffset)&& config.Left.LineOffset!==0)
+            {
+                left-=config.Left.LineOffset;
+                this.Canvas.strokeStyle=this.LineColor;
+                this.SetLineWidth();
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(border.Left,yFixed);
+                this.Canvas.lineTo(left,yFixed);
+                this.Canvas.stroke();
+                this.RestoreLineWidth();
+            }
+
             var margin=config.Left.Margin;
-            var rtBG={ Right:border.Left-1, Height:textHeight+margin.Top+margin.Bottom, Width:textWidth+margin.Left+margin.Right };
+            var rtBG={ Right:left+1, Height:textHeight+margin.Top+margin.Bottom, Width:textWidth+margin.Left+margin.Right };
             rtBG.Top=y-textHeight/2-margin.Top;
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Left=rtBG.Right-rtBG.Width;
@@ -71193,13 +71239,30 @@ function ChartDrawPictureHorizontalLine()
             var xText=rtBG.Left+margin.Left;
             var yText=rtBG.Top+margin.Top;
             this.Canvas.fillStyle=config.TextColor;
-            this.Canvas.fillText(text,xText,yText);
+            this.Canvas.fillText(leftText,xText,yText);
         }
 
         if (config.Right.IsShow && this.Frame.ChartBorder.Right>5)
         {
+            var rightText=text;
+            if (config.Right.Text) rightText=config.Right.Text;
+            var textWidth=this.Canvas.measureText(rightText).width;
+
+            var left=border.Right;
+            if (IFrameSplitOperator.IsNumber(config.Right.LineOffset)&& config.Right.LineOffset!==0)
+            {
+                left+=config.Right.LineOffset;
+                this.Canvas.strokeStyle=this.LineColor;
+                this.SetLineWidth();
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(border.Right,yFixed);
+                this.Canvas.lineTo(left,yFixed);
+                this.Canvas.stroke();
+                this.RestoreLineWidth();
+            }
+
             var margin=config.Right.Margin;
-            var rtBG={ Left:border.Right+1, Height:textHeight+margin.Top+margin.Bottom, Width:textWidth+margin.Left+margin.Right };
+            var rtBG={ Left:left-1, Height:textHeight+margin.Top+margin.Bottom, Width:textWidth+margin.Left+margin.Right };
             rtBG.Top=y-textHeight/2-margin.Top;
             rtBG.Bottom=rtBG.Top+rtBG.Height;
             rtBG.Right=rtBG.Left+rtBG.Width;
@@ -71213,7 +71276,7 @@ function ChartDrawPictureHorizontalLine()
             var xText=rtBG.Left+margin.Left;
             var yText=rtBG.Top+margin.Top;
             this.Canvas.fillStyle=config.TextColor;
-            this.Canvas.fillText(text,xText,yText);
+            this.Canvas.fillText(rightText,xText,yText);
         }
     }
 
@@ -82003,30 +82066,6 @@ function JSChartResource()
         }
     };
 
-    //指标搜索
-    this.DialogSearchIndex=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        IndexNameColor:"rgb(0,0,0)",             //数值名称
-        GroupNameColor:"rgb(0,0,0)",
-        InputTextColor:"rgb(0,0,0)"
-    };
-
-    this.DialogModifyIndexParam=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        ParamNameColor:"rgb(0,0,0)",             //数值名称
-        InputTextColor:"rgb(0,0,0)"
-    };
-
     //弹幕
     this.Barrage= {
         Font:16*GetDevicePixelRatio() +'px 微软雅黑',   //字体
@@ -83251,20 +83290,6 @@ function JSChartResource()
             }
         }
 
-        if (style.DialogSearchIndex)
-        {
-            var item=style.DialogSearchIndex;
-
-            if (item.BGColor) this.DialogSearchIndex.BGColor=item.BGColor;
-            if (item.BorderColor) this.DialogSearchIndex.BorderColor=item.BorderColor;
-            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
-            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
-            
-            if (item.IndexNameColor) this.DialogSearchIndex.IndexNameColor=item.IndexNameColor;
-            if (item.GroupNameColor) this.DialogSearchIndex.GroupNameColor=item.GroupNameColor;
-            if (item.InputTextColor) this.DialogSearchIndex.InputTextColor=item.InputTextColor;
-        }
-
         if (style.MinuteInfo)
         {
             var item=style.MinuteInfo;
@@ -91575,7 +91600,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (item)
         {
             drawPicture=item.Create();
-            drawPicture.HQChart=this;
         }
 
         if (!drawPicture)    //iconfont图标
@@ -91598,6 +91622,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         drawPicture.Period=this.Period;
         drawPicture.Right=this.Right;
         drawPicture.Option=this.ChartDrawOption;
+        drawPicture.HQChart=this;
         
         if (callback) drawPicture.FinishedCallback=callback;    //完成通知上层回调
         if (option) drawPicture.SetOption(option);
@@ -91628,8 +91653,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         drawPicture.Period=this.Period;
         drawPicture.Right=this.Right;
         drawPicture.Option=this.ChartDrawOption;
+        drawPicture.HQChart=this;
         if (obj.Value) drawPicture.Value=obj.Value;
         if (obj.Guid) drawPicture.Guid=obj.Guid;
+        if (obj.CacheData) drawPicture.CacheData=obj.CacheData; //缓存数据
 
         if (drawPicture.ImportStorageData) drawPicture.ImportStorageData(obj);
         drawPicture.SetOption(obj);
@@ -92245,6 +92272,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             drawPicture.Status=10;
             drawPicture.Frame=this.Frame.SubFrame[item.FrameID].Frame;  //绑定框架坐标
             drawPicture.Option=this.ChartDrawOption;
+            drawPicture.HQChart=this;
             
             if (drawPicture.ImportStorageData) drawPicture.ImportStorageData(item);
             if (drawPicture.Period!=this.Period) 
@@ -100007,6 +100035,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         drawPicture.Symbol=this.Symbol;
         drawPicture.Period=888888888;
         drawPicture.Option=this.ChartDrawOption;
+        drawPicture.HQChart=this;
         
         if (callback) drawPicture.FinishedCallback=callback;    //完成通知上层回调
         if (option) drawPicture.SetOption(option);
@@ -100037,8 +100066,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         drawPicture.Frame=this.Frame.SubFrame[obj.FrameID].Frame;  //绑定框架坐标
         drawPicture.Symbol=this.Symbol;
         drawPicture.Period=888888888;
+        drawPicture.HQChart=this;
         if (obj.Value) drawPicture.Value=obj.Value;
         if (obj.Guid) drawPicture.Guid=obj.Guid;
+        if (obj.CacheData) drawPicture.CacheData=obj.CacheData; //缓存数据
 
         if (drawPicture.ImportStorageData) drawPicture.ImportStorageData(obj);
         drawPicture.SetOption(obj);
@@ -100084,6 +100115,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
             drawPicture.Canvas=this.Canvas;
             drawPicture.Status=10;
+            drawPicture.HQChart=this;
             drawPicture.Frame=this.Frame.SubFrame[item.FrameID].Frame;  //绑定框架坐标
             if (drawPicture.ImportStorageData) drawPicture.ImportStorageData(item);
             drawPicture.ResetXValue();
@@ -137131,17 +137163,6 @@ function GetBlackStyle()
             PositionColor:"rgb(255,0,255)"            //持仓
         },
 
-        DialogSearchIndex:
-        {
-            BGColor:'rgb(20,20,20)',            //背景色
-            BorderColor:'rgb(170,170,170)',     //边框颜色
-            TitleColor:'rgb(230,230,230)',       //标题颜色
-
-            IndexNameColor:"rgb(210,210,210)",       
-            GroupNameColor:"rgb(210,210,210)",      
-            InputTextColor:"rgb(210,210,210)", 
-        },
-
         DialogPopKeyboard:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -153775,7 +153796,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15137";
+var HQCHART_VERSION="1.1.15151";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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