hqchart 1.1.12708 → 1.1.12714

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

@@ -4638,6 +4638,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowIndexTitle)) chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;
                 if (IFrameSplitOperator.IsBool(item.IsDrawTitleBottomLine)) subFrame.IsDrawTitleBottomLine=item.IsDrawTitleBottomLine;
                 if (IFrameSplitOperator.IsBool(item.IsShowNameArrow)) chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;
+
+                if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
             }
         }
 
@@ -5051,6 +5053,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             {
                 var item=option.Frame[i];
                 if (!chart.Frame.SubFrame[i]) continue;
+                var subFrame=chart.Frame.SubFrame[i].Frame;
+                
                 if (IFrameSplitOperator.IsNumber(item.SplitCount)) chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitCount=item.SplitCount;
                 if (item.StringFormat) chart.Frame.SubFrame[i].Frame.YSplitOperator.StringFormat=item.StringFormat;
                 if (IFrameSplitOperator.IsNumber(item.SplitType)) 
@@ -5085,6 +5089,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
                 //是否显示关闭集合竞价按钮
                 if (IFrameSplitOperator.IsNumber(item.CloseBeforeButton)) chart.Frame.SubFrame[i].Frame.IsShowCloseButton=item.CloseBeforeButton;
+
+                if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
             }
 
             chart.UpdateXShowText();
@@ -13346,6 +13352,8 @@ function IChartFramePainting()
     this.HorizontalMin;                 //Y轴最小值
     this.XPointCount=10;                //X轴数据个数
 
+    this.ClientBGColor;                 //客户区背景色
+
     //Y轴原始的最大值 最小值
     this.YMaxMin={ Max:null, Min:null };
 
@@ -13411,6 +13419,7 @@ function IChartFramePainting()
     this.Draw=function()
     {
         this.Buttons=[];
+        this.DrawClientBG();
         this.DrawFrame();
         this.DrawBorder();
 
@@ -13421,6 +13430,25 @@ function IChartFramePainting()
 
     this.DrawFrame=function() { }
 
+    this.DrawClientBG=function()
+    {
+        if (!this.ClientBGColor) return;
+
+        var border=this.IsHScreen==true?this.ChartBorder.GetHScreenBorder():this.ChartBorder.GetBorder();
+
+        var left=ToFixedPoint(border.Left);
+        var top=ToFixedPoint(border.Top);
+        //var top=ToFixedPoint(border.TopEx);
+        var right=ToFixedPoint(border.Right);
+        var bottom=ToFixedPoint(border.Bottom);
+        var width=right-left;
+        var height=bottom-top;
+
+        this.Canvas.fillStyle=this.ClientBGColor;
+        this.Canvas.fillRect(left,top,width,height);
+
+    }
+
     this.ClearCoordinateText=function(option)
     {
         if (IFrameSplitOperator.IsNonEmptyArray(this.HorizontalInfo))
@@ -34834,7 +34862,9 @@ function ChartSingleText()
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
@@ -34863,6 +34893,10 @@ function ChartSingleText()
         var chartright=this.ChartBorder.GetRight();
         var top=this.ChartBorder.GetTopEx();
         var bottom=this.ChartBorder.GetBottomEx();
+
+        this.Canvas.save();
+        this.ClipClient(this.ChartFrame.IsHScreen);
+
         if (isHScreen) 
         {
             chartright=this.ChartBorder.GetBottom();
@@ -34928,7 +34962,7 @@ function ChartSingleText()
                 var x=left+(right-left)/2;
             }
             
-            var y=this.ChartFrame.GetYFromData(value);
+            var y=this.ChartFrame.GetYFromData(value,false);
 
             if (x>chartright) break;
 
@@ -35027,6 +35061,8 @@ function ChartSingleText()
                 }
             }
         }
+
+        this.Canvas.restore();
     }
 
     this.DrawPosition=function()    //绘制在指定位置上
@@ -35346,7 +35382,9 @@ function ChartDrawText()
 
     this.Draw=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -35364,6 +35402,10 @@ function ChartDrawText()
         var chartright=this.ChartBorder.GetRight();
         var top=this.ChartBorder.GetTopEx();
         var bottom=this.ChartBorder.GetBottomEx();
+
+        this.Canvas.save();
+        this.ClipClient(isHScreen);
+
         if (isHScreen) 
         {
             chartright=this.ChartBorder.GetBottom();
@@ -35412,7 +35454,7 @@ function ChartDrawText()
             }
             else
             {
-                y=this.ChartFrame.GetYFromData(value);
+                y=this.ChartFrame.GetYFromData(value,false);
             }
                 
             if (x>chartright) break;
@@ -35436,6 +35478,8 @@ function ChartDrawText()
 
             this.DrawVerticalLine(i, drawTextInfo, isHScreen);
         }
+
+        this.Canvas.restore();
     }
 
     this.DrawText=function(text, drawInfo, isHScreen)
@@ -105067,6 +105111,11 @@ function JSDraw(errorHandler,symbolData)
         return offset;
     }
 
+    this.FIRSTDRAW=function(value)
+    {
+        return value;
+    }
+
 
     /*
     SOUND 播放声音。用法：SOUND(NAME)，播放NAME
@@ -111698,6 +111747,7 @@ function JSExecute(ast,option)
                 var fontSize=-1;
                 var bgConfig=null;    //背景设置
                 var vLineConfig=null;
+                var isFirstDraw=null;
                 let xOffset=null, yOffset=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
@@ -111821,6 +111871,11 @@ function JSExecute(ast,option)
                             {
                                 yOffset=itemExpression.Out;
                             }
+                            else if (itemExpression.Callee.Name=="FIRSTDRAW")
+                            {
+                                if (itemExpression.Out===0) isFirstDraw=false;
+                                else if (itemExpression.Out===1) isFirstDraw=true;
+                            }
                             else if (itemExpression.Callee.Name=="SOUND")
                             {
                                 var event=this.GetSoundEvent();
@@ -111969,6 +112024,7 @@ function JSExecute(ast,option)
                     if (vLineConfig) outVar.VerticalLine=vLineConfig;
                     if (IFrameSplitOperator.IsNumber(xOffset)) outVar.XOffset=xOffset;
                     if (IFrameSplitOperator.IsNumber(yOffset)) outVar.YOffset=yOffset;
+                    if (IFrameSplitOperator.IsBool(isFirstDraw)) outVar.IsFirstDraw=isFirstDraw;
                     this.OutVarTable.push(outVar);
                 }
                 else if (varName)
@@ -112337,6 +112393,9 @@ function JSExecute(ast,option)
             case "YMOVE":
                 node.Out=this.Draw.YMOVE(args[0]);
                 break;
+            case "FIRSTDRAW":
+                node.Out=this.Draw.FIRSTDRAW(args[0]);
+                break;
             case 'PARTLINE':
                 node.Draw=this.Draw.PARTLINE(args);
                 node.Out=[];
@@ -113407,6 +113466,8 @@ function JSExplainer(ast,option)
                 return `上涨颜色${args[0]}`;
             case "DOWNCOLOR":
                 return `下跌颜色${args[0]}`;
+            case "FIRSTDRAW":
+                return "";
 
             default:
                 this.ThrowUnexpectedNode(node,`函数${funcName}不存在`);
@@ -114919,6 +114980,8 @@ function ScriptIndex(name,script,args,option)
         chart.SecondColor = varItem.Draw.Color[1];
         chart.Data.Data=varItem.Draw.DrawData;
 
+        if (IFrameSplitOperator.IsBool(varItem.IsFirstDraw)) chart.IsDrawFirst=varItem.IsFirstDraw;
+
         hqChart.ChartPaint.push(chart);
     }
 
@@ -116252,6 +116315,10 @@ function OverlayScriptIndex(name,script,args,option)
                     case 'POLYLINE':
                         this.CreatePolyLine(hqChart,windowIndex,item,i);
                         break;
+                    case 'DRAWGBK':
+                    case "DRAWGBK2":
+                        this.CreateBackgroud(hqChart,windowIndex,item,i);
+                        break;
                     case 'DRAWNUMBER':
                     case "DRAWNUMBER_FIX":  
                     case 'DRAWTEXT_FIX':  
@@ -116783,6 +116850,8 @@ function OverlayScriptIndex(name,script,args,option)
         chart.SecondColor = varItem.Draw.Color[1];
         chart.Data.Data=varItem.Draw.DrawData;
 
+        if (IFrameSplitOperator.IsBool(varItem.IsFirstDraw)) chart.IsDrawFirst=varItem.IsFirstDraw;
+
         frame.ChartPaint.push(chart);
     }
 
@@ -130868,7 +130937,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12692";
+var HQCHART_VERSION="1.1.12712";
 
 function PrintHQChartVersion()
 {

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

@@ -4682,6 +4682,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowIndexTitle)) chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;
                 if (IFrameSplitOperator.IsBool(item.IsDrawTitleBottomLine)) subFrame.IsDrawTitleBottomLine=item.IsDrawTitleBottomLine;
                 if (IFrameSplitOperator.IsBool(item.IsShowNameArrow)) chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;
+
+                if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
             }
         }
 
@@ -5095,6 +5097,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             {
                 var item=option.Frame[i];
                 if (!chart.Frame.SubFrame[i]) continue;
+                var subFrame=chart.Frame.SubFrame[i].Frame;
+                
                 if (IFrameSplitOperator.IsNumber(item.SplitCount)) chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitCount=item.SplitCount;
                 if (item.StringFormat) chart.Frame.SubFrame[i].Frame.YSplitOperator.StringFormat=item.StringFormat;
                 if (IFrameSplitOperator.IsNumber(item.SplitType)) 
@@ -5129,6 +5133,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
                 //是否显示关闭集合竞价按钮
                 if (IFrameSplitOperator.IsNumber(item.CloseBeforeButton)) chart.Frame.SubFrame[i].Frame.IsShowCloseButton=item.CloseBeforeButton;
+
+                if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
             }
 
             chart.UpdateXShowText();
@@ -13390,6 +13396,8 @@ function IChartFramePainting()
     this.HorizontalMin;                 //Y轴最小值
     this.XPointCount=10;                //X轴数据个数
 
+    this.ClientBGColor;                 //客户区背景色
+
     //Y轴原始的最大值 最小值
     this.YMaxMin={ Max:null, Min:null };
 
@@ -13455,6 +13463,7 @@ function IChartFramePainting()
     this.Draw=function()
     {
         this.Buttons=[];
+        this.DrawClientBG();
         this.DrawFrame();
         this.DrawBorder();
 
@@ -13465,6 +13474,25 @@ function IChartFramePainting()
 
     this.DrawFrame=function() { }
 
+    this.DrawClientBG=function()
+    {
+        if (!this.ClientBGColor) return;
+
+        var border=this.IsHScreen==true?this.ChartBorder.GetHScreenBorder():this.ChartBorder.GetBorder();
+
+        var left=ToFixedPoint(border.Left);
+        var top=ToFixedPoint(border.Top);
+        //var top=ToFixedPoint(border.TopEx);
+        var right=ToFixedPoint(border.Right);
+        var bottom=ToFixedPoint(border.Bottom);
+        var width=right-left;
+        var height=bottom-top;
+
+        this.Canvas.fillStyle=this.ClientBGColor;
+        this.Canvas.fillRect(left,top,width,height);
+
+    }
+
     this.ClearCoordinateText=function(option)
     {
         if (IFrameSplitOperator.IsNonEmptyArray(this.HorizontalInfo))
@@ -34878,7 +34906,9 @@ function ChartSingleText()
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
@@ -34907,6 +34937,10 @@ function ChartSingleText()
         var chartright=this.ChartBorder.GetRight();
         var top=this.ChartBorder.GetTopEx();
         var bottom=this.ChartBorder.GetBottomEx();
+
+        this.Canvas.save();
+        this.ClipClient(this.ChartFrame.IsHScreen);
+
         if (isHScreen) 
         {
             chartright=this.ChartBorder.GetBottom();
@@ -34972,7 +35006,7 @@ function ChartSingleText()
                 var x=left+(right-left)/2;
             }
             
-            var y=this.ChartFrame.GetYFromData(value);
+            var y=this.ChartFrame.GetYFromData(value,false);
 
             if (x>chartright) break;
 
@@ -35071,6 +35105,8 @@ function ChartSingleText()
                 }
             }
         }
+
+        this.Canvas.restore();
     }
 
     this.DrawPosition=function()    //绘制在指定位置上
@@ -35390,7 +35426,9 @@ function ChartDrawText()
 
     this.Draw=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
 
         if (this.NotSupportMessage)
         {
@@ -35408,6 +35446,10 @@ function ChartDrawText()
         var chartright=this.ChartBorder.GetRight();
         var top=this.ChartBorder.GetTopEx();
         var bottom=this.ChartBorder.GetBottomEx();
+
+        this.Canvas.save();
+        this.ClipClient(isHScreen);
+
         if (isHScreen) 
         {
             chartright=this.ChartBorder.GetBottom();
@@ -35456,7 +35498,7 @@ function ChartDrawText()
             }
             else
             {
-                y=this.ChartFrame.GetYFromData(value);
+                y=this.ChartFrame.GetYFromData(value,false);
             }
                 
             if (x>chartright) break;
@@ -35480,6 +35522,8 @@ function ChartDrawText()
 
             this.DrawVerticalLine(i, drawTextInfo, isHScreen);
         }
+
+        this.Canvas.restore();
     }
 
     this.DrawText=function(text, drawInfo, isHScreen)
@@ -105111,6 +105155,11 @@ function JSDraw(errorHandler,symbolData)
         return offset;
     }
 
+    this.FIRSTDRAW=function(value)
+    {
+        return value;
+    }
+
 
     /*
     SOUND 播放声音。用法：SOUND(NAME)，播放NAME
@@ -111742,6 +111791,7 @@ function JSExecute(ast,option)
                 var fontSize=-1;
                 var bgConfig=null;    //背景设置
                 var vLineConfig=null;
+                var isFirstDraw=null;
                 let xOffset=null, yOffset=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
@@ -111865,6 +111915,11 @@ function JSExecute(ast,option)
                             {
                                 yOffset=itemExpression.Out;
                             }
+                            else if (itemExpression.Callee.Name=="FIRSTDRAW")
+                            {
+                                if (itemExpression.Out===0) isFirstDraw=false;
+                                else if (itemExpression.Out===1) isFirstDraw=true;
+                            }
                             else if (itemExpression.Callee.Name=="SOUND")
                             {
                                 var event=this.GetSoundEvent();
@@ -112013,6 +112068,7 @@ function JSExecute(ast,option)
                     if (vLineConfig) outVar.VerticalLine=vLineConfig;
                     if (IFrameSplitOperator.IsNumber(xOffset)) outVar.XOffset=xOffset;
                     if (IFrameSplitOperator.IsNumber(yOffset)) outVar.YOffset=yOffset;
+                    if (IFrameSplitOperator.IsBool(isFirstDraw)) outVar.IsFirstDraw=isFirstDraw;
                     this.OutVarTable.push(outVar);
                 }
                 else if (varName)
@@ -112381,6 +112437,9 @@ function JSExecute(ast,option)
             case "YMOVE":
                 node.Out=this.Draw.YMOVE(args[0]);
                 break;
+            case "FIRSTDRAW":
+                node.Out=this.Draw.FIRSTDRAW(args[0]);
+                break;
             case 'PARTLINE':
                 node.Draw=this.Draw.PARTLINE(args);
                 node.Out=[];
@@ -113451,6 +113510,8 @@ function JSExplainer(ast,option)
                 return `上涨颜色${args[0]}`;
             case "DOWNCOLOR":
                 return `下跌颜色${args[0]}`;
+            case "FIRSTDRAW":
+                return "";
 
             default:
                 this.ThrowUnexpectedNode(node,`函数${funcName}不存在`);
@@ -114963,6 +115024,8 @@ function ScriptIndex(name,script,args,option)
         chart.SecondColor = varItem.Draw.Color[1];
         chart.Data.Data=varItem.Draw.DrawData;
 
+        if (IFrameSplitOperator.IsBool(varItem.IsFirstDraw)) chart.IsDrawFirst=varItem.IsFirstDraw;
+
         hqChart.ChartPaint.push(chart);
     }
 
@@ -116296,6 +116359,10 @@ function OverlayScriptIndex(name,script,args,option)
                     case 'POLYLINE':
                         this.CreatePolyLine(hqChart,windowIndex,item,i);
                         break;
+                    case 'DRAWGBK':
+                    case "DRAWGBK2":
+                        this.CreateBackgroud(hqChart,windowIndex,item,i);
+                        break;
                     case 'DRAWNUMBER':
                     case "DRAWNUMBER_FIX":  
                     case 'DRAWTEXT_FIX':  
@@ -116827,6 +116894,8 @@ function OverlayScriptIndex(name,script,args,option)
         chart.SecondColor = varItem.Draw.Color[1];
         chart.Data.Data=varItem.Draw.DrawData;
 
+        if (IFrameSplitOperator.IsBool(varItem.IsFirstDraw)) chart.IsDrawFirst=varItem.IsFirstDraw;
+
         frame.ChartPaint.push(chart);
     }
 
@@ -131026,7 +131095,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12692";
+var HQCHART_VERSION="1.1.12712";
 
 function PrintHQChartVersion()
 {