hqchart 1.1.14128 → 1.1.14135

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.14128",
+  "version": "1.1.14135",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogTooltip.js

@@ -488,6 +488,7 @@ function JSDialogTooltip()
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
         var upperSymbol=this.HQChart.Symbol.toUpperCase();
+        var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);
         var priceFormat=0;
         if (this.Style==1) priceFormat=1;
 
@@ -505,7 +506,7 @@ function JSDialogTooltip()
             this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'DialogTooltip-High',priceFormat),
             this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'DialogTooltip-Low',priceFormat),
             this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'DialogTooltip-Close',priceFormat),
-            this.FormatVol(data.Vol,'DialogTooltip-Vol' ),
+            this.FormatVol(data.Vol/unit,'DialogTooltip-Vol' ),
             this.FormatAmount(data.Amount,'DialogTooltip-Amount' ),
             this.FormatIncrease(data.Close,yClose,defaultfloatPrecision,'DialogTooltip-Increase',priceFormat),
             this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'DialogTooltip-Amplitude',priceFormat),
@@ -567,6 +568,8 @@ function JSDialogTooltip()
     this.GetFormatMinuteTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
+        var upperSymbol=this.HQChart.Symbol.toUpperCase();
+        var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);
         var aryText=[];
         if (data.Type==0) //连续交易
         {
@@ -581,7 +584,7 @@ function JSDialogTooltip()
                 this.ForamtPrice(item.AvPrice,item.YClose, defaultfloatPrecision,'DialogTooltip-AvPrice', 1),
                 this.FormatRisefall(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Risefall'),
                 this.FormatIncrease(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Increase', 1),
-                this.FormatVol(item.Vol,'DialogTooltip-Vol' ),
+                this.FormatVol(item.Vol/unit,'DialogTooltip-Vol' ),
                 this.FormatAmount(item.Amount,'DialogTooltip-Amount' ),
             ];
 
@@ -614,7 +617,7 @@ function JSDialogTooltip()
                 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],'DialogTooltip-AC-Vol' ),
+                this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol' ),
             ];
         }
         else
@@ -1479,6 +1482,7 @@ function JSFloatTooltip()
         var symbol=kItem.Symbol;
         var upperSymbol=symbol.toUpperCase();
         var defaultfloatPrecision=GetfloatPrecision(symbol);//价格小数位数
+        var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);
 
         //日期
         var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'FloatTooltip-Date' );
@@ -1500,7 +1504,7 @@ function JSFloatTooltip()
             this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'FloatTooltip-Low'),
             this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'FloatTooltip-Close'),
             this.ForamtPrice(data.YClose,data.YClose, defaultfloatPrecision,'FloatTooltip-YClose'),
-            this.FormatVol(data.Vol,'FloatTooltip-Vol' ),
+            this.FormatVol(data.Vol/unit,'FloatTooltip-Vol' ),
             this.FormatAmount(data.Amount,'FloatTooltip-Amount' ),
             this.FormatIncrease(data.Close,yClose,defaultfloatPrecision,'FloatTooltip-Increase'),
             this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'FloatTooltip-Amplitude'), 

package/src/jscommon/umychart.complier.js

@@ -12481,9 +12481,7 @@ function JSSymbolData(ast,option,jsExecute)
                 return kData.GetClose();
             case 'VOL':
             case 'V':
-                if (MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) 
-                    return kData.GetVol(100);   //A股的 把股转成手
-                return kData.GetVol();
+                return kData.GetVol(MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol));
             case 'OPEN':
             case 'O':
                 return kData.GetOpen();
@@ -13112,9 +13110,7 @@ function JSSymbolData(ast,option,jsExecute)
                 return this.Data.GetClose();
             case 'VOL':
             case 'V':
-                if (MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol) && this.DataType==HQ_DATA_TYPE.KLINE_ID) //!! A股K线量单位时股，分时图单位还是手
-                    return this.Data.GetVol(100);   //A股的 把股转成手
-                return this.Data.GetVol();
+                return this.Data.GetVol(MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol));
             case 'OPEN':
             case 'O':
                 return this.Data.GetOpen();
@@ -13360,9 +13356,7 @@ function JSSymbolData(ast,option,jsExecute)
                 return result.GetAmount();
             case 'V':
             case "VOL":
-                if (MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) 
-                    return result.GetVol(100);
-                return result.GetVol();
+                return result.GetVol(MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol));
             case "VOLINSTK":
                 return result.GetPosition();
             default: