hqchart 1.1.12614 → 1.1.12627

package/src/jscommon/umychart.js

@@ -30520,6 +30520,108 @@ function ChartSingleText()
 }
 
 
+function ChartTradeIcon()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartTradeIcon';    //类名
+    this.TextAlign='center';
+    this.TextBaseline='middle';
+    this.SVG={ Family:"iconfont", Size:12 };
+    this.AryIcon;
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if(!this.Data || !this.Data.Data) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryIcon)) return;
+
+        this.Canvas.font=`${this.SVG.Size}px ${this.SVG.Family}`;
+        this.Canvas.textAlign=this.TextAlign;
+        this.Canvas.textBaseline='middle';
+        var yOffset=0;
+        if (this.TradeType=="BUY" || this.TradeType=="BUYSHORT") 
+        {
+            this.Canvas.textBaseline="bottom";
+            yOffset=-2;
+        }
+        else if (this.TradeType=="SELL" || this.TradeType=="SELLSHORT")
+        {
+            this.Canvas.textBaseline="top";
+            yOffset+2;
+        }
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var chartright=this.ChartBorder.GetRight();
+        if (bHScreen) chartright=this.ChartBorder.GetBottom();
+        var xPointCount=this.ChartFrame.XPointCount;
+        var border=this.ChartFrame.GetBorder();
+        var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
+        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 (!IFrameSplitOperator.IsNumber(value)) continue;
+            if (value<=0) continue;
+
+            var iconItem=this.AryIcon[i];
+            if (!IFrameSplitOperator.IsNumber(iconItem.Value) || !iconItem.Icon) continue;
+
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            if (right>chartright) break;
+
+
+            var x=left+(right-left)/2;
+            var y=this.GetYFromData(iconItem.Value, false);
+
+            this.Canvas.fillStyle=iconItem.Color;
+            this.Canvas.fillText(iconItem.Icon,x,y+yOffset);
+        }
+    }
+
+    this.GetMaxMin=function()
+    {
+        var range={Max:null, Min:null };
+        if(!this.Data || !this.Data.Data) return range;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryIcon)) return range;
+
+        var xPointCount=this.ChartFrame.XPointCount;
+        var start=this.Data.DataOffset;
+        if (this.ChartFrame.GlobalOption && this.ChartFrame.GlobalOption.IsValueFullRange)
+        {
+            start=0;
+            xPointCount=this.Data.Data.length;
+        }
+
+        for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        {
+            var value=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsNumber(value)) continue;
+            if (value<=0) continue;
+
+            var iconItem=this.AryIcon[i];
+            if (!IFrameSplitOperator.IsNumber(iconItem.Value) || !iconItem.Icon) continue;
+
+            if (range.Max==null) range.Max=iconItem.Value;
+            else if (range.Max<iconItem.Value) range.Max=iconItem.Value;
+
+            if (range.Min==null) range.Min=iconItem.Value;
+            else if (range.Min>iconItem.Value) range.Min=iconItem.Value;
+        }
+
+        return range;
+    }
+}
+
+
 function ChartDrawText()
 {
     this.newMethod=IChartPainting;   //派生
@@ -51187,7 +51289,7 @@ function IChartDrawPicture()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -54612,7 +54714,7 @@ function ChartDrawPictureParallelChannel()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -74051,34 +74153,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
-    //叠加股票
+    //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        var arySymbol=null;
+        if (IFrameSplitOperator.IsString(symbol)) arySymbol=[symbol];
+        else if (Array.isArray(symbol)) arySymbol=symbol;
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return false;
+
+        var aryNewSymbol=[];
+        for(var i=0, j=0;i<arySymbol.length;++i)
         {
-            var item=this.OverlayChartPaint[i];
-            if (item.Symbol==symbol)
+            var strSymbol=arySymbol[i];
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
             {
-                console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${symbol} exist.`);
-                return false;
+                var item=this.OverlayChartPaint[j];
+                if (item.Symbol==strSymbol)
+                {
+                    bFind=true;
+                    console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${strSymbol} exist.`);
+                    break;
+                }
             }
+
+            if (!bFind) aryNewSymbol.push(strSymbol);
         }
 
-        var paint=new ChartOverlayMinutePriceLine();
-        paint.Canvas=this.Canvas;
-        paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
-        paint.ChartFrame=this.Frame.SubFrame[0].Frame;
-        paint.Name="Overlay-Minute";
-        paint.Symbol=symbol;
-        paint.Identify=`Overlay-Minute-${symbol}`;
-        if (option && option.Color) paint.Color=option.Color; //外部设置颜色
-        else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
-        ++g_JSChartResource.OverlaySymbol.Random;
-        paint.MainData=this.SourceData; //绑定主图数据
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
 
-        if (paint.SetOption) paint.SetOption(option);
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var strSymbol=aryNewSymbol[i];
 
-        this.OverlayChartPaint.push(paint);
+            var paint=new ChartOverlayMinutePriceLine();
+            paint.Canvas=this.Canvas;
+            paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
+            paint.ChartFrame=this.Frame.SubFrame[0].Frame;
+            paint.Name="Overlay-Minute";
+            paint.Symbol=strSymbol;
+            paint.Identify=`Overlay-Minute-${strSymbol}`;
+            if (option && option.Color) paint.Color=option.Color; //外部设置颜色
+            else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
+            ++g_JSChartResource.OverlaySymbol.Random;
+            paint.MainData=this.SourceData; //绑定主图数据
+    
+            if (paint.SetOption) paint.SetOption(option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
 
         if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
         else this.RequestOverlayHistoryMinuteData();

package/src/jscommon/umychart.resource/js/codemirror/javascript.js

@@ -78,7 +78,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       'VARP':FUNCTION_NAME,'NDAY':FUNCTION_NAME,'UPNDAY':FUNCTION_NAME,'DOWNNDAY':FUNCTION_NAME,'LONGCROSS':FUNCTION_NAME,'EXISTR':FUNCTION_NAME,
       'RELATE':FUNCTION_NAME,'COVAR':FUNCTION_NAME,'HHVBARS':FUNCTION_NAME,'LLVBARS':FUNCTION_NAME,'BETA':FUNCTION_NAME,
       'DRAWKLINE_IF':FUNCTION_NAME,'BACKSET':FUNCTION_NAME,'SARTURN':FUNCTION_NAME,'SAR':FUNCTION_NAME,'REVERSE':FUNCTION_NAME,'SUMBARS':FUNCTION_NAME,
-      'MEMA':FUNCTION_NAME,'WMA':FUNCTION_NAME,"STRLEN":FUNCTION_NAME,
+      'MEMA':FUNCTION_NAME,'WMA':FUNCTION_NAME,"STRLEN":FUNCTION_NAME,"TMA":FUNCTION_NAME,"HV":FUNCTION_NAME,"HOD":FUNCTION_NAME,"LV":FUNCTION_NAME,
+      "VALUEWHEN":FUNCTION_NAME,"TESTSKIP":FUNCTION_NAME,"IFC":FUNCTION_NAME,"IFN":FUNCTION_NAME,"RGB":FUNCTION_NAME,"RGBX":FUNCTION_NAME,
+      "SYSPARAM":FUNCTION_NAME,"CALCSTOCKINDEX":FUNCTION_NAME,"STKINDI":FUNCTION_NAME,"RGBA":FUNCTION_NAME,
+
+      "ISUP":DATA_NAME,"ISEQUAL":DATA_NAME,"ISDOWN":DATA_NAME,
+
+      "XMOVE":FUNCTION_NAME,"YMOVE":FUNCTION_NAME,"UPCOLOR":FUNCTION_NAME,"DOWNCOLOR":FUNCTION_NAME,
+      "STRFORMAT":FUNCTION_NAME,
 
       //动态行情函数
       "DYNAINFO":FUNCTION_NAME,
@@ -93,16 +100,20 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       'NEWS':FUNCTION_NAME,
 
       //日期类
-      'DATE':DATA_NAME,'MONTH':DATA_NAME,'YEAR':DATA_NAME,
+      'DATE':DATA_NAME,'MONTH':DATA_NAME,'YEAR':DATA_NAME,"PERIOD":DATA_NAME,'TIME':DATA_NAME,'TIME2':DATA_NAME, "WEEKDAY":DATA_NAME,
+      "WEEKOFYEAR":DATA_NAME,"MACHINEDATE":DATA_NAME,"MACHINETIME":DATA_NAME,"MACHINEWEEK":DATA_NAME,"DAYSTOTODAY":DATA_NAME,
+      "FROMOPEN":DATA_NAME,"TOTALFZNUM":DATA_NAME,
+      "DATETODAY":FUNCTION_NAME,"DAYTODATE":FUNCTION_NAME,"TIMETOSEC":FUNCTION_NAME,"SECTOTIME":FUNCTION_NAME,
 
       //绘图函数
       'DRAWTEXT':FUNCTION_NAME,'STICKLINE':FUNCTION_NAME,'DRAWBAND':FUNCTION_NAME,'DRAWKLINE':FUNCTION_NAME,
       'PLOYLINE':FUNCTION_NAME,'POLYLINE':FUNCTION_NAME,'DRAWNUMBER':FUNCTION_NAME,'DRAWICON':FUNCTION_NAME,'SUPERDRAWTEXT':FUNCTION_NAME,
+     
 
       //个股行情数据
       "CLOSE":DATA_NAME, "C":DATA_NAME,"VOL":DATA_NAME, "V":DATA_NAME, 
       "OPEN":DATA_NAME, "O":DATA_NAME, "HIGH":DATA_NAME, "H":DATA_NAME, "LOW":DATA_NAME,"L":DATA_NAME,"AMOUNT":DATA_NAME,
-      "CURRBARSCOUNT":DATA_NAME,
+      "CURRBARSCOUNT":DATA_NAME, "VOLINSTK":DATA_NAME, "ZSTJJ":DATA_NAME, "OPI":DATA_NAME,
 
       //大盘数据
       "INDEXA":DATA_NAME,"INDEXC":DATA_NAME,"INDEXH":DATA_NAME,"INDEXL":DATA_NAME,"INDEXO":DATA_NAME,"INDEXV":DATA_NAME,'INDEXADV':DATA_NAME,'INDEXDEC':DATA_NAME,
@@ -112,7 +123,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       'LINETHICK1':LINE_WIDTH_NAME,'LINETHICK2':LINE_WIDTH_NAME,'LINETHICK3':LINE_WIDTH_NAME,'LINETHICK4':LINE_WIDTH_NAME,'LINETHICK5':LINE_WIDTH_NAME,
       'LINETHICK6':LINE_WIDTH_NAME,'LINETHICK7':LINE_WIDTH_NAME,'LINETHICK8':LINE_WIDTH_NAME,'LINETHICK9':LINE_WIDTH_NAME,'LINETHICK10':LINE_WIDTH_NAME,
 
+      //字体大小
+      "FONTSIZE10":LINE_WIDTH_NAME,"FONTSIZE11":LINE_WIDTH_NAME,"FONTSIZE12":LINE_WIDTH_NAME,"FONTSIZE4":LINE_WIDTH_NAME,"FONTSIZE15":LINE_WIDTH_NAME,
+      "FONTSIZE16":LINE_WIDTH_NAME,"FONTSIZE17":LINE_WIDTH_NAME,"FONTSIZE18":LINE_WIDTH_NAME,"FONTSIZE9":LINE_WIDTH_NAME,"FONTSIZE20":LINE_WIDTH_NAME,
+      "FONTSIZE21":LINE_WIDTH_NAME,"FONTSIZE22":LINE_WIDTH_NAME,"FONTSIZE23":LINE_WIDTH_NAME,"FONTSIZE24":LINE_WIDTH_NAME,"FONTSIZE25":LINE_WIDTH_NAME,
+
+      "VALIGN0":LINE_WIDTH_NAME,"VALIGN1":LINE_WIDTH_NAME,"VALIGN2":LINE_WIDTH_NAME,
+
       'COLORSTICK':DRAW_NAME,'CIRCLEDOT':DRAW_NAME,'POINTDOT':DRAW_NAME,'LINESTICK':DRAW_NAME,'STICK':DRAW_NAME,'NODRAW':DRAW_NAME,
+      "LINEAREA":DRAW_NAME,
+
+      "BUY":DRAW_NAME,"SELL":DRAW_NAME,"SELLSHORT":DRAW_NAME,"BUYSHORT":DRAW_NAME,"TIPICON":DRAW_NAME,
 
       //颜色
       'COLORYELLOW':COLORYELLOW,'COLORBLACK':COLORBLACK,'COLORBLUE':COLORBLUE,'COLORGREEN':COLORGREEN,'COLORCYAN':COLORCYAN,'COLORRED':COLORRED,