hqchart 1.1.12513 → 1.1.12522

package/src/jscommon/umychart.wechat/umychart.chartpaint.wechat.js

@@ -98,6 +98,7 @@ function IChartPainting()
     this.Name;                          //名称
     this.ClassName = 'IChartPainting';    //类名
     this.Data = new ChartData();          //数据区
+    this.Script;                        //图形对应的指标脚本 (只有指标图形才有)
 
     this.NotSupportMessage = null;
     this.MessageFont = g_JSChartPaintResource.Index.NotSupport.Font;
@@ -123,6 +124,13 @@ function IChartPainting()
         return isMinute
     }
 
+    //是否隐藏指标
+    this.IsHideScriptIndex=function()
+    {
+        if (this.Script && this.Script.IsShow==false) return true;
+        return false;
+    }
+
     this.DrawNotSupportmessage = function () 
     {
         this.Canvas.font = this.MessageFont;
@@ -3303,6 +3311,7 @@ function ChartLine()
     this.Draw = function () 
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsHideScriptIndex()) return;
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
@@ -3804,6 +3813,7 @@ function ChartStick()
     this.DrawLine = function () 
     {
         if (this.ChartFrame.IsMinSize) return;
+        if (this.IsHideScriptIndex()) return;
         if (!this.Data || !this.Data.Data) return;
 
         var isHScreen = (this.ChartFrame.IsHScreen === true);
@@ -3915,7 +3925,7 @@ function ChartLineStick()
     this.Draw = function () 
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-
+        if (this.IsHideScriptIndex()) return;
         if (this.NotSupportMessage) 
         {
             this.DrawNotSupportmessage();
@@ -5936,6 +5946,7 @@ function ChartMACD()
     this.Draw = function () 
     {
         if (this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsHideScriptIndex()) return;
         if (this.NotSupportMessage) 
         {
             this.DrawNotSupportmessage();
@@ -7010,6 +7021,7 @@ function ChartVolStick()
     this.Draw = function () 
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsHideScriptIndex()) return;
         if (this.ChartFrame.IsHScreen === true) 
         {
             this.HScreenDraw();

package/src/jscommon/umychart.wechat/umychart.index.wechat.js

@@ -216,6 +216,8 @@ function ScriptIndex(name, script, args, option)
     this.TitleFont=g_JSChartResource.DynamicTitleFont;      //标题字体
     this.IsShortTitle=false;                                //是否显示指标参数
 
+    this.IsShow=true;       //是否显示图形
+
     if (option) 
     {
         if (option.FloatPrecision >= 0) this.FloatPrecision = option.FloatPrecision;
@@ -1476,6 +1478,10 @@ function ScriptIndex(name, script, args, option)
     {
         if (this.Name) chart.IndexName=this.Name;
         else if (this.ID) chart.IndexName==this.ID;
+
+        if (this.ID) chart.IndexID=this.ID;
+        
+        chart.Script=this;  //指标内容绑定上去
     }
 }