hqchart 1.1.15111 → 1.1.15121

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

@@ -6766,6 +6766,14 @@ JSChart.RegisterChartFrameClass=function(name, option)
 }
 
 
+//注册DOM对话框类
+//option:{ Create:创建类方法 }
+JSChart.RegisterDOMClass=function(name, option)
+{
+    return g_JSDOMFactory.Add(name, option);
+}
+
+
 //一些公共函数
 JSChart.ToFixedPoint=function(value)
 {
@@ -16699,6 +16707,36 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpdateWindowIndexV2(aryUpdate);
         return true;
     }
+
+    this.TryClickLock=function(x,y)
+    {
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return false;
+
+        for(var i=0;i<this.Frame.SubFrame.length; ++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            var chartLock=item.Frame.LockPaint;
+            if (!chartLock || !chartLock.LockRect) continue;
+
+            var tooltip=new TooltipData();
+            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
+
+            tooltip.HQChart=this;
+
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
+            if (event && event.Callback) 
+            {
+                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
+                event.Callback(event,sendData,this);
+            }
+
+
+            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
+            return true;
+        }
+
+        return false;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -20454,7 +20492,7 @@ function AverageWidthFrame()
 
         if (this.ClassName=="MinuteFrame" || this.ClassName=="KLineFrame")
         {
-            this.DivFrameToolbar=new JSDivFrameToolbar();
+            this.DivFrameToolbar=g_JSDOMFactory.Create('JSDivFrameToolbar');//new JSDivFrameToolbar();
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
@@ -30999,9 +31037,20 @@ function IChartPainting()
         var x=left+width/2;
         var y=top+height/2;
 
+        var bHScreen=this.ChartFrame.IsHScreen;
+        if (bHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(x, y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            x=0,y=0;
+        }
+
         this.Canvas.textAlign="center";
         this.Canvas.textBaseline="middle";
         this.Canvas.fillText(this.NotSupportMessage,x,y);
+
+        if (bHScreen)  this.Canvas.restore();
     }
 
     this.GetTooltipData=function(x,y,tooltip)
@@ -52043,6 +52092,8 @@ function ChartLock()
     this.IndexName;     //指标名字
     this.IndexID;       //指标ID
 
+    this.MinWidthText="  付费指标  "
+
     this.SetData=function(aryData)
     {
         this.AryData=aryData;
@@ -52170,11 +52221,27 @@ function ChartLock()
             }
         }
 
+        this.Canvas.font=this.Font;
+        var minWidth=this.Canvas.measureText(this.MinWidthText).width;
+
+        var aryText=null;
+        if (Array.isArray(this.Title)) aryText=this.Title;
+        else aryText=[{Text:this.Title}];
+            
+        var outSize={ };
+        if (!this.CalculateTextSize(aryText, this.Font, outSize)) outSize=null;
+        if (outSize && outSize.Width+8>minWidth) minWidth=outSize.Width+8;  //确保文字可以显示
+
         if (bHScreen)
         {
             var rtBG={ Left:border.Left, Right:border.RightEx, Top:left, Bottom:border.Bottom };
             rtBG.Width=rtBG.Right-rtBG.Left;
             rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (rtBG.Height<minWidth)
+            {
+                rtBG.Height=minWidth;
+                rtBG.Top=rtBG.Bottom-rtBG.Height;
+            }
             this.LockRect=rtBG;    //保存上锁区域
 
             if (bDraw)
@@ -52189,6 +52256,11 @@ function ChartLock()
             var rtBG={ Left:left, Right:border.RightEx, Top:border.TopTitle, Bottom:border.Bottom };
             rtBG.Width=rtBG.Right-rtBG.Left;
             rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (rtBG.Width<minWidth)
+            {
+                rtBG.Width=minWidth;
+                rtBG.Left=rtBG.Right-rtBG.Width;
+            }
             this.LockRect=rtBG;    //保存上锁区域
 
             if (bDraw)
@@ -52201,13 +52273,7 @@ function ChartLock()
         }
 
         if (!bDraw) return;
-
-        var aryText=null;
-        if (Array.isArray(this.Title)) aryText=this.Title;
-        else aryText=[{Text:this.Title}];
-            
-        var outSize={ };
-        if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
+        if (!outSize) return;
 
         this.Canvas.textAlign='left';
         this.Canvas.textBaseline='bottom';
@@ -90862,32 +90928,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
-    this.TryClickLock=function(x,y)
-    {
-        for(var i=0;i<this.Frame.SubFrame.length; ++i)
-        {
-            var item=this.Frame.SubFrame[i];
-            var chartLock=item.Frame.LockPaint;
-            if (!chartLock || !chartLock.LockRect) continue;
-
-            var tooltip=new TooltipData();
-            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
-            if (event && event.Callback) 
-            {
-                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
-                event.Callback(event,sendData,this);
-            }
-
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
-
     this.TryClickIndexTitle=function(x,y)
     {
         for(var i in this.TitlePaint)
@@ -100694,34 +100734,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return false;
     }
-
-    this.TryClickLock=function(x,y)
-    {
-        for(var i=0;i<this.Frame.SubFrame.length; ++i)
-        {
-            var item=this.Frame.SubFrame[i];
-            var chartLock=item.Frame.LockPaint;
-            if (!chartLock || !chartLock.LockRect) continue;
-
-            var tooltip=new TooltipData();
-            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
-            if (event && event.Callback) 
-            {
-                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
-                event.Callback(event,sendData,this);
-            }
-
-
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
 }
 
 //盘前数据
@@ -102673,6 +102685,7 @@ function KLineChartHScreenContainer(uielement)
             frame.RightSpaceCount=this.RightSpaceCount; //右边
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.GlobalOption=this.GlobalOption;
+            frame.CreateLockPaint();
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -102861,6 +102874,7 @@ function MinuteChartHScreenContainer(uielement)
             frame.XPointCount=243;
             frame.HQChart=this;
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            frame.CreateLockPaint();
 
             var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
             frame.HorizontalMax=DEFAULT_HORIZONTAL[0];
@@ -109636,8 +109650,6 @@ function JSDivFrameToolbar()
         this.SetToolbar(aryButton); //重新设置按钮
     }
 
-    
-
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -109819,6 +109831,37 @@ JSDivFrameToolbar.GetDfaultButtons=function()
 }
 
 
+
+//DOM工厂类
+function JSDOMFactory()
+{
+    //[key:name, { Create:function(divElement) { return new class(divElement); }} ]
+    this.DataMap=new Map(
+    [
+        ["JSDivFrameToolbar", { Create:function(option) { return new JSDivFrameToolbar(option); } }],
+    ]); 
+
+    this.Create=function(name, option)
+    {
+        if (!this.DataMap.has(name)) 
+        {
+            JSConsole.Chart.Warn(`[JSDOMFactory::Create] can't find class=${name}.`);
+            return null;
+        }
+
+        var item=this.DataMap.get(name);
+        return item.Create(option);
+    }
+
+    this.Add=function(name, option)
+    {
+        this.DataMap.set(name, { Create:option.Create } );
+    }
+}
+
+var g_JSDOMFactory=new JSDOMFactory();
+
+
 function JSToolbarTooltip()
 {
     this.DivTooltip=null;
@@ -165100,11 +165143,7 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                 [
                     { Name:"收盘线(后台指标)", ID:"API-DRAWTEXTREL", Type:2, Args:null },
                     { Name:"高低均价(自定义脚本)", ID:"HIGH_LOW_AV", Type:1, Script:"均价:(H+L)/2;高:H;低:L;", Args:[ { Name:'N', Value:20}, { Name:'M', Value:6}]},
-                    { 
-                        Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:1, Args:null,
-                        Script:TEST_INDEX_4AE0_1,
-                        Lock:{ IsLocked:true }
-                    }
+                    { Name:"指标异常(后台指标)", ID:"API_ERRORMESSAGE", Type:2, Args:null,}
                 ]
             },
             {
@@ -165758,7 +165797,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15110";
+var HQCHART_VERSION="1.1.15120";
 
 function PrintHQChartVersion()
 {
@@ -165925,6 +165964,7 @@ export default {
         JSCHART_MENU_ID:JSCHART_MENU_ID,
         JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID,        //交易状态
         JSCHART_CORSSCURSOR_STATUS_ID:JSCHART_CORSSCURSOR_STATUS_ID,    //十字光标状态
+        CONDITION_PERIOD:CONDITION_PERIOD,          //指标周期条件枚举
     },