hqchart 1.1.13911 → 1.1.13921

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

@@ -4898,6 +4898,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
             if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
             if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
+            if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
         }
 
         if (option.MinuteInfo) chart.CreateMinuteInfo(option.MinuteInfo);
@@ -9380,6 +9381,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DrawDrawPictureXYCoordinate(); //绘制画图工具 X,Y轴刻度信息
         
+        var bDrawDialogTooltip=false;
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
         if (this.LastPoint.X!=null || this.LastPoint.Y!=null)
         {
@@ -9424,7 +9426,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.ChartCorssCursor.Canvas=this.Canvas;
                 }
 
-                this.DrawTooltipDialog();
+                bDrawDialogTooltip=true;
             }
 
             ptPosition=this.Frame.PtInFrame(this.LastPoint.X, this.LastPoint.Y);
@@ -9505,6 +9507,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var frame=this.LastMouseStatus.MouseOnToolbar.Frame;
             if (frame && frame.DrawToolbarTooltip) frame.DrawToolbarTooltip(this.LastMouseStatus.MouseOnToolbar);
         }
+
+
+        if (bDrawDialogTooltip) this.DrawTooltipDialog();
        
         //发送图形状态给外部
         if (this.mapEvent.has(JSCHART_EVENT_ID.CHART_STATUS))
@@ -9830,7 +9835,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         this.DrawDrawPictureXYCoordinate();
-
+        var bDrawDialogTooltip=false;
         if (this.ChartCorssCursor)
         {
             this.ChartCorssCursor.LastPoint=this.LastPoint;
@@ -9875,7 +9880,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.ChartCorssCursor.Canvas=this.Canvas;
             }
 
-            this.DrawTooltipDialog();
+            bDrawDialogTooltip=true;
         }
 
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
@@ -9970,6 +9975,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.OffscreenToShowCanvas();
 
+        if (bDrawDialogTooltip) this.DrawTooltipDialog();
+
         ++this.TouchDrawCount;
     }
 
@@ -36956,7 +36963,8 @@ function ChartVolStick()
     this.ClassName='ChartVolStick';
 
     this.BarWidth;                  //固定宽度 目前只支持宽度为1
-    this.BarType;                   //柱子状态 1=实心 0=空心 2=涨实跌空 如果设置了这个属性， 属性KLineDrawType无效
+    this.BarType;                   //柱子状态 1=实心 0=空心 2=涨实跌空 如果设置了这个属性， 属性KLineDrawType无效 
+    this.BarColorType=0;            //0=柱子颜色跟K线走  1=正upcolor 负downcolor
     this.PtInChart=this.PtInBar;
     this.DrawSelectedStatus=this.DrawLinePoint;
 
@@ -37003,7 +37011,7 @@ function ChartVolStick()
                 if (right>chartright) break;
 
                 var y=this.ChartFrame.GetYFromData(value);
-                var barColor=this.GetBarColor(kItem);
+                var barColor=this.GetBarColor(kItem,value);
                 var bUp=barColor.IsUp;
                 
                    
@@ -37051,7 +37059,7 @@ function ChartVolStick()
                 if (x>chartright) break;
 
                 if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                else barColor=this.GetBarColor(kItem);
+                else barColor=this.GetBarColor(kItem, value);
                 
                 this.Canvas.strokeStyle=barColor.Color;
                 
@@ -37096,7 +37104,7 @@ function ChartVolStick()
                 if (right>chartBottom) break;
 
                 var y=this.ChartFrame.GetYFromData(value);
-                var barColor=this.GetBarColor(kItem);
+                var barColor=this.GetBarColor(kItem, value);
                 var bUp=barColor.IsUp;
                 
                 var height=ToFixedRect(y-yBottom);  //高度调整为整数
@@ -37142,7 +37150,7 @@ function ChartVolStick()
                 if (x>chartBottom) break;
 
                 if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                else barColor=this.GetBarColor(kItem);
+                else barColor=this.GetBarColor(kItem,value);
 
                 var bUp=barColor.IsUp;
                 this.Canvas.strokeStyle=barColor.Color;
@@ -37182,8 +37190,14 @@ function ChartVolStick()
         return range;
     }
 
-    this.GetBarColor=function(kItem)
+    this.GetBarColor=function(kItem, value)
     {
+        if (this.BarColorType===1)  //更具正负决定柱子颜色
+        {
+            if (value>=0) return { Color:this.UpColor, IsUp:true };  //颜色, 是否是上涨
+            else return { Color:this.DownColor, IsUp:false };
+        }
+
         if (kItem.Close>=kItem.Open) return { Color:this.UpColor, IsUp:true };  //颜色, 是否是上涨
         else return { Color:this.DownColor, IsUp:false };
     }
@@ -46177,7 +46191,7 @@ function KLineTooltipPaint()
         }
 
         if (this.HQChart.CurrentChartDrawPicture) return false;   //画图工具操作的时候 不显示
-
+       
         return true;
     }
 
@@ -47009,6 +47023,8 @@ function MinuteLeftTooltipPaint()
         var pt=this.HQChart.LastPoint;
         if (!pt) return false;
 
+        if (this.HQChart.ChartCorssCursor && !this.HQChart.ChartCorssCursor.IsShowCorss) return false;
+
         return this.HQChart.IsMouseOnClient(pt.X, pt.Y);
     }
 
@@ -72922,7 +72938,7 @@ function JSChartResource()
         AmountColor:"rgb(79, 79, 79)",      //成交金额
         DateTimeColor:'rgb(60,60,60)',
         TurnoverRateColor:'rgb(43,54,69)',       //换手率
-        PositionColor:"rgb(43,54,69)"            //持仓
+        PositionColor:"rgb(255,0,255)"            //持仓
     }
 
     //弹幕
@@ -74863,7 +74879,7 @@ function JSChartLocalization()
         ['DivTooltip-Amount', {CN:'金额:', EN:'Amount:', TC:'金額'}],
         ['DivTooltip-Exchange', {CN:'换手:', EN:'Exchange:', TC:'換手'}],
         ['DivTooltip-Position', {CN:'持仓:', EN:'Position:', TC:'持倉'}],
-        ['DivTooltip-Price', {CN:'价格:', EN:'Open:', TC:'價格'}],
+        ['DivTooltip-Price', {CN:'价格:', EN:'Price:', TC:'價格'}],
 
         ['DialogTooltip-Date', {CN:'日期', EN:'Date', TC:'日期'}],
         ['DialogTooltip-Time', {CN:'时间', EN:'Time', TC:'時間'}],
@@ -74872,12 +74888,18 @@ function JSChartLocalization()
         ['DialogTooltip-Low', {CN:'最低价', EN:'Low', TC:'最低價'}],
         ['DialogTooltip-Close', {CN:'收盘价', EN:'Close', TC:'收盤價'}],
         ['DialogTooltip-Increase', {CN:'涨幅', EN:'Increase', TC:'漲幅'}],
+        ['DialogTooltip-Risefall', {CN:'涨跌', EN:'Risefall', TC:'漲跌'}],
         ['DialogTooltip-Vol', {CN:'成交量', EN:'Volume', TC:'數量'}],
         ['DialogTooltip-Amount', {CN:'成交额', EN:'Amount', TC:'金額'}],
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
-        ['DialogTooltip-Price', {CN:'价格', EN:'Open', TC:'價格'}],
+        ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['DialogTooltip-YClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
         ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
+        ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
+        ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
+        ['DialogTooltip-AC-Increase', {CN:'竞价涨幅', EN:'Increase', TC:'競價漲幅'}],
+        ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
 
         //走势图PC tooltip
         ['PCTooltip-Date', {CN:'日期', EN:'Date', TC:"日期"}],
@@ -84881,6 +84903,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         var keyID = e.keyCode ? e.keyCode :e.which;
 
+        var draw=false;
+        if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
+        {
+            var sendData={ e:e, KeyID:keyID, Draw:false, PreventDefault:false };
+            this.ChartCorssCursor.OnKeyDown(sendData);
+            draw=sendData.Draw;
+        }
+
         switch(keyID)
         {
             case 37: //left
@@ -84986,10 +85016,20 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     this.ChartOperator(option);
                 }
                 break;
+            case 27:
+                if (this.CurrentChartDrawPicture)
+                {
+                    var drawPicture=this.CurrentChartDrawPicture;
+                    if (drawPicture.Status!=20) //画布移动的时候不能取消
+                        this.CurrentChartDrawPicture=null;
+                }
+                break;
             default:
                 return;
         }
 
+        if (draw) this.DrawDynamicInfo();
+
         //不让滚动条滚动
         if(e.preventDefault) e.preventDefault();
         else e.returnValue = false;
@@ -88936,6 +88976,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return null;
     }
+
+    this.DrawTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return;
+
+        this.UpdateTooltipDialog();
+    }
+
+    this.UpdateTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return false;
+        if (!this.ChartCorssCursor) return false;
+
+        var minuteItem=null;    //{ Type:0=连续交易 1=集合竞价, Data:数据 }
+        if (this.ChartCorssCursor.ClientPos>=0)
+        {
+            var titlePaint=this.TitlePaint[0];
+            if (titlePaint && titlePaint.PointInfo)
+            {
+                var pointInfo=titlePaint.PointInfo;
+                if ((pointInfo.ClientPos==2 || pointInfo.ClientPos==3 ||  (pointInfo.ClientPos>=200&& pointInfo.ClientPos<=299) || (pointInfo.ClientPos>=300&& pointInfo.ClientPos<=399)))
+                {
+                    var auctionData=titlePaint.GetCurrentAuctionData();
+                    if (!auctionData) return;
+                    minuteItem={ Type:1, Data:auctionData };
+                }
+                else
+                {
+                    var minuteData=titlePaint.GetCurrentKLineData();
+                    if (!minuteData) return;
+                    minuteItem={ Type:0, Data:minuteData };
+                }
+            }
+            
+        }
+
+        var sendData=
+        { 
+            ClientPos:this.ChartCorssCursor.ClientPos,  //位置
+            IsShowCorss:this.ChartCorssCursor.IsShowCorss,  //是否显示十字线
+            MinItem:minuteItem, 
+            Symbol:this.Symbol, Name:this.Name,
+        };
+
+
+        this.DialogTooltip.Update(sendData);
+
+        return true;
+    }
 }
 
 //盘前数据
@@ -120116,6 +120205,7 @@ function ScriptIndex(name,script,args,option)
         if (varItem.UpColor) chart.UpColor=varItem.UpColor;
         if (varItem.DownColor) chart.DownColor=varItem.DownColor;
         if (IFrameSplitOperator.IsNumber(varItem.StickType)) chart.BarType=varItem.StickType;
+        if (IFrameSplitOperator.IsNumber(varItem.BarColorType)) chart.BarColorType=varItem.BarColorType;
         if (varItem.LineWidth) 
         {
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
@@ -120127,9 +120217,21 @@ function ScriptIndex(name,script,args,option)
         chart.HistoryData=hisData;
         this.ReloadChartResource(hqChart,windowIndex,chart);
 
-        var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
-        hqChart.TitlePaint[titleIndex].Data[id]=titleData;
-        this.SetTitleData(titleData,chart);
+        if (varItem.IsShowTitle===false)    //NOTEXT 不绘制标题
+        {
+
+        }
+        else if (IFrameSplitOperator.IsString(varItem.Name) && varItem.Name.indexOf("NOTEXT")==0) //标题中包含NOTEXT不绘制标题
+        {
+
+        }
+        else
+        {
+            var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
+            hqChart.TitlePaint[titleIndex].Data[id]=titleData;
+            this.SetTitleData(titleData,chart);
+        }
+        
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
@@ -122075,6 +122177,7 @@ function OverlayScriptIndex(name,script,args,option)
         if (varItem.UpColor) chart.UpColor=varItem.UpColor;
         if (varItem.DownColor) chart.DownColor=varItem.DownColor;
         if (IFrameSplitOperator.IsNumber(varItem.StickType)) chart.BarType=varItem.StickType;
+        if (IFrameSplitOperator.IsNumber(varItem.BarColorType)) chart.BarColorType=varItem.BarColorType;
         if (varItem.LineWidth) 
         {
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
@@ -123503,6 +123606,8 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                 if (IFrameSplitOperator.IsBool(item.isDotLine)) outVarItem.IsDotLine = item.isDotLine;
                 if (IFrameSplitOperator.IsNonEmptyArray(item.lineDash)) outVarItem.LineDash=item.lineDash;
                 if (IFrameSplitOperator.IsBool(item.isSingleLine))  outVarItem.IsSingleLine=item.isSingleLine;
+                if (IFrameSplitOperator.IsNumber(item.StickType)) outVarItem.StickType=item.StickType;
+                if (IFrameSplitOperator.IsNumber(item.BarColorType)) outVarItem.BarColorType=item.BarColorType;
 
                 result.push(outVarItem);
             }
@@ -125245,7 +125350,7 @@ function GetBlackStyle()
             AmountColor:"rgb(210,210,210)",      //成交金额
             DateTimeColor:'rgb(210,210,210)',
             TurnoverRateColor:'rgb(43,54,69)',       //换手率
-            PositionColor:"rgb(43,54,69)"            //持仓
+            PositionColor:"rgb(255,0,255)"            //持仓
         },
         
         //走势图 信息地雷
@@ -138689,7 +138794,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13910";
+var HQCHART_VERSION="1.1.13920";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -56000,7 +56000,7 @@ HQData.RequestMinuteRealtimeData=function(data,callback)
 
         //生成随机测试数据
         var price=kItem[5];
-        var value=Math.ceil(Math.random()*10)/10000*price;
+        var value=Math.ceil(Math.random()*10)/5000*price;
         var bUp=Math.ceil(Math.random()*10)>=5;
         
         if (bUp) price+=value;
@@ -56863,6 +56863,8 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
         arySymbol.push(symbolItem);
     }
 
+    arySymbol.push( { Symbol:"ICL8.cfe", Name:"中证主连", ShortSymbol:"ICL8", Spell:"ICL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"ICL8.cfe", Type:0 }  } );
+
     arySymbol.push( { Symbol:"01", Name:"分时成交明细", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" , Data:{ PageName:"分时成交明细", Type:2 }} );
     arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
     arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
@@ -56871,6 +56873,13 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
     arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)",Data:{ Index:"RSI", Type:1 }}  );
     arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MA", Type:1 } } );
     arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"BOLL", Type:1 } } );
+    arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KD", Type:1 } } );
+    arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MARSI", Type:1 } } );
+    arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"VMACD", Type:1 } } );
+    arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"AMO", Type:1 } } );
+    arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
     
     callback(arySymbol);
 }
@@ -56953,6 +56962,9 @@ HQData.GetDayKLineDataBySymbol=function(symbol)
         case "399006.sz":
             data=SZ_399006_DAY_KLINE;
             break;
+        case "ICL8.cfe":
+            data=CFE_ICL8_DAY_KLINE;
+            break;
         default:
             data=SZ_000001_DAY_KLINE;
             break;