hqchart 1.1.15039 → 1.1.15046

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

@@ -4562,7 +4562,13 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         if (option.DrawTool)    //画图工具
         {
-            if (option.DrawTool.StorageKey && chart.ChartDrawStorage) chart.ChartDrawStorage.Load(option.DrawTool.StorageKey);
+            var item=option.DrawTool;
+            if (chart.ChartDrawStorage)
+            {
+                if (item.StorageKey) chart.ChartDrawStorage.Load(item.StorageKey);
+                if (IFrameSplitOperator.IsBool(item.EnableCrossPeriod)) chart.ChartDrawStorage.EnableCrossPeriod=item.EnableCrossPeriod;
+            }
+            
         }
 
         if (option.KeyboardMove)
@@ -14166,6 +14172,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         drawPicture.PointMagnetKLine();
         drawPicture.Status=10;  //完成
+        drawPicture.Period=this.Period;
         drawPicture.PointToValue();
 
         if (this.ChartDrawStorage) this.ChartDrawStorage.SaveDrawData(drawPicture);
@@ -68770,10 +68777,89 @@ function IChartDrawPicture()
         }
     }
 
-    this.UpdateXValue=function()    //通过datetime更新x的索引
+    this.GetkData=function()
     {
-        if (!this.Frame) return false;
+        if (!this.Frame) return null;
         var data=this.Frame.Data;
+        if (!data) return null;
+
+        return data;
+    }
+
+    //周期变动 X重新定位
+    this.ChangePeriod=function(period)
+    {
+        var kData=this.GetkData();
+        if (!kData) return;
+
+        var aryDateTime=[];
+        for(var i=0; i<this.Value.length; ++i)
+        {
+            var item=this.Value[i];
+            if (!item.DateTime) break;
+            var dateTime={ Date:item.DateTime.Date, Time:0, Match:null };
+            if (IFrameSplitOperator.IsNumber(item.DateTime.Time)) dateTime.Time=item.DateTime.Time;
+            aryDateTime[i]=dateTime;
+        }
+
+        var findCount=0;
+        var perData=null;
+        var perIndex=-1;
+        for(var i=0, j=0;i<kData.Data.length;++i)
+        {
+            var kItem=kData.Data[i];
+
+            for(j=0;j<aryDateTime.length;++j)
+            {
+                var item=aryDateTime[j];
+                if (item.Match) continue;
+
+                if (ChartData.IsDayPeriod(period, true))
+                {
+                    if (kItem.Date>item.Date)
+                    {
+                        item.Match={ KItem:perData, Index:perIndex };
+                        ++findCount;
+                    } 
+                }
+                else if (ChartData.IsMinutePeriod(period, true))
+                {
+                    if (kItem.Date>item.Date || (kItem.Date==item.Date && kItem.Time>item.Time)) 
+                    {
+                        item.Match={ KItem:perData, Index:perIndex };
+                        ++findCount;
+                    }
+                }
+            }
+
+            perData=kItem;
+            perIndex=i;
+
+            if (findCount>=aryDateTime.length) break;
+        }
+
+        for(var i=0;i<aryDateTime.length;++i)
+        {
+            var item=aryDateTime[i];
+            var valueItem=this.Value[i];
+            if (item.Match && item.Match.KItem)
+            {
+                valueItem.DateTime={ Date:item.Match.Date, Time:item.Match.Time };
+                valueItem.XValue=item.Match.Index;
+            }
+            else
+            {
+                valueItem.DateTime=null;
+                valueItem.XValue=null;
+            }
+        }
+
+        this.Period=period;
+    }
+
+    this.UpdateXValue=function()    //通过datetime更新x的索引
+    {
+        var data=this.GetkData();
         if (!data) return false;
 
         var aryDateTime=[];
@@ -80483,9 +80569,12 @@ function ChartDrawTVShortPosition()
 
 function ChartDrawStorage()
 {
-    this.DrawData=new Map();    //画图工具数据 key=symbol-Period, value=Map() Key:Guid, Value:{Guid, Symbol, Period, ClassName, Value}
+    //this.DrawData=new Map();        //画图工具数据 key=symbol-Period, value=Map() Key:Guid, Value:{ Guid, Symbol, Period, ClassName, Value }
+    this.DrawDataV2=new Map();        //画图工具数据 key=symbol, value=Map() Key:Guid, Value:{ Guid, Symbol, Period, ClassName, Value }
+
     this.StorageKey;
-    this.GetEventCallback;      //事件回调
+    this.GetEventCallback;              //事件回调
+    this.EnableCrossPeriod=false;       //跨周期
 
     this.Load=function(key)     //从本地读取画图工具
     {
@@ -80498,18 +80587,39 @@ function ChartDrawStorage()
         if (typeof(cacheValue) != "string") return;
 
         var saveData=JSON.parse(cacheValue);
-        for(var i in saveData)
-        {
-            var item=saveData[i];
-            var drawMap=new Map();
+        if (!saveData) return;
 
-            for(var j in item.Value)
+        if (IFrameSplitOperator.IsNonEmptyArray(saveData))  //老版本 key=symbol-Period
+        {
+            for(var i=0;i<saveData.length;++i)
             {
-                var drawItem=item.Value[j];
-                drawMap.set(drawItem.Key, drawItem.Value);    
+                var item=saveData[i];
+                for(var j=0;j<item.Value.length;++j)
+                {
+                    var drawItem=item.Value[j];
+                    var symbol=drawItem.Value.Symbol;
+                    if (!this.DrawDataV2.has(symbol))
+                        this.DrawDataV2.set(symbol, {Symbol:symbol, MapPicture: new Map() });
+
+                    var stockItem=this.DrawDataV2.get(symbol);
+                    stockItem.MapPicture.set(drawItem.Value.Guid, drawItem.Value);
+                }
             }
+        }
+        else if (saveData.Ver==2.0 && IFrameSplitOperator.IsNonEmptyArray(saveData.Data))
+        {
+            for(var i=0;i<saveData.Data.length;++i)
+            {
+                var item=saveData.Data[i];  //{ Symbol:, AryPicture:[ { Guid, Symbol, Period, ClassName, Value },  ] }
+                var stockItem={ Symbol:item.Symbol, MapPicture:new Map() };
+                for(var j=0; j<item.AryPicture.length;++j)
+                {
+                    var drawItem=item.AryPicture[j];
+                    stockItem.MapPicture.set(drawItem.Guid, drawItem);   
+                }
 
-            this.DrawData.set(item.Key,drawMap);
+                this.DrawDataV2.set(stockItem.Symbol,stockItem);
+            }
         }
     }
 
@@ -80518,89 +80628,95 @@ function ChartDrawStorage()
         if (!this.StorageKey) return;
         
         var saveData=[];
-        for(var stock of this.DrawData)
+        for(var mapItem of this.DrawDataV2)
         {
-            var key=stock[0];
-            var value=stock[1];
-            var itemData={ Key:key, Value:[]};
+            var symbol=mapItem[0];
+            var stockItem=mapItem[1];
+
+            var itemData={ Symbol:symbol, AryPicture:[] };
 
-            for(var drawItem of value)
+            for(var pictureItem of stockItem.MapPicture)
             {
-                if (drawItem[1] && drawItem[1].EnableSave===false) continue;
+                var drawItem=pictureItem[1];
+                if (drawItem.EnableSave===false) continue;
 
-                itemData.Value.push({Key:drawItem[0], Value:drawItem[1]});
+                itemData.AryPicture.push(drawItem);
             }
 
-            if (IFrameSplitOperator.IsNonEmptyArray(itemData.Value))
+            if (IFrameSplitOperator.IsNonEmptyArray(itemData.AryPicture))
                 saveData.push(itemData);
         }
 
         JSConsole.Chart.Log(`[ChartDrawStorage::Save] save to localStorage, key=${this.StorageKey}`);
-        var strData=JSON.stringify(saveData);
+        var strData=JSON.stringify({Ver:2.0, Data:saveData});
         localStorage[this.StorageKey]=strData;
     }
 
-    this.GetItemKey=function(obj)   //生成每个画图工具的key
-    {
-        var strKey=`${obj.Symbol}-${obj.Period}`;
-        return strKey;
-    }
-
     this.SaveDrawData=function(drawPicture)   //保存一个画图工具
     {
-        var strKey=this.GetItemKey(drawPicture);
+        var symbol=drawPicture.Symbol;
         var data=drawPicture.ExportStorageData();
         if (!data) return;
 
-        if (this.DrawData.has(strKey))  //更新
+        if (this.DrawDataV2.has(symbol))  //更新
         {
-            JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] Upate: key, drawPicture, data', strKey, drawPicture,data);
-            this.DrawData.get(strKey).set(data.Guid, data);
+            JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] Upate: symbol, drawPicture, data', symbol, drawPicture, data);
+            var stockItem=this.DrawDataV2.get(symbol);
+            stockItem.MapPicture.set(data.Guid, data);
         }
         else    //新增
         {
-            JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] Insert: key, drawPicture, data', strKey, drawPicture,data);
-            var newData=new Map();
-            newData.set(data.Guid, data);
-            this.DrawData.set(strKey,newData);
+            JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] Insert: symbol, drawPicture, data', symbol, drawPicture,data);
+            var stockItem={ Symbol:symbol,  MapPicture:new Map() } ;
+            stockItem.set(data.Guid, data);
+            this.DrawDataV2.set(symbol,newData);
         }
 
-        JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] All draw data： ', this.DrawData);
+        JSConsole.Chart.Log('[ChartDrawStorage::SaveDrawData] All draw data： ', this.DrawDataV2);
 
         this.Save();
     }
 
     this.DeleteDrawData=function(drawPicture)   //删除一个画图工具
     {
-        var strKey=this.GetItemKey(drawPicture);
-        if (!this.DrawData.has(strKey))  return;
+        var symbol=drawPicture.Symbol;
+        if (!this.DrawDataV2.has(symbol)) return;
 
-        var mapDraw=this.DrawData.get(strKey);
-        if (!mapDraw.has(drawPicture.Guid)) return;
+        var stockItem=this.DrawDataV2.get(symbol);
+        if (!stockItem.MapPicture.has(drawPicture.Guid)) return;
 
-        mapDraw.delete(drawPicture.Guid);
+        stockItem.MapPicture.delete(drawPicture.Guid);
         this.Save();
     }
 
     this.Clear=function()
     {
-        this.DrawData=new Map();
+        this.DrawDataV2=new Map();
         this.Save();
     }
 
-    this.GetDrawData=function(obj) //获取已有的画图工具数据{Symbol: , Period:, }
+    this.GetDrawData=function(obj) //获取已有的画图工具数据{ Symbol: , Period:, }
     {
-        var data=[];
-        var strKey=this.GetItemKey(obj);
-        if (!this.DrawData.has(strKey)) return data;
+        var aryData=[];
+        var symbol=obj.Symbol;
+
+        if (!this.DrawDataV2.has(symbol)) return aryData;
 
-        var stockData=this.DrawData.get(strKey);
-        for(var item of stockData)
+        var stockItem=this.DrawDataV2.get(symbol);
+        for(var mapItem of stockItem.MapPicture)
         {
-            data.push(item[1]);
+            var drawItem=mapItem[1];
+            if (this.EnableCrossPeriod)
+            {
+                aryData.push(drawItem);
+            }
+            else
+            {
+                if (drawItem.Period==obj.Period) aryData.push(drawItem);
+            }
         }
 
-        return data;
+        return aryData;
     }
 }
 
@@ -91921,7 +92037,16 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             drawPicture.Option=this.ChartDrawOption;
             
             if (drawPicture.ImportStorageData) drawPicture.ImportStorageData(item);
-            drawPicture.UpdateXValue();
+            if (drawPicture.Period!=this.Period) 
+            {
+                drawPicture.ChangePeriod(this.Period);
+            }
+            else
+            {
+                drawPicture.UpdateXValue();
+            }
+
+           
             drawPicture.ValueToPoint();
 
             var self=this;
@@ -99719,7 +99844,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     {
         if (!this.ChartDrawStorageCache || this.ChartDrawStorageCache.length<=0) return;
 
-        var self=this;
+        var kData=this.GetKData();
         for(var i=0; i<this.ChartDrawStorageCache.length; ++i)
         {
             var item=this.ChartDrawStorageCache[i];
@@ -156932,6 +157057,8 @@ var JS_DRAWTOOL_MENU_ID=
     CMD_ZOOM_OUT_FONT_ID:12, //字体缩小
     CMD_MODIFY_TEXT_ID:13,  //随机生成文字内容
     CMD_ADVANCED_SETTING_ID:14, //高级设置
+
+    CMD_CROSS_PERIOD_ID:15, //跨周期
 };
 
 function JSDialogDrawTool()
@@ -157054,6 +157181,7 @@ function JSDialogDrawTool()
         AryTool:
         [
             { Title:"选中", ClassName:'hqchart_drawtool icon-arrow', Type:1, Data:{ID:JS_DRAWTOOL_MENU_ID.CMD_SELECTED_ID} },
+            { Title:"跨周期", ClassName: 'hqchart_drawtool icon-kuazhouqi', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CROSS_PERIOD_ID }},
             { Title:'尺子', ClassName: 'hqchart_drawtool icon-ruler', Type:0, Data:{ ID:"尺子" } },
             { Title:"磁铁", ClassName:'hqchart_drawtool icon-xifu', Type:2, Data:{ID:JS_DRAWTOOL_MENU_ID.CMD_ENABLE_MAGNET_ID} },
             { Title:"点击切换颜色", ClassName: 'hqchart_drawtool icon-fangkuai', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
@@ -157213,12 +157341,15 @@ function JSDialogDrawTool()
             this.ClearCurrnetDrawPicture();
             this.EnableEraseChart(false);
         }
+        else if (type==2 && id==JS_DRAWTOOL_MENU_ID.CMD_CROSS_PERIOD_ID)
+        {
+            this.EnableCrossPeriod(data);
+        }
         else if (type==2 && id==JS_DRAWTOOL_MENU_ID.CMD_ENABLE_MAGNET_ID)
         {
             this.ChangeMagnet(data);
         }
         else if (type==0)
-    
         {
             this.ClearAllSelectedChart();
             this.EnableEraseChart(false);
@@ -157241,6 +157372,26 @@ function JSDialogDrawTool()
         }
     }
 
+    this.EnableCrossPeriod=function(data)
+    {
+        if (!this.HQChart) return;
+        if (!this.HQChart.ChartDrawStorage) return;
+
+        this.HQChart.ChartDrawStorage.EnableCrossPeriod=!this.HQChart.ChartDrawStorage.EnableCrossPeriod;
+        var enable=this.HQChart.ChartDrawStorage.EnableCrossPeriod;
+
+        if (enable) 
+        {
+            data.Span.classList.remove("UMyChart_DrawTool_Span");
+            data.Span.classList.add("UMyChart_DrawTool_Span_Selected");
+        }
+        else 
+        {
+            data.Span.classList.remove("UMyChart_DrawTool_Span_Selected");
+            data.Span.classList.add("UMyChart_DrawTool_Span");
+        }
+    }
+
     this.CreateToolGroup=function(tbody)
     {
         var trDom=document.createElement("tr");
@@ -157286,6 +157437,14 @@ function JSDialogDrawTool()
         {
             spanDom.style['color']=this.LineColor;
         }
+        else if (item.Type==2 && item.Data.ID==JS_DRAWTOOL_MENU_ID.CMD_CROSS_PERIOD_ID)
+        {
+            if (this.HQChart && this.HQChart.ChartDrawStorage && this.HQChart.ChartDrawStorage.EnableCrossPeriod)
+            {
+                data.Span.classList.remove("UMyChart_DrawTool_Span");
+                data.Span.classList.add("UMyChart_DrawTool_Span_Selected");
+            }
+        }
         
         tdDom.onmousedown=(e)=> { this.OnClickItem(e, data); };   //点击
 
@@ -165017,7 +165176,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15038";
+var HQCHART_VERSION="1.1.15045";
 
 function PrintHQChartVersion()
 {