hqchart 1.1.13577 → 1.1.13588

package/package.json

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

package/src/jscommon/umychart.DialogDrawTool.js

@@ -39,7 +39,8 @@ function JSDialogDrawTool()
                 { Title: '标价线', ClassName: 'hqchart_drawtool icon-price_line', Type:0, Data:{ ID:"标价线" } },
                 { Title: '垂直线', ClassName: 'hqchart_drawtool icon-vertical_line', Type:0, Data:{ ID:"垂直线" } },
                 { Title: '十字线', ClassName: 'hqchart_drawtool icon-tubiao_shizixian', Type:0, Data:{ ID:"十字线" } },
-                { Title: '箭头', ClassName: 'hqchart_drawtool icon-draw_rays', Type:0, Data:{ ID:"箭头" } },
+                { Title: '箭头', ClassName: 'hqchart_drawtool icon-bottom-arrow-solid', Type:0, Data:{ ID:"箭头" } },
+                { Title: '大箭头', ClassName: 'hqchart_drawtool icon-big_arrow', Type:0, Data:{ ID:"ArrowMarker" } },
                 { Title: '趋势线', ClassName: 'hqchart_drawtool icon-draw_trendline', Type:0, Data:{ ID:"趋势线" } },
                 { Title: '水平线', ClassName: 'hqchart_drawtool icon-draw_hline', Type:0, Data:{ ID:"水平线" } },
                 { Title: '水平射线', ClassName: 'hqchart_drawtool icon-tubiao_shuipingshexian', Type:0, Data:{ ID:"水平射线" } },

package/src/jscommon/umychart.js

@@ -2601,6 +2601,7 @@ var JSCHART_EVENT_ID=
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
     ON_CLICK_REPORT_BUTTON:142,             //报价列表按钮
+    ON_CLICK_REPORT_LINK:143,               //报价列表 链接
 
 
     ON_CHANGE_INDEX:150,        //切换指标
@@ -56410,7 +56411,8 @@ IChartDrawPicture.ArrayDrawPricture=
     { Name:"PriceRange", ClassName:"ChartPriceRange", Create:function() { return new ChartPriceRange(); }},
     { Name:"DateRange", ClassName:"ChartDateRange", Create:function() { return new ChartDateRange(); }},
     { Name:"InfoLine", ClassName:"ChartInfoLine", Create:function() { return new ChartInfoLine(); }},
-    { Name:"TrendAngle", ClassName:"ChartTrendAngle", Create:function() { return new ChartTrendAngle(); }}
+    { Name:"TrendAngle", ClassName:"ChartTrendAngle", Create:function() { return new ChartTrendAngle(); }},
+    { Name:"ArrowMarker", ClassName:"ChartArrowMarker", Create:function() { return new ChartArrowMarker(); } },
 ];
 
 IChartDrawPicture.MapIonFont=new Map(
@@ -56935,6 +56937,90 @@ function ChartDrawArrowLine()
     }
 }
 
+function ChartArrowMarker()
+{
+    this.newMethod=IChartDrawPicture;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartArrowMarker';
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
+   
+    this.InsideAngle=25;
+    this.InsideWidth=70;
+
+    this.OutAngle=35;
+    this.OutWidth=100;
+
+    this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
+
+    this.CalculatePoint=function(angle, ptStart, ptEnd, lineWidth)
+    {
+        var theta=angle;            //三角斜边一直线夹角
+        var headlen=lineWidth;      //三角斜边长度
+
+        var angle = Math.atan2(ptStart.Y - ptEnd.Y, ptStart.X - ptEnd.X) * 180 / Math.PI,
+        angle1 = (angle + theta) * Math.PI / 180,
+        angle2 = (angle - theta) * Math.PI / 180,
+        topX = headlen * Math.cos(angle1),
+        topY = headlen * Math.sin(angle1),
+        botX = headlen * Math.cos(angle2),
+        botY = headlen * Math.sin(angle2);
+
+        return { Top:{X:topX+ptEnd.X, Y:topY+ptEnd.Y}, Bottom:{X:botX+ptEnd.X, Y:botY+ptEnd.Y} };
+    }
+
+    this.Draw=function()
+    {
+        this.LinePoint=[];
+        if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
+        var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
+        if (!drawPoint) return;
+        if (drawPoint.length!=2) return;
+
+        this.ClipFrame();
+
+        var ptStart=drawPoint[0];
+        var ptEnd=drawPoint[1];
+
+        //计算箭头 的两条边线坐标
+        var outArrow=this.CalculatePoint(this.OutAngle, ptStart, ptEnd, this.OutWidth);
+        var insideArrow=this.CalculatePoint(this.InsideAngle, ptStart, ptEnd, this.InsideWidth);
+
+        this.Canvas.beginPath();
+        this.Canvas.moveTo(ptStart.X,ptStart.Y);
+        this.Canvas.lineTo(insideArrow.Top.X,insideArrow.Top.Y);
+        this.Canvas.lineTo(outArrow.Top.X,outArrow.Top.Y);
+        this.Canvas.lineTo(ptEnd.X,ptEnd.Y);
+        this.Canvas.lineTo(outArrow.Bottom.X,outArrow.Bottom.Y);
+        this.Canvas.lineTo(insideArrow.Bottom.X,insideArrow.Bottom.Y);
+        this.Canvas.lineTo(ptStart.X,ptStart.Y);
+        this.Canvas.closePath();
+
+        this.Canvas.fillStyle=this.LineColor;
+        this.Canvas.fill();
+
+        /*
+        if (this.IsSelected)
+        {
+            this.Canvas.strokeStyle='rgba(255,0,0,0.5)';
+            this.Canvas.lineWidth=20 * GetDevicePixelRatio();
+            this.Canvas.stroke();
+        }
+        */
+
+        var line={Start:ptStart, End:ptEnd};
+        this.LinePoint.push(line);
+        
+        this.DrawPoint([ptStart,ptEnd]);  //画点
+        this.Canvas.restore();
+    }
+}
+
 //画图工具-射线
 function ChartDrawPictureHaflLine()
 {
@@ -67439,10 +67525,46 @@ function JSChartResource()
         CheckBox:
         {
             Family:"iconfont", Size:15,
-            Checked:{ Color:"rgb(33,148,240)", Symbol:"\ue6b3", DisableColor:"rgb(112,128,144)" },
-            Unchecked:{ Color:"rgb(33,148,240)", Symbol:"\ue6b4", DisableColor:"rgb(112,128,144)" },
+            Checked:{ Color:"rgb(69,147,238)", Symbol:"\ue6b3", DisableColor:"rgb(230,230,230)", MouseOnColor:"rgb(69,147,238)" },
+            Unchecked:{ Color:"rgb(120,120,120)", Symbol:"\ue6b4", DisableColor:"rgb(230,230,230)", MouseOnColor:"rgb(69,147,238)" },
 
             Margin:{ Left:5, Right:5, Bottom:2, Top:4 },
+        },
+
+        Link:
+        {
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+            TextColor:"rgb(30,144,255)",
+
+            Disable:{ TextColor:"rgb(211,211,211)" },
+            MouseOn:{ TextColor:"rgb(30,144,255)" },
+        },
+
+        ProgressBar:
+        {
+            BGColor:"rgb(229,231,238)",
+            BarColor:"rgb(26,125,255)",
+            Margin:{ Left:2, Right:2, Bottom:2, Top:2 },
+            BarMargin:{ Left:2, Right:2, Bottom:2, Top:2 },
+            TextColor:"rgb(0,0,0)",
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+            TextMargin:{ Left:40, Right:2, Bottom:2, Top:2},
+            Disable:{ BGColor:"rgb(229,231,238)", BarColor:"rgb(131,131,131)", TextColor:"rgb(159,161,159)"}
+        },
+
+        Button:
+        {
+            BGColor:"rgb(61,134,180)",
+            TextColor:"rgb(255,255,255)",
+            BorderColor:"rgb(200,200,200)",
+
+            Disable:{ BGColor:"rgb(105,105,105)", TextColor:"rgb(169,169,169)"},
+            MouseOn:{ BGColor:"rgb(57,125,169)", TextColor:"rgb(230,230,230)" },
+
+            Margin:{ Left:5, Right:5, Bottom:2, Top:2 },
+            TextMargin:{ Bottom:2 },
+
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`
         }
     },
 
@@ -68485,6 +68607,58 @@ function JSChartResource()
 
             CopyMarginConfig(dest.CheckBox.Margin, subItem.Margin);
         }
+
+        if (item.Link)
+        {
+            var subItem=item.Link;
+            if (subItem.Font) dest.Link.Font=subItem.Font;
+            if (subItem.TextColor) dest.Link.TextColor=subItem.TextColor;
+            if (subItem.Disable && subItem.Disable.TextColor) dest.Link.Disable.TextColor=subItem.Disable.TextColor;
+            if (subItem.MouseOn && subItem.MouseOn.TextColor) dest.Link.MouseOn.TextColor=subItem.MouseOn.TextColor;
+        }
+
+        if (item.ProgressBar)
+        {
+            var subItem=item.ProgressBar;
+            if (subItem.BGColor) dest.ProgressBar.BGColor=subItem.BGColor;
+            if (subItem.BarColor) dest.ProgressBar.BarColor=subItem.BarColor;
+            if (subItem.TextColor) dest.ProgressBar.TextColor=subItem.TextColor;
+            if (subItem.Font) dest.ProgressBar.Font=subItem.Font;
+            if (subItem.Disable)
+            {
+                if (subItem.Disable.BGColor) dest.ProgressBar.Disable.BGColor=subItem.Disable.BGColor;
+                if (subItem.Disable.BarColor) dest.ProgressBar.Disable.BarColor=subItem.Disable.BarColor;
+                if (subItem.Disable.TextColor) dest.ProgressBar.Disable.TextColor=subItem.Disable.TextColor;
+            }
+
+            CopyMarginConfig(dest.ProgressBar.Margin, subItem.Margin);
+            CopyMarginConfig(dest.ProgressBar.BarMargin, subItem.BarMargin);
+            CopyMarginConfig(dest.ProgressBar.TextMargin, subItem.TextMargin);
+        }
+
+        if (item.Buttom)
+        {
+            var subItem=item.Buttom;
+            if (subItem.BGColor) dest.Buttom.BGColor=subItem.BGColor;
+            if (subItem.TextColor) dest.Buttom.TextColor=subItem.TextColor;
+            if (subItem.BorderColor) dest.Buttom.BorderColor=subItem.BorderColor;
+            if (subItem.Font) dest.Buttom.Font=subItem.Font;
+
+            if (subItem.Disable)
+            {
+                if (subItem.Disable.BGColor) dest.Buttom.Disable.BGColor=subItem.Disable.BGColor;
+                if (subItem.Disable.TextColor) dest.Buttom.Disable.TextColor=subItem.Disable.TextColor;
+            }
+
+            if (subItem.MouseOn)
+            {
+                if (subItem.MouseOn.BGColor) dest.Buttom.MouseOn.BGColor=subItem.MouseOn.BGColor;
+                if (subItem.MouseOn.TextColor) dest.Buttom.MouseOn.TextColor=subItem.MouseOn.TextColor;
+            }
+
+            CopyMarginConfig(dest.Buttom.Margin, subItem.Margin);
+            CopyMarginConfig(dest.Buttom.TextMargin, subItem.TextMargin);
+        }
         
     }