hqchart 1.1.15273 → 1.1.15299

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

@@ -58292,6 +58292,8 @@ 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_ERRORMESSAGE")
         HQData.APIIndex_ErrorMessage(data, callback);
@@ -59987,6 +59989,52 @@ 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}`;
+        }
+        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)     //标注最大值最小值
         {
@@ -44206,7 +44212,8 @@ function ChartDrawText()
 
     this.ClassName='ChartDrawText';         //类名
     this.Color="rgb(255,193,37)";           //线段颜色
-    this.TextFont="14px 微软雅黑";           //线段宽度
+    this.Font;                              //固定字体
+    this.TextFont="14px 微软雅黑";           //输出使用的字体
     this.TextBaseline="middle";
     this.TextAlign='left';
     this.Text
@@ -44281,8 +44288,9 @@ function ChartDrawText()
         var isArrayText=Array.isArray(this.Text);
         var drawTextInfo={ Text:{ Color:this.Color, Align:this.TextAlign, Baseline:this.TextBaseline }, Font:{ } };
         
-
-        if (this.FixedFontSize>0)  //固定字体大小模式
+        if (this.Font) 
+            this.TextFont=this.Font; 
+        else if (this.FixedFontSize>0)  //固定字体大小模式
             this.TextFont=`${this.FixedFontSize}px ${this.TextSize.FontName}`;
         else    //动态字体大小
             this.TextFont=this.GetDynamicFont(dataWidth,distanceWidth,this.TextSize.Max,this.TextSize.Min,this.TextSize.Zoom,this.TextSize.FontName);
@@ -53132,6 +53140,7 @@ function KLineTooltipPaint()
     this.ExtendLineWidth=2;
 
     this.Font=[g_JSChartResource.TooltipPaint.TitleFont];
+    
 
     this.HQChart;
     this.KLineTitlePaint;
@@ -53251,6 +53260,8 @@ function KLineTooltipPaint()
                 lineWidth+=textWidth;
             }
 
+            if (IFrameSplitOperator.IsNumber(item.Space)) lineWidth+=item.Space;
+
             if (maxLineWidth<lineWidth) maxLineWidth=lineWidth;
 
             height+=this.LineHeight;
@@ -53442,20 +53453,33 @@ function KLineTooltipPaint()
         {
             var item=titleData.AryText[i];
 
+            var titleWidth=0;
             if (item.Title)
             {
                 this.Canvas.textAlign="left";
                 this.Canvas.fillStyle=item.TitleColor;
                 this.Canvas.fillText(item.Title,left,top);
+                var titleWidth=this.Canvas.measureText(item.Title).width+2;
             }
 
             if (item.Text)
             {
-                this.Canvas.textAlign="right";
-                this.Canvas.fillStyle=item.Color;
-                this.Canvas.fillText(item.Text,right,top);
+                if (item.TextAlign==1)  //1=左对齐 0=右对齐
+                {
+                    var yText=left+titleWidth+2;
+                    if (IFrameSplitOperator.IsNumber(item.Space)) yText+=item.Space; //标题和数据内容间距
+                    this.Canvas.textAlign="left";
+                    this.Canvas.fillStyle=item.Color;
+                    this.Canvas.fillText(item.Text,yText,top);
+                }
+                else
+                {
+                    this.Canvas.textAlign="right";
+                    this.Canvas.fillStyle=item.Color;
+                    this.Canvas.fillText(item.Text,right,top);
+                }
             }
-
+                
             top+=this.LineHeight+this.LineSpace;
         }
 
@@ -57623,6 +57647,8 @@ function LatestPointFlashPaint()
     this.ClassName='LatestPointFlashPaint';
     this.HQChart;
 
+    this.FlashType=0;   //0=数据更新了闪烁, 1=一直显示
+    //闪烁
     this.Status=0;
     this.UpdateTime=new Date();
     this.FlashCount=0;  //闪烁次数
@@ -57647,6 +57673,7 @@ function LatestPointFlashPaint()
         if (option)
         {
             if (IFrameSplitOperator.IsNumber(option.Frequency)) this.Frequency=option.Frequency;
+            if (IFrameSplitOperator.IsNumber(option.FlashType)) this.FlashType=option.FlashType;
         }
     }
 
@@ -57681,18 +57708,32 @@ function LatestPointFlashPaint()
         if (!this.HQChart) return;
         this.HQChart.ClearCanvas(this.FlashCanvas);
 
-        if (this.FlashCount<=0) return;
-        if (this.IsStatusChange())
+        if (this.FlashType===1)
+        {
+
+        }
+        else
         {
-            this.Status=(this.Status+1)%2;
-            --this.FlashCount;
+            if (this.FlashCount<=0) return;
+            if (this.IsStatusChange())
+            {
+                this.Status=(this.Status+1)%2;
+                --this.FlashCount;
+            }
+            if (this.Status==0) return;
         }
+        
+
 
-        if (this.Status==0) return;
         if (!this.HQChart.GlobalOption || !this.HQChart.GlobalOption.LatestPoint) return;
         var point=this.HQChart.GlobalOption.LatestPoint;
         if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
 
+        this.DrawPoint(point);
+    }
+
+    this.DrawPoint=function(point)
+    {
         if (this.Style==1) this.GetChartColor();
 
         this.FlashCanvas.fillStyle=this.BGColor;
@@ -62200,7 +62241,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;
@@ -64866,7 +64907,8 @@ function HQMinuteTimeStringFormat()
     this.MultiDayBeforeOpenData;    //多日分时图 盘前数据
     this.MultiDayAfterCloseData;    //多日分时图 收盘数据
 
-    this.GetEventCallback
+    this.GetEventCallback;
+    this.HQChart;
 
     this.GetBeforeOpen=function()
     {
@@ -64964,7 +65006,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;
@@ -82826,7 +82870,7 @@ function JSChartResource()
     //虚线配置
     this.DOTLINE=
     {
-        LineDash:[3,5]  //虚线配置
+        LineDash:[2*GetDevicePixelRatio(),2*GetDevicePixelRatio()]  //虚线配置
     }
 
     this.DRAWSL=
@@ -92347,12 +92391,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=[];    //信息地雷
@@ -92614,6 +92665,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:"鼠标形状", 
@@ -94487,6 +94540,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[]
@@ -97239,7 +97327,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;
@@ -103261,6 +103350,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;
@@ -106897,7 +106987,7 @@ function MinuteTimeStringData()
         return data;
     }
 
-    this.GetTimeData = function (symbol) 
+    this.GetTimeData = function (symbol, option) 
     {
         if (!symbol) return this.SHSZ;
 
@@ -106913,7 +107003,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);
         }
@@ -107378,8 +107468,8 @@ function MinuteCoordinateData()
     }
 
     
-
-    this.GetCoordinateData = function (symbol, width) 
+    // option=GlobalOption
+    this.GetCoordinateData = function (symbol, width, option) 
     {
         var data = null;
         if (!symbol) 
@@ -107404,7 +107494,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))
@@ -107486,9 +107576,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;
@@ -107527,9 +107617,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)
@@ -108335,7 +108425,7 @@ function FuturesTimeData()
         }
     }
 
-    this.GetData=function(upperSymbol)
+    this.GetData=function(upperSymbol, option)
     {
         var oneWord = upperSymbol.charAt(0);
         var twoWords = upperSymbol.substr(0,2);
@@ -108380,9 +108470,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];
@@ -120228,6 +120318,17 @@ function JSDraw(errorHandler,symbolData)
         let bSecondPont=false;
         let lineCache={Start:{ },End:{ }, List:new Array()};
 
+        function CopyLineData(aryDest, arySrc)
+        {
+            if (!IFrameSplitOperator.IsNonEmptyArray(arySrc)) return;
+
+            for(var j=0; j<arySrc.length; ++j)
+            {
+                var item=arySrc[j];
+                aryDest[item.ID]=item.Value;
+            }
+        }
+
         for(let i=0;i<count;++i)
         {
             drawData[i]=null;
@@ -120254,6 +120355,16 @@ function JSDraw(errorHandler,symbolData)
                     {
                         bSecondPont=true;
                         lineCache.End={ID:i, Value:data2[i]};   //第2个点
+                        
+                        if (condition[i])
+                        {
+                            var lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+                            CopyLineData(drawData,lineData);
+
+                            bFirstPoint=true;
+                            bSecondPont=false;
+                            lineCache.Start={ID:i, Value:data[i]};  //第1个点
+                        }
                     }
                 }
                 else if (bFirstPoint==true && bSecondPont==true)
@@ -120265,13 +120376,8 @@ function JSDraw(errorHandler,symbolData)
                     }
                     else if (condition[i])  //条件1满足
                     {
-                        let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
-
-                        for(let j in lineData)
-                        {
-                            let item=lineData[j];
-                            drawData[item.ID]=item.Value;
-                        }
+                        var lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+                        CopyLineData(drawData,lineData);
 
                         if (expand==1) this.CalculateDrawDataExtendLine(drawData, lineCache.Start.ID-2);//右延长线
 
@@ -120288,12 +120394,9 @@ function JSDraw(errorHandler,symbolData)
             //最后一组线
             if (bFirstPoint==true && bSecondPont==true)
             {
-                let lineData=this.CalculateDrawLine(lineCache);     
-                for(let j in lineData)
-                {
-                    let item=lineData[j];
-                    drawData[item.ID]=item.Value;
-                }
+                var lineData=this.CalculateDrawLine(lineCache);     
+                CopyLineData(drawData,lineData);
+
             }
         }
 
@@ -120810,7 +120913,13 @@ function JSDraw(errorHandler,symbolData)
     {
         if (!numberData) return null;
 
-        if (numberData.DataType==1) return numberData.SingleValue;
+        if (numberData.DataType==1) 
+        {
+            var value=numberData.SingleValue;
+            if (IFrameSplitOperator.IsNumber(value)) return value.toFixed(decimal);
+            else if (value) return value.toString();
+            else return null;
+        }
 
         if (!IFrameSplitOperator.IsNonEmptyArray(numberData.ArrayValue)) return null;
 
@@ -121196,6 +121305,12 @@ function JSDraw(errorHandler,symbolData)
         return rgba;
     }
 
+    //设置字体
+    this.CSSFONT=function(strFont)
+    {
+        return strFont;
+    }
+
     this.UPCOLOR=function(color)
     {
         return color;
@@ -128241,6 +128356,7 @@ function JSExecute(ast,option)
                 let xOffset=null, yOffset=null;
                 var klineType=null;
                 var lineDash=null;
+                var font=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
                     let itemExpression=item.Expression.Expression[j];
@@ -128357,6 +128473,10 @@ function JSExecute(ast,option)
                             {
                                 downColor=itemExpression.Out;
                             }
+                            else if (itemExpression.Callee.Name=="CSSFONT")
+                            {
+                                font=itemExpression.Out;
+                            }
                             else if (itemExpression.Callee.Name=="STICKTYPE")
                             {
                                 stickType=itemExpression.Out;
@@ -128559,6 +128679,7 @@ function JSExecute(ast,option)
                     if (drawAlign>=0) outVar.DrawAlign=drawAlign;
                     if (drawVAlign>=0) outVar.DrawVAlign=drawVAlign;
                     if (fontSize>0) outVar.DrawFontSize=fontSize;
+                    if (font) outVar.Font=font;
                     if (bgConfig) outVar.Background=bgConfig;
                     if (vLineConfig) outVar.VerticalLine=vLineConfig;
                     if (IFrameSplitOperator.IsNumber(xOffset)) outVar.XOffset=xOffset;
@@ -129059,6 +129180,9 @@ function JSExecute(ast,option)
             case "DOWNCOLOR":
                 node.Out=this.Draw.DOWNCOLOR(args[0]);
                 break;
+            case "CSSFONT":
+                node.Out=this.Draw.CSSFONT(args[0]);
+                break;
             case "STICKTYPE":   //柱子类型
                 node.Out=this.Draw.STICKTYPE(args[0]);
                 break;
@@ -131773,6 +131897,7 @@ function ScriptIndex(name,script,args,option)
         }
 
         if (varItem.DrawFontSize>0) chartText.FixedFontSize=varItem.DrawFontSize;
+        if (varItem.Font) chartText.Font=varItem.Font;
         if (varItem.Background) chartText.TextBG=varItem.Background;
         if (varItem.VerticalLine) chartText.VerticalLine=varItem.VerticalLine;
 
@@ -131928,6 +132053,12 @@ function ScriptIndex(name,script,args,option)
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
             if (!isNaN(width) && width>0) line.LineWidth=width;
         }
+
+        if (varItem.IsDotLine) 
+        {
+            line.IsDotLine=true; //虚线
+            line.LineDash=g_JSChartResource.DOTLINE.LineDash.slice();
+        }
         
         let titleIndex=windowIndex+1;
         line.Data.Data=varItem.Draw.DrawData;
@@ -134162,6 +134293,7 @@ function OverlayScriptIndex(name,script,args,option)
         }
 
         if (varItem.DrawFontSize>0) chartText.FixedFontSize=varItem.DrawFontSize;
+        if (varItem.Font) chartText.Font=varItem.Font;
         if (varItem.Background) chartText.TextBG=varItem.Background;
         if (varItem.VerticalLine) chartText.VerticalLine=varItem.VerticalLine;
         if (IFrameSplitOperator.IsNumber(varItem.XOffset)) chartText.ShowOffset.X=varItem.XOffset;
@@ -134360,6 +134492,12 @@ function OverlayScriptIndex(name,script,args,option)
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
             if (!isNaN(width) && width>0) chart.LineWidth=width;
         }
+
+        if (varItem.IsDotLine) 
+        {
+            chart.IsDotLine=true; //虚线
+            chart.LineDash=g_JSChartResource.DOTLINE.LineDash.slice();
+        }
         
         let titleIndex=windowIndex+1;
         chart.Data.Data=varItem.Draw.DrawData;
@@ -136157,14 +136295,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;
@@ -136204,6 +136342,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTEXT_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;
@@ -166907,7 +167057,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15272";
+var HQCHART_VERSION="1.1.15298";
 
 function PrintHQChartVersion()
 {