hqchart 1.1.15364 → 1.1.15368

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

@@ -7193,6 +7193,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,
@@ -90316,14 +90317,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
             };
@@ -90336,29 +90349,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;
@@ -90368,7 +90366,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;
@@ -95353,20 +95351,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;
@@ -118437,6 +118439,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)
@@ -118563,6 +118591,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)
@@ -118570,13 +118600,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;
@@ -120288,6 +120318,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":
@@ -120500,7 +120532,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;
@@ -120511,14 +120544,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 };
                 }
             }
         }
@@ -120527,13 +120564,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 };
                 }
             }
         }
@@ -130731,6 +130772,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]}比较`; } } ],
@@ -149671,7 +149713,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
         {
@@ -149689,7 +149731,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");
@@ -167518,7 +167560,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15363";
+var HQCHART_VERSION="1.1.15367";
 
 function PrintHQChartVersion()
 {