hqchart 1.1.15184 → 1.1.15191

package/src/jscommon/umychart.testdata.js

@@ -351,7 +351,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
 
         //盘中
-        //stockItem.minute.length=50;
+        stockItem.minute.length=50;
          //测试用 这里可以修改数据
         //var lastItem=srcStock.minute[srcStock.minute.length-1];
         //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
@@ -963,6 +963,7 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
         dayItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
     }
    
+    aryDay[0].minute.length=20;
     var hqchartData={code:0, data:aryDay, name:symbol, symbol: symbol};
 
     //hqchartData.data[0].minute.length=45;
@@ -1322,6 +1323,23 @@ HQData.CustomFunction_RequestData=function(data, callback)
             hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol/3 });
         }
     }
+    else if (funcName=="FUNC_ALPHA")
+    {
+        //模拟下载alpha系数序列
+        setTimeout(()=>
+        {
+            var kData=data.Self.Data;
+            var hqchartData={ DataType:2, Data:[] };
+            for(var i=0;i<kData.Data.length;++i)
+            {
+                var kItem=kData.Data[i];
+                hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:HQData.GetRandomTestData(0,100)/100 });
+            }
+             callback(hqchartData);
+        },300);
+
+        return;
+    }
     else
     {
         var error= `函数'${funcName}' 没有对接数据. [HQData.CustomFunction_RequestData]`;
@@ -1331,6 +1349,21 @@ HQData.CustomFunction_RequestData=function(data, callback)
     callback(hqchartData);
 }
 
+//ALPHA:FUNC_ALPHA(L);
+HQData.FUNC_ALPHA=function(obj)
+{
+    console.log("[HQData::FuncAlpha] obj=", obj);
+    var aryValue=obj.Args[0];           //参数
+    var aryAlpha=obj.DownloadData;      //下载数据
+    var aryData=[];
+    for(var i=0; i<aryValue.length; ++i)
+    {
+        aryData.push(aryValue[i]*aryAlpha[i]);
+    }
+
+    return { Out:aryData };
+}
+
 HQData.CustomVarData_RequestData=function(data, callback)
 {
     data.PreventDefault=true;

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

@@ -7789,7 +7789,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (!indexScript) return;
 
             data.IndexScript=indexScript;
-            data.Title=`[${indexScript.Name}]参数修改 窗口[${data.WindowIndex+1}]`;
+            data.Title=`[${indexScript.Name || "--"}]参数修改 窗口[${data.WindowIndex+1}]`;
         }
         else if (data.Type==2)
         {
@@ -7798,7 +7798,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var indexScript=overlayIndex.OverlayItem.Script;
 
             data.IndexScript=indexScript;
-            data.Title=`[${indexScript.Name}]参数修改 叠加窗口[${data.WindowIndex+1}]`;
+            data.Title=`[${indexScript.Name || "--"}]参数修改 叠加窗口[${data.WindowIndex+1}]`;
         }
 
         this.DialogModifyIndexParam.SetIndexData(data);
@@ -14908,8 +14908,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         var paint=this.GetRectSelectPaint();
         if (!paint) return false;
-        if (bEnforce) paint.PreventClose=false;
-        return paint.ClearPoint();
+        if (bEnforce) 
+        {
+            var oldPreventClose=paint.PreventClose; //备份下
+            paint.PreventClose=false;
+            var result=paint.ClearPoint();
+            paint.PreventClose=oldPreventClose; //还原
+            return result;
+        }
+        else
+        {
+            return paint.ClearPoint();
+        }
     }
 
     //删除指定窗口的所有叠加指标
@@ -55357,6 +55367,7 @@ function RectSelectPaint()
             if (option.LineColor) this.LineColor=option.LineColor;
             if (option.AreaColor) this.AreaColor=option.AreaColor;
             if (IFrameSplitOperator.IsBool(option.SpaceReselected)) this.SpaceReselected=option.SpaceReselected;
+            if (IFrameSplitOperator.IsBool(option.PreventClose)) this.PreventClose=option.PreventClose;
 
             if (option.ShowRangeText)
             {
@@ -81951,12 +81962,7 @@ function JSChartResource()
         }
     }
 
-    this.DivFrameToolbar=
-    {
-        Icon:{ Color:"rgb(0,0,0)", HoverColor:"rgb(30,144,255)" },
-        Tooltip:{ BGColor:"rgb(255,255,255)", TextColor:"rgb(71,71,71)", BorderColor:"rgb(0,0,0)" },
-    }
-   
+    
     //画图工具
     this.DrawPicture=
     {
@@ -83902,28 +83908,6 @@ function JSChartResource()
 
         if (style.SmallFloatTooltipV2) this.SetSmallFloatTooltipV2(style.SmallFloatTooltipV2);
 
-        if (style.DivFrameToolbar) this.SetDivFrameToolbar(style.DivFrameToolbar);
-    }
-
-    this.SetDivFrameToolbar=function(style)
-    {
-        var dest=this.DivFrameToolbar;
-        if (style.Icon)
-        {
-            var item=style.Icon;
-            var subDest=dest.Icon;
-            if (item.Color) subDest.Color=item.Color;
-            if (item.HoverColor) subDest.HoverColor=item.HoverColor;
-        }
-
-        if (style.Tooltip)
-        {
-            var item=style.Tooltip;
-            var subDest=dest.Tooltip;
-            if (item.TextColor) subDest.TextColor=item.TextColor;
-            if (item.BorderColor) subDest.BorderColor=item.BorderColor;
-            if (item.BGColor) subDest.BGColor=item.BGColor;
-        }
     }
 
     this.SetSmallFloatTooltipV2=function(style)
@@ -109528,12 +109512,6 @@ function JSDivFrameToolbar()
     this.Left=-1;
     this.Top=-1;
 
-    this.IconConfig=
-    { 
-        Color:g_JSChartResource.DivFrameToolbar.Icon.Color, 
-        HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor
-    }
-
     this.AryButton=[]; //按钮数组
 
     //创建按钮
@@ -109675,20 +109653,10 @@ function JSDivFrameToolbar()
     this.UpdateStyle=function()
     {
         if (!this.DivToolbar) return;
-
-        for(var i=0;i<this.AryButton.length; i++)
-        {
-            var item=this.AryButton[i]
-            if (!item.Span) continue;
-            item.Span.style["color"]=this.IconConfig.Color;     
-        }
     }
 
     this.ReloadResource=function(option)
     {
-        this.IconConfig.Color=g_JSChartResource.DivFrameToolbar.Icon.Color, 
-        this.IconConfig.HoverColor=g_JSChartResource.DivFrameToolbar.Icon.HoverColor;
-
         this.UpdateStyle();
     }
 
@@ -109725,15 +109693,12 @@ function JSDivFrameToolbar()
     {
         if (!item.Span) return;
 
-        item.Span.style["color"]=this.IconConfig.HoverColor;
-
         this.ShowTooltip(e, item);
     }
 
     this.OnLeaveButton=function(e, item)
     {
         if (!item.Span) return;
-        item.Span.style["color"]=this.IconConfig.Color;
 
         this.HideTooltip();
     }
@@ -109877,10 +109842,6 @@ function JSToolbarTooltip()
     this.Left=-1;
     this.Top=-1;
 
-    this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;
-    this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;
-    this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;
-
     this.Create=function()
     {
         var divDom=document.createElement("div");
@@ -109894,20 +109855,12 @@ function JSToolbarTooltip()
 
     this.ReloadResource=function(option)
     {
-        this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;
-        this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;
-        this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;
-
         this.UpdateStyle();
     }
 
     this.UpdateStyle=function()
     {
         if (!this.DivTooltip) return;
-
-        this.DivTooltip.style["background-color"]=this.BGColor;
-        this.DivTooltip.style["color"]=this.TextColor;
-        this.DivTooltip.style["border"]="1px solid " + this.BorderColor;
     }
 
     this.Show=function(top, left, tooltipData)
@@ -137415,12 +137368,6 @@ function GetBlackStyle()
             }
         },
 
-        DivFrameToolbar:
-        {
-            Icon:{ Color:"rgb(156,156,156)", HoverColor:"rgb(255,255,255)" },
-            Tooltip:{ BGColor:"rgb(32,32,32)", TextColor:"rgb(204,204,204)", BorderColor:"rgb(69,69,69)" },
-        },
-        
         DrawPicture:  //画图工具
         {
             LineColor: 
@@ -154164,7 +154111,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15183";
+var HQCHART_VERSION="1.1.15190";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -55883,7 +55883,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
 
         //盘中
-        //stockItem.minute.length=50;
+        stockItem.minute.length=50;
          //测试用 这里可以修改数据
         //var lastItem=srcStock.minute[srcStock.minute.length-1];
         //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
@@ -56495,6 +56495,7 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
         dayItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
     }
    
+    aryDay[0].minute.length=20;
     var hqchartData={code:0, data:aryDay, name:symbol, symbol: symbol};
 
     //hqchartData.data[0].minute.length=45;
@@ -56854,6 +56855,23 @@ HQData.CustomFunction_RequestData=function(data, callback)
             hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol/3 });
         }
     }
+    else if (funcName=="FUNC_ALPHA")
+    {
+        //模拟下载alpha系数序列
+        setTimeout(()=>
+        {
+            var kData=data.Self.Data;
+            var hqchartData={ DataType:2, Data:[] };
+            for(var i=0;i<kData.Data.length;++i)
+            {
+                var kItem=kData.Data[i];
+                hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:HQData.GetRandomTestData(0,100)/100 });
+            }
+             callback(hqchartData);
+        },300);
+
+        return;
+    }
     else
     {
         var error= `函数'${funcName}' 没有对接数据. [HQData.CustomFunction_RequestData]`;
@@ -56863,6 +56881,21 @@ HQData.CustomFunction_RequestData=function(data, callback)
     callback(hqchartData);
 }
 
+//ALPHA:FUNC_ALPHA(L);
+HQData.FUNC_ALPHA=function(obj)
+{
+    console.log("[HQData::FuncAlpha] obj=", obj);
+    var aryValue=obj.Args[0];           //参数
+    var aryAlpha=obj.DownloadData;      //下载数据
+    var aryData=[];
+    for(var i=0; i<aryValue.length; ++i)
+    {
+        aryData.push(aryValue[i]*aryAlpha[i]);
+    }
+
+    return { Out:aryData };
+}
+
 HQData.CustomVarData_RequestData=function(data, callback)
 {
     data.PreventDefault=true;

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

@@ -7833,7 +7833,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (!indexScript) return;
 
             data.IndexScript=indexScript;
-            data.Title=`[${indexScript.Name}]参数修改 窗口[${data.WindowIndex+1}]`;
+            data.Title=`[${indexScript.Name || "--"}]参数修改 窗口[${data.WindowIndex+1}]`;
         }
         else if (data.Type==2)
         {
@@ -7842,7 +7842,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var indexScript=overlayIndex.OverlayItem.Script;
 
             data.IndexScript=indexScript;
-            data.Title=`[${indexScript.Name}]参数修改 叠加窗口[${data.WindowIndex+1}]`;
+            data.Title=`[${indexScript.Name || "--"}]参数修改 叠加窗口[${data.WindowIndex+1}]`;
         }
 
         this.DialogModifyIndexParam.SetIndexData(data);
@@ -14952,8 +14952,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         var paint=this.GetRectSelectPaint();
         if (!paint) return false;
-        if (bEnforce) paint.PreventClose=false;
-        return paint.ClearPoint();
+        if (bEnforce) 
+        {
+            var oldPreventClose=paint.PreventClose; //备份下
+            paint.PreventClose=false;
+            var result=paint.ClearPoint();
+            paint.PreventClose=oldPreventClose; //还原
+            return result;
+        }
+        else
+        {
+            return paint.ClearPoint();
+        }
     }
 
     //删除指定窗口的所有叠加指标
@@ -55401,6 +55411,7 @@ function RectSelectPaint()
             if (option.LineColor) this.LineColor=option.LineColor;
             if (option.AreaColor) this.AreaColor=option.AreaColor;
             if (IFrameSplitOperator.IsBool(option.SpaceReselected)) this.SpaceReselected=option.SpaceReselected;
+            if (IFrameSplitOperator.IsBool(option.PreventClose)) this.PreventClose=option.PreventClose;
 
             if (option.ShowRangeText)
             {
@@ -81995,12 +82006,7 @@ function JSChartResource()
         }
     }
 
-    this.DivFrameToolbar=
-    {
-        Icon:{ Color:"rgb(0,0,0)", HoverColor:"rgb(30,144,255)" },
-        Tooltip:{ BGColor:"rgb(255,255,255)", TextColor:"rgb(71,71,71)", BorderColor:"rgb(0,0,0)" },
-    }
-   
+    
     //画图工具
     this.DrawPicture=
     {
@@ -83946,28 +83952,6 @@ function JSChartResource()
 
         if (style.SmallFloatTooltipV2) this.SetSmallFloatTooltipV2(style.SmallFloatTooltipV2);
 
-        if (style.DivFrameToolbar) this.SetDivFrameToolbar(style.DivFrameToolbar);
-    }
-
-    this.SetDivFrameToolbar=function(style)
-    {
-        var dest=this.DivFrameToolbar;
-        if (style.Icon)
-        {
-            var item=style.Icon;
-            var subDest=dest.Icon;
-            if (item.Color) subDest.Color=item.Color;
-            if (item.HoverColor) subDest.HoverColor=item.HoverColor;
-        }
-
-        if (style.Tooltip)
-        {
-            var item=style.Tooltip;
-            var subDest=dest.Tooltip;
-            if (item.TextColor) subDest.TextColor=item.TextColor;
-            if (item.BorderColor) subDest.BorderColor=item.BorderColor;
-            if (item.BGColor) subDest.BGColor=item.BGColor;
-        }
     }
 
     this.SetSmallFloatTooltipV2=function(style)
@@ -109572,12 +109556,6 @@ function JSDivFrameToolbar()
     this.Left=-1;
     this.Top=-1;
 
-    this.IconConfig=
-    { 
-        Color:g_JSChartResource.DivFrameToolbar.Icon.Color, 
-        HoverColor:g_JSChartResource.DivFrameToolbar.Icon.HoverColor
-    }
-
     this.AryButton=[]; //按钮数组
 
     //创建按钮
@@ -109719,20 +109697,10 @@ function JSDivFrameToolbar()
     this.UpdateStyle=function()
     {
         if (!this.DivToolbar) return;
-
-        for(var i=0;i<this.AryButton.length; i++)
-        {
-            var item=this.AryButton[i]
-            if (!item.Span) continue;
-            item.Span.style["color"]=this.IconConfig.Color;     
-        }
     }
 
     this.ReloadResource=function(option)
     {
-        this.IconConfig.Color=g_JSChartResource.DivFrameToolbar.Icon.Color, 
-        this.IconConfig.HoverColor=g_JSChartResource.DivFrameToolbar.Icon.HoverColor;
-
         this.UpdateStyle();
     }
 
@@ -109769,15 +109737,12 @@ function JSDivFrameToolbar()
     {
         if (!item.Span) return;
 
-        item.Span.style["color"]=this.IconConfig.HoverColor;
-
         this.ShowTooltip(e, item);
     }
 
     this.OnLeaveButton=function(e, item)
     {
         if (!item.Span) return;
-        item.Span.style["color"]=this.IconConfig.Color;
 
         this.HideTooltip();
     }
@@ -109921,10 +109886,6 @@ function JSToolbarTooltip()
     this.Left=-1;
     this.Top=-1;
 
-    this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;
-    this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;
-    this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;
-
     this.Create=function()
     {
         var divDom=document.createElement("div");
@@ -109938,20 +109899,12 @@ function JSToolbarTooltip()
 
     this.ReloadResource=function(option)
     {
-        this.BGColor=g_JSChartResource.DivFrameToolbar.Tooltip.BGColor;
-        this.TextColor=g_JSChartResource.DivFrameToolbar.Tooltip.TextColor;
-        this.BorderColor=g_JSChartResource.DivFrameToolbar.Tooltip.BorderColor;
-
         this.UpdateStyle();
     }
 
     this.UpdateStyle=function()
     {
         if (!this.DivTooltip) return;
-
-        this.DivTooltip.style["background-color"]=this.BGColor;
-        this.DivTooltip.style["color"]=this.TextColor;
-        this.DivTooltip.style["border"]="1px solid " + this.BorderColor;
     }
 
     this.Show=function(top, left, tooltipData)
@@ -137459,12 +137412,6 @@ function GetBlackStyle()
             }
         },
 
-        DivFrameToolbar:
-        {
-            Icon:{ Color:"rgb(156,156,156)", HoverColor:"rgb(255,255,255)" },
-            Tooltip:{ BGColor:"rgb(32,32,32)", TextColor:"rgb(204,204,204)", BorderColor:"rgb(69,69,69)" },
-        },
-        
         DrawPicture:  //画图工具
         {
             LineColor: 
@@ -166177,7 +166124,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15183";
+var HQCHART_VERSION="1.1.15190";
 
 function PrintHQChartVersion()
 {