hqchart 1.1.15382 → 1.1.15390

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

@@ -12688,6 +12688,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.IsHScreenModel=function()
+    {
+        if (this.ClassName=="KLineChartHScreenContainer" || this.ClassName=="MinuteChartHScreenContainer") return true;
+
+        return false;
+    }
+
     this.UpdatePointByCursorIndex=function(type)    //type 1=根据十字光标更新 2=强制取消十字光标
     {
         if (type==1)    //根据十字光标更新
@@ -12708,8 +12715,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     pt.X=null;
                 }
             }
-            this.LastPoint.X=pt.X;
-            this.LastPoint.Y=pt.Y;
+
+            if (this.IsHScreenModel())
+            {
+                this.LastPoint.X=pt.Y;
+                this.LastPoint.Y=pt.X;
+            }
+            else
+            {
+                this.LastPoint.X=pt.X;
+                this.LastPoint.Y=pt.Y;
+            }
+            
         }
         else if (type==2)
         {
@@ -12729,8 +12746,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 pt.Y=this.Frame.GetYFromData(close);
                 this.LastPoint.FrameID=0;
             }
-            this.LastPoint.X=pt.X;
-            this.LastPoint.Y=pt.Y;
+
+            if (this.IsHScreenModel())
+            {
+                this.LastPoint.X=pt.Y;
+                this.LastPoint.Y=pt.X;
+            }
+            else
+            {
+                this.LastPoint.X=pt.X;
+                this.LastPoint.Y=pt.Y;
+            }
+            
         }
     }
 
@@ -83567,6 +83594,13 @@ function JSChartResource()
             CloseColor:"rgb(30,144,255)",
             YCloseColor:"rgba(105,105,105,0.5)",  //昨收线
             AreaColor:'rgba(0,191,255,0.2)',
+
+            UpColor:"rgb(255,0,0)",
+            UpAreaColor:"rgba(255,0,0,0.5)",
+            DownColor:"rgb(0,128,0)",
+            DownAreaColor:"rgba(0,128,0,0.5)",
+            UnchangeColor:'rgb(90,90,90)', 
+            UnchangeAreaColor:'rgba(90,90,90,0.5)', 
         },
 
         KLine:
@@ -84965,6 +84999,13 @@ function JSChartResource()
             if (closeLine.CloseColor) this.Report.CloseLine.CloseColor=closeLine.CloseColor;
             if (closeLine.YCloseColor) this.Report.CloseLine.YCloseColor=closeLine.YCloseColor;
             if (closeLine.AreaColor) this.Report.CloseLine.AreaColor=closeLine.AreaColor;
+
+            if (closeLine.UpColor) this.Report.CloseLine.UpColor=closeLine.UpColor;
+            if (closeLine.UpAreaColor) this.Report.CloseLine.UpAreaColor=closeLine.UpAreaColor;
+            if (closeLine.DownColor) this.Report.CloseLine.DownColor=closeLine.DownColor;
+            if (closeLine.DownAreaColor) this.Report.CloseLine.DownAreaColor=closeLine.DownAreaColor;
+            if (closeLine.UnchangeColor) this.Report.CloseLine.UnchangeColor=closeLine.UnchangeColor;
+            if (closeLine.UnchangeAreaColor) this.Report.CloseLine.UnchangeAreaColor=closeLine.UnchangeAreaColor;
         }
 
         if (item.KLine)
@@ -97713,21 +97754,31 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.UpdatePointByCursorIndex=function()
     {
-        this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
+        var x=null, y=null;
+        x=this.Frame.GetXFromIndex(this.CursorIndex);
 
         var index=this.CursorIndex;
         index=parseInt(index.toFixed(0));
         var data=this.GetKData();
-        if (data.DataOffset+index>=data.Data.length)
+        if (data.DataOffset+index<data.Data.length)
         {
-            return;
+            var item=data.Data[data.DataOffset+index];
+            var close=null;
+            if (item.Before) close=item.Before.Close;
+            else close=item.Close;
+            y=this.Frame.GetYFromData(close);
         }
-        var item=data.Data[data.DataOffset+index];
-        var close=null;
-        if (item.Before) close=item.Before.Close;
-        else close=item.Close
 
-        this.LastPoint.Y=this.Frame.GetYFromData(close);
+        if (this.IsHScreenModel())
+        {
+            this.LastPoint.X=y;
+            this.LastPoint.Y=x;
+        }
+        else
+        {
+            this.LastPoint.X=x;
+            this.LastPoint.Y=y;
+        }
         this.LastPoint.FrameID=0;
     }
 
@@ -111341,6 +111392,24 @@ JSComplierHelper.GetConvertValueName=function(funcName)
 
     return valueName;
 }
+
+
+//DYNAINFO() 转换
+//["DYNA_NOW",null],  //DYNA_NOW  现价 DYNAINFO(7) 即时行情数据 没有现价时(比如在开盘前),返回昨收盘价
+//["DYNA_ZAF",null],  //DYNA_ZAF 涨幅 DYNAINFO(14)  即时行情数据(沪深京早盘竞价期间使用匹配价的涨幅) 转换成幅度需要乘100
+//["DYNA_LB", null],  //DYNA_LB   DYNAINFO(17)    量比 即时行情数据
+//["DYNA_ZAS",null],  //DYNA_ZAS  DYNAINFO(24)  返回涨速 报价界面行情数据 转换成幅度需要乘100
+//["SELLVOL", null], //返回内盘,即DYNAINFO(22) 即时行情数据
+//["BUYVOL", null],  //返回外盘,即DYNAINFO(21) 即时行情数据
+const MAP_DYNAINFO_SHORTCUT=new Map(
+[
+    ['DYNA_NOW', { Name:"DYNA_NOW", ID:7 } ],
+    ['DYNA_LB',  { Name:"DYNA_LB", ID:17 } ],
+    ['DYNA_ZAS', { Name:"DYNA_ZAS", ID:24 } ],
+    ['SELLVOL',  { Name:"SELLVOL", ID:22 }],
+    ['BUYVOL',  { Name:"BUYVOL", ID:21 } ],
+]
+);
         
 
 
@@ -112280,6 +112349,14 @@ function Node(ErrorHandler)
             return;
         }
 
+        if (MAP_DYNAINFO_SHORTCUT.has(varName))
+        {
+            var item=MAP_DYNAINFO_SHORTCUT.get(varName);
+            var item={ ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SYMBOL_LATEST_DATA, Args:[item.ID], FunctionName:varName };
+            this.Dynainfo.push(item);
+            return;
+        }
+
         if (varName.indexOf('#')>0)
         {
             var aryWrods = varName.split('#');
@@ -123035,8 +123112,10 @@ var DYNAINFO_ARGUMENT_ID=
     CLOSE:7,
     VOL:8,
     AMOUNT:10,
+    UPDOWN:12,      //DYNAINFO(12) 日涨跌 即时行情数据
     AMPLITUDE:13,   //振幅
     INCREASE:14,    //涨幅
+                    
     EXCHANGERATE:37,    //换手率
 };
 
@@ -123215,16 +123294,18 @@ function JSSymbolData(ast,option,jsExecute)
         let stock=data.stock[0];
         if (!stock) return;
 
-        if (IFrameSplitOperator.IsNumber(stock.yclose)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.YCLOSE,stock.yclose);
-        if (IFrameSplitOperator.IsNumber(stock.open)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.OPEN,stock.open);
-        if (IFrameSplitOperator.IsNumber(stock.high)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.HIGH,stock.high);
-        if (IFrameSplitOperator.IsNumber(stock.low)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.LOW,stock.low);
-        if (IFrameSplitOperator.IsNumber(stock.price)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.CLOSE,stock.price);
-        if (IFrameSplitOperator.IsNumber(stock.vol)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.VOL,stock.vol);
-        if (IFrameSplitOperator.IsNumber(stock.amount)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.AMOUNT,stock.amount);
-        if (IFrameSplitOperator.IsNumber(stock.increase)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.INCREASE,stock.increase);
-        if (IFrameSplitOperator.IsNumber(stock.exchangerate)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.EXCHANGERATE,stock.exchangerate);
-        if (IFrameSplitOperator.IsNumber(stock.amplitude)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.AMPLITUDE,stock.amplitude);
+        if (IFrameSplitOperator.IsNumber(stock.yclose)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.YCLOSE),stock.yclose);
+        if (IFrameSplitOperator.IsNumber(stock.open)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.OPEN),stock.open);
+        if (IFrameSplitOperator.IsNumber(stock.high)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.HIGH),stock.high);
+        if (IFrameSplitOperator.IsNumber(stock.low)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.LOW),stock.low);
+        if (IFrameSplitOperator.IsNumber(stock.price)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.CLOSE),stock.price);
+        if (IFrameSplitOperator.IsNumber(stock.vol)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.VOL),stock.vol);
+        if (IFrameSplitOperator.IsNumber(stock.amount)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.AMOUNT),stock.amount);
+        if (IFrameSplitOperator.IsNumber(stock.increase)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.INCREASE),stock.increase);
+        if (IFrameSplitOperator.IsNumber(stock.exchangerate)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.EXCHANGERATE),stock.exchangerate);
+        if (IFrameSplitOperator.IsNumber(stock.amplitude)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.AMPLITUDE),stock.amplitude);
+        if (IFrameSplitOperator.IsNumber(stock.updown)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.UPDOWN),stock.updown); 
+        
        
         /*
         this.LatestData={ Symbol:stock.symbol, Name:stock.name, Date:stock.date, Time:stock.time,
@@ -123249,7 +123330,7 @@ function JSSymbolData(ast,option,jsExecute)
             if (IFrameSplitOperator.IsNumber(item.value) || IFrameSplitOperator.IsString(item.value))
             {
                 JSConsole.Complier.Log(`[JSSymbolData::RecvLatestDataVer2] symbol=${symbol} DYNAINFO(${item.id})=${item.value}.`);
-                this.LatestData.set(item.id, item.value);
+                this.LatestData.set(this.GetLatestDataKey(item.id), item.value);
             }
                 
         }
@@ -123257,9 +123338,48 @@ function JSSymbolData(ast,option,jsExecute)
         JSConsole.Complier.Log('[JSSymbolData::RecvLatestDataVer2]', this.LatestData);
     }
 
-    this.GetLatestCacheData=function(dataname)
+    this.GetLatestCacheData=function(dataID)
     {
-        if (this.LatestData.has(dataname)) return this.LatestData.get(dataname);
+        var key=this.GetLatestDataKey(dataID);
+        if (!this.LatestData.has(key)) return null;
+
+        var data=this.LatestData.get(key);
+
+        //DYNAINFO(36) 自由流通换手率(序列数据,每个周期的数据不同,使用最新的自由流通股本) 转换成幅度需要乘100 比如DYNAINFO(36)>0.25表示换手超过25%
+        //DYNAINFO(37) 换手率(序列数据,每个周期的数据不同,使用的流通股本为最近数据) 转换成幅度需要乘100 比如DYNAINFO(37)>0.1表示换手超过10%
+        if (dataID==37 || dataID==36)
+        {
+            var value=null;
+            if (IFrameSplitOperator.IsNumber(data)) value=data;
+            else if (IFrameSplitOperator.IsNonEmptyArray(data) && IFrameSplitOperator.IsNumber(data[0])) value=data[0];
+            else return null;
+
+            if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
+           
+            var aryData=[];
+            for(var i=0;i<this.Data.Data.length;++i)
+            {
+                var kItem=this.Data.Data[i];
+                aryData[i]=null;
+                if (!kItem || !IFrameSplitOperator.IsNumber(kItem.Vol)) continue;
+
+                aryData[i]=kItem.Vol/value*100.0;//  换手率
+            }
+
+            return aryData;
+        }
+
+        
+        return data;
+    }
+
+    this.GetDynaCacheData=function(name)
+    {
+        if (MAP_DYNAINFO_SHORTCUT.has(name))
+        {
+            var item=MAP_DYNAINFO_SHORTCUT.get(name);
+            return this.GetLatestCacheData(item.ID);
+        }
 
         return null;
     }
@@ -128246,6 +128366,13 @@ function JSExecute(ast,option)
         ["TR", null], //真实波幅
         ["AUTOFILTER", null],
 
+        ["DYNA_NOW",null],  //DYNA_NOW  现价 DYNAINFO(7) 即时行情数据 没有现价时(比如在开盘前),返回昨收盘价
+        ["DYNA_ZAF",null],  //DYNA_ZAF 涨幅 DYNAINFO(14)  即时行情数据(沪深京早盘竞价期间使用匹配价的涨幅) 转换成幅度需要乘100
+        ["DYNA_LB", null],  //DYNA_LB   DYNAINFO(17)    量比 即时行情数据
+        ["DYNA_ZAS",null],  //DYNA_ZAS  DYNAINFO(24)  返回涨速 报价界面行情数据 转换成幅度需要乘100
+        ["SELLVOL", null], //返回内盘,即DYNAINFO(22) 即时行情数据
+        ["BUYVOL", null],  //返回外盘,即DYNAINFO(21) 即时行情数据
+
         ['LARGEINTRDVOL', null],    //逐笔买入大单成交量,相当于L2_VOL(0,0)+L2_VOL(1,0),沪深京品种的资金流向,仅日线以上周期,用于特定版本
         ['LARGEOUTTRDVOL', null],    //逐笔卖出大单成交量,相当于L2_VOL(0,1)+L2_VOL(1,1),沪深京品种的资金流向,仅日线以上周期,用于特定版本
         ["TRADENUM", null],         //逐笔成交总单数,沪深京品种的资金流向,仅日线以上周期,用于特定版本
@@ -128578,6 +128705,14 @@ function JSExecute(ast,option)
                 return this.SymbolData.WEEKOFYEAR();
             case "DAYSTOTODAY":
                 return this.SymbolData.DAYSTOTODAY();
+
+            case "DYNA_NOW":
+            case "DYNA_ZAF":
+            case "DYNA_LB":
+            case "DYNA_ZAS":
+            case "SELLVOL":
+            case "BUYVOL":
+                return this.SymbolData.GetDynaCacheData(name);
         }
 
         this.ThrowUnexpectedNode(node, '变量'+name+'不存在', name);
@@ -146978,7 +147113,15 @@ function ChartReport()
     { 
         CloseColor:g_JSChartResource.Report.CloseLine.CloseColor,
         YCloseColor:g_JSChartResource.Report.CloseLine.YCloseColor,
-        AreaColor:g_JSChartResource.Report.CloseLine.AreaColor
+        AreaColor:g_JSChartResource.Report.CloseLine.AreaColor,
+
+        UpColor:g_JSChartResource.Report.CloseLine.UpColor,
+        DownColor:g_JSChartResource.Report.CloseLine.DownColor,
+        UnchangeColor:g_JSChartResource.Report.CloseLine.UnchangeColor, 
+
+        UpAreaColor:g_JSChartResource.Report.CloseLine.UpAreaColor,
+        DownAreaColor:g_JSChartResource.Report.CloseLine.DownAreaColor,
+        UnchangeAreaColor:g_JSChartResource.Report.CloseLine.UnchangeAreaColor, 
     }
 
     //K线配置
@@ -147289,6 +147432,7 @@ function ChartReport()
         else if (item.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID)
         {
             if (IFrameSplitOperator.IsBool(item.IsDrawArea)) colItem.IsDrawArea=item.IsDrawArea;
+            if (IFrameSplitOperator.IsNumber(item.LineColorType)) colItem.LineColorType=item.LineColorType;
         }
         else if(item.Type==REPORT_COLUMN_ID.TIME_ID)
         {
@@ -147417,7 +147561,7 @@ function ChartReport()
             { Type:REPORT_COLUMN_ID.VOL_IN_ID, Title:"内盘", TextAlign:"right", TextColor:g_JSChartResource.Report.DownTextColor, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.VOL_OUT_ID, Title:"外盘", TextAlign:"right", TextColor:g_JSChartResource.Report.UpTextColor, Width:null, MaxText:"8888.8擎" },
 
-            { Type:REPORT_COLUMN_ID.CLOSE_LINE_ID, Title:"走势", TextAlign:"center", TextColor:g_JSChartResource.Report.CloseLineColor, Width:null, MaxText:"88888.88888" },
+            { Type:REPORT_COLUMN_ID.CLOSE_LINE_ID, Title:"走势", TextAlign:"center", TextColor:g_JSChartResource.Report.CloseLineColor, Width:null, MaxText:"88888.88888", LineColorType:0 },
 
 
             { Type:REPORT_COLUMN_ID.BUY_VOL_ID, Title:"买量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Vol, Width:null, MaxText:"8888.8擎" },
@@ -150456,8 +150600,7 @@ function ChartReport()
             this.Canvas.setLineDash([]);
         }
 
-        if (lineData.Color) this.Canvas.strokeStyle=lineData.Color;
-        else this.Canvas.strokeStyle=this.CloseLineConfig.CloseColor; 
+        this.Canvas.strokeStyle=this.GetCloseLineColor(lineData, column);
 
         var bFirstPoint=true;
         var ptFirst={}; //第1个点
@@ -150495,8 +150638,7 @@ function ChartReport()
                 this.Canvas.lineTo(x,yCenter);
                 this.Canvas.lineTo(ptFirst.X,yCenter);
                 this.Canvas.closePath();
-                var areaColor=this.CloseLineConfig.AreaColor;
-                if (lineData.AreaColor) areaColor=lineData.AreaColor;
+                var areaColor=this.GetCloseAreaColor(lineData, column);
                 this.SetFillStyle(areaColor,left,top, left,bottom);
                 this.Canvas.fill();
             }
@@ -150505,6 +150647,48 @@ function ChartReport()
         this.Canvas.restore();
     }
 
+    this.GetCloseLineColor=function(lineData, column)
+    {
+        var color=this.CloseLineConfig.CloseColor;
+        if (lineData.Color) 
+        {
+            color=lineData.Color;
+        }
+        else if (column.LineColorType==1)
+        {
+            var color= this.CloseLineConfig.UnchangeColor;
+            if (IFrameSplitOperator.IsNumber(lineData.YClose) && IFrameSplitOperator.IsNonEmptyArray(lineData.Data) && IFrameSplitOperator.IsNumber(lineData.Data[ lineData.Data.length -1 ]))
+            {
+                var lastValue=lineData.Data[ lineData.Data.length -1 ];
+                if (lastValue>lineData.YClose) color=this.CloseLineConfig.UpColor; 
+                else if (lastValue<lineData.YClose) color=this.CloseLineConfig.DownColor; 
+            }
+        }
+
+        return color;
+    }
+
+    this.GetCloseAreaColor=function(lineData, column)
+    {
+        var color=this.CloseLineConfig.AreaColor;
+        if (lineData.AreaColor) 
+        {
+            color=lineData.AreaColor;
+        }
+        else if (column.LineColorType==1)
+        {
+            var color= this.CloseLineConfig.UnchangeAreaColor;
+            if (IFrameSplitOperator.IsNumber(lineData.YClose) && IFrameSplitOperator.IsNonEmptyArray(lineData.Data) && IFrameSplitOperator.IsNumber(lineData.Data[ lineData.Data.length -1 ]))
+            {
+                var lastValue=lineData.Data[ lineData.Data.length -1 ];
+                if (lastValue>lineData.YClose) color=this.CloseLineConfig.UpAreaColor; 
+                else if (lastValue<lineData.YClose) color=this.CloseLineConfig.DownAreaColor; 
+            }
+        }
+
+        return color;
+    }
+
     //klineData={ Data:[ open, high, low, close ] }
     this.DrawKLine=function(klineData, column, rtItem, data)
     {
@@ -150574,7 +150758,31 @@ function ChartReport()
         var distanceWidth=this.KLineConfig.DistanceWidth;
         var xOffset=left;
         var x, xLeft, xRight;
+        var drawCount=0;
         for(var i=0;i<aryKLine.length;++i,xOffset+=(dataWidth+distanceWidth))
+        {
+            xLeft=xOffset;
+            xRight=xOffset+dataWidth;
+            x=xLeft+(xRight-xLeft)/2;
+            if (xRight>right) break;
+            drawCount++;
+        }
+
+        var xOffset=left;
+        var startIndex=0;
+        if (aryKLine.length>drawCount) 
+        {
+            high=null,low=null;
+            startIndex=aryKLine.length-drawCount;
+            for(var i=startIndex;i<aryKLine.length;++i)
+            {
+                var item=aryKLine[i];
+                if (high==null || high<item.High) high=item.High;
+                if (low==null || low>item.Low) low=item.Low;
+            }
+        }
+
+        for(var i=startIndex;i<aryKLine.length;++i,xOffset+=(dataWidth+distanceWidth))
         {
             var item=aryKLine[i];
             xLeft=xOffset;
@@ -150662,7 +150870,11 @@ function ChartReport()
         }
         else
         {
-
+            this.Canvas.beginPath();
+            var xBar=x;
+            this.Canvas.moveTo(ToFixedPoint(xBar),ToFixedPoint(yBarTop));
+            this.Canvas.lineTo(ToFixedPoint(xBar),ToFixedPoint(yBarBottom));
+            this.Canvas.stroke();
         }
     }
 
@@ -155550,7 +155762,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15381";
+var HQCHART_VERSION="1.1.15389";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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