hqchart 1.1.14412 → 1.1.14425

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

@@ -4246,6 +4246,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsNumber(item.WheelYMove)) chart.EnableYDrag.WheelYMove=item.WheelYMove;
         }
 
+        if (option.EnableXDrag)
+        {
+            var item=option.EnableXDrag;
+            if (IFrameSplitOperator.IsBool(item.Bottom)) chart.EnableXDrag.Bottom=item.Bottom;
+        }
+
         if (option.KLineTooltip)
         {
             var item=option.KLineTooltip;
@@ -5810,6 +5816,13 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             return [];
     }
 
+    //手动更新指标 aryIndex=[ {ID:主图指标ID, OverlayID:叠加指标ID }] ,option={ Draw:true/false }
+    this.UpdateWindowIndexV2=function(aryIndex, option)
+    {
+        if (this.JSChartContainer && typeof(this.JSChartContainer.UpdateWindowIndexV2)=='function')
+            return this.JSChartContainer.UpdateWindowIndexV2(aryIndex, option);
+    }
+
     this.ChangeInstructionIndex=function(indexName, option) 
     {
         if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeInstructionIndex)=='function')
@@ -6981,7 +6994,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     { 
         Left:false, Right:false,    //是否可以拖拽缩放Y轴最大最小值
         Wheel:false, WheelYMove:5  //是否可以滚轴缩放Y轴最大最小值
-    };  
+    }; 
+    
+    this.EnableXDrag={ Bottom:true };   //X轴拖动缩放
 
     this.EnableZoomIndexWindow=false;               //是否支持双击缩放附图窗口
     this.EnableVerifyRecvData=false;                //是否检测接收到的数据
@@ -7817,14 +7832,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         var drag=
         {
-            "Click":{},
-            "LastMove":{},  //最后移动的位置
+            Click:{},
+            LastMove:{},  //最后移动的位置
             CurrentMove:{},     //当前的移动
+            IsInFrameBottom:false,
         };
 
+        
+
         drag.Click.X=e.clientX;
         drag.Click.Y=e.clientY;
-        drag.Click.IsInFrameBottom=this.Frame.PtInFrameBottom(x,y);   //是否点击在X轴上
+        if (this.EnableXDrag.Bottom) drag.Click.IsInFrameBottom=this.Frame.PtInFrameBottom(x,y);   //是否点击在X轴上
         drag.LastMove.X=e.clientX;
         drag.LastMove.Y=e.clientY;
 
@@ -10526,7 +10544,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
-        if (this.ClassName=="KLineChartContainer"  && this.Frame.PtInFrameBottom(x,y))
+        //X轴拖动缩放
+        if (this.ClassName=="KLineChartContainer"  && this.EnableXDrag.Bottom && this.Frame.PtInFrameBottom(x,y))
         {
             mouseStatus={ Cursor:"ew-resize", Name:"FrameButtom"};
             JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] frame bottom ");
@@ -14498,69 +14517,82 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
-    this.UpdateWindowIndexV2=function(aryIndex)
+    //手动更新指标 [ {ID:主图指标ID, OverlayID:叠加指标ID }]
+    this.UpdateWindowIndexV2=function(aryIndex, option)
     {
+        if (!this.Frame || !this.Frame.SubFrame) return false;
+
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+
         if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
 
-        var aryID=[];
-        for(var i=0;i<this.WindowIndex.length;++i)
+        var setMainIndex=new Set();         //主图指标
+        var setOverlayIndex=new Set();      //附图指标
+
+        for(var i=0;aryIndex.length;++i)
         {
-            var item=this.WindowIndex[i];
+            var item=aryIndex[i];
             if (!item) continue;
-            if (!item.ID) continue;
 
-            if (aryIndex.find((element)=>{ return element.ID==item.ID;} ))
-            {
-                aryID.push(i);
-            }
+            if (item.ID) setMainIndex.set(item.ID);
+            if (item.OverlayID) setOverlayIndex.set(item.OverlayID);
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(aryID)) return false;
+        if (setMainIndex.size<=0 && setOverlayIndex.size<0) return false;
 
+        //K线数据
+        var bindData=new ChartData();
+        if (kData) bindData.Data=kData.Data;
         if (this.IsKLineContainer())    //K线
         {
-            var bindData=new ChartData();
-            bindData.Data=this.SourceData.Data;
             bindData.Period=this.Period;
             bindData.Right=this.Right;
+        }
 
-            if (this.IsApiPeriod)
+        //主图指标
+        if (setMainIndex.size>0)
+        {
+            for(var i=0;i<this.WindowIndex.length;++i)
             {
+                var item=this.WindowIndex[i];
+                if (!item) continue;
     
+                if (setMainIndex.has(item.ID)) 
+                {
+                    this.BindIndexData(i,bindData);
+                }
             }
-            else
+        }
+
+        //叠加指标
+        if (setOverlayIndex.size>0)
+        {
+            for(var i=0;i<this.Frame.SubFrame.length;++i)
             {
-                if (bindData.Right>0)    //复权
+                var item=this.Frame.SubFrame[i];
+                for(var j=0; j<item.OverlayIndex.length; ++j)
                 {
-                    var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
-                    bindData.Data=rightData;
-                }
+                    var overlayItem=item.OverlayIndex[j];
     
-                if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据
-                {
-                    var periodData=bindData.GetPeriodData(bindData.Period);
-                    bindData.Data=periodData;
+                    if (setOverlayIndex.has(overlayItem.Identify))
+                    {
+                        this.BindOverlayIndexData(overlayItem,i,hisData)
+                    }
                 }
             }
         }
-        else if (this.IsMinuteContainer()) //分时图
-        {
-            var bindData=this.SourceData;
-        }
-        else
-        {
-            return;
-        }
 
-       
-        for(var i=0;i<aryID.length;++i)
+        var bDraw=true;
+        if (option && option.Draw===false) bDraw=false;
+        if (bDraw)
         {
-            this.BindIndexData(aryID[i],bindData)
+            this.UpdataDataoffset();           //更新数据偏移
+            this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+            this.Draw();
         }
 
-        this.UpdataDataoffset();           //更新数据偏移
-        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
-        this.Draw();
+        return true;
     }
 
     this.GetKData=function()
@@ -15637,7 +15669,7 @@ function AverageWidthFrame()
     this.IsShowYLine=true;
     this.YInsideOffset=0;
     this.YTextBaseline=0;       //0=居中 1=上部 (目前就支持内部刻度)
-    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行
+    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行 3=多行输出（json格式)
     this.RightTextMaxWidth=0;
 
     this.ShortYLineLength=5;
@@ -54769,7 +54801,7 @@ function FrameSplitKLinePriceY()
     this.EnableZoomUpDown=false;    //上下左右拖拽
     this.LastMaxMin;        //当前显示的最高最低范围
 
-    this.PercentageTextFormat=0;    //0=显示第1行  1=显示2行 2=单行格式: 价格/百分比
+    this.PercentageTextFormat=0;    //0=显示第1行  1=单行格式: 价格/百分比, 2=显示2行 3=2行显示(json格式)
 
     this.IsEnableDragY=function()
     {
@@ -55001,17 +55033,7 @@ function FrameSplitKLinePriceY()
             var price=(value+1)*firstOpenPrice;
             var item=new CoordinateInfo();
             item.Value=price;
-            if (this.IsShowLeftText) item.Message[0]=price.toFixed(floatPrecision);     //左边价格坐标  
-            
-            if (this.IsShowRightText) 
-            {
-                var strPrice=price.toFixed(floatPrecision);
-                var text=(value*100).toFixed(2);    //右边百分比
-                text=IFrameSplitOperator.RemoveZero(text);
-                text+='%';
-                item.Message[1]=[text,strPrice];
-                item.ExtendData=textColor;
-            }
+            this.FormatPercentageItem(item, value, floatPrecision,textColor);
             aryHorizontal.push(item);
         }
 
@@ -55022,16 +55044,7 @@ function FrameSplitKLinePriceY()
 
             var item=new CoordinateInfo();
             item.Value=price;
-            if (this.IsShowLeftText) item.Message[0]=price.toFixed(floatPrecision);   //左边价格坐标      
-            if (this.IsShowRightText) 
-            {
-                var strPrice=price.toFixed(floatPrecision);
-                var text=(value*100).toFixed(2);    //右边百分比
-                text=IFrameSplitOperator.RemoveZero(text);
-                text+='%';
-                item.Message[1]=[text,strPrice];  
-                item.ExtendData=textColor;
-            }
+            this.FormatPercentageItem(item, value, floatPrecision,textColor);
             aryHorizontal.push(item);
         }
 
@@ -55047,6 +55060,26 @@ function FrameSplitKLinePriceY()
         return true;
     }
 
+    this.FormatPercentageItem=function(item, percentage, floatPrecision, textColor)
+    {
+        var price=item.Value;
+        var strPrice=price.toFixed(floatPrecision);
+        if (this.IsShowLeftText) item.Message[0]=strPrice;   //左边价格坐标  
+
+        if (this.IsShowRightText)   //右侧 价格/百分比
+        {
+            var strPrcentage=`${IFrameSplitOperator.RemoveZero(percentage.toFixed(2))}%`;    //右边百分比
+            if (this.PercentageTextFormat==1)
+                item.Message[1]=[{ Text:strPrice, Color:textColor.PriceColor }, {Text:"/", Color:textColor.PercentageColor}, {Text:strPrcentage, Color:textColor.SplitColor}];
+            else if (this.PercentageTextFormat==3)
+                item.Message[1]=[{ Text:strPrice, Color:textColor.PriceColor }, {Text:strPrcentage, Color:textColor.PercentageColor}];
+            else if (this.PercentageTextFormat==2)
+                item.Message[1]=[strPrcentage, strPrice];
+            else
+                item.Message[1]=strPrcentage;
+        }    
+    }
+
     //等比坐标 当前屏最后第2根K线的收盘加为基准, 上下涨幅10%分割
     this.SplitIncrease=function(splitData,floatPrecision)    
     {
@@ -128455,9 +128488,9 @@ function GetBlackStyle()
            
             PercentageText:      //百分比坐标文字颜色
             { 
-                PriceColor:'rgb(101,104,112)', 
-                PercentageColor:"rgb(101,104,112)", 
-                SplitColor:"rgb(101,104,112)",
+                PriceColor:'rgb(220,220,220)', 
+                PercentageColor:"rgb(220,220,220)", 
+                SplitColor:"rgb(220,220,220)",
                 Font:14*GetDevicePixelRatio() +"px 微软雅黑"
             }
         }, 
@@ -143404,7 +143437,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14410";
+var HQCHART_VERSION="1.1.14424";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -4290,6 +4290,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsNumber(item.WheelYMove)) chart.EnableYDrag.WheelYMove=item.WheelYMove;
         }
 
+        if (option.EnableXDrag)
+        {
+            var item=option.EnableXDrag;
+            if (IFrameSplitOperator.IsBool(item.Bottom)) chart.EnableXDrag.Bottom=item.Bottom;
+        }
+
         if (option.KLineTooltip)
         {
             var item=option.KLineTooltip;
@@ -5854,6 +5860,13 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             return [];
     }
 
+    //手动更新指标 aryIndex=[ {ID:主图指标ID, OverlayID:叠加指标ID }] ,option={ Draw:true/false }
+    this.UpdateWindowIndexV2=function(aryIndex, option)
+    {
+        if (this.JSChartContainer && typeof(this.JSChartContainer.UpdateWindowIndexV2)=='function')
+            return this.JSChartContainer.UpdateWindowIndexV2(aryIndex, option);
+    }
+
     this.ChangeInstructionIndex=function(indexName, option) 
     {
         if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeInstructionIndex)=='function')
@@ -7025,7 +7038,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     { 
         Left:false, Right:false,    //是否可以拖拽缩放Y轴最大最小值
         Wheel:false, WheelYMove:5  //是否可以滚轴缩放Y轴最大最小值
-    };  
+    }; 
+    
+    this.EnableXDrag={ Bottom:true };   //X轴拖动缩放
 
     this.EnableZoomIndexWindow=false;               //是否支持双击缩放附图窗口
     this.EnableVerifyRecvData=false;                //是否检测接收到的数据
@@ -7861,14 +7876,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         var drag=
         {
-            "Click":{},
-            "LastMove":{},  //最后移动的位置
+            Click:{},
+            LastMove:{},  //最后移动的位置
             CurrentMove:{},     //当前的移动
+            IsInFrameBottom:false,
         };
 
+        
+
         drag.Click.X=e.clientX;
         drag.Click.Y=e.clientY;
-        drag.Click.IsInFrameBottom=this.Frame.PtInFrameBottom(x,y);   //是否点击在X轴上
+        if (this.EnableXDrag.Bottom) drag.Click.IsInFrameBottom=this.Frame.PtInFrameBottom(x,y);   //是否点击在X轴上
         drag.LastMove.X=e.clientX;
         drag.LastMove.Y=e.clientY;
 
@@ -10570,7 +10588,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
-        if (this.ClassName=="KLineChartContainer"  && this.Frame.PtInFrameBottom(x,y))
+        //X轴拖动缩放
+        if (this.ClassName=="KLineChartContainer"  && this.EnableXDrag.Bottom && this.Frame.PtInFrameBottom(x,y))
         {
             mouseStatus={ Cursor:"ew-resize", Name:"FrameButtom"};
             JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] frame bottom ");
@@ -14542,69 +14561,82 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
-    this.UpdateWindowIndexV2=function(aryIndex)
+    //手动更新指标 [ {ID:主图指标ID, OverlayID:叠加指标ID }]
+    this.UpdateWindowIndexV2=function(aryIndex, option)
     {
+        if (!this.Frame || !this.Frame.SubFrame) return false;
+
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+
         if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
 
-        var aryID=[];
-        for(var i=0;i<this.WindowIndex.length;++i)
+        var setMainIndex=new Set();         //主图指标
+        var setOverlayIndex=new Set();      //附图指标
+
+        for(var i=0;aryIndex.length;++i)
         {
-            var item=this.WindowIndex[i];
+            var item=aryIndex[i];
             if (!item) continue;
-            if (!item.ID) continue;
 
-            if (aryIndex.find((element)=>{ return element.ID==item.ID;} ))
-            {
-                aryID.push(i);
-            }
+            if (item.ID) setMainIndex.set(item.ID);
+            if (item.OverlayID) setOverlayIndex.set(item.OverlayID);
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(aryID)) return false;
+        if (setMainIndex.size<=0 && setOverlayIndex.size<0) return false;
 
+        //K线数据
+        var bindData=new ChartData();
+        if (kData) bindData.Data=kData.Data;
         if (this.IsKLineContainer())    //K线
         {
-            var bindData=new ChartData();
-            bindData.Data=this.SourceData.Data;
             bindData.Period=this.Period;
             bindData.Right=this.Right;
+        }
 
-            if (this.IsApiPeriod)
+        //主图指标
+        if (setMainIndex.size>0)
+        {
+            for(var i=0;i<this.WindowIndex.length;++i)
             {
+                var item=this.WindowIndex[i];
+                if (!item) continue;
     
+                if (setMainIndex.has(item.ID)) 
+                {
+                    this.BindIndexData(i,bindData);
+                }
             }
-            else
+        }
+
+        //叠加指标
+        if (setOverlayIndex.size>0)
+        {
+            for(var i=0;i<this.Frame.SubFrame.length;++i)
             {
-                if (bindData.Right>0)    //复权
+                var item=this.Frame.SubFrame[i];
+                for(var j=0; j<item.OverlayIndex.length; ++j)
                 {
-                    var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
-                    bindData.Data=rightData;
-                }
+                    var overlayItem=item.OverlayIndex[j];
     
-                if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据
-                {
-                    var periodData=bindData.GetPeriodData(bindData.Period);
-                    bindData.Data=periodData;
+                    if (setOverlayIndex.has(overlayItem.Identify))
+                    {
+                        this.BindOverlayIndexData(overlayItem,i,hisData)
+                    }
                 }
             }
         }
-        else if (this.IsMinuteContainer()) //分时图
-        {
-            var bindData=this.SourceData;
-        }
-        else
-        {
-            return;
-        }
 
-       
-        for(var i=0;i<aryID.length;++i)
+        var bDraw=true;
+        if (option && option.Draw===false) bDraw=false;
+        if (bDraw)
         {
-            this.BindIndexData(aryID[i],bindData)
+            this.UpdataDataoffset();           //更新数据偏移
+            this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+            this.Draw();
         }
 
-        this.UpdataDataoffset();           //更新数据偏移
-        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
-        this.Draw();
+        return true;
     }
 
     this.GetKData=function()
@@ -15681,7 +15713,7 @@ function AverageWidthFrame()
     this.IsShowYLine=true;
     this.YInsideOffset=0;
     this.YTextBaseline=0;       //0=居中 1=上部 (目前就支持内部刻度)
-    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行
+    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行 3=多行输出（json格式)
     this.RightTextMaxWidth=0;
 
     this.ShortYLineLength=5;
@@ -54813,7 +54845,7 @@ function FrameSplitKLinePriceY()
     this.EnableZoomUpDown=false;    //上下左右拖拽
     this.LastMaxMin;        //当前显示的最高最低范围
 
-    this.PercentageTextFormat=0;    //0=显示第1行  1=显示2行 2=单行格式: 价格/百分比
+    this.PercentageTextFormat=0;    //0=显示第1行  1=单行格式: 价格/百分比, 2=显示2行 3=2行显示(json格式)
 
     this.IsEnableDragY=function()
     {
@@ -55045,17 +55077,7 @@ function FrameSplitKLinePriceY()
             var price=(value+1)*firstOpenPrice;
             var item=new CoordinateInfo();
             item.Value=price;
-            if (this.IsShowLeftText) item.Message[0]=price.toFixed(floatPrecision);     //左边价格坐标  
-            
-            if (this.IsShowRightText) 
-            {
-                var strPrice=price.toFixed(floatPrecision);
-                var text=(value*100).toFixed(2);    //右边百分比
-                text=IFrameSplitOperator.RemoveZero(text);
-                text+='%';
-                item.Message[1]=[text,strPrice];
-                item.ExtendData=textColor;
-            }
+            this.FormatPercentageItem(item, value, floatPrecision,textColor);
             aryHorizontal.push(item);
         }
 
@@ -55066,16 +55088,7 @@ function FrameSplitKLinePriceY()
 
             var item=new CoordinateInfo();
             item.Value=price;
-            if (this.IsShowLeftText) item.Message[0]=price.toFixed(floatPrecision);   //左边价格坐标      
-            if (this.IsShowRightText) 
-            {
-                var strPrice=price.toFixed(floatPrecision);
-                var text=(value*100).toFixed(2);    //右边百分比
-                text=IFrameSplitOperator.RemoveZero(text);
-                text+='%';
-                item.Message[1]=[text,strPrice];  
-                item.ExtendData=textColor;
-            }
+            this.FormatPercentageItem(item, value, floatPrecision,textColor);
             aryHorizontal.push(item);
         }
 
@@ -55091,6 +55104,26 @@ function FrameSplitKLinePriceY()
         return true;
     }
 
+    this.FormatPercentageItem=function(item, percentage, floatPrecision, textColor)
+    {
+        var price=item.Value;
+        var strPrice=price.toFixed(floatPrecision);
+        if (this.IsShowLeftText) item.Message[0]=strPrice;   //左边价格坐标  
+
+        if (this.IsShowRightText)   //右侧 价格/百分比
+        {
+            var strPrcentage=`${IFrameSplitOperator.RemoveZero(percentage.toFixed(2))}%`;    //右边百分比
+            if (this.PercentageTextFormat==1)
+                item.Message[1]=[{ Text:strPrice, Color:textColor.PriceColor }, {Text:"/", Color:textColor.PercentageColor}, {Text:strPrcentage, Color:textColor.SplitColor}];
+            else if (this.PercentageTextFormat==3)
+                item.Message[1]=[{ Text:strPrice, Color:textColor.PriceColor }, {Text:strPrcentage, Color:textColor.PercentageColor}];
+            else if (this.PercentageTextFormat==2)
+                item.Message[1]=[strPrcentage, strPrice];
+            else
+                item.Message[1]=strPrcentage;
+        }    
+    }
+
     //等比坐标 当前屏最后第2根K线的收盘加为基准, 上下涨幅10%分割
     this.SplitIncrease=function(splitData,floatPrecision)    
     {
@@ -128499,9 +128532,9 @@ function GetBlackStyle()
            
             PercentageText:      //百分比坐标文字颜色
             { 
-                PriceColor:'rgb(101,104,112)', 
-                PercentageColor:"rgb(101,104,112)", 
-                SplitColor:"rgb(101,104,112)",
+                PriceColor:'rgb(220,220,220)', 
+                PercentageColor:"rgb(220,220,220)", 
+                SplitColor:"rgb(220,220,220)",
                 Font:14*GetDevicePixelRatio() +"px 微软雅黑"
             }
         }, 
@@ -153199,7 +153232,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14410";
+var HQCHART_VERSION="1.1.14424";
 
 function PrintHQChartVersion()
 {