hqchart 1.1.15138 → 1.1.15152

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.15138",
+  "version": "1.1.15152",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogDrawTool.js

@@ -727,7 +727,7 @@ function JSDialogModifyDraw()
 
         var spanDom=document.createElement("span");
         spanDom.className="hqchart_drawtool icon-tuodong";
-        spanDom.classList.add("UMyChart_DrawTool_Span");
+        spanDom.classList.add("UMyChart_Draw_Modify_Dialog_Drag_Span");
         drgDiv.appendChild(spanDom);
 
         for(var i=0;i<this.AryButton.length;++i)
@@ -753,7 +753,7 @@ function JSDialogModifyDraw()
 
         var spanDom=document.createElement("span");
         spanDom.className=item.ClassName;
-        spanDom.classList.add("UMyChart_DrawTool_Span");
+        spanDom.classList.add("UMyChart_Draw_Modify_Dialog_Button_Span");
         divItem.appendChild(spanDom);
        
 
@@ -782,7 +782,6 @@ function JSDialogModifyDraw()
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID:
                 this.LockButton=data;
-                this.LockButton.Span.style['color']="rgb(220,220,220)";
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID:
                 this.FontZoomButton=data;
@@ -987,7 +986,23 @@ function JSDialogModifyDraw()
         if (!this.ChartPicture || !this.HQChart) return;
         this.ChartPicture.EnableMove=!this.ChartPicture.EnableMove;
 
-        if (this.LockButton) this.LockButton.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
+        return this.UpdateLockButtonStyle();
+    }
+
+    this.UpdateLockButtonStyle=function()
+    {
+        if (!this.LockButton) return;
+
+        if (this.ChartPicture.EnableMove)
+        {
+            this.LockButton.Span.classList.remove("UMyChart_Draw_Modify_Dialog_Button_Span");
+            this.LockButton.Span.classList.add("UMyChart_Draw_Modify_Dialog_Unlock_Button_Span");
+        }
+        else
+        {
+            this.LockButton.Span.classList.remove("UMyChart_Draw_Modify_Dialog_Unlock_Button_Span");
+            this.LockButton.Span.classList.add("UMyChart_Draw_Modify_Dialog_Button_Span");
+        }
     }
 
     this.ModifyBorderColor=function()
@@ -1172,8 +1187,7 @@ function JSDialogModifyDraw()
 
         if (this.LockButton) 
         {
-            var item=this.LockButton;
-            item.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
+           this.UpdateLockButtonStyle();
         }
 
         if (this.FontZoomButton)

package/src/jscommon/umychart.DialogSearchIndex.js

@@ -25,14 +25,6 @@ function JSDialogSearchIndex()
     //{ WindowIndex:窗口索引, OpType:1=切换主图指标 2=添加叠加指标 3=新增指标窗口,  Title: };  
     this.OpData=null;        
 
-    this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
-    this.TitleBGColor=g_JSChartResource.DialogSearchIndex.TitleBGColor;
-    this.BGColor=g_JSChartResource.DialogSearchIndex.BGColor;
-    this.BorderColor=g_JSChartResource.DialogSearchIndex.BorderColor;
-    this.IndexNameColor=g_JSChartResource.DialogSearchIndex.IndexNameColor;
-    this.GroupNameColor=g_JSChartResource.DialogSearchIndex.GroupNameColor;
-    this.InputTextColor=g_JSChartResource.DialogSearchIndex.InputTextColor;
-
     this.MaxRowCount=30;    //行
     this.ColCount=3;        //列
     this.MaxGroupCount=20;  //分类最多个数
@@ -399,15 +391,7 @@ function JSDialogSearchIndex()
 
     this.UpdateStyle=function()
     {
-        if (!this.DivDialog) return;
-
-        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
-        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
-
-        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
-        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
-
-        if (this.InputTextColor) this.InputDom.style['color']=this.InputTextColor;
+       
     };
 
     this.ChangeGroup=function(groupID)
@@ -442,7 +426,6 @@ function JSDialogSearchIndex()
             cell.Span.innerText=item.Group.Name;
             cell.Span.dataset.groupid=item.Group.ID;
             cell.Span.dataset.groupname=item.Group.Name;
-            cell.Span.style.color=this.GroupNameColor;
 
             if (cell.Div.style.display=="none") cell.Div.style.display="";
         }
@@ -468,7 +451,6 @@ function JSDialogSearchIndex()
                 {
                     var indexItem=data.AryIndex[index];
                     cell.Span.innerText=indexItem.Name;
-                    cell.Span.style.color=this.IndexNameColor;
                     if (cell.Td.style.display=="none") cell.Td.style.display="";
                     cell.IndexItem=indexItem;
                     ++index;
@@ -557,17 +539,7 @@ function JSDialogSearchIndex()
     //配色修改
     this.ReloadResource=function(option)
     {
-        this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
-        this.TitleBGColor=g_JSChartResource.DialogSearchIndex.TitleBGColor;
-        this.BGColor=g_JSChartResource.DialogSearchIndex.BGColor;
-        this.BorderColor=g_JSChartResource.DialogSearchIndex.BorderColor;
-        this.IndexNameColor=g_JSChartResource.DialogSearchIndex.IndexNameColor;
-        this.GroupNameColor=g_JSChartResource.DialogSearchIndex.GroupNameColor;
-        this.InputTextColor=g_JSChartResource.DialogSearchIndex.InputTextColor;
-
-        if (!this.DivDialog) return;
-
-        this.UpdateStyle();
+        
     }
 
 }
@@ -878,13 +850,6 @@ function JSDialogModifyIndexParam()
     this.TitleBox=null; //{ DivTitle, DivName, DivName }
     this.Style=0;       //样式 预留
 
-    this.TitleColor=g_JSChartResource.DialogModifyIndexParam.TitleColor;
-    this.TitleBGColor=g_JSChartResource.DialogModifyIndexParam.TitleBGColor;
-    this.BGColor=g_JSChartResource.DialogModifyIndexParam.BGColor;
-    this.BorderColor=g_JSChartResource.DialogModifyIndexParam.BorderColor;
-    this.ParamNameColor=g_JSChartResource.DialogModifyIndexParam.ParamNameColor;
-    this.InputTextColor=g_JSChartResource.DialogModifyIndexParam.InputTextColor;
-
     this.MaxRowCount=30;    //行
 
     this.HQChart=null;
@@ -1132,8 +1097,9 @@ function JSDialogModifyIndexParam()
         input.className='UMyChart_ModifyIndexParam_Input';
         input.type="number";
         input.step=1;
-        input.addEventListener("mouseup", (e)=>{ this.OnParamMouseUp(e)});
-        input.addEventListener("keyup", (e)=>{ this.OnParamKeyUp(e)})
+        //input.addEventListener("mouseup", (e)=>{ this.OnParamMouseUp(e)});
+        //input.addEventListener("keyup", (e)=>{ this.OnParamKeyUp(e)} );
+        input.addEventListener("input", (e)=>{ this.OnParamInput(e)} );
         tdDom.appendChild(input);
         rowItem.Input=input;
 
@@ -1142,13 +1108,7 @@ function JSDialogModifyIndexParam()
 
     this.UpdateStyle=function()
     {
-        if (!this.DivDialog) return;
-
-        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
-        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
-
-        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
-        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
+       
     };
 
     this.UpdateParamTable=function(aryText)
@@ -1159,10 +1119,9 @@ function JSDialogModifyIndexParam()
             var item=aryText[index];
             var row=this.AryData[index];
             row.SpanName.innerText=`${item.Name}: `;
-            row.SpanName.style.color=this.ParamNameColor;
+           
 
             row.Input.value=item.Value;
-            row.Input.style.color=this.InputTextColor;
             row.Input.dataset.paramid=item.Index;
 
             if (row.Tr.style.display=="none") row.Tr.style.display="";
@@ -1269,6 +1228,7 @@ function JSDialogModifyIndexParam()
         }
     }
 
+    /*
     this.OnParamMouseUp=function(e)
     {
         var input=e.target;
@@ -1286,6 +1246,16 @@ function JSDialogModifyIndexParam()
 
         this.ModifyParam(id, parseInt(value));
     }
+    */
+
+    this.OnParamInput=function(e)
+    {
+        var input=e.target;
+        var value=input.value;
+        var id=input.dataset.paramid;
+
+        this.ModifyParam(id, parseInt(value));
+    }
 
     this.ModifyParam=function(id, value)
     {   

package/src/jscommon/umychart.js

@@ -2475,6 +2475,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)
 {
@@ -2900,6 +2907,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=
@@ -6439,6 +6448,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         chartItem.Canvas=canvas;    //叠加图形
                     }
                 }
+
+                if (item.Frame.LockPaint)
+                {
+                    item.Frame.LockPaint.Canvas=canvas;
+                }
             }
         }
 
@@ -64564,7 +64578,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:}
@@ -66916,9 +66930,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=
@@ -67017,6 +67031,9 @@ function ChartDrawPictureHorizontalLine()
             left=this.Frame.ChartBorder.GetTop();
             right=this.Frame.ChartBorder.GetBottom();
         }
+
+        
+
         this.ClipFrame();
 
         this.Canvas.strokeStyle=this.LineColor;
@@ -67056,6 +67073,8 @@ function ChartDrawPictureHorizontalLine()
         //画点
         this.DrawPoint(drawPoint);
 
+        this.FormatLabelTextEvent(drawPoint);
+        
         //显示价格
         this.DrawInsideLabel(drawPoint[0])
 
@@ -67063,6 +67082,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)
     {
@@ -67070,6 +67099,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);
 
@@ -67078,12 +67109,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;
@@ -67097,13 +67143,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;
@@ -67117,7 +67180,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);
         }
     }
 
@@ -77907,30 +77970,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 微软雅黑',   //字体
@@ -79155,20 +79194,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;
@@ -87479,7 +87504,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (item)
         {
             drawPicture=item.Create();
-            drawPicture.HQChart=this;
         }
 
         if (!drawPicture)    //iconfont图标
@@ -87502,6 +87526,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);
@@ -87532,8 +87557,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);
@@ -88149,6 +88176,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) 
@@ -95911,6 +95939,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);
@@ -95941,8 +95970,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);
@@ -95988,6 +96019,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();