hqchart 1.1.12598 → 1.1.12607

package/lib/umychart.vue.js

@@ -4922,8 +4922,66 @@ if(!pageInfo)return;if(!this.OverlayIndex)return;if(!IFrameSplitOperator.IsNonEm
 info.IsLast=pageInfo.IsLast;//是否是最后一个数据
 if(IFrameSplitOperator.IsNumber(option.LineType))info.LineType=option.LineType;info.Value=item.Value;var text=IFrameSplitOperator.FormatValueString(item.Value,floatPrecision,this.LanguageID);if(option.Position=='left')info.Message[0]=text;else info.Message[1]=text;if(!pageInfo.IsLast){var config={};if(!pageInfo.IsLast)config.EmptyBGColor=g_JSChartResource.FrameLatestPrice.EmptyBGColor;info.ExtendData={Custom:config};}if(event){var sendData={PreventDefault:false,Label:info,Data:item,IndexName:chart.IndexName,OverlayIdentify:this.OverlayIndex.Identify};event.Callback(event,sendData,this);if(sendData.PreventDefault)continue;}this.Frame.CustomHorizontalInfo.push(info);}}};}//字符串格式化 千分位分割
 IFrameSplitOperator.FormatValueThousandsString=function(value,floatPrecision){if(value==null||isNaN(value)){if(floatPrecision>0){var nullText='-.';for(var i=0;i<floatPrecision;++i){nullText+='-';}return nullText;}return'--';}var result='';var num=value.toFixed(floatPrecision);if(floatPrecision>0){var numFloat=num.split('.')[1];var numM=num.split('.')[0];while(numM.length>3){result=','+numM.slice(-3)+result;numM=numM.slice(0,numM.length-3);}if(numM){result=numM+result+'.'+numFloat;}}else{while(num.length>3){result=','+num.slice(-3)+result;num=num.slice(0,num.length-3);}if(num){result=num+result;}}return result;};//数据输出格式化 floatPrecision=小数位数
-IFrameSplitOperator.FormatValueString=function(value,floatPrecision,languageID){if(value==null||isNaN(value)){if(floatPrecision>0){var nullText='-.';for(var i=0;i<floatPrecision;++i){nullText+='-';}return nullText;}return'--';}if(value<0.00000000001&&value>-0.00000000001){return"0";}var absValue=Math.abs(value);if(languageID===JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID){if(absValue<10000)return value.toFixed(floatPrecision);else if(absValue<1000000)return(value/1000).toFixed(floatPrecision)+"K";else if(absValue<1000000000)return(value/1000000).toFixed(floatPrecision)+"M";else if(absValue<1000000000000)return(value/1000000000).toFixed(floatPrecision)+"B";else return(value/1000000000000).toFixed(floatPrecision)+"T";}else if(languageID===JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID)//繁体
-{if(absValue<10000)return value.toFixed(floatPrecision);else if(absValue<100000000)return(value/10000).toFixed(floatPrecision)+"萬";else if(absValue<1000000000000)return(value/100000000).toFixed(floatPrecision)+"億";else return(value/1000000000000).toFixed(floatPrecision)+"萬億";}else{if(absValue<10000)return value.toFixed(floatPrecision);else if(absValue<1000000)return(value/10000).toFixed(floatPrecision)+"万";else if(absValue<100000000)return(value/10000).toFixed(floatPrecision)+"万";else if(absValue<1000000000000)return(value/100000000).toFixed(floatPrecision)+"亿";else return(value/1000000000000).toFixed(floatPrecision)+"万亿";}return'';};//成交量显示
+IFrameSplitOperator.FormatValueString=function(value,floatPrecision,languageID){/*
+    if (value==null || isNaN(value))
+    {
+        if (floatPrecision>0)
+        {
+            var nullText='-.';
+            for(var i=0;i<floatPrecision;++i)
+                nullText+='-';
+            return nullText;
+        }
+
+        return '--';
+    }
+
+    if (value<0.00000000001 && value>-0.00000000001)
+    {
+        return "0";
+    }
+
+    var absValue = Math.abs(value);
+    if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID)
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 1000000)
+            return (value/1000).toFixed(floatPrecision)+"K";
+        else if (absValue < 1000000000)
+            return (value/1000000).toFixed(floatPrecision)+"M";
+        else if (absValue < 1000000000000)
+            return (value/1000000000).toFixed(floatPrecision)+"B";
+        else 
+            return (value/1000000000000).toFixed(floatPrecision)+"T";
+    }
+    else if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID)  //繁体
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision)+"萬";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision)+"億";
+        else
+            return (value/1000000000000).toFixed(floatPrecision)+"萬億";
+    }
+    else
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue<1000000)
+            return (value/10000).toFixed(floatPrecision)+"万";
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision)+"万";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision)+"亿";
+        else
+            return (value/1000000000000).toFixed(floatPrecision)+"万亿";
+    }
+    */return IFrameSplitOperator.FormatValueStringV2(value,floatPrecision,floatPrecision,languageID);};//数据输出格式化 floatPrecision=原始小数位数 floatPrecision2=转换成'万','亿'..的小数位
+IFrameSplitOperator.FormatValueStringV2=function(value,floatPrecision,floatPrecision2,languageID){if(value==null||isNaN(value)){if(floatPrecision>0){var nullText='-.';for(var i=0;i<floatPrecision;++i){nullText+='-';}return nullText;}return'--';}if(value<0.00000000001&&value>-0.00000000001){return"0";}var absValue=Math.abs(value);if(languageID===JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID){if(absValue<10000)return value.toFixed(floatPrecision);else if(absValue<1000000)return(value/1000).toFixed(floatPrecision2)+"K";else if(absValue<1000000000)return(value/1000000).toFixed(floatPrecision2)+"M";else if(absValue<1000000000000)return(value/1000000000).toFixed(floatPrecision2)+"B";else return(value/1000000000000).toFixed(floatPrecision2)+"T";}else if(languageID===JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID)//繁体
+{if(absValue<10000)return value.toFixed(floatPrecision);else if(absValue<100000000)return(value/10000).toFixed(floatPrecision2)+"萬";else if(absValue<1000000000000)return(value/100000000).toFixed(floatPrecision2)+"億";else return(value/1000000000000).toFixed(floatPrecision2)+"萬億";}else{if(absValue<10000)return value.toFixed(floatPrecision);else if(absValue<1000000)return(value/10000).toFixed(floatPrecision2)+"万";else if(absValue<100000000)return(value/10000).toFixed(floatPrecision2)+"万";else if(absValue<1000000000000)return(value/100000000).toFixed(floatPrecision2)+"亿";else return(value/1000000000000).toFixed(floatPrecision2)+"万亿";}return'';};//成交量显示
 IFrameSplitOperator.FormatVolString=function(value,languageID){var absValue=Math.abs(value);if(absValue<100000)return value.toFixed(0);else if(absValue<10000000)return(value/10000).toFixed(1)+"万";else if(absValue<100000000)return(value/10000).toFixed(0)+"万";else if(absValue<1000000000)return(value/100000000).toFixed(2)+"亿";else if(absValue<1000000000000)return(value/100000000).toFixed(1)+"亿";else return(value/1000000000000).toFixed(1)+"万亿";};//整形输出格式化 floatPrecision=小数位数
 IFrameSplitOperator.FromatIntegerString=function(value,floatPrecision,languageID){if(value<10000&&IFrameSplitOperator.IsInteger(value))floatPrecision=0;//<10000的整形 去掉小数位数
 return IFrameSplitOperator.FormatValueString(value,floatPrecision,languageID);};IFrameSplitOperator.NumberToString=function(value){if(value<10)return'0'+value.toString();return value.toString();};//毫秒格式 固定3位, 不足前面自动补0 
@@ -11855,7 +11913,7 @@ WHITE_ID:0//白色风格
 this.CanvasElement=document.createElement("canvas");this.CanvasElement.className='jsdeallist-drawing';this.CanvasElement.id=Guid();this.CanvasElement.setAttribute("tabindex",0);if(this.CanvasElement.style)this.CanvasElement.style.outline='none';if(divElement.hasChildNodes()){JSConsole.Chart.Log("[JSDealChart::JSDealList] divElement hasChildNodes",divElement.childNodes);}divElement.appendChild(this.CanvasElement);this.OnSize=function(){//画布大小通过div获取
 var height=parseInt(this.DivElement.style.height.replace("px",""));this.CanvasElement.height=height;this.CanvasElement.width=parseInt(this.DivElement.style.width.replace("px",""));this.CanvasElement.style.width=this.CanvasElement.width+'px';this.CanvasElement.style.height=this.CanvasElement.height+'px';var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 this.CanvasElement.height*=pixelTatio;this.CanvasElement.width*=pixelTatio;JSConsole.Chart.Log('[JSDealChart::OnSize] devicePixelRatio='+window.devicePixelRatio+', height='+this.CanvasElement.height+', width='+this.CanvasElement.width);if(this.JSChartContainer&&this.JSChartContainer.OnSize){this.JSChartContainer.OnSize();}};this.SetOption=function(option){var chart=this.CreateJSDealChartContainer(option);if(!chart)return false;if(option.OnCreatedCallback)option.OnCreatedCallback(chart);this.JSChartContainer=chart;this.DivElement.JSChart=this;//div中保存一份
-if(!option.Symbol){chart.Draw();}else{chart.ChangeSymbol(option.Symbol);}};this.CreateJSDealChartContainer=function(option){var chart=new JSDealChartContainer(this.CanvasElement);chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);this.SetChartBorder(chart,option);//是否自动更新
+if(!option.Symbol){chart.Draw();}else{chart.ChangeSymbol(option.Symbol);}};this.CreateJSDealChartContainer=function(option){var chart=new JSDealChartContainer(this.CanvasElement);chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNumber(option.ShowOrder))chart.ChartPaint[0].ShowOrder=option.ShowOrder;this.SetChartBorder(chart,option);//是否自动更新
 if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;if(IFrameSplitOperator.IsBool(option.EnableFilter))chart.EnableFilter=option.EnableFilter;//注册事件
 if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}return chart;};this.SetChartBorder=function(chart,option){if(!option.Border)return;var item=option.Border;if(IFrameSplitOperator.IsNumber(option.Border.Left))chart.Frame.ChartBorder.Left=option.Border.Left;if(IFrameSplitOperator.IsNumber(option.Border.Right))chart.Frame.ChartBorder.Right=option.Border.Right;if(IFrameSplitOperator.IsNumber(option.Border.Top))chart.Frame.ChartBorder.Top=option.Border.Top;if(IFrameSplitOperator.IsNumber(option.Border.Bottom))chart.Frame.ChartBorder.Bottom=option.Border.Bottom;var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTatio;chart.Frame.ChartBorder.Top*=pixelTatio;chart.Frame.ChartBorder.Bottom*=pixelTatio;};/////////////////////////////////////////////////////////////////////////////
@@ -11958,6 +12016,7 @@ this.Open;//开盘价
 this.Decimal=2;//小数位数
 this.IsSingleTable=false;//单表模式
 this.IsShowHeader=true;//是否显示表头
+this.ShowOrder=1;//0=顺序 1=倒序
 this.SizeChange=true;//涨跌颜色
 this.UpColor=g_JSChartResource.DealList.UpTextColor;this.DownColor=g_JSChartResource.DealList.DownTextColor;this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor;this.BorderColor=g_JSChartResource.DealList.BorderColor;//边框线
 //表头配置
@@ -11970,7 +12029,7 @@ this.ItemFontConfig={Size:g_JSChartResource.DealList.Row.Font.Size,Name:g_JSChar
 }this.Column.push(colItem);}};this.GetDefaultColunm=function(id){var DEFAULT_COLUMN=[{Type:DEAL_COLUMN_ID.TIME_ID,Title:"时间",TextAlign:"center",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.Time,MaxText:"88:88:88",Foramt:"HH:MM:SS"},{Type:DEAL_COLUMN_ID.PRICE_ID,Title:"价格",TextAlign:"center",Width:null,MaxText:"888888.88"},{Type:DEAL_COLUMN_ID.VOL_ID,Title:"成交",TextAlign:"right",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.Vol,MaxText:"888888"},{Type:DEAL_COLUMN_ID.BS_ID,Title:"",TextAlign:"right",Width:null,MaxText:"擎"},{Type:DEAL_COLUMN_ID.DEAL_ID,Title:"笔数",TextAlign:"right",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.Deal,MaxText:"8888"},{Type:DEAL_COLUMN_ID.UPDOWN_ID,Title:"涨跌",TextAlign:"right",Width:null,MaxText:"-8888.88"},{Type:DEAL_COLUMN_ID.STRING_TIME_ID,Title:"时间",TextAlign:"center",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.Time,MaxText:"88:88:88"},{Type:DEAL_COLUMN_ID.INDEX_ID,Title:"序号",TextAlign:"center",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.Index,MaxText:"88888"},{Type:DEAL_COLUMN_ID.MULTI_BAR_ID,Title:"柱子",TextAlign:"center",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.BarTitle,MaxText:"888888"},{Type:DEAL_COLUMN_ID.CENTER_BAR_ID,Title:"柱子2",TextAlign:"center",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.BarTitle,MaxText:"888888"},{Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.DealList.FieldColor.Text,MaxText:"擎擎擎擎擎"}];for(var i=0;i<DEFAULT_COLUMN.length;++i){var item=DEFAULT_COLUMN[i];if(item.Type==id)return item;}return null;};this.Draw=function(){if(this.SizeChange)this.CalculateSize();else this.UpdateCacheData();this.DrawBorder();this.DrawHeader();this.DrawBody();this.SizeChange=false;};//更新缓存变量
 this.UpdateCacheData=function(){this.RectClient.Left=this.ChartBorder.GetLeft();this.RectClient.Right=this.ChartBorder.GetRight();this.RectClient.Top=this.ChartBorder.GetTop();this.RectClient.Bottom=this.ChartBorder.GetBottom();this.Decimal=GetfloatPrecision(this.Symbol);};this.GetPageSize=function(recalculate)//recalculate 是否重新计算
 {if(recalculate)this.CalculateSize();var size=this.TableCount*this.RowCount;return size;};this.CalculateSize=function()//计算大小
-{this.UpdateCacheData();var pixelRatio=GetDevicePixelRatio();this.HeaderFont=this.HeaderFontConfig.Size*pixelRatio+'px '+this.HeaderFontConfig.Name;this.ItemFont=this.ItemFontConfig.Size*pixelRatio+'px '+this.ItemFontConfig.Name;this.Canvas.font=this.ItemFont;var sumWidth=0,itemWidth=0;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];itemWidth=this.Canvas.measureText(item.MaxText).width;item.Width=itemWidth+4;sumWidth+=item.Width;}var clientWidth=this.RectClient.Right-this.RectClient.Left;this.TableCount=parseInt(clientWidth/sumWidth);if(this.IsSingleTable)this.TableCount=1;this.TableWidth=clientWidth/this.TableCount;this.HeaderHeight=this.GetFontHeight(this.HeaderFont,"擎")+this.HeaderMergin.Top+this.HeaderMergin.Bottom;if(!this.IsShowHeader)this.HeaderHeight=0;this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+this.HeaderMergin.Top+this.HeaderMergin.Bottom;this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight)/this.RowHeight);};this.DrawHeader=function(){if(!this.IsShowHeader)return;var left=this.RectClient.Left+this.HeaderMergin.Left;var top=this.RectClient.Top;var y=top+this.HeaderMergin.Top+(this.HeaderHeight-this.HeaderMergin.Top-this.HeaderMergin.Bottom)/2;this.Canvas.font=this.HeaderFont;this.Canvas.fillStyle=this.HeaderColor;for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;for(j=0;j<this.Column.length;++j){var item=this.Column[j];var itemWidth=item.Width;if(j==this.Column.length-1)itemWidth=this.TableWidth-(textLeft-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;var x=textLeft;if(item.TextAlign=='center'){x=textLeft+itemWidth/2;this.Canvas.textAlign="center";}else if(item.TextAlign=='right'){x=textLeft+itemWidth;this.Canvas.textAlign="right";}else{this.Canvas.textAlign="left";}this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Title,x,y);textLeft+=item.Width;}}};this.DrawBorder=function(){var left=ToFixedPoint(this.RectClient.Left);var right=ToFixedPoint(this.RectClient.Right);var top=ToFixedPoint(this.RectClient.Top);var bottom=ToFixedPoint(this.RectClient.Bottom);this.Canvas.strokeStyle=this.BorderColor;this.Canvas.beginPath();if(this.IsShowHeader){this.Canvas.moveTo(left,top+this.HeaderHeight);this.Canvas.lineTo(right,top+this.HeaderHeight);}var tableLeft=ToFixedPoint(left+this.TableWidth);for(var i=1;i<this.TableCount;++i){this.Canvas.moveTo(tableLeft,top);this.Canvas.lineTo(tableLeft,bottom);tableLeft=ToFixedPoint(tableLeft+this.TableWidth);}this.Canvas.stroke();};this.DrawBody=function(){if(!this.Data)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;this.Canvas.font=this.ItemFont;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left+this.HeaderMergin.Left;var dataCount=this.Data.Data.length;var index=this.Data.DataOffset;for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;var textTop=top;for(j=0;j<this.RowCount&&index<dataCount;++j,++index){var dataItem=this.Data.Data[index];this.DrawRow(dataItem,textLeft,textTop,index);textTop+=this.RowHeight;}}};this.DrawRow=function(data,left,top,dataIndex,colIndex){var tableLeft=left;var tableRight=left+this.TableWidth;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];var textColor=item.TextColor;var text=null;var itemWidth=item.Width;var textAlign=item.TextAlign;if(left+itemWidth>tableRight)break;if(i==this.Column.length-1)itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;if(item.Type==DEAL_COLUMN_ID.TIME_ID){text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);}else if(item.Type==DEAL_COLUMN_ID.STRING_TIME_ID){text=data.StrTime;}else if(item.Type==DEAL_COLUMN_ID.PRICE_ID){if(data.Price>this.YClose)textColor=this.UpColor;else if(data.Price<this.YClose)textColor=this.DownColor;else textColor=this.UnchagneColor;text=data.Price.toFixed(this.Decimal);}else if(item.Type==DEAL_COLUMN_ID.VOL_ID){text=IFrameSplitOperator.FormatValueString(data.Vol,0);textColor=this.GetVolColor(item,data);}else if(item.Type==DEAL_COLUMN_ID.DEAL_ID){text=IFrameSplitOperator.FormatValueString(data.Deal,0);}else if(item.Type==DEAL_COLUMN_ID.BS_ID){if(data.BS==1){text="B";textColor=this.UpColor;}else if(data.BS==2){text="S";textColor=this.DownColor;}}else if(item.Type==DEAL_COLUMN_ID.UPDOWN_ID){if(IFrameSplitOperator.IsNumber(this.YClose)){var value=data.Price-this.YClose;text=value.toFixed(2);if(value>0)textColor=this.UpColor;else if(value<0)textColor=this.DownColor;else textColor=this.UnchagneColor;}}else if(item.Type==DEAL_COLUMN_ID.INDEX_ID){text=(dataIndex+1).toString();}else if(item.Type==DEAL_COLUMN_ID.MULTI_BAR_ID){var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};this.DrawMultiBar(item,data,rtItem);}else if(item.Type==DEAL_COLUMN_ID.CENTER_BAR_ID){var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};this.DrawCenterBar(item,data,rtItem);}else if(item.Type==DEAL_COLUMN_ID.CUSTOM_TEXT_ID){var out={Text:null,TextColor:null,TextAlign:null};//输出
+{this.UpdateCacheData();var pixelRatio=GetDevicePixelRatio();this.HeaderFont=this.HeaderFontConfig.Size*pixelRatio+'px '+this.HeaderFontConfig.Name;this.ItemFont=this.ItemFontConfig.Size*pixelRatio+'px '+this.ItemFontConfig.Name;this.Canvas.font=this.ItemFont;var sumWidth=0,itemWidth=0;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];itemWidth=this.Canvas.measureText(item.MaxText).width;item.Width=itemWidth+4;sumWidth+=item.Width;}var clientWidth=this.RectClient.Right-this.RectClient.Left;this.TableCount=parseInt(clientWidth/sumWidth);if(this.IsSingleTable)this.TableCount=1;this.TableWidth=clientWidth/this.TableCount;this.HeaderHeight=this.GetFontHeight(this.HeaderFont,"擎")+this.HeaderMergin.Top+this.HeaderMergin.Bottom;if(!this.IsShowHeader)this.HeaderHeight=0;this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+this.HeaderMergin.Top+this.HeaderMergin.Bottom;this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight)/this.RowHeight);};this.DrawHeader=function(){if(!this.IsShowHeader)return;var left=this.RectClient.Left+this.HeaderMergin.Left;var top=this.RectClient.Top;var y=top+this.HeaderMergin.Top+(this.HeaderHeight-this.HeaderMergin.Top-this.HeaderMergin.Bottom)/2;this.Canvas.font=this.HeaderFont;this.Canvas.fillStyle=this.HeaderColor;for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;for(j=0;j<this.Column.length;++j){var item=this.Column[j];var itemWidth=item.Width;if(j==this.Column.length-1)itemWidth=this.TableWidth-(textLeft-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;var x=textLeft;if(item.TextAlign=='center'){x=textLeft+itemWidth/2;this.Canvas.textAlign="center";}else if(item.TextAlign=='right'){x=textLeft+itemWidth;this.Canvas.textAlign="right";}else{this.Canvas.textAlign="left";}this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Title,x,y);textLeft+=item.Width;}}};this.DrawBorder=function(){var left=ToFixedPoint(this.RectClient.Left);var right=ToFixedPoint(this.RectClient.Right);var top=ToFixedPoint(this.RectClient.Top);var bottom=ToFixedPoint(this.RectClient.Bottom);this.Canvas.strokeStyle=this.BorderColor;this.Canvas.beginPath();if(this.IsShowHeader){this.Canvas.moveTo(left,top+this.HeaderHeight);this.Canvas.lineTo(right,top+this.HeaderHeight);}var tableLeft=ToFixedPoint(left+this.TableWidth);for(var i=1;i<this.TableCount;++i){this.Canvas.moveTo(tableLeft,top);this.Canvas.lineTo(tableLeft,bottom);tableLeft=ToFixedPoint(tableLeft+this.TableWidth);}this.Canvas.stroke();};this.DrawBody=function(){if(!this.Data)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;this.Canvas.font=this.ItemFont;var top=this.RectClient.Top+this.HeaderHeight;var left=this.RectClient.Left+this.HeaderMergin.Left;var dataCount=this.Data.Data.length;var index=this.Data.DataOffset;if(this.ShowOrder==1){var index=this.Data.DataOffset+this.TableCount*this.RowCount;if(index>=dataCount)index=dataCount-1;for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;var textTop=top;for(j=0;j<this.RowCount&&index>=0;++j,--index){var dataItem=this.Data.Data[index];this.DrawRow(dataItem,textLeft,textTop,index);textTop+=this.RowHeight;}}}else{for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;var textTop=top;for(j=0;j<this.RowCount&&index<dataCount;++j,++index){var dataItem=this.Data.Data[index];this.DrawRow(dataItem,textLeft,textTop,index);textTop+=this.RowHeight;}}}};this.DrawRow=function(data,left,top,dataIndex,colIndex){var tableLeft=left;var tableRight=left+this.TableWidth;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];var textColor=item.TextColor;var text=null;var itemWidth=item.Width;var textAlign=item.TextAlign;if(left+itemWidth>tableRight)break;if(i==this.Column.length-1)itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;if(item.Type==DEAL_COLUMN_ID.TIME_ID){text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);}else if(item.Type==DEAL_COLUMN_ID.STRING_TIME_ID){text=data.StrTime;}else if(item.Type==DEAL_COLUMN_ID.PRICE_ID){if(data.Price>this.YClose)textColor=this.UpColor;else if(data.Price<this.YClose)textColor=this.DownColor;else textColor=this.UnchagneColor;text=data.Price.toFixed(this.Decimal);}else if(item.Type==DEAL_COLUMN_ID.VOL_ID){text=IFrameSplitOperator.FormatValueString(data.Vol,0);textColor=this.GetVolColor(item,data);}else if(item.Type==DEAL_COLUMN_ID.DEAL_ID){text=IFrameSplitOperator.FormatValueString(data.Deal,0);}else if(item.Type==DEAL_COLUMN_ID.BS_ID){if(data.BS==1){text="B";textColor=this.UpColor;}else if(data.BS==2){text="S";textColor=this.DownColor;}}else if(item.Type==DEAL_COLUMN_ID.UPDOWN_ID){if(IFrameSplitOperator.IsNumber(this.YClose)){var value=data.Price-this.YClose;text=value.toFixed(2);if(value>0)textColor=this.UpColor;else if(value<0)textColor=this.DownColor;else textColor=this.UnchagneColor;}}else if(item.Type==DEAL_COLUMN_ID.INDEX_ID){text=(dataIndex+1).toString();}else if(item.Type==DEAL_COLUMN_ID.MULTI_BAR_ID){var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};this.DrawMultiBar(item,data,rtItem);}else if(item.Type==DEAL_COLUMN_ID.CENTER_BAR_ID){var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};this.DrawCenterBar(item,data,rtItem);}else if(item.Type==DEAL_COLUMN_ID.CUSTOM_TEXT_ID){var out={Text:null,TextColor:null,TextAlign:null};//输出
 var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};if(this.DrawCustomText(item,data,rtItem,dataIndex,i,out)){if(out.Text)text=out.Text;if(out.TextColor)textColor=out.TextColor;if(out.TextAlign)textAlign=out.TextAlign;}}this.DrawItemText(text,textColor,textAlign,left,top,itemWidth);left+=item.Width;}};this.DrawItemText=function(text,textColor,textAlign,left,top,width){var x=left;if(textAlign=='center'){x=left+width/2;this.Canvas.textAlign="center";}else if(textAlign=='right'){x=left+width;this.Canvas.textAlign="right";}else{this.Canvas.textAlign="left";}this.Canvas.textBaseline="middle";this.Canvas.fillStyle=textColor;if(text)this.Canvas.fillText(text,x,top+this.RowHeight/2);};this.DrawMultiBar=function(colunmInfo,data,rtItem){if(!data.Source||!IFrameSplitOperator.IsNonEmptyArray(data.Source))return false;var barData=data.Source[colunmInfo.DataIndex];//{ Value:[0.4,0,2], Color:[0,1] };
 if(!barData)return false;if(!IFrameSplitOperator.IsNonEmptyArray(barData.Value))return false;var width=rtItem.Width-this.BarMergin.Left-this.BarMergin.Right;var left=rtItem.Left+this.BarMergin.Left;var top=rtItem.Top+this.RowMergin.Top+this.BarMergin.Top;var height=rtItem.Height-this.RowMergin.Top-this.RowMergin.Bottom-this.BarMergin.Top-this.BarMergin.Bottom;var right=left+width;for(var i=0;i<barData.Value.length;++i){var value=barData.Value[i];if(value<=0)continue;if(left>=right)break;var barWidth=width*value;if(barWidth<1)barWidth=1;if(left+barWidth>right)barWidth=right-left;var colorIndex=i;if(IFrameSplitOperator.IsNonEmptyArray(barData.Color)&&i<barData.Color.length)colorIndex=barData.Color[i];this.Canvas.fillStyle=g_JSChartResource.DealList.FieldColor.Bar[colorIndex];this.Canvas.fillRect(left,top,barWidth,height);left+=barWidth;}return true;};this.DrawCenterBar=function(colunmInfo,data,rtItem){if(!data.Source||!IFrameSplitOperator.IsNonEmptyArray(data.Source))return false;var barData=data.Source[colunmInfo.DataIndex];//{ Value:[0.4,0,2], Color:[0,1] };
 if(!barData)return false;if(!IFrameSplitOperator.IsNonEmptyArray(barData.Value))return false;var width=(rtItem.Width-this.BarMergin.Left-this.BarMergin.Right)/2;var left=rtItem.Left+this.BarMergin.Left;var center=left+width;var top=rtItem.Top+this.RowMergin.Top+this.BarMergin.Top;var height=rtItem.Height-this.RowMergin.Top-this.RowMergin.Bottom-this.BarMergin.Top-this.BarMergin.Bottom;var right=left+width;for(var i=0;i<barData.Value.length&&i<2;++i){var value=barData.Value[i];if(value<=0)continue;if(value>1)value=1;var barWidth=width*value;if(barWidth<1)barWidth=1;var colorIndex=i;if(IFrameSplitOperator.IsNonEmptyArray(barData.Color)&&i<barData.Color.length)colorIndex=barData.Color[i];this.Canvas.fillStyle=g_JSChartResource.DealList.FieldColor.Bar[colorIndex];if(i==0)//左边
@@ -12662,7 +12721,7 @@ function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventL
 hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.ExecuteScript(item,data);}}};this.OnExecuteFinish=function(data,indexInfo,jsExectute){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT};postMessage(message);};this.OnExecuteError=function(error,indexInfo){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12597";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12606";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12598",
+  "version": "1.1.12607",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.deal.js

@@ -78,6 +78,8 @@ function JSDealChart(divElement)
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
         if (IFrameSplitOperator.IsNonEmptyArray(option.Column))  chart.SetColumn(option.Column);
 
+        if (IFrameSplitOperator.IsNumber(option.ShowOrder)) chart.ChartPaint[0].ShowOrder=option.ShowOrder;
+
         this.SetChartBorder(chart, option);
 
         //是否自动更新
@@ -896,6 +898,7 @@ function ChartDealList()
     this.Decimal=2; //小数位数
     this.IsSingleTable=false;    //单表模式
     this.IsShowHeader=true;    //是否显示表头
+    this.ShowOrder=1;           //0=顺序 1=倒序
 
     this.SizeChange=true;
 
@@ -1182,18 +1185,42 @@ function ChartDealList()
         var left=this.RectClient.Left+this.HeaderMergin.Left;
         var dataCount=this.Data.Data.length;
         var index=this.Data.DataOffset;
-        for(var i=0,j=0;i<this.TableCount;++i)
+
+        if (this.ShowOrder==1)
         {
-            var tableLeft=left+(this.TableWidth*i);
-            var textLeft=tableLeft;
-            var textTop=top;
-            for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
+            var index=this.Data.DataOffset+(this.TableCount*this.RowCount);
+            if (index>=dataCount) index=dataCount-1;
+            for(var i=0,j=0;i<this.TableCount;++i)
             {
-                var dataItem=this.Data.Data[index];
-
-                this.DrawRow(dataItem, textLeft, textTop, index);
+                var tableLeft=left+(this.TableWidth*i);
+                var textLeft=tableLeft;
+                var textTop=top;
 
-                textTop+=this.RowHeight;
+                for(j=0;j<this.RowCount && index>=0;++j, --index)
+                {
+                    var dataItem=this.Data.Data[index];
+    
+                    this.DrawRow(dataItem, textLeft, textTop, index);
+    
+                    textTop+=this.RowHeight;
+                }
+            }
+        }
+        else
+        {
+            for(var i=0,j=0;i<this.TableCount;++i)
+            {
+                var tableLeft=left+(this.TableWidth*i);
+                var textLeft=tableLeft;
+                var textTop=top;
+                for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
+                {
+                    var dataItem=this.Data.Data[index];
+    
+                    this.DrawRow(dataItem, textLeft, textTop, index);
+    
+                    textTop+=this.RowHeight;
+                }
             }
         }
     }

package/src/jscommon/umychart.js

@@ -42421,6 +42421,7 @@ IFrameSplitOperator.FormatValueThousandsString=function(value,floatPrecision)
 //数据输出格式化 floatPrecision=小数位数
 IFrameSplitOperator.FormatValueString=function(value, floatPrecision,languageID)
 {
+    /*
     if (value==null || isNaN(value))
     {
         if (floatPrecision>0)
@@ -42477,6 +42478,71 @@ IFrameSplitOperator.FormatValueString=function(value, floatPrecision,languageID)
         else
             return (value/1000000000000).toFixed(floatPrecision)+"万亿";
     }
+    */
+    
+
+    return IFrameSplitOperator.FormatValueStringV2(value, floatPrecision, floatPrecision, languageID);
+}
+
+//数据输出格式化 floatPrecision=原始小数位数 floatPrecision2=转换成'万','亿'..的小数位
+IFrameSplitOperator.FormatValueStringV2=function(value, floatPrecision, floatPrecision2, languageID)
+{
+    if (value==null || isNaN(value))
+    {
+        if (floatPrecision>0)
+        {
+            var nullText='-.';
+            for(var i=0;i<floatPrecision;++i)
+                nullText+='-';
+            return nullText;
+        }
+
+        return '--';
+    }
+
+    if (value<0.00000000001 && value>-0.00000000001)
+    {
+        return "0";
+    }
+
+    var absValue = Math.abs(value);
+    if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID)
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 1000000)
+            return (value/1000).toFixed(floatPrecision2)+"K";
+        else if (absValue < 1000000000)
+            return (value/1000000).toFixed(floatPrecision2)+"M";
+        else if (absValue < 1000000000000)
+            return (value/1000000000).toFixed(floatPrecision2)+"B";
+        else 
+            return (value/1000000000000).toFixed(floatPrecision2)+"T";
+    }
+    else if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID)  //繁体
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision2)+"萬";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision2)+"億";
+        else
+            return (value/1000000000000).toFixed(floatPrecision2)+"萬億";
+    }
+    else
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue<1000000)
+            return (value/10000).toFixed(floatPrecision2)+"万";
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision2)+"万";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision2)+"亿";
+        else
+            return (value/1000000000000).toFixed(floatPrecision2)+"万亿";
+    }
 
     return '';
 }

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

@@ -46501,6 +46501,7 @@ IFrameSplitOperator.FormatValueThousandsString=function(value,floatPrecision)
 //数据输出格式化 floatPrecision=小数位数
 IFrameSplitOperator.FormatValueString=function(value, floatPrecision,languageID)
 {
+    /*
     if (value==null || isNaN(value))
     {
         if (floatPrecision>0)
@@ -46557,6 +46558,71 @@ IFrameSplitOperator.FormatValueString=function(value, floatPrecision,languageID)
         else
             return (value/1000000000000).toFixed(floatPrecision)+"万亿";
     }
+    */
+    
+
+    return IFrameSplitOperator.FormatValueStringV2(value, floatPrecision, floatPrecision, languageID);
+}
+
+//数据输出格式化 floatPrecision=原始小数位数 floatPrecision2=转换成'万','亿'..的小数位
+IFrameSplitOperator.FormatValueStringV2=function(value, floatPrecision, floatPrecision2, languageID)
+{
+    if (value==null || isNaN(value))
+    {
+        if (floatPrecision>0)
+        {
+            var nullText='-.';
+            for(var i=0;i<floatPrecision;++i)
+                nullText+='-';
+            return nullText;
+        }
+
+        return '--';
+    }
+
+    if (value<0.00000000001 && value>-0.00000000001)
+    {
+        return "0";
+    }
+
+    var absValue = Math.abs(value);
+    if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID)
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 1000000)
+            return (value/1000).toFixed(floatPrecision2)+"K";
+        else if (absValue < 1000000000)
+            return (value/1000000).toFixed(floatPrecision2)+"M";
+        else if (absValue < 1000000000000)
+            return (value/1000000000).toFixed(floatPrecision2)+"B";
+        else 
+            return (value/1000000000000).toFixed(floatPrecision2)+"T";
+    }
+    else if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID)  //繁体
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision2)+"萬";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision2)+"億";
+        else
+            return (value/1000000000000).toFixed(floatPrecision2)+"萬億";
+    }
+    else
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue<1000000)
+            return (value/10000).toFixed(floatPrecision2)+"万";
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision2)+"万";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision2)+"亿";
+        else
+            return (value/1000000000000).toFixed(floatPrecision2)+"万亿";
+    }
 
     return '';
 }
@@ -119401,6 +119467,8 @@ function JSDealChart(divElement)
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
         if (IFrameSplitOperator.IsNonEmptyArray(option.Column))  chart.SetColumn(option.Column);
 
+        if (IFrameSplitOperator.IsNumber(option.ShowOrder)) chart.ChartPaint[0].ShowOrder=option.ShowOrder;
+
         this.SetChartBorder(chart, option);
 
         //是否自动更新
@@ -120219,6 +120287,7 @@ function ChartDealList()
     this.Decimal=2; //小数位数
     this.IsSingleTable=false;    //单表模式
     this.IsShowHeader=true;    //是否显示表头
+    this.ShowOrder=1;           //0=顺序 1=倒序
 
     this.SizeChange=true;
 
@@ -120505,18 +120574,42 @@ function ChartDealList()
         var left=this.RectClient.Left+this.HeaderMergin.Left;
         var dataCount=this.Data.Data.length;
         var index=this.Data.DataOffset;
-        for(var i=0,j=0;i<this.TableCount;++i)
+
+        if (this.ShowOrder==1)
         {
-            var tableLeft=left+(this.TableWidth*i);
-            var textLeft=tableLeft;
-            var textTop=top;
-            for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
+            var index=this.Data.DataOffset+(this.TableCount*this.RowCount);
+            if (index>=dataCount) index=dataCount-1;
+            for(var i=0,j=0;i<this.TableCount;++i)
             {
-                var dataItem=this.Data.Data[index];
+                var tableLeft=left+(this.TableWidth*i);
+                var textLeft=tableLeft;
+                var textTop=top;
 
-                this.DrawRow(dataItem, textLeft, textTop, index);
-
-                textTop+=this.RowHeight;
+                for(j=0;j<this.RowCount && index>=0;++j, --index)
+                {
+                    var dataItem=this.Data.Data[index];
+    
+                    this.DrawRow(dataItem, textLeft, textTop, index);
+    
+                    textTop+=this.RowHeight;
+                }
+            }
+        }
+        else
+        {
+            for(var i=0,j=0;i<this.TableCount;++i)
+            {
+                var tableLeft=left+(this.TableWidth*i);
+                var textLeft=tableLeft;
+                var textTop=top;
+                for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
+                {
+                    var dataItem=this.Data.Data[index];
+    
+                    this.DrawRow(dataItem, textLeft, textTop, index);
+    
+                    textTop+=this.RowHeight;
+                }
             }
         }
     }
@@ -129560,7 +129653,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12597";
+var HQCHART_VERSION="1.1.12606";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -46545,6 +46545,7 @@ IFrameSplitOperator.FormatValueThousandsString=function(value,floatPrecision)
 //数据输出格式化 floatPrecision=小数位数
 IFrameSplitOperator.FormatValueString=function(value, floatPrecision,languageID)
 {
+    /*
     if (value==null || isNaN(value))
     {
         if (floatPrecision>0)
@@ -46601,6 +46602,71 @@ IFrameSplitOperator.FormatValueString=function(value, floatPrecision,languageID)
         else
             return (value/1000000000000).toFixed(floatPrecision)+"万亿";
     }
+    */
+    
+
+    return IFrameSplitOperator.FormatValueStringV2(value, floatPrecision, floatPrecision, languageID);
+}
+
+//数据输出格式化 floatPrecision=原始小数位数 floatPrecision2=转换成'万','亿'..的小数位
+IFrameSplitOperator.FormatValueStringV2=function(value, floatPrecision, floatPrecision2, languageID)
+{
+    if (value==null || isNaN(value))
+    {
+        if (floatPrecision>0)
+        {
+            var nullText='-.';
+            for(var i=0;i<floatPrecision;++i)
+                nullText+='-';
+            return nullText;
+        }
+
+        return '--';
+    }
+
+    if (value<0.00000000001 && value>-0.00000000001)
+    {
+        return "0";
+    }
+
+    var absValue = Math.abs(value);
+    if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID)
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 1000000)
+            return (value/1000).toFixed(floatPrecision2)+"K";
+        else if (absValue < 1000000000)
+            return (value/1000000).toFixed(floatPrecision2)+"M";
+        else if (absValue < 1000000000000)
+            return (value/1000000000).toFixed(floatPrecision2)+"B";
+        else 
+            return (value/1000000000000).toFixed(floatPrecision2)+"T";
+    }
+    else if (languageID===JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID)  //繁体
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision2)+"萬";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision2)+"億";
+        else
+            return (value/1000000000000).toFixed(floatPrecision2)+"萬億";
+    }
+    else
+    {
+        if (absValue < 10000)
+            return value.toFixed(floatPrecision);
+        else if (absValue<1000000)
+            return (value/10000).toFixed(floatPrecision2)+"万";
+        else if (absValue < 100000000)
+            return (value/10000).toFixed(floatPrecision2)+"万";
+        else if (absValue < 1000000000000)
+            return (value/100000000).toFixed(floatPrecision2)+"亿";
+        else
+            return (value/1000000000000).toFixed(floatPrecision2)+"万亿";
+    }
 
     return '';
 }
@@ -119445,6 +119511,8 @@ function JSDealChart(divElement)
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
         if (IFrameSplitOperator.IsNonEmptyArray(option.Column))  chart.SetColumn(option.Column);
 
+        if (IFrameSplitOperator.IsNumber(option.ShowOrder)) chart.ChartPaint[0].ShowOrder=option.ShowOrder;
+
         this.SetChartBorder(chart, option);
 
         //是否自动更新
@@ -120263,6 +120331,7 @@ function ChartDealList()
     this.Decimal=2; //小数位数
     this.IsSingleTable=false;    //单表模式
     this.IsShowHeader=true;    //是否显示表头
+    this.ShowOrder=1;           //0=顺序 1=倒序
 
     this.SizeChange=true;
 
@@ -120549,18 +120618,42 @@ function ChartDealList()
         var left=this.RectClient.Left+this.HeaderMergin.Left;
         var dataCount=this.Data.Data.length;
         var index=this.Data.DataOffset;
-        for(var i=0,j=0;i<this.TableCount;++i)
+
+        if (this.ShowOrder==1)
         {
-            var tableLeft=left+(this.TableWidth*i);
-            var textLeft=tableLeft;
-            var textTop=top;
-            for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
+            var index=this.Data.DataOffset+(this.TableCount*this.RowCount);
+            if (index>=dataCount) index=dataCount-1;
+            for(var i=0,j=0;i<this.TableCount;++i)
             {
-                var dataItem=this.Data.Data[index];
+                var tableLeft=left+(this.TableWidth*i);
+                var textLeft=tableLeft;
+                var textTop=top;
 
-                this.DrawRow(dataItem, textLeft, textTop, index);
-
-                textTop+=this.RowHeight;
+                for(j=0;j<this.RowCount && index>=0;++j, --index)
+                {
+                    var dataItem=this.Data.Data[index];
+    
+                    this.DrawRow(dataItem, textLeft, textTop, index);
+    
+                    textTop+=this.RowHeight;
+                }
+            }
+        }
+        else
+        {
+            for(var i=0,j=0;i<this.TableCount;++i)
+            {
+                var tableLeft=left+(this.TableWidth*i);
+                var textLeft=tableLeft;
+                var textTop=top;
+                for(j=0;j<this.RowCount && index<dataCount;++j, ++index)
+                {
+                    var dataItem=this.Data.Data[index];
+    
+                    this.DrawRow(dataItem, textLeft, textTop, index);
+    
+                    textTop+=this.RowHeight;
+                }
             }
         }
     }
@@ -129713,7 +129806,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12597";
+var HQCHART_VERSION="1.1.12606";
 
 function PrintHQChartVersion()
 {

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

@@ -440,6 +440,24 @@ IFrameSplitOperator.FormatValueColor = function (value, value2)
     else return 'PriceDown';
 }
 
+ //成交量显示
+ IFrameSplitOperator.FormatVolString=function(value,languageID)
+ {
+     var absValue = Math.abs(value);
+     if (absValue<100000) 
+         return value.toFixed(0);
+     else if (absValue<10000000)
+         return (value/10000).toFixed(1)+"万";
+     else if (absValue<100000000)
+         return (value/10000).toFixed(0)+"万";
+     else if (absValue<1000000000)
+         return (value/100000000).toFixed(2)+"亿";
+     else if (absValue < 1000000000000)
+         return (value/100000000).toFixed(1)+"亿";
+     else
+         return (value/1000000000000).toFixed(1)+"万亿";
+ }
+
 IFrameSplitOperator.IsNumber=function(value)
 {
     if (value==null) return false;

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

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