hqchart 1.1.13409 → 1.1.13441

package/src/jscommon/umychart.testdata.js

@@ -55,6 +55,15 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestLatestData(data,callback);
             break;
 
+
+        case "KLineChartContainer::RequestOverlayHistoryData":      //叠加股票
+            HQData.RequestOverlayHistoryData(data, callback);
+            break;
+
+        case "KLineChartContainer::RequestOverlayHistoryMinuteData":
+            HQData.RequestOverlayHistoryMinuteData(data, callback);
+            break;
+
        
 
 
@@ -376,3 +385,28 @@ HQData.RequestLatestData=function(data,callback)
 
     callback(hqchartData);
 }
+
+HQData.RequestOverlayHistoryData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    var hqchartData={  symbol: symbol,name: symbol };
+    if (symbol=="399001.sz") 
+        hqchartData.data=KLINE_DAY_OVERLAY_DATA2.data
+    else 
+        hqchartData.data=KLINE_DAY_OVERLAY_DATA.data
+        
+    callback(hqchartData);
+}
+
+HQData.RequestOverlayHistoryMinuteData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    var hqchartData={  symbol: symbol,name: symbol };
+    hqchartData.data=KLINE_MINUTE_DATA2.data;
+
+    callback(hqchartData);
+}
+
+

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

@@ -125,6 +125,8 @@ function JSIndexScript()
             ["ICHIMOKU",this.ICHIMOKU],["CDP-STD", this.CDP_STD],["TBP-STD",this.TBP_STD],
             ["ADX", this.ADX],
 
+            ["持仓量", this.VOL_POSITION],  //成交量+持仓量
+
             //通达信特色指标
             ["散户线", this.ShareholderCount],["NXTS", this.NXTS],["FKX", this.FKX],["两融资金", this.Margin4],
             ["ZSDB",this.ZSDB],
@@ -3363,6 +3365,20 @@ JSIndexScript.prototype.CJL = function ()
     return data;
 }
 
+JSIndexScript.prototype.VOL_POSITION=function()
+{
+    let data =
+    {
+        Name: '持仓量', Description: '持仓量', IsMainIndex: false,
+        Args: [],
+        Script: //脚本
+            "成交量:VOL,VOLSTICK;\n\
+持仓量:VOLINSTK,SINGLELINE;"
+    };
+
+    return data;
+}
+
 JSIndexScript.prototype.ASI = function () 
 {
     let data =
@@ -6488,7 +6504,7 @@ var JSCHART_EVENT_ID=
 
 
     ON_CHANGE_INDEX:150,        //切换指标
-    ON_MENU_COMMAND:151,        //菜单时间回调
+    ON_MENU_COMMAND:151,        //菜单事件回调
     ON_CREATE_RIGHT_MENU:152,   //创建右键菜单
 
     ON_FORMAT_CALL_AUCTION_INDEX_TITLE:153, //集合竞价指标窗口标题内容
@@ -15124,7 +15140,19 @@ function AverageWidthFrame()
                     }
                     else    //显示第1行
                     {
-                        this.Canvas.fillText(item.Message[1][0],xText+this.YTextPadding[1],yText);
+                        var text=item.Message[1][0];
+
+                        if (item.TextColor2) this.Canvas.fillStyle=item.TextColor2;
+                        if (rightExtendText && rightExtendText.Align===2 && this.YRightTextInfo)    //右对齐
+                        {
+                            this.Canvas.textAlign="right";
+                            var xRight=this.YRightTextInfo.MainTextWidth+right-this.YTextPadding[1];
+                            this.Canvas.fillText(text,xRight,yText);
+                        }
+                        else
+                        {
+                            this.Canvas.fillText(text,xText+this.YTextPadding[1],yText);
+                        }
                     }
                 }
                 else
@@ -15134,7 +15162,7 @@ function AverageWidthFrame()
                     if (!rtPreRight || (rtRight && !this.IsTextTopBottomOverlap(rtRight,rtPreRight)))
                     {
                         if (item.TextColor2) this.Canvas.fillStyle=item.TextColor2;
-                        if (rightExtendText && rightExtendText.Align===2 && this.YRightTextInfo)
+                        if (rightExtendText && rightExtendText.Align===2 && this.YRightTextInfo)    //右对齐
                         {
                             this.Canvas.textAlign="right";
                             var xRight=this.YRightTextInfo.MainTextWidth+right-this.YTextPadding[1];
@@ -24664,6 +24692,7 @@ function ChartData()
             var yClose=this.Data[index].YClose;
 
             result[index]=HistoryData.Copy(this.Data[index]);
+            result[index].RightSeed=seed;
 
             for(--index; index>=0; --index)
             {
@@ -24694,6 +24723,7 @@ function ChartData()
             var seed=1;
             var close=this.Data[index].Close;
             result[index]=HistoryData.Copy(this.Data[index]);
+            result[index].RightSeed=seed;
 
             for(++index;index<this.Data.length;++index)
             {
@@ -35023,6 +35053,86 @@ function ChartOverlayLine()
     }
 }
 
+//独立线段
+function ChartSingleLine()
+{
+    this.newMethod=ChartLine;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartSingleLine';     //类名
+    this.MaxMin=null;    //当前的显示范围
+
+    this.Draw=function()
+    {
+        this.MaxMin=null;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if (!this.Data || !this.Data.Data) return;
+
+        this.MaxMin=this.GetCurrentMaxMin();
+        if (!this.MaxMin) return;
+        if (!IFrameSplitOperator.IsNumber(this.MaxMin.Max) || !IFrameSplitOperator.IsNumber(this.MaxMin.Min)) return;
+
+        switch(this.DrawType)
+        {
+            
+            default: 
+                return this.DrawStraightLine();
+        }
+    }
+
+    //获取当前页的最大最小值
+    this.GetCurrentMaxMin=function()
+    {
+        var xPointCount=this.ChartFrame.XPointCount;
+        var range={ Max:null, Min:null };
+
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        {
+            var value=this.Data.Data[i];
+            if (!IFrameSplitOperator.IsNumber(value)) continue;
+
+            if (range.Max==null) range.Max=value;
+            if (range.Min==null) range.Min=value;
+
+            if (range.Max<value) range.Max=value;
+            if (range.Min>value) range.Min=value;
+        }
+
+        return range;
+    }
+
+    this.GetMaxMin=function()
+    {
+        return { Max:null, Min:null };
+    }
+
+    this.GetYFromData=function(value)
+    {
+        var bHScreen = (this.ChartFrame.IsHScreen === true);
+
+        if (bHScreen)
+        {
+            if (value <= this.MaxMin.Min) return this.ChartBorder.GetLeftEx();
+            if (value >= this.MaxMin.Max) return this.ChartBorder.GetRightEx();
+
+            var width = this.ChartBorder.GetWidthEx() * (value - this.MaxMin.Min) / (this.MaxMin.Max - this.MaxMin.Min);
+            return this.ChartBorder.GetLeftEx() + width;
+        }
+        else
+        {
+            if(value<=this.MaxMin.Min) return this.ChartBorder.GetBottomEx();
+            if(value>=this.MaxMin.Max) return this.ChartBorder.GetTopEx();
+    
+            var height=this.ChartBorder.GetHeightEx()*(value-this.MaxMin.Min)/(this.MaxMin.Max-this.MaxMin.Min);
+            return this.ChartBorder.GetBottomEx()-height;
+        }
+    }
+}
+
 //彩色线段
 function ChartPartLine()
 {
@@ -35793,6 +35903,8 @@ function ChartVolStick()
 
         var yBottom=this.ChartFrame.GetYFromData(0);
 
+        this.Canvas.save();
+
         if (dataWidth>=4 && !(this.BarWidth===1))
         {
             yBottom=ToFixedRect(yBottom);
@@ -35834,6 +35946,7 @@ function ChartVolStick()
         {
             var preKItem=null;
             var barColor=null;
+            this.Canvas.linewidth=1*GetDevicePixelRatio();
             for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
             {
                 var value=this.Data.Data[i];
@@ -35868,6 +35981,8 @@ function ChartVolStick()
                 preKItem=kItem;
             }
         }
+
+        this.Canvas.restore();
     }
 
     this.HScreenDraw=function() //横屏画法
@@ -37943,8 +38058,8 @@ function ChartMinutePriceLine()
         if (isHScreen===true) chartright=this.ChartBorder.GetBottom();
         var xPointCount=this.ChartFrame.XPointCount;
         var minuteCount=this.ChartFrame.MinuteCount;
-        var bottom=this.ChartBorder.GetBottomEx();
-        var left=this.ChartBorder.GetLeftEx();
+        var bottom=this.ChartBorder.GetBottom();
+        var left=this.ChartBorder.GetLeft();
         var data=this.Data;
 
         this.DrawBeforeOpen();   //盘前
@@ -113838,6 +113953,7 @@ function JSExecute(ast,option)
                 let isExData=false;
                 let isDotLine=false;
                 let isOverlayLine=false;    //叠加线
+                let isSingleLine=false;     //独立线段
                 var isNoneName=false;
                 var isShowTitle=true;
                 //显示在位置之上,对于DRAWTEXT和DRAWNUMBER等函数有用,放在语句的最后面(不能与LINETHICK等函数共用),比如:
@@ -113894,9 +114010,11 @@ function JSExecute(ast,option)
                         else if (value==="DRAWCENTER") isDrawCenter=true;
                         else if (value=="DRAWBELOW") isDrawBelow=true;
                         else if (value=="STEPLINE") stepLine=true;
+                        else if (value=="SINGLELINE") isSingleLine=true;
                         else if (value.indexOf('COLOR')==0) color=value;
                         else if (value.indexOf("RGBX")==0 && value.length==10) color=value; //RGBX+“RRGGBB”
                         else if (value.indexOf('LINETHICK')==0) lineWidth=value;
+                        
 
                         else if (value=="ALIGN0") drawAlign=0;
                         else if (value=="ALIGN1") drawAlign=1;
@@ -114145,6 +114263,7 @@ function JSExecute(ast,option)
                     if (isExData==true) value.IsExData = true;
                     if (isDotLine==true) value.IsDotLine=true;
                     if (isOverlayLine==true) value.IsOverlayLine=true;
+                    if (isSingleLine==true) value.IsSingleLine=true;
                     if (isNoneName==true) value.NoneName=true;
                     if (isShowTitle==false) value.IsShowTitle=false;
                     if (stepLine==true) value.Type=7;
@@ -114180,6 +114299,7 @@ function JSExecute(ast,option)
                     if (isExData==true) value.IsExData = true;
                     if (isDotLine==true) value.IsDotLine=true;
                     if (isOverlayLine==true) value.IsOverlayLine=true;
+                    if (isSingleLine==true) value.IsSingleLine=true;
                     if (isShowTitle==false) value.IsShowTitle=false;
                     if (stepLine==true) value.Type=7;
                     this.OutVarTable.push(value);
@@ -117007,6 +117127,54 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(line);
     }
 
+    this.CreateSingleLine=function(hqChart,windowIndex,varItem,id,lineType)
+    {
+        var line=new ChartSingleLine();
+        line.Canvas=hqChart.Canvas;
+        line.DrawType=1;
+        line.Name=varItem.Name;
+        line.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        line.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        line.Identify=this.Guid;
+        if (varItem.Color) line.Color=this.GetColor(varItem.Color);
+        else line.Color=this.GetDefaultColor(id);
+
+        if (varItem.LineWidth) 
+        {
+            let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
+            if (!isNaN(width) && width>0) line.LineWidth=width;
+        }
+
+        if (varItem.IsDotLine) line.IsDotLine=true; //虚线
+        if (varItem.IsShow==false) line.IsShow=false;
+
+        let titleIndex=windowIndex+1;
+        line.Data.Data=varItem.Data;
+
+        this.ReloadChartResource(hqChart,windowIndex,line);
+        
+        if (varItem.IsShowTitle===false)    //NOTEXT 不绘制标题
+        {
+
+        }
+        else if (IFrameSplitOperator.IsString(varItem.Name) && varItem.Name.indexOf("NOTEXT")==0) //标题中包含NOTEXT不绘制标题
+        {
+
+        }
+        else
+        {
+            if (varItem.NoneName) 
+                hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(line.Data,null,line.Color);
+            else
+                hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(line.Data,varItem.Name,line.Color);
+
+            this.SetTitleData(hqChart.TitlePaint[titleIndex].Data[id],line);
+        }
+        
+        this.SetChartIndexName(line);
+        hqChart.ChartPaint.push(line);
+    }
+
     //创建柱子
     this.CreateBar=function(hqChart,windowIndex,varItem,id)
     {
@@ -118311,6 +118479,7 @@ function ScriptIndex(name,script,args,option)
             if (item.Type==0)  
             {
                 if (item.IsOverlayLine) this.CreateOverlayLine(hqChart,windowIndex,item,i,item.Type);
+                else if (item.IsSingleLine) this.CreateSingleLine(hqChart,windowIndex,item,i,item.Type);
                 else this.CreateLine(hqChart,windowIndex,item,i,item.Type);
             }
             else if (item.Type==1)
@@ -134033,7 +134202,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13408";
+var HQCHART_VERSION="1.1.13440";
 
 function PrintHQChartVersion()
 {
@@ -134138,6 +134307,13 @@ export default  {
 
     CoordinateInfo:CoordinateInfo,
 
+    //图形基类导出
+    IChartPainting:IChartPainting,              //图形
+    IExtendChartPainting:IExtendChartPainting,  //扩展图形
+    IChartTitlePainting:IChartTitlePainting,    //标题类
+    IChartDrawPicture:IChartDrawPicture,        //画图工具
+    DynamicTitleData:DynamicTitleData,          //指标标题数据
+
     //成交明细
     JSDealChart:JSDealChart,
     DEAL_COLUMN_ID:DEAL_COLUMN_ID,
@@ -134146,9 +134322,9 @@ export default  {
     JSReportChart:JSReportChart,
     REPORT_COLUMN_ID:REPORT_COLUMN_ID,
 
-     //键盘精灵
-     JSKeyboardChart:JSKeyboardChart,
-     KEYBOARD_COLUMN_ID:KEYBOARD_COLUMN_ID,
+    //键盘精灵
+    JSKeyboardChart:JSKeyboardChart,
+    KEYBOARD_COLUMN_ID:KEYBOARD_COLUMN_ID,
 
     //X轴滚动条
     JSScrollBarChart:JSScrollBarChart,

package/src/jscommon/umychart.version.js

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

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

@@ -48730,6 +48730,15 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestLatestData(data,callback);
             break;
 
+
+        case "KLineChartContainer::RequestOverlayHistoryData":      //叠加股票
+            HQData.RequestOverlayHistoryData(data, callback);
+            break;
+
+        case "KLineChartContainer::RequestOverlayHistoryMinuteData":
+            HQData.RequestOverlayHistoryMinuteData(data, callback);
+            break;
+
        
 
 
@@ -49052,6 +49061,31 @@ HQData.RequestLatestData=function(data,callback)
     callback(hqchartData);
 }
 
+HQData.RequestOverlayHistoryData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    var hqchartData={  symbol: symbol,name: symbol };
+    if (symbol=="399001.sz") 
+        hqchartData.data=KLINE_DAY_OVERLAY_DATA2.data
+    else 
+        hqchartData.data=KLINE_DAY_OVERLAY_DATA.data
+        
+    callback(hqchartData);
+}
+
+HQData.RequestOverlayHistoryMinuteData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    var hqchartData={  symbol: symbol,name: symbol };
+    hqchartData.data=KLINE_MINUTE_DATA2.data;
+
+    callback(hqchartData);
+}
+
+
+
 
 /*暴露外部用的方法*/
 export default