ver 13878

13875 整理K线测试数据 13874 增加分时图叠加测试数据 13869 小程序分时图叠加股票代码优化 13868 ResetOverlaySymbolStatus()移到JSChartContainer中 13866 小程序分钟K线拖拽支持叠加股票 13865 K线拖拽现在支持叠加股票 13864 小程序K线支持多个股票的叠加 13863 小程序分时图测试数据整理 13861 小程序K线RequestMinuteRealtimeData，RequestRealtimeData增加当前K线范围数据
jones2000 · Sep 23, 2024 · 977d396 · 977d396
1 parent ce3c4d1
commit 977d396
Show file tree

Hide file tree

Showing 32 changed files with 466,039 additions and 573 deletions.
diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js
@@ -13901,6 +13901,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (data.PreventDefault) return;
         }
     }
+
+    this.ResetOverlaySymbolStatus=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -80707,15 +80716,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //取消叠加股票
     this.ClearOverlaySymbol=function()
     {
@@ -86265,7 +86265,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!bFind) aryNewSymbol.push(strSymbol);
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewSymbol)) return true;
 
         for(var i=0;i<aryNewSymbol.length;++i)
         {
@@ -86294,15 +86294,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return true;
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //删除一个叠加股票
     this.DeleteOverlaySymbol=function(symbol)
     {
@@ -138496,7 +138487,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13856";
+var HQCHART_VERSION="1.1.13877";
 
 function PrintHQChartVersion()
 {

diff --git a/vuehqchart/src/jscommon/umychart.NetworkFilterTest.js b/vuehqchart/src/jscommon/umychart.NetworkFilterTest.js
diff --git a/vuehqchart/src/jscommon/umychart.js b/vuehqchart/src/jscommon/umychart.js
@@ -9976,6 +9976,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (data.PreventDefault) return;
         }
     }
+
+    this.ResetOverlaySymbolStatus=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -76782,15 +76791,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //取消叠加股票
     this.ClearOverlaySymbol=function()
     {
@@ -82340,7 +82340,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!bFind) aryNewSymbol.push(strSymbol);
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewSymbol)) return true;
 
         for(var i=0;i<aryNewSymbol.length;++i)
         {
@@ -82369,15 +82369,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return true;
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //删除一个叠加股票
     this.DeleteOverlaySymbol=function(symbol)
     {

diff --git a/vuehqchart/src/jscommon/umychart.version.js b/vuehqchart/src/jscommon/umychart.version.js
@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.13856";
+var HQCHART_VERSION="1.1.13877";
 
 function PrintHQChartVersion()
 {

diff --git a/vuehqchart/src/jscommon/umychart.vue.build/umychart.testdata.bat b/vuehqchart/src/jscommon/umychart.vue.build/umychart.testdata.bat
@@ -1,3 +1,3 @@
-copy ..\umychart.testdata\DayKLine\600000.sh.day.kline.js+..\umychart.testdata\M1KLine\600000.sh.minute.kline.js+..\umychart.testdata\DayKLine\000001.sz.day.kline.js+..\umychart.testdata\M1KLine\000001.sz.minute.kline.js+..\umychart.testdata\60000.sh.5day.minute.js+..\umychart.testdata\60000.sh.capital.kline.js+..\umychart.testdata\60000.sh.day.minute.js+..\umychart.testdata.js  ..\umychart.NetworkFilterTest.js /b
+copy ..\umychart.testdata\DayKLine\600000.sh.day.kline.js+..\umychart.testdata\M1KLine\600000.sh.minute.kline.js+..\umychart.testdata\DayKLine\000001.sz.day.kline.js+..\umychart.testdata\M1KLine\000001.sz.minute.kline.js+..\umychart.testdata\DayMinute\000151.sz.1day.minute.js+..\umychart.testdata\DayMinute\000001.sz.1day.minute.js+..\umychart.testdata\DayMinute\600000.sh.1day.minute.js+..\umychart.testdata\Day5Minute\600000.sh.5day.minute.js+..\umychart.testdata\Day5Minute\000001.sz.5day.minute.js+..\umychart.testdata\Day5Minute\000151.sz.5day.minute.js+..\umychart.testdata\60000.sh.5day.minute.js+..\umychart.testdata\60000.sh.capital.kline.js+..\umychart.testdata\60000.sh.day.minute.js+..\umychart.testdata.js  ..\umychart.NetworkFilterTest.js /b
 
 copy ..\umychart.NetworkFilterTest.js+umychart.testdata.vue.export.js ..\umychart.vue\umychart.NetworkFilterTest.vue.js /b
diff --git a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
@@ -13945,6 +13945,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (data.PreventDefault) return;
         }
     }
+
+    this.ResetOverlaySymbolStatus=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -80751,15 +80760,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //取消叠加股票
     this.ClearOverlaySymbol=function()
     {
@@ -86309,7 +86309,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!bFind) aryNewSymbol.push(strSymbol);
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewSymbol)) return true;
 
         for(var i=0;i<aryNewSymbol.length;++i)
         {
@@ -86338,15 +86338,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return true;
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //删除一个叠加股票
     this.DeleteOverlaySymbol=function(symbol)
     {
@@ -143052,7 +143043,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13856";
+var HQCHART_VERSION="1.1.13877";
 
 function PrintHQChartVersion()
 {

diff --git a/webhqchart.demo/jscommon/umychart.NetworkFilterTest.js b/webhqchart.demo/jscommon/umychart.NetworkFilterTest.js
diff --git a/webhqchart.demo/jscommon/umychart.js b/webhqchart.demo/jscommon/umychart.js
@@ -9976,6 +9976,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (data.PreventDefault) return;
         }
     }
+
+    this.ResetOverlaySymbolStatus=function()
+    {
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        {
+            var item=this.OverlayChartPaint[i];
+            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -76782,15 +76791,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //取消叠加股票
     this.ClearOverlaySymbol=function()
     {
@@ -82340,7 +82340,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!bFind) aryNewSymbol.push(strSymbol);
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryNewSymbol)) return true;
 
         for(var i=0;i<aryNewSymbol.length;++i)
         {
@@ -82369,15 +82369,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return true;
     }
 
-    this.ResetOverlaySymbolStatus=function()
-    {
-        for(var i in this.OverlayChartPaint)
-        {
-            var item=this.OverlayChartPaint[i];
-            item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
-        }
-    }
-
     //删除一个叠加股票
     this.DeleteOverlaySymbol=function(symbol)
     {