hqchart 1.1.15292 → 1.1.15304

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

@@ -58292,6 +58292,10 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_BASELINE_BAR(data, callback);
     else if (request.Data.indexname=="API_VERTLINE")
         HQData.APIIndex_VERTLINE(data, callback);
+    else if (request.Data.indexname=="API_DRAWTEXT_FIX")
+        HQData.APIIndex_DRAWTEXT_FIX(data, callback);
+    else if (request.Data.indexname=="API_DRAWNUMBER_FIX")
+        HQData.APIIndex_DRAWNUMBER_FIX(data, callback);
 
     else if (request.Data.indexname=="API_ERRORMESSAGE")
         HQData.APIIndex_ErrorMessage(data, callback);
@@ -59987,6 +59991,99 @@ HQData.API_CHART_AREA_TEXT=function(data, callback)
 }
 
 
+HQData.APIIndex_DRAWTEXT_FIX=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var textData= 
+    { 
+        name:'DRAWTEXT_FIX', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWTEXT_FIX', 
+            DrawData: { Value:[], Text:[] },
+            Position:{ X:0.5, Y:0.2, Type:1 }
+        },
+        Color:"rgb(30,144,255)",
+        Font:`italic bold 2.2em "Fira Sans", sans-serif`,
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+
+        if (i%50==1)
+        {
+            textData.Draw.DrawData.Value[i]=1;
+            //textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
+            textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
+        }
+        else
+        {
+            textData.Draw.DrawData.Value[i]=0;
+        }
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[textData] } 
+    };
+
+    console.log('[HQData.APIIndex_PARTLINE] apiData ', apiData);
+    callback(apiData);
+}
+
+HQData.APIIndex_DRAWNUMBER_FIX=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var textData= 
+    { 
+        name:'DRAWNUMBER_FIX', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWNUMBER_FIX', 
+            DrawData: { Value:[], Text:[] },
+            Position:{ X:0.5, Y:0.2, Type:1 }
+        },
+        Color:"rgb(30,144,255)",
+        Font:`italic bold 2.2em "Fira Sans", sans-serif`,
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+
+        if (i%50==1)
+        {
+            textData.Draw.DrawData.Value[i]=1;
+            textData.Draw.DrawData.Text[i]=`${i.toFixed(2)}`
+            //textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
+        }
+        else
+        {
+            textData.Draw.DrawData.Value[i]=0;
+        }
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[textData] } 
+    };
+
+    console.log('[HQData.APIIndex_PARTLINE] apiData ', apiData);
+    callback(apiData);
+}
+
+
 HQData.APIIndex_ErrorMessage=function(data, callback)
 {
     data.PreventDefault=true;

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

@@ -7278,6 +7278,7 @@ var JSCHART_MENU_ID=
     CMD_CORSS_X_TEXTALIGN_ID:61,            //十字光标 底部文字对齐方式
 
     CMD_CHANGE_YRIGHT_TEXT_FORMAT:62,       //分时图主图 右侧刻度格式
+    CMD_ENABLE_ZOOM_Y_ID:63,                //放大缩小Y坐标 { FrameID:, Enable: , Range:{ Max:, Min: }}
 
 
     CMD_REPORT_CHANGE_BLOCK_ID:100,      //报价列表 切换板块ID
@@ -16080,6 +16081,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.ResetFrameXYSplit();
                 this.Draw();
                 break;
+            case JSCHART_MENU_ID.CMD_ENABLE_ZOOM_Y_ID:
+                if (!srcParam) return false;
+                if (this.EnableZoomYCoordinate) this.EnableZoomYCoordinate(srcParam);
+                break;
         }
     }
 
@@ -34758,12 +34763,13 @@ function ChartKLine()
         if (this.TradeIcon) this.DrawTradeIcon()
         else this.DrawTrade();
 
+        if (this.PriceGap.Enable) this.DrawPriceGap();
+
         this.Canvas.restore();
 
         this.UpdateGlobalLatestPoint();
 
         this.DrawPredictionLine();
-        if (this.PriceGap.Enable) this.DrawPriceGap();
 
         if (this.IsShowMaxMinPrice)     //标注最大值最小值
         {
@@ -43808,6 +43814,7 @@ function ChartDrawText_Fix()
         if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
         if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Value) || !IFrameSplitOperator.IsNonEmptyArray(data.Text)) return;
 
+        var splitWord="&";  //内置分隔符
         for(var i=0;i<kData.Data.length;++i)
         {
             var value=data.Value[i];
@@ -43818,6 +43825,18 @@ function ChartDrawText_Fix()
 
             var kItem=kData.Data[i];
             var item={ Value:value, Text:text, Date:kItem.Date, Time:kItem.Time };
+            if (text.includes(splitWord))   //&自动换行
+            {
+                var aryText=[];
+                var aryValue=text.split(splitWord);
+                for(var j=0;j<aryValue.length;++j)
+                {
+                    var value=aryValue[j];
+                    if (value) aryText.push({ Name:value});
+                }
+                if (IFrameSplitOperator.IsNonEmptyArray(aryText)) item.Text=aryText;
+            }
+
             var key=this.BuildKey(item);
 
             /* //测试
@@ -62235,7 +62254,7 @@ function FrameSplitMinuteX()
         width=width/GetDevicePixelRatio();
 
         const minuteCoordinate = g_MinuteCoordinateData;
-        var xcoordinateData = minuteCoordinate.GetCoordinateData(this.Symbol,width);
+        var xcoordinateData = minuteCoordinate.GetCoordinateData(this.Symbol, width, this.Frame.GlobalOption);
         var minuteCount=xcoordinateData.Count;
         var minuteMiddleCount=xcoordinateData.MiddleCount>0? xcoordinateData.MiddleCount: parseInt(minuteCount/2);
         var xcoordinate = xcoordinateData.Data;
@@ -64901,7 +64920,8 @@ function HQMinuteTimeStringFormat()
     this.MultiDayBeforeOpenData;    //多日分时图 盘前数据
     this.MultiDayAfterCloseData;    //多日分时图 收盘数据
 
-    this.GetEventCallback
+    this.GetEventCallback;
+    this.HQChart;
 
     this.GetBeforeOpen=function()
     {
@@ -64999,7 +65019,9 @@ function HQMinuteTimeStringFormat()
         if (this.Frame && this.Frame.MinuteCount) showIndex=index%this.Frame.MinuteCount;
 
         var timeStringData=g_MinuteTimeStringData;
-        var timeData=timeStringData.GetTimeData(this.Symbol);
+        var globalOption=null;
+        if (this.HQChart) globalOption=this.HQChart.GlobalOption;
+        var timeData=timeStringData.GetTimeData(this.Symbol, globalOption);
         if (!timeData) return false;
 
         if (showIndex<0) showIndex=0;
@@ -92382,12 +92404,19 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var bDaySummary=klineChart.DaySummary.Enable;
         var infoPosition=klineChart.InfoPosition;
         var coordinateType=null, yCoordinateType=null;      //坐标类型
+        var bZoomYCoordinate=false;
         var mainFrame=null;
         if (this.Frame.SubFrame[0] && this.Frame.SubFrame[0].Frame) mainFrame=this.Frame.SubFrame[0].Frame;
         if (mainFrame) 
         {
             coordinateType=mainFrame.CoordinateType;
-            if (mainFrame.YSplitOperator) yCoordinateType=mainFrame.YSplitOperator.CoordinateType;
+            if (mainFrame.YSplitOperator) 
+            {
+                yCoordinateType=mainFrame.YSplitOperator.CoordinateType;
+                if (mainFrame.YSplitOperator.FixedYMaxMin && mainFrame.YSplitOperator.EnableZoomUpDown)
+                    bZoomYCoordinate=true;
+            }
+            
         }
 
         var aryKLineInfo=[];    //信息地雷
@@ -92649,6 +92678,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
                     { Name:"显示走完剩余时间", Data:{ ID:JSCHART_MENU_ID.CMD_ENABLE_KLINE_DAY_SUMMARY_ID, Args:[!bDaySummary]}, Checked:bDaySummary},
 
+                    { Name:"拖动Y轴", Data:{ ID:JSCHART_MENU_ID.CMD_ENABLE_ZOOM_Y_ID, Args:[{FrameID:0, Enable:!bZoomYCoordinate }, ]}, Checked:bZoomYCoordinate}, 
+
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
                     { 
                         Name:"鼠标形状", 
@@ -94522,6 +94553,41 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         return false;
     }
+
+    //option={ FrameID:, Enable: }
+    this.EnableZoomYCoordinate=function(option)
+    {
+        if (!option) return false;
+        if (!IFrameSplitOperator.IsNumber(option.FrameID)) return false;
+        if (!IFrameSplitOperator.IsBool(option.Enable)) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return false;
+        if (option.FrameID<0 || option.FrameID>this.Frame.SubFrame.length) return false;
+
+        var item=this.Frame.SubFrame[option.FrameID];
+        if (!item || !item.Frame || !item.Frame.YSplitOperator) return false;
+
+        var frame=item.Frame;
+        var splitOper=frame.YSplitOperator;
+
+        if (option.Enable)
+        {
+             var max=frame.HorizontalMax, min=frame.HorizontalMin;
+            if (!IFrameSplitOperator.IsNumber(max) || !IFrameSplitOperator.IsNumber(min)) return false;
+
+            splitOper.FixedYMaxMin={ Max:max, Min:min };
+            splitOper.EnableZoomUpDown=true;
+            frame.XYSplit=true;
+            this.ChartDragSelectRect.EnableLButton=false;
+        }
+        else
+        {
+            splitOper.FixedYMaxMin=null
+            splitOper.EnableZoomUpDown=false;
+            frame.XYSplit=true;
+        }
+
+        this.Draw();
+    }
 }
 
 //API 返回数据 转化为array[]
@@ -97274,7 +97340,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ChartCorssCursor.PtInClient=(x,y)=>{ return this.PtInClient(x,y); }
         this.ChartCorssCursor.Canvas=this.Canvas;
         this.ChartCorssCursor.StringFormatX=g_DivTooltipDataForamt.Create("CorssCursor_Minute_XStringFormat");
-        this.ChartCorssCursor.StringFormatX.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        this.ChartCorssCursor.StringFormatX.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
+        this.ChartCorssCursor.StringFormatX.HQChart=this;
         this.ChartCorssCursor.StringFormatY=g_DivTooltipDataForamt.Create("CorssCursor_YStringFormat");
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;
@@ -103296,6 +103363,7 @@ function MinuteChartHScreenContainer(uielement)
         this.ChartCorssCursor.Canvas=this.Canvas;
         this.ChartCorssCursor.StringFormatX=g_DivTooltipDataForamt.Create("CorssCursor_Minute_XStringFormat");
         this.ChartCorssCursor.StringFormatX.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        this.ChartCorssCursor.StringFormatX.HQChart=this;
         this.ChartCorssCursor.StringFormatY=g_DivTooltipDataForamt.Create("CorssCursor_YStringFormat");
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY.HQChart=this;
@@ -106932,7 +107000,7 @@ function MinuteTimeStringData()
         return data;
     }
 
-    this.GetTimeData = function (symbol) 
+    this.GetTimeData = function (symbol, option) 
     {
         if (!symbol) return this.SHSZ;
 
@@ -106948,7 +107016,7 @@ function MinuteTimeStringData()
         if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol)) return this.GetUSA(upperSymbol);
         if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
         {
-            var splitData = g_FuturesTimeData.GetSplitData(upperSymbol);
+            var splitData = g_FuturesTimeData.GetSplitData(upperSymbol, option);
             if (!splitData) return null;
             return this.GetFutures(splitData);
         }
@@ -107413,8 +107481,8 @@ function MinuteCoordinateData()
     }
 
     
-
-    this.GetCoordinateData = function (symbol, width) 
+    // option=GlobalOption
+    this.GetCoordinateData = function (symbol, width, option) 
     {
         var data = null;
         if (!symbol) 
@@ -107439,7 +107507,7 @@ function MinuteCoordinateData()
             else if (MARKET_SUFFIX_NAME.IsJP(upperSymbol))
                 data=this.GetJPData(upperSymbol,width);
             else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
-                return this.GetChinatFuturesData(upperSymbol,width);
+                return this.GetChinatFuturesData(upperSymbol, width, option);
             else if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol))
                 data = this.GetUSAData(upperSymbol,width);
             else if (MARKET_SUFFIX_NAME.IsFTSE(upperSymbol))
@@ -107521,9 +107589,9 @@ function MinuteCoordinateData()
         return result;
     }
 
-    this.GetFuturesData = function (upperSymbol,width,timeData)
+    this.GetFuturesData = function (upperSymbol,width,timeData, option)
     {
-        var splitData = timeData.GetSplitData(upperSymbol);
+        var splitData = timeData.GetSplitData(upperSymbol, option);
         if (!splitData) return null;
         var stringData = g_MinuteTimeStringData.GetFutures(splitData);
         if (!stringData) return null;
@@ -107562,9 +107630,9 @@ function MinuteCoordinateData()
         return result;
     }
 
-    this.GetChinatFuturesData=function(upperSymbol,width)
+    this.GetChinatFuturesData=function(upperSymbol, width, option)
     {
-        return this.GetFuturesData(upperSymbol,width, g_FuturesTimeData);
+        return this.GetFuturesData(upperSymbol,width, g_FuturesTimeData, option);
     }
 
     this.GetNYMEXData=function(upperSymbol,width)
@@ -108370,7 +108438,7 @@ function FuturesTimeData()
         }
     }
 
-    this.GetData=function(upperSymbol)
+    this.GetData=function(upperSymbol, option)
     {
         var oneWord = upperSymbol.charAt(0);
         var twoWords = upperSymbol.substr(0,2);
@@ -108415,9 +108483,9 @@ function FuturesTimeData()
         return null;
     }
 
-    this.GetSplitData = function (upperSymbol)
+    this.GetSplitData = function (upperSymbol, option)
     {
-        var data=this.GetData(upperSymbol);
+        var data=this.GetData(upperSymbol, option);
         if (!data) return null;
 
         return this.TIME_SPLIT[data.Time];
@@ -136240,14 +136308,14 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             var indexData=[];
             var outVarItem={Name:item.name,Type:item.type};
             if (item.color) outVarItem.Color=item.color;
+            else if (item.Color) outVarItem.Color=item.Color;
             if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle;  //是否显示指标标题
             if (IFrameSplitOperator.IsNumber(item.DrawVAlign)) outVarItem.DrawVAlign = item.DrawVAlign;
             if (IFrameSplitOperator.IsNumber(item.DrawAlign)) outVarItem.DrawAlign = item.DrawAlign;
+            if (item.Font) outVarItem.Font=item.Font;
             if (item.data) 
             {
                 outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);
-
-                if (item.color) outVarItem.Color=item.color;
                 if (item.linewidth) outVarItem.LineWidth=item.linewidth; 
                 if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow;  //是否绘制线段
                 if (item.isexdata==true) outVarItem.IsExData = true;
@@ -136287,6 +136355,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTEXT_FIX" || draw.DrawType=="DRAWNUMBER_FIX")
+                {
+                    drawItem.Text=draw.Text;
+                    drawItem.Name=draw.Name;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData={ Value:null, Text:null };
+                    drawItem.DrawData.Value=this.FittingArray(draw.DrawData.Value,date,time,hqChart);
+                    drawItem.DrawData.Text=this.FittingArray(draw.DrawData.Text,date,time,hqChart);
+                    drawItem.Position=draw.Position;
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=="VERTLINE") //竖线
                 {
                     drawItem.Text=draw.Text;
@@ -166990,7 +167070,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15291";
+var HQCHART_VERSION="1.1.15303";
 
 function PrintHQChartVersion()
 {