hqchart 1.1.15364 → 1.1.15375

package/src/jscommon/umychart.complier.js

@@ -7544,6 +7544,32 @@ function JSAlgorithm(errorHandler,symbolData)
         return result;
     }
 
+    //VARCAT6(A,B,C,D,E,F):将六个字符串A,B,C,D,E,F相加成一个字符串.
+    //每个数据都进行序列运算,若用于多股选股,建议换用STRCAT6
+    //用法: VARCAT6('多头',VAR2STR(C,2),' ',VAR2STR(O,2),' ',VAR2STR(MA(C,5),2))将六个字符串相加成一个字符串
+    this.VARCAT6=function(data,data2,data3,data4,data5)
+    {
+        var aryData=[];
+        if (Array.isArray(data) || IFrameSplitOperator.IsString(data)) aryData.push(data);
+        if (Array.isArray(data2) || IFrameSplitOperator.IsString(data2)) aryData.push(data2);
+        if (Array.isArray(data3) || IFrameSplitOperator.IsString(data3)) aryData.push(data3);
+        if (Array.isArray(data4) || IFrameSplitOperator.IsString(data4)) aryData.push(data4);
+        if (Array.isArray(data5) || IFrameSplitOperator.IsString(data5)) aryData.push(data5);
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryData)) return [];
+        if (aryData.length==1) return data;
+
+        var tempData=this.VARCAT(aryData[0], aryData[1]);
+        var result=tempData;
+        for(var i=2;i<aryData.length;++i)
+        {
+            result=this.VARCAT(tempData,aryData[i]);
+            tempData=result;
+        }
+
+        return result;
+    }
+
     //FINDSTR(A,B):在字符串A中查找字符串B,如果找到返回1,否则返回0.
     //用法: FINDSTR('多头开仓','开仓')在字符串'多头开仓'中查找字符串'开仓',返回1
     this.FINDSTR=function(data, data2)
@@ -7670,6 +7696,8 @@ function JSAlgorithm(errorHandler,symbolData)
     this.VAR2STR=function(data,n)
     {
         var result=[];
+        var dec=0;
+        if (IFrameSplitOperator.IsNumber(n)) dec=n;
         if (Array.isArray(data))
         {
             for(var i=0;i<data.length;++i)
@@ -7677,13 +7705,13 @@ function JSAlgorithm(errorHandler,symbolData)
                 result[i]=null;
                 var item=data[i];
                 if (this.IsNumber(item))
-                    result[i]=item.toFixed(n);
+                    result[i]=item.toFixed(dec);
             }
         }
         else
         {
             if (this.IsNumber(data))
-                result=data.toFixed(n);
+                result=data.toFixed(dec);
         }
 
         return result;
@@ -9395,6 +9423,8 @@ function JSAlgorithm(errorHandler,symbolData)
                 return this.VAR2STR(args[0], args[1]);
             case "VARCAT":
                 return this.VARCAT(args[0], args[1]);
+            case "VARCAT6":
+                return this.VARCAT6(args[0], args[1],args[2], args[3],args[4], args[5]);
             case "STRSPACE":
                 return this.STRSPACE(args[0]);
             case "FINDSTR":
@@ -9607,7 +9637,8 @@ function JSDraw(errorHandler,symbolData)
         var drawData=[];
         var result={ DrawData:drawData, DrawType:'DRAWFLAGTEXT' };
         if (!text) return result;
-
+        var bArrayText=Array.isArray(text); //是否是数组字符串
+        
         if (Array.isArray(condition))
         {
             if (condition.length<=0) return result;
@@ -9618,14 +9649,18 @@ function JSDraw(errorHandler,symbolData)
                 drawData[i]=null;
     
                 if (isNaN(condition[i]) || !condition[i]) continue;
+
+                var outText=null;
+                if (!bArrayText) outText=text;
+                else if (bArrayText && text[i]) outText=text[i];
     
                 if (bSinglePrice) 
                 {
-                    drawData[i]={ YValue:price, Text:text };
+                    drawData[i]={ YValue:price, Text:outText };
                 }
                 else 
                 {
-                    if (IFrameSplitOperator.IsNumber(price[i])) drawData[i]={ YValue:price[i], Text:text };
+                    if (IFrameSplitOperator.IsNumber(price[i])) drawData[i]={ YValue:price[i], Text:outText };
                 }
             }
         }
@@ -9634,13 +9669,17 @@ function JSDraw(errorHandler,symbolData)
             var bSinglePrice=IFrameSplitOperator.IsNumber(price);
             for(var i=0;i<this.SymbolData.Data.Data.length;++i)
             {
+                var outText=null;
+                if (!bArrayText) outText=text;
+                else if (bArrayText && text[i]) outText=text[i];
+
                 if (bSinglePrice) 
                 {
-                    drawData[i]={ YValue:price, Text:text };
+                    drawData[i]={ YValue:price, Text:outText };
                 }
                 else 
                 {
-                    if (IFrameSplitOperator.IsNumber(price[i])) drawData[i]={ YValue:price[i], Text:text };
+                    if (IFrameSplitOperator.IsNumber(price[i])) drawData[i]={ YValue:price[i], Text:outText };
                 }
             }
         }
@@ -19838,6 +19877,7 @@ function JSExplainer(ast,option)
             ["STRCAT", { Name:"STRCAT", Param:{ Count:2 }, ToString:function(args) { return `字符串相加`; } } ],
             ["STRCAT6",{ Name:"STRCAT6", Param:{ Dynamic:true }, ToString:function(args) { return `字符串相加`; } } ],
             ["VARCAT", { Name:"VARCAT", Param:{ Count:2 }, ToString:function(args) { return `字符串相加`; } } ],
+            ["VARCAT6", { Name:"VARCAT", Param:{ Dynamic:true }, ToString:function(args) { return `字符串相加`; } } ],
             ["STRSPACE", { Name:"STRSPACE", Param:{ Count:1 }, ToString:function(args) { return `字符串${args[0]}加一空格`; } } ],
             ["SUBSTR", { Name:"SUBSTR", Param:{ Count:3 }, ToString:function(args) { return `字符串${args[0]}中取一部分`; } } ],
             ["STRCMP", { Name:"STRCMP", Param:{ Count:2 }, ToString:function(args) { return `字符串${args[0]}和字符串${args[1]}比较`; } } ],

package/src/jscommon/umychart.js

@@ -283,6 +283,49 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (IFrameSplitOperator.IsNumber(item.Count)) klineChart.PriceGap.Count=item.Count;
     }
 
+    //设置十字光标
+    this.SetCorssCursorConfig=function(chart, option)
+    {
+        if (!option || !option.CorssCursorInfo) return;
+
+        var item=option.CorssCursorInfo;
+        if (IFrameSplitOperator.IsNumber(item.Left)) chart.ChartCorssCursor.ShowTextMode.Left=item.Left;
+        if (IFrameSplitOperator.IsNumber(item.Right)) chart.ChartCorssCursor.ShowTextMode.Right=item.Right;
+        if (IFrameSplitOperator.IsNumber(item.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=item.Bottom;
+
+        if (IFrameSplitOperator.IsBool(item.IsShowCorss)) chart.ChartCorssCursor.IsShowCorss=item.IsShowCorss;
+
+        if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
+        if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
+        if (IFrameSplitOperator.IsNumber(item.VLineType)) chart.ChartCorssCursor.VLineType=item.VLineType;
+        
+        if (item.RightButton)
+        {
+            if (IFrameSplitOperator.IsBool(item.RightButton.Enable)) chart.ChartCorssCursor.RightButton.Enable=item.RightButton.Enable;
+        }
+
+        if (item.BottomButton)
+        {
+            var subItem=item.BottomButton;
+            if (IFrameSplitOperator.IsBool(subItem.Enable)) chart.ChartCorssCursor.BottomButton.Enable=subItem.Enable;
+        }
+
+        if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
+        if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
+
+        if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
+        if (IFrameSplitOperator.IsBool(item.EnableDBClick)) chart.ChartCorssCursor.EnableDBClick=item.EnableDBClick;
+
+        if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
+
+        if (item.YDecimals) //Y轴文字小数位数
+        {
+            var subItem=item.YDecimals;
+            if (IFrameSplitOperator.IsNumber(subItem.Value)) chart.ChartCorssCursor.StringFormatY.DecimalsConfig.Value=subItem.Value;
+            if (IFrameSplitOperator.IsNumber(subItem.Type)) chart.ChartCorssCursor.StringFormatY.DecimalsConfig.Type=subItem.Type;
+        }
+    }
+
     //历史K线图
     this.CreateKLineChartContainer=function(option)
     {
@@ -536,48 +579,23 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.IsCorssOnlyDrawKLine===true) chart.ChartCorssCursor.IsOnlyDrawKLine=option.IsCorssOnlyDrawKLine;
         if (option.CorssCursorTouchEnd===true) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd;
         if (option.IsClickShowCorssCursor==true) chart.IsClickShowCorssCursor=option.IsClickShowCorssCursor;
-        if (option.CorssCursorInfo)
+        this.SetCorssCursorConfig(chart, option);
+        if (option.CorssCursorInfo) //十字光标K线上的属性设置
         {
             var item=option.CorssCursorInfo;
-            if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left;
-            if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right;
-            if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom;
-            if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss;
             if (IFrameSplitOperator.IsBool(item.IsShowClose)) chart.ChartCorssCursor.IsShowClose = item.IsShowClose;    //Y轴显示收盘价
             if (IFrameSplitOperator.IsBool(item.IsOnlyDrawKLine)) chart.ChartCorssCursor.IsOnlyDrawKLine = item.IsOnlyDrawKLine;    //Y轴显示收盘价
             if (option.CorssCursorInfo.PressTime) chart.PressTime=option.CorssCursorInfo.PressTime; //长按显示十字光标的时间
-            if (IFrameSplitOperator.IsNumber(option.CorssCursorInfo.HPenType)) chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType;
-            if (option.CorssCursorInfo.VPenType>0) chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType;
-            if (IFrameSplitOperator.IsNumber(item.VLineType)) chart.ChartCorssCursor.VLineType=item.VLineType;
             if (option.CorssCursorInfo.DateFormatType>0) chart.ChartCorssCursor.StringFormatX.DateFormatType=option.CorssCursorInfo.DateFormatType;
             if (IFrameSplitOperator.IsBool(item.IsDrawXRangeBG)) chart.ChartCorssCursor.IsDrawXRangeBG=item.IsDrawXRangeBG;
             if (IFrameSplitOperator.IsBool(option.CorssCursorInfo.IsFixXLastTime)) chart.ChartCorssCursor.IsFixXLastTime=option.CorssCursorInfo.IsFixXLastTime;
             if (IFrameSplitOperator.IsNumber(item.TextHeight)) chart.ChartCorssCursor.TextHeight=item.TextHeight;
-            
-            if (item.RightButton)
-            {
-                if (IFrameSplitOperator.IsBool(item.RightButton.Enable)) chart.ChartCorssCursor.RightButton.Enable=item.RightButton.Enable;
-            }
-
-            if (item.BottomButton)
-            {
-                var subItem=item.BottomButton;
-                if (IFrameSplitOperator.IsBool(subItem.Enable)) chart.ChartCorssCursor.BottomButton.Enable=subItem.Enable;
-            }
-
-            if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
-            if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
-            if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
-            if (IFrameSplitOperator.IsBool(item.EnableDBClick)) chart.ChartCorssCursor.EnableDBClick=item.EnableDBClick;
-
-            if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
 
             if (item.RangeIncrease)
             {
                 var subItem=item.RangeIncrease;
                 if (IFrameSplitOperator.IsBool(subItem.IsShow)) chart.ChartCorssCursor.StringFormatX.RangeIncrease.IsShow=subItem.IsShow;
                 if (IFrameSplitOperator.IsNumber(subItem.Formula)) chart.ChartCorssCursor.StringFormatX.RangeIncrease.Formula=subItem.Formula;
-
             }
         }
 
@@ -1105,39 +1123,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.PageInfo) chart.SetPageInfo(option.PageInfo);
 
         chart.Create(windowsCount,option);                            //创建子窗口
-
-        if (option.CorssCursorInfo)
+        this.SetCorssCursorConfig(chart, option);
+        if (option.CorssCursorInfo) //分时图十字光标属性设置
         {
             var item=option.CorssCursorInfo;
-            if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left;
-            if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right;
-            if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom;
-            if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss;
+           
             if (option.CorssCursorInfo.RightTextFormat>0) chart.ChartCorssCursor.TextFormat.Right=option.CorssCursorInfo.RightTextFormat;
             if (option.CorssCursorInfo.IsOnlyDrawMinute == true) chart.ChartCorssCursor.IsOnlyDrawMinute = option.CorssCursorInfo.IsOnlyDrawMinute;    //Y轴显示收盘价
             if (IFrameSplitOperator.IsBool(option.CorssCursorInfo.IsFixXLastTime)) chart.ChartCorssCursor.IsFixXLastTime=option.CorssCursorInfo.IsFixXLastTime;
 
-            if (item.RightButton)
-            {
-                if (IFrameSplitOperator.IsBool(item.RightButton.Enable)) chart.ChartCorssCursor.RightButton.Enable=item.RightButton.Enable;
-            } 
-
-            if (item.BottomButton)
-            {
-                var subItem=item.BottomButton;
-                if (IFrameSplitOperator.IsBool(subItem.Enable)) chart.ChartCorssCursor.BottomButton.Enable=subItem.Enable;
-            }
-
-            if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
-            if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
-
-            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 (IFrameSplitOperator.IsBool(item.EnableDBClick)) chart.ChartCorssCursor.EnableDBClick=item.EnableDBClick;
-            if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
-            if (IFrameSplitOperator.IsNumber(item.VLineType)) chart.ChartCorssCursor.VLineType=item.VLineType;
-
             if (item.TextStyle)
             {
                 if (item.TextStyle.Right)   //右侧输出样式
@@ -3053,6 +3047,7 @@ var JSCHART_DATA_FIELD_ID=
     KLINE_COLOR_DATA:66,            //K线自定义颜色数据
     KLINE_DAY_EXTENDDATA:25,
     KLINE_MINUTE_EXTENDDATA:25,
+    KLINE_TICK_EXTENDDATA:25,
 
     //OrderBook Heatmap
     KLINE_HEATMAP:67,
@@ -60796,6 +60791,7 @@ function HQPriceStringFormat()
 
     this.PriceFormatType=0; //主窗口格式    0=默认 1=科学计数
     this.DataFormatType=0;  //副图指标格式   0=默认 1=科学计数
+    this.DecimalsConfig={ Value:2, Type:0 };        //小数设置, Value:小数位数 , Type: 0=默认 1=跟指标标题一致
 
     this.GetEventCallback
 
@@ -60894,7 +60890,7 @@ function HQPriceStringFormat()
         if (!this.Value) return false;
 
         this.PercentageText=null;
-        var defaultfloatPrecision=2;     //价格小数位数 
+        var defaultfloatPrecision=this.DecimalsConfig.Value;     //价格小数位数 
         if (this.FrameID==0)    //第1个窗口显示原始价格
         {
             var defaultfloatPrecision=GetfloatPrecision(this.Symbol);
@@ -60943,6 +60939,7 @@ function HQPriceStringFormat()
         }
         else if (this.FrameID==1)
         {
+            defaultfloatPrecision=this.GetIndexTitleFloatPrecision(this.FrameID);
             if (this.DataFormatType==1)
             {
                 this.Text=IFrameSplitOperator.FormatValueThousandsString(this.Value,defaultfloatPrecision);
@@ -60975,6 +60972,7 @@ function HQPriceStringFormat()
         }
         else
         {
+            defaultfloatPrecision=this.GetIndexTitleFloatPrecision(this.FrameID);
             if (this.DataFormatType==1) this.Text=IFrameSplitOperator.FormatValueThousandsString(this.Value,defaultfloatPrecision);
             else this.Text=IFrameSplitOperator.FormatValueString(this.Value,defaultfloatPrecision,this.LanguageID);
             if (IFrameSplitOperator.IsNumber(this.RValue)) this.RText=IFrameSplitOperator.FormatValueString(this.RValue,defaultfloatPrecision,this.LanguageID);
@@ -61020,6 +61018,23 @@ function HQPriceStringFormat()
         return true;
     }
 
+    //获取指标标题小数位数
+    this.GetIndexTitleFloatPrecision=function(frameID)
+    {
+        var dec=this.DecimalsConfig.Value;
+        if (this.DecimalsConfig.Type===0) return dec;
+
+        if (frameID<0) return dec;
+        if (!this.HQChart) return dec;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.WindowIndex)) return dec;
+        var item=this.HQChart.WindowIndex[frameID];
+        if (!item) return dec;
+
+        if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) dec=item.FloatPrecision;
+
+        return dec;
+    }
+
     //深度图刻度
     this.GetExtendPaintData=function(floatPrecision)
     {
@@ -86176,14 +86191,26 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     {
         var self=this;
         var start=0;
-        if (this.SourceData && this.SourceData.Data) start=this.SourceData.Data.length;
+        var hisData=this.GetKData();
+        var dateRange=hisData.GetDateRange();
+
         if (this.NetworkFilter)
         {
+            var kLineDrawType=this.GetKLineDrawType();
             var obj=
             {
                 Name:'KLineChartContainer::RequestTickRealtimeData', //类名::
                 Explain:'当天最新分笔数据',
-                Request:{ Url:self.TickApiUrl, Data:{ symbol: self.Symbol, start:start, end:start+1000 }, Type:'POST' }, 
+                Request:
+                { 
+                    Url:self.TickApiUrl, 
+                    Data:
+                    { 
+                        symbol:self.Symbol, period:this.Period, right:this.Right, 
+                        dateRange:dateRange, klineDrawType:kLineDrawType
+                    }, 
+                    Type:'POST' 
+                }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -86196,29 +86223,14 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
-
-        JSNetwork.HttpRequest({
-            url: self.TickApiUrl,
-            data:{"symbol":self.Symbol, start:start-10, end:start+1000 },
-            type:"post",
-            dataType: "json",
-            async:true,
-            success: function (data)
-            {
-                self.ChartSplashPaint.EnableSplash(false);
-                self.RecvTickRealtimeData(data);
-                self.AutoUpdate();
-            }
-        });
     }
 
     this.RecvTickRealtimeData=function(data)
     {
-        if (data.ver==2.0)
-            var aryDayData=KLineChartContainer.JsonDataToTickDataV2(data);    //增量数据
-        else
-            var aryDayData=KLineChartContainer.JsonDataToTickData(data);    //增量数据
-        if (!aryDayData || aryDayData.length<=0) return;
+        var aryDayData=null;
+        if (data.ver==2.0) aryDayData=KLineChartContainer.JsonDataToTickDataV2(data);    //增量数据
+        else aryDayData=KLineChartContainer.JsonDataToTickData(data);    //增量数据
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryDayData)) return;
 
         var redraw=false;   //强制重绘
         if (data.redraw==true) redraw=true;
@@ -86228,7 +86240,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var lastTime=0;
         if (source.length>0) lastTime=source[source.length-1].Time;
         var newCount=0;
-        for(var i in aryDayData)
+        for(var i=0; i<aryDayData.length; ++i)
         {
             var item=aryDayData[i];
             if (item.Time<=lastTime) continue;
@@ -91213,20 +91225,24 @@ KLineChartContainer.JsonDataToTickDataV2=function(data)
 {
    var aryDayData=[];
    if (!IFrameSplitOperator.IsNonEmptyArray(data.data)) return aryDayData;
-
+   var extendDataIndex=JSCHART_DATA_FIELD_ID.KLINE_TICK_EXTENDDATA;
    for(var i=0;i<data.data.length;++i)
    {
        var item = new HistoryData();
-       var tick=data.data[i];   //[ date, time, yClose, price, extendData]
+       var tick=data.data[i];   //[ date, time, yClose, price, vol, amount, flag,]
        if (!tick) continue;
 
        item.Date = tick[0];
        item.Time=tick[1];
        item.YClose = tick[2];
        item.Low=item.High=item.Close=item.Open = tick[3];
+       item.Vol = tick[4];      //原始单位股
+       item.Amount = tick[5];
+       item.Flag=tick[6];
+
        aryDayData.push(item);
 
-       if (tick[4]) item.ExtendData=tick[4];
+       if (tick[extendDataIndex]) item.ExtendData=tick[extendDataIndex];
    }
 
    return aryDayData;

package/src/jscommon/umychart.report.js

@@ -8036,7 +8036,7 @@ function ChartReport()
 
     this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
+        if (!stock || !IFrameSplitOperator.IsNumber(stock.Time)) return;
 
         if (column.ValueType==0) //0=hhmm 1=hhmmss 2=hhmmss.fff
         {
@@ -8054,7 +8054,7 @@ function ChartReport()
 
     this.FormaDateDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!IFrameSplitOperator.IsNumber(stock.Date)) return;
+        if (!stock || !IFrameSplitOperator.IsNumber(stock.Date)) return;
 
         if (column.FormatType==0)
             drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");

package/src/jscommon/umychart.testdata.js

@@ -62,6 +62,15 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestMinuteRealtimeData(data,callback);
             break;
 
+        case "KLineChartContainer::RequestTickData":
+            //HQChart使用教程30-K线图如何对接第3方数据5-逐笔数据
+            HQData.RequestKLineTickData(data,callback);
+            break;
+        case "KLineChartContainer::RequestTickRealtimeData":
+            //HQChart使用教程30-K线图如何对接第3方数据16-轮询增量更新逐笔数据
+            HQData.RequestTickRealtimeData(data,callback);
+            break;
+
         case "JSSymbolData::GetVariantData":                            //额外的变量数据
             //HQChart使用教程30-K线图如何对接第3方数据29-板块字符串函数数据[GNBLOCK,GNBLOCKNUM......]
             HQData.RequestIndexVariantData(data,callback);
@@ -1230,6 +1239,50 @@ HQData.RequestMinuteRealtimeData=function(data,callback)
 }
 
 
+HQData.RequestKLineTickData=function(data,callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    console.log(`[HQData::RequestKLineTickData] Symbol=${symbol}`);
+
+    var hqchartData={ code:0, symbol:symbol, name:symbol, data:[], ver:2.0 };
+    for(var i=0;i<MSECOND_TEST_DATA.data.length-100;++i)
+    {
+        var item=MSECOND_TEST_DATA.data[i];
+        var flag=HQData.GetRandomTestData(1,10)%3;
+        var kItem=[item[0], parseInt(item[8]/1000), item[1], item[5], item[6]*1000, item[7], flag ];
+        hqchartData.data.push(kItem);
+    }
+    
+    callback(hqchartData);
+}
+
+HQData.RequestTickRealtimeData=function(data,callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol; //请求的股票代码
+    var dateRange=data.Request.Data.dateRange;
+    var endTime=dateRange.End.Time;
+    var endDate=dateRange.End.Date;
+
+    var hqchartData={ code:0, symbol:symbol, name:symbol, data:[], ver:2.0 };
+    for(var i=0;i<MSECOND_TEST_DATA.data.length;++i)
+    {
+        var item=MSECOND_TEST_DATA.data[i];
+        var time=parseInt(item[8]/1000);
+        if (time>endTime) 
+        {
+            var flag=HQData.GetRandomTestData(1,10)%3;
+            var kItem=[item[0], time, item[1], item[5], item[6]*1000, item[7], flag ];
+            hqchartData.data.push(kItem);
+            break;
+        }
+    }
+
+    callback(hqchartData);
+}
+
+
 HQData.RequestIndexVariantData=function(data,callback)
 {
     data.PreventDefault=true;
@@ -3897,7 +3950,13 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
             DrawType:'KLINE_TABLE', 
             DrawData:[ ] ,                                      //数据  [ [ { Text, Color: BGColor }, ...... ], [],]
             RowCount:4,
-            RowName:[ {Name:"账户[*9993]",TextAlign:"center", Color:"rgb(124, 252, 0)"}, {Name:"账户[*8881]",TextAlign:"center", Color:"rgb(238, 99, 9)"}, {Name:"账户3",TextAlign:"center"},{Name:"账户4", TextAlign:"center"}],
+            RowName:
+            [ 
+                {Name:"账户[*9993]",TextAlign:"center", Color:"rgb(124, 252, 0)"}, 
+                {Name:"账户[*8881]",TextAlign:"center", Color:"rgb(238, 99, 9)", BGColor:"rgb(100,0,200)" }, 
+                {Name:"账户3",TextAlign:"center"},
+                {Name:"账户4", TextAlign:"center"}
+            ],
 
             Config:
             {
@@ -3908,7 +3967,9 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
                 RowNamePosition:3,
                 TextFont:{ Family:'微软雅黑' , FontMaxSize:14*GetDevicePixelRatio(), },
                 RowHeightType:0,
-                Style:1
+                Style:1,
+
+                AryBorderColor:[null, "rgb(100,20,200)", "rgb(200,0,100)"]
             }
         },