hqchart 1.1.15696 → 1.1.15708

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

@@ -5314,6 +5314,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 }
 
                 chart.SetSubFrameAttribute(chart.Frame.SubFrame[index],item, null);
+                chart.UpdateIndexTemporaryAttribute(i, item.AryTemporaryAttribute); //指标临时属性
             }
         }
 
@@ -16973,6 +16974,88 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         script.RecvSubscribeData(data,this,overlayIndex.WindowIndex,kData);
     }
+
+    this.UpdateIndexTemporaryAttribute=function(windowIndex, aryAttribute)
+    {
+        if (windowIndex<0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryAttribute)) return;
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
+        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
+
+        this.IndexTemporaryAttribute[windowIndex]=[];
+        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
+
+        for(var i=0;i<aryAttribute.length;++i)
+        {
+            var item=aryAttribute[i];
+            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
+            {
+                var backup=mainFrame.ChartBorder.BottomSpace;
+                mainFrame.ChartBorder.BottomSpace=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
+            {
+                var backup=mainFrame.ChartBorder.TopSpace;
+                mainFrame.ChartBorder.TopSpace=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
+            {
+                var backup=mainFrame.YSplitOperator.IsShowLeftText;
+                mainFrame.YSplitOperator.IsShowLeftText=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
+            {
+                var backup=mainFrame.YSplitOperator.IsShowRightText;
+                mainFrame.YSplitOperator.IsShowRightText=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
+            {
+                var backup=mainFrame.YSplitOperator.SplitType;
+                mainFrame.YSplitOperator.SplitType=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+
+        }
+    }
+
+    this.RestoreIndexTemporaryAttribute=function(windowIndex)
+    {
+        if (windowIndex<0) return;
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
+        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryTemporaryAttribute)) return;
+        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
+
+        for(var i=0;i<aryTemporaryAttribute.length;++i)
+        {
+            var item=aryTemporaryAttribute[i];
+            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
+            {
+                mainFrame.ChartBorder.BottomSpace=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
+            {
+                mainFrame.ChartBorder.TopSpace=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
+            {
+                mainFrame.YSplitOperator.IsShowLeftText=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
+            {
+                mainFrame.YSplitOperator.IsShowRightText=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
+            {
+                mainFrame.YSplitOperator.SplitType=item.BackupValue;
+            }
+        }
+
+    }
 }
 
 function GetDevicePixelRatio()
@@ -83858,7 +83941,7 @@ function JSChartResource()
     {
         BuyColor:"rgb(242,54,69)",
         SellColor:"rgb(8,153,129)",
-        BarWidth:4*GetDevicePixelRatio(),
+        BarWidth:2*GetDevicePixelRatio(),
         MaxBarWidth:120,
         YOffset:1,
         Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
@@ -97072,88 +97155,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         this.Draw();
     }
-
-    this.UpdateIndexTemporaryAttribute=function(windowIndex, aryAttribute)
-    {
-        if (windowIndex<0) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(aryAttribute)) return;
-        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
-        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
-
-        this.IndexTemporaryAttribute[windowIndex]=[];
-        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
-
-        for(var i=0;i<aryAttribute.length;++i)
-        {
-            var item=aryAttribute[i];
-            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
-            {
-                var backup=mainFrame.ChartBorder.BottomSpace;
-                mainFrame.ChartBorder.BottomSpace=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
-            {
-                var backup=mainFrame.ChartBorder.TopSpace;
-                mainFrame.ChartBorder.TopSpace=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
-            {
-                var backup=mainFrame.YSplitOperator.IsShowLeftText;
-                mainFrame.YSplitOperator.IsShowLeftText=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
-            {
-                var backup=mainFrame.YSplitOperator.IsShowRightText;
-                mainFrame.YSplitOperator.IsShowRightText=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
-            {
-                var backup=mainFrame.YSplitOperator.SplitType;
-                mainFrame.YSplitOperator.SplitType=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-
-        }
-    }
-
-    this.RestoreIndexTemporaryAttribute=function(windowIndex)
-    {
-        if (windowIndex<0) return;
-        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
-        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
-        if (!IFrameSplitOperator.IsNonEmptyArray(aryTemporaryAttribute)) return;
-        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
-
-        for(var i=0;i<aryTemporaryAttribute.length;++i)
-        {
-            var item=aryTemporaryAttribute[i];
-            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
-            {
-                mainFrame.ChartBorder.BottomSpace=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
-            {
-                mainFrame.ChartBorder.TopSpace=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
-            {
-                mainFrame.YSplitOperator.IsShowLeftText=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
-            {
-                mainFrame.YSplitOperator.IsShowRightText=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
-            {
-                mainFrame.YSplitOperator.SplitType=item.BackupValue;
-            }
-        }
-
-    }
 }
 
 //API 返回数据 转化为array[]
@@ -97570,7 +97571,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     delete this.newMethod;
 
     this.ClassName='MinuteChartContainer';
-    this.WindowIndex=new Array();
+    this.WindowIndex=[];
+    this.IndexTemporaryAttribute=[];    //指标临时属性，切换指标时会清除
     this.Symbol;
     this.AryDate;                             //日期列表[]
     this.Name;
@@ -100409,8 +100411,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ChangeScriptIndex=function(windowIndex,indexData,option)
     {
         this.DeleteIndexPaint(windowIndex, true);
+        this.RestoreIndexTemporaryAttribute(windowIndex);   //恢复临时属性
         this.WindowIndex[windowIndex]=new ScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
 
+        if (option)
+        {
+            if (option.AryTemporaryAttribute)
+            {
+                this.UpdateIndexTemporaryAttribute(windowIndex, option.AryTemporaryAttribute); //指标临时属性
+            }
+        }
+
         var bindData=this.SourceData;
         this.BindIndexData(windowIndex,bindData);   //执行脚本
 
@@ -100423,6 +100434,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ChangeAPIIndex=function(windowIndex,indexData)
     {
         this.DeleteIndexPaint(windowIndex, true);
+        this.RestoreIndexTemporaryAttribute(windowIndex);   //恢复临时属性
         //使用API挂接指标数据 API:{ Name:指标名字, Script:指标脚本可以为空, Args:参数可以为空, Url:指标执行地址 }
         var apiItem=indexData.API;
         this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
@@ -100430,6 +100442,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (indexData)
         {
             if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
+
+            if (indexData.AryTemporaryAttribute)
+            {
+                this.UpdateIndexTemporaryAttribute(windowIndex, indexData.AryTemporaryAttribute); //指标临时属性
+            }
         }
 
         this.Frame.ClearUpDonwFrameYData({ Index:windowIndex });
@@ -100563,11 +100580,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var bRefreshData= (dayCount!=null || symbol!=null);
 
         //清空所有的指标图型
-        for(var i=0;i<windows.length;++i)
+        for(var i=0;i<currentLength;++i)
         {
             this.DeleteIndexPaint(i);
             var frame=this.Frame.SubFrame[i];
             if (!frame) continue;
+            this.RestoreIndexTemporaryAttribute(i);   //恢复临时属性
             frame.YSpecificMaxMin=null;
             frame.YSplitScale = null;
         }
@@ -100653,6 +100671,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             }
            
             this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex], item, frameItem);
+            if (item) this.UpdateIndexTemporaryAttribute(windowIndex, item.AryTemporaryAttribute); //指标临时属性
         }
 
         //清空叠加指标
@@ -108417,7 +108436,6 @@ function IMinuteInfo()
     this.RequestData=function(hqChart)
     {
         var self = this;
-        this.Data=[];
         var param=
         {
             HQChart:hqChart
@@ -108469,6 +108487,7 @@ function MarketEventInfo()
 
     this.RecvData=function(recvData,param)
     {
+        this.Data=[];
         if (recvData && recvData.ver==3)
         {
             this.RecvDataV3(recvData,param);
@@ -108545,6 +108564,8 @@ function MinuteNewsInfo()
 
     this.RecvData=function(recvData,param)
     {
+        this.Data=[];
+
         if (!recvData || !IFrameSplitOperator.IsNonEmptyArray(recvData.list)) return;
 
         for(var i=0;i<recvData.list.length;++i)
@@ -140632,6 +140653,16 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType==SCRIPT_CHART_NAME.DRAW_HORIZONTAL_CHANNEL)
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+                    drawItem.Config=draw.Config;
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -141426,8 +141457,8 @@ function GetBlackStyle()
 
             BuySellBar:
             {
-                BuyColor:"rgb(102, 33, 33)",
-                SellColor:"rgb(20, 63, 31)",
+                BuyColor:"rgb(255,0,0)",
+                SellColor:"rgb(0,255,0)",
                 Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
                 TextColor:"rgb(220,220,220)",
             }
@@ -159064,7 +159095,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15695";
+var HQCHART_VERSION="1.1.15707";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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