hqchart 1.1.15480 → 1.1.15494

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

@@ -5851,6 +5851,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             {
                 var item=option.Frame[i];
                 if (!chart.Frame.SubFrame[i]) continue;
+                chart.SetSubFrameAttribute(chart.Frame.SubFrame[i], null, item);
+                /*
                 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.FloatPrecision)) chart.Frame.SubFrame[i].Frame.YSplitOperator.FloatPrecision=item.FloatPrecision;
@@ -5860,6 +5862,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
                 if (item.IsShowLeftText==false) chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowLeftText=item.IsShowLeftText;            //显示左边刻度
                 if (item.IsShowRightText==false) chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowRightText=item.IsShowRightText;         //显示右边刻度 
+                */
             }
         }
 
@@ -5874,9 +5877,13 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         if(option.KLineTitle)    //股票名称 日期 周期
         {
-            if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false;
-            if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false;
-            if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false;
+            var item=option.KLineTitle;
+            var chartTitle=chart.TitlePaint[0];
+            if (IFrameSplitOperator.IsBool(item.IsShowName)) chartTitle.IsShowName=item.IsShowName;
+            if (IFrameSplitOperator.IsBool(item.IsShowSettingInfo)) chartTitle.IsShowSettingInfo=item.IsShowSettingInfo;
+            if (IFrameSplitOperator.IsBool(item.IsShow)) chartTitle.IsShow=item.IsShow;
+            if (IFrameSplitOperator.IsBool(item.IsShowDateTime)) chartTitle.IsShowDateTime=item.IsShowDateTime;
+            if (IFrameSplitOperator.IsBool(item.IsTitleShowLatestData)) chart.IsTitleShowLatestData=item.IsTitleShowLatestData;
         }
 
         if (IFrameSplitOperator.IsNonEmptyArray(option.Overlay)) //叠加股票
@@ -43622,6 +43629,125 @@ function ChartText()
     }
 }
 
+function ChartDrawIconV2()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName="ChartDrawIconV2";
+    this.bHScreen=false;   //是否横屏
+    this.Icon=null;
+    this.TextAlign='left';
+    this.Direction=0;               //0=middle 1=bottom 2=top
+    this.ShowOffset={ X:0, Y:0 };   //显示偏移
+    this.Size=null;
+
+     this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if (!this.Data || !this.Data.Data) return;
+        if (!this.Icon) return;
+
+        this.bHScreen=(this.ChartFrame.IsHScreen===true);
+        var xPointCount=this.ChartFrame.XPointCount;
+        var bMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        var chartright=this.ChartBorder.GetRight();
+        var top=this.ChartBorder.GetTopEx();
+        var bottom=this.ChartBorder.GetBottomEx();
+
+        if (this.bHScreen) 
+        {
+            chartright=this.ChartBorder.GetBottom();
+            top=this.ChartBorder.GetRightEx();
+            bottom=this.ChartBorder.GetLeftEx();
+            xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+
+        var pixelTatio = GetDevicePixelRatio();
+        var iconWidth=this.Icon.Width*pixelTatio;
+        var iconHeight=this.Icon.Height*pixelTatio;
+        if (IFrameSplitOperator.IsNumber(this.Size)) iconWidth=iconHeight=this.Size*pixelTatio;
+
+        
+
+        this.Canvas.save();
+        this.ClipClient(this.ChartFrame.IsHScreen);
+
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var value=this.Data.Data[i];
+            if (value==null) continue;
+
+            if (bMinute)
+            {
+                var x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+            
+            var y=this.ChartFrame.GetYFromData(value,false);
+
+            if (x>chartright) break;
+
+            if (this.TextAlign=="right") x-=iconWidth;
+            else if (this.TextAlign=="center") x-=iconWidth/2;
+
+            if (this.Direction===0) y-=iconHeight/2;
+            else if (this.Direction===1) y-=iconHeight;
+
+
+            y+=this.ShowOffset.Y;
+            x+=this.ShowOffset.X;
+
+            var drawInfo={ X:x, Y:y, Image:this.Icon.Image, Width:iconWidth, Height:iconHeight };
+
+            this.DrawIcon(drawInfo);
+        }
+
+
+
+        this.Canvas.restore();
+
+    }
+
+    this.DrawIcon=function(drawInfo)
+    {
+        if (!drawInfo || !drawInfo.Image) return;
+
+        if (this.bHScreen)
+        {
+            /*
+            var xCenter=drawInfo.X+drawInfo.Width/2;
+            var yCenter=drawInfo.Y+drawInfo.Height/2;
+            this.Canvas.save();
+            this.Canvas.translate(yCenter,xCenter);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.drawImage(drawInfo.Image, 0, 0, drawInfo.Width, drawInfo.Height);
+            this.Canvas.restore();
+            */
+            
+            this.Canvas.drawImage(drawInfo.Image, drawInfo.Y, drawInfo.X, drawInfo.Width, drawInfo.Height);
+        }
+        else
+        {
+            this.Canvas.drawImage(drawInfo.Image, drawInfo.X, drawInfo.Y, drawInfo.Width, drawInfo.Height);
+        }
+    }
+}
+
+
 /*
     文字输出 支持横屏
     数组(Data)不为null的数据中输出 this.Text文本
@@ -107146,6 +107272,26 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    IsCFFEXOption:function(upperSymbol) //中金所股票期权
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsCFFEX(upperSymbol)) return false;   
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol);
+        //MO2602-C-6300.cffex
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+        
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+        if (["IM","IO","MO","HO"].includes(prefix)) return true;
+        
+        return true;
+    },
+
     IsDCE: function (upperSymbol) 
     {
         if (!upperSymbol) return false;
@@ -107752,6 +107898,23 @@ var MARKET_SUFFIX_NAME=
         if (pos<=0) return symbol;
 
         return symbol.slice(0,pos);
+    },
+
+    SplitSymbol:function(symbol, format) //分析代码 返回对象
+    {
+        if (!format || !symbol) return null;
+        var shortSymbol=this.GetShortSymbol(symbol);
+        if (format=="A+D+")
+        {
+            var regex=/([a-zA-Z]+)(\d+)/;
+            var match=shortSymbol.match(regex);
+            if (!match || !match[1] || !match[2]) return null;
+            
+            return { AryString:[match[1], match[2]], ShortSymbol:shortSymbol, Symbol:symbol, Market:symbol.slice(shortSymbol.length) };
+        }
+
+
+        return null;
     }
 
 }
@@ -111652,6 +111815,7 @@ var g_JSComplierResource=
         Data:new Map()  //自定义图标 key=id 
                         //value={ID:, Text:, Color, Family: }   //svg
                         //value={ ID:1, Symbol:'↑', Color:'rgb(238,44,44)' } //文字
+                        //value={ ID:, Image:, Width, Height }
     },
 
     CustomFunction: //定制函数
@@ -111699,20 +111863,24 @@ var g_JSComplierResource=
     GetDrawIcon:function(id)
     {
         var icon;
-        if (g_JSComplierResource.CustomDrawIcon.Data.has(id))
+        if (this.CustomDrawIcon.Data.has(id))
         {
             const iconfont=g_JSComplierResource.CustomDrawIcon.Data.get(id);
-            if (iconfont.Symbol)    //文字
+
+            if (iconfont.Image) //图片
+                icon={ ID:id, Image:iconfont.Image, Width:iconfont.Width, Height:iconfont.Height };
+            else if (iconfont.Symbol)    //文字
                 icon={ Symbol:iconfont.Symbol, Color:iconfont.Color, IconFont:false, ID:id };
             else    //SVG图标
                 icon={ Symbol:iconfont.Text, Color:iconfont.Color, Family:iconfont.Family, IconFont:true, ID:id };
+
             return icon;
         }
 
-        if (g_JSComplierResource.DrawIcon.Data.has(id))
+        if (this.DrawIcon.Data.has(id))
         {
-            const iconfont=g_JSComplierResource.DrawIcon.Data.get(id);
-            icon={ Symbol:iconfont.Text, Color:iconfont.Color, Family:g_JSComplierResource.DrawIcon.Family, IconFont:true, ID:id };
+            const iconfont=this.DrawIcon.Data.get(id);
+            icon={ Symbol:iconfont.Text, Color:iconfont.Color, Family:this.DrawIcon.Family, IconFont:true, ID:id };
             return icon;
         }
 
@@ -111754,6 +111922,11 @@ var g_JSComplierResource=
     {
         if (g_JSComplierResource.CustomDataFunction.Data.has(name)) return true;
         return false;
+    },
+
+    AddDrawIcon:function(id, icon)
+    {
+        this.CustomDrawIcon.Data.set(id, icon);
     }
 }
 
@@ -132213,14 +132386,16 @@ JSComplier.SetDomain = function (domain, cacheDomain)   //修改API地址
 
 JSComplier.AddIcon=function(obj)    //添加一个obj={ID:, Text:, Color, Family: }
 {
-    g_JSComplierResource.CustomDrawIcon.Data.set(obj.ID, obj);
+
+    if (!obj || !obj.ID) return;
+
+    g_JSComplierResource.AddDrawIcon(obj.ID, obj);
 }
 
 JSComplier.AddFunction=function(obj)    //添加函数 { Name:函数名, Description:描述信息, IsDownload:是否需要下载数据, Invoke:函数执行(可选) }
 {
     if (!obj || !obj.Name) return;
 
-    var ID=obj.Name.toUpperCase();
     g_JSComplierResource.CustomFunction.Data.set(ID, obj);
 }
 
@@ -134004,7 +134179,21 @@ function ScriptIndex(name,script,args,option)
     //创建图标
     this.CreateIcon=function(hqChart,windowIndex,varItem,id)
     {
-        let chartText=new ChartSingleText();
+        var chartText=null;
+
+        if (varItem.Draw && varItem.Draw.Icon && varItem.Draw.Icon.Image) 
+        {
+            chartText=new ChartDrawIconV2();
+            chartText.Icon=varItem.Draw.Icon;
+            if (varItem.DrawFontSize>0) chartText.Size=varItem.DrawFontSize;
+        }
+        else
+        {
+            chartText=new ChartSingleText();
+            if (varItem.DrawFontSize>0) chartText.FixedFontSize=varItem.DrawFontSize;
+        }
+
+        
         chartText.Canvas=hqChart.Canvas;
         chartText.TextAlign='center';
 
@@ -134035,6 +134224,10 @@ function ScriptIndex(name,script,args,option)
         {
             chartText.IconFont={ Family:icon.Family, Text:icon.Symbol, Color:icon.Color };
             if (varItem.Color) chartText.IconFont.Color=this.GetColor(varItem.Color);
+        }
+        else if (icon.Image)
+        {
+
         }
         else
         {
@@ -134044,7 +134237,7 @@ function ScriptIndex(name,script,args,option)
             else chartText.Color='rgb(0,0,0)';
         }
 
-        if (varItem.DrawFontSize>0) chartText.FixedFontSize=varItem.DrawFontSize;
+       
         if (IFrameSplitOperator.IsNumber(varItem.XOffset)) chartText.ShowOffset.X=varItem.XOffset;
         if (IFrameSplitOperator.IsNumber(varItem.YOffset)) chartText.ShowOffset.Y=varItem.YOffset;
 
@@ -136102,7 +136295,19 @@ function OverlayScriptIndex(name,script,args,option)
     {
         var overlayIndex=this.OverlayIndex;
         var frame=overlayIndex.Frame;
-        let chart=new ChartSingleText();
+        var chart=null;
+
+        if (varItem.Draw && varItem.Draw.Icon && varItem.Draw.Icon.Image) 
+        {
+            chart=new ChartDrawIconV2();
+            chart.Icon=varItem.Draw.Icon;
+            if (varItem.DrawFontSize>0) chart.Size=varItem.DrawFontSize;
+        }
+        else
+        {
+            chart=new ChartSingleText();
+        }
+
         chart.Canvas=hqChart.Canvas;
         chart.TextAlign='center';
 
@@ -136133,6 +136338,10 @@ function OverlayScriptIndex(name,script,args,option)
         if (icon.IconFont==true)
         {
             chart.IconFont={ Family:icon.Family, Text:icon.Symbol, Color:icon.Color };
+        }
+        else if (icon.Image)
+        {
+
         }
         else
         {
@@ -153956,6 +154165,7 @@ function JSTReportChartContainer(uielement)
             {
                 Name:'JSTReportChartContainer::RequestStockListData', //类名::
                 Explain:'T型报价列表数据',
+                Request:{ Data: { symbol:this.Symbol } }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -171502,7 +171712,7 @@ function ChartStockData()
 
 
 
-var HQCHART_VERSION="1.1.15479";
+var HQCHART_VERSION="1.1.15493";
 
 function PrintHQChartVersion()
 {