hqchart 1.1.14843 → 1.1.14848

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

@@ -45600,6 +45600,7 @@ function ChartBaseLineBar()
     this.LineWidth=1;
     this.IsDrawFirst=true;
     this.AryData=[];    //{ Date, Time, Up, Down }
+    this.DefaultMax;    //默认最大值
 
     this.MaxValue;
     this.YBaseLine;
@@ -45663,13 +45664,18 @@ function ChartBaseLineBar()
 
             if (IFrameSplitOperator.IsNumber(item.Up))
             {
-                var y=yCenter-(item.Up*this.BarMaxHeight/this.MaxValue);
+                var value=Math.abs(item.Up)*this.BarMaxHeight/this.MaxValue;
+                if (value<2) value=2;   //太短了 就直接画2个像素高度
+                var y=yCenter-value;
+                
                 aryUpBar.push({ X:x, Y:y});
             }
             
             if (IFrameSplitOperator.IsNumber(item.Down))
             {
-                var y=yCenter+(Math.abs(item.Down)*this.BarMaxHeight/this.MaxValue);
+                var value=Math.abs(item.Down)*this.BarMaxHeight/this.MaxValue;
+                if (value<2) value=2;
+                var y=yCenter+value;
                 aryDownBar.push({X:x, Y:y});
             }
         }
@@ -45717,7 +45723,7 @@ function ChartBaseLineBar()
         for (var i=0;i<aryBar.length;++i)
         {
             var item=aryBar[i];
-            var x=ToFixedPoint(item.X)
+            var x=ToFixedPoint(item.X);
             if (bHScreen)
             {
                 this.Canvas.moveTo(yCenter,x);
@@ -45771,6 +45777,7 @@ function ChartBaseLineBar()
         if (max && min)
         {
             this.MaxValue=Math.max(Math.abs(max.Value),Math.abs(min.Value));
+            if (IFrameSplitOperator.IsNumber(this.DefaultMax)) this.MaxValue=Math.max(this.DefaultMax,this.MaxValue);
         }
     }
 
@@ -82476,6 +82483,7 @@ function JSChartLocalization()
         ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
         ['DialogTooltip-AC-Increase', {CN:'竞价涨幅', EN:'Increase', TC:'競價漲幅'}],
         ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
+        ['DialogTooltip-AC-NotMatchVol', {CN:'未匹配量:', EN:'NV:', TC:'未匹配量'}],
         ['DialogTooltip-Value', {CN:'数值', EN:'Value', TC:'数值'}],
 
         ['FloatTooltip-Date', {CN:'日期', EN:'Date', TC:'日期'}],
@@ -129257,6 +129265,7 @@ function ScriptIndex(name,script,args,option)
         {
             if (config.UpColor) chart.UpColor=config.UpColor;
             if (config.DownColor) chart.DownColor=config.DownColor;
+            if (IFrameSplitOperator.IsNumber(config.DefaultMax)) chart.DefaultMax=config.DefaultMax;
         }
         
         chart.BuildCacheData();
@@ -130827,6 +130836,7 @@ function OverlayScriptIndex(name,script,args,option)
         {
             if (config.UpColor) chart.UpColor=config.UpColor;
             if (config.DownColor) chart.DownColor=config.DownColor;
+            if (IFrameSplitOperator.IsNumber(config.DefaultMax)) chart.DefaultMax=config.DefaultMax;
         }
         
         chart.BuildCacheData();
@@ -157267,17 +157277,31 @@ function JSDialogTooltip()
         {
             var item=data.Data.Data;
             if (!item) item={ Vol:[] };
-
-            var timeForamt="HH:MM:SS";
-            if (item.Ver===1) timeForamt="HH:MM"
-            aryText=
-            [
-                this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
-                this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
-                this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
-                this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
-                this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol' ),
-            ];
+            if (data.Data.Ver===1) 
+            {
+                var timeForamt="HH:MM"
+                aryText=
+                [
+                    this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                    this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
+                    this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
+                    this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
+                    this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol'),
+                ];
+            }
+            else
+            {
+                var timeForamt="HH:MM:SS";
+                aryText=
+                [
+                    this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                    this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
+                    this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
+                    this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
+                    this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol', 2),
+                    this.FormatVol(item.Vol[1]/unit,'DialogTooltip-AC-NotMatchVol', 2),
+                ];
+            }
         }
         else
         {
@@ -157398,7 +157422,7 @@ function JSDialogTooltip()
         return item;
     }
 
-    this.FormatVol=function(vol, TitleID)
+    this.FormatVol=function(vol, TitleID, floatPrecision)
     {
         var item=
         {
@@ -157409,7 +157433,10 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(vol)) return item;
 
-        item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);
+        var decimal=0;  //小数位数
+        if (IFrameSplitOperator.IsNumber(floatPrecision)) decimal=floatPrecision;
+
+        item.Text=IFrameSplitOperator.FormatValueStringV2(vol,decimal,2,this.LanguageID);
         
         return item;
     }
@@ -161087,7 +161114,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14842";
+var HQCHART_VERSION="1.1.14847";
 
 function PrintHQChartVersion()
 {