hqchart 1.1.12580 → 1.1.12585

package/lib/umychart.vue.js

@@ -1704,7 +1704,8 @@ this.VerticalDrag;//通过X轴左右拖动数据(手势才有)
 this.EnableVerticalDrag=false;//十字光标长留(手势才有)
 this.ClickModel={IsShowCorssCursor:false};this.EnableClickModel=false;//标题栏显示最新数据
 this.DisplayLatestOption={Timer:null,Enable:false,DelayTime:60*1000*3,LastPoint:null};this.DrawDynamicInfoOption={Timer:null,Enable:false,DelayTime:10};this.CustomChartDrag;//自定义图形的拖拽操作 { Type:, Data: }
-//obj={ Element:, Canvas: }
+this.StockCache={Data:null};//扩展数据缓存数据
+this.ClearStockCache=function(){this.StockCache.Data=null;};//obj={ Element:, Canvas: }
 this.SetCorssCursorElement=function(obj){if(!obj||!obj.Element||!obj.Canvas)return;this.CorssCursorElement=obj.Element;this.CorssCursorCanvas=obj.Canvas;};this.StopDisplayLatest=function(){this.GlobalOption.IsDisplayLatest=false;if(this.DisplayLatestOption.Timer){clearTimeout(this.DisplayLatestOption.Timer);this.DisplayLatestOption.Timer=null;}};this.StartStopDisplayLatest=function(){var _this4=this;this.StopDisplayLatest();if(!this.DisplayLatestOption.Enable)return;this.DisplayLatestOption.Timer=setTimeout(function(){if(_this4.DisplayLatest){JSConsole.Chart.Log('[JSChartContainer:StartStopDisplayLatest] call this.DisplayLatest()');_this4.DisplayLatest();}},this.DisplayLatestOption.DelayTime);};this.StopDrawDynamicInfo=function(){if(this.DrawDynamicInfoOption.Timer){clearTimeout(this.DrawDynamicInfoOption.Timer);this.DrawDynamicInfoOption.Timer=null;}};this.ChartDestroy=function()//销毁
 {this.IsDestroy=true;this.StopAutoUpdate();if(this.GetLatestVersionTimer!=null){clearTimeout(this.GetLatestVersionTimer);this.GetLatestVersionTimer=null;}};this.ChartDestory=this.ChartDestroy;//老版本写错了,需要兼容下
 this.GetLatestVersionTimer=null;//获取最新版本
@@ -7218,10 +7219,10 @@ this.ClearIndexPaint();//清空指标
 if(option){if(option.Windows&&Array.isArray(option.Windows)&&option.Windows.length>0){var windows=option.Windows;var systemScript=new JSIndexScript();for(var i in windows){if(i>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
 var item=windows[i];if(!item)continue;if(item.Script){this.WindowIndex[i]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
 }else if(item.API){var apiItem=item.API;this.WindowIndex[i]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexInfo=systemScript.Get(indexID);if(indexInfo){var args=indexInfo.Args;if(item.Args)indexInfo.Args=item.Args;indexInfo.ID=indexID;this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
-}}}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.RequestHistoryData();//请求日线数据
+}}}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
 //this.ReqeustKLineInfoData();
-}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ReqeustHistoryMinuteData();//请求分钟数据
-}else if(ChartData.IsTickPeriod(this.Period)){this.RequestTickData();}};this.ReqeustKLineInfoData=function(obj){if(obj&&obj.FunctionName=="RecvDragDayData")//增量更新
+}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.ReqeustHistoryMinuteData();//请求分钟数据
+}else if(ChartData.IsTickPeriod(this.Period)){this.ClearStockCache();this.RequestTickData();}};this.ReqeustKLineInfoData=function(obj){if(obj&&obj.FunctionName=="RecvDragDayData")//增量更新
 {obj.Update=true;}else{if(this.ChartPaint.length>0){var klinePaint=this.ChartPaint[0];klinePaint.InfoData=new _map2.default();}obj.Update=false;}//信息地雷信息
 if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return;for(var i=0;i<this.ChartInfo.length;++i){this.ChartInfo[i].RequestData(this,obj);}};//设置K线信息地雷
 this.SetKLineInfo=function(aryInfo,bUpdate){this.ChartInfo=[];//先清空
@@ -7713,7 +7714,7 @@ if(this.Frame&&this.Frame.SubFrame){for(var i=0;i<this.Frame.SubFrame.length;++i
 {var overlayItem=item.OverlayIndex[j];for(var k=0;k<overlayItem.ChartPaint.length;++k){var overlayChart=overlayItem.ChartPaint[k];if(overlayChart&&overlayChart.OnDestroy)overlayChart.OnDestroy();}overlayItem.ChartPaint=[];}}}}//清空叠加标题
 for(var i=1;i<this.TitlePaint.length;++i){var item=this.TitlePaint[i];item.OverlayIndex=new _map2.default();}};this.ResetDayOffset=function(){if(this.PageInfo.Enable){this.DayOffset.Offset=this.PageInfo.Offset;this.DayOffset.ShowDayCount=this.PageInfo.ShowDayCount;}else{this.DayOffset.Offset=0;this.DayOffset.ShowDayCount=-1;}this.DayOffset.PageInfo=null;};this.ResetDataStatus=function(){this.DataStatus.MultiDay=false;this.DataStatus.LatestDay=false;};//切换股票代码
 this.ChangeSymbol=function(symbol,option){this.StopDisplayLatest();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeSymbol");this.Symbol=symbol;this.ResetDayOffset();this.ResetDataStatus();this.ClearIndexPaint();//清空指标
-this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRunCount();if(option){if(IFrameSplitOperator.IsNumber(option.DayCount))this.DayCount=option.DayCount;if(IFrameSplitOperator.IsNonEmptyArray(option.Windows))//切换指标
+this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRunCount();this.ClearStockCache();if(option){if(IFrameSplitOperator.IsNumber(option.DayCount))this.DayCount=option.DayCount;if(IFrameSplitOperator.IsNonEmptyArray(option.Windows))//切换指标
 {var systemScript=new JSIndexScript();for(var i=0;i<option.Windows.length;++i){var index=2+i;if(index>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
 var item=option.Windows[i];if(!item)continue;if(item.Script){this.WindowIndex[index]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
 }else if(item.API){var apiItem=item.API;this.WindowIndex[index]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexInfo=systemScript.Get(indexID);if(indexInfo){var args=indexInfo.Args;if(item.Args)indexInfo.Args=item.Args;indexInfo.ID=indexID;this.WindowIndex[index]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
@@ -8840,7 +8841,8 @@ if(upperSymbol.charAt(1)!='7'&&upperSymbol.charAt(1)!='8')return true;}else if(u
 if(upperSymbol.charAt(2)=='1')return true;//创业板 301XXX.sz
 }}}return false;},IsBJStock:function IsBJStock(symbol)//北交所股票
 {if(!symbol)return false;var upperSymbol=symbol.toUpperCase();if(!this.IsBJ(upperSymbol))return false;var value=upperSymbol.charAt(0);if(value=='4'||value=='8')return true;return false;},IsSHStockSTAR:function IsSHStockSTAR(symbol)// 是否是科创板 Sci-Tech innovAtion boaRd (STAR Market)
-{if(!symbol)return false;var upperSymbol=symbol.toUpperCase();if(!this.IsSH(upperSymbol))return false;if(upperSymbol.charAt(0)=='6'&&upperSymbol.charAt(1)=='8'&&upperSymbol.charAt(2)=='8')return true;return false;},GetMarketStatus:function GetMarketStatus(symbol)//获取市场状态 0=闭市 1=盘前 2=盘中 3=盘后
+{if(!symbol)return false;var upperSymbol=symbol.toUpperCase();if(!this.IsSH(upperSymbol))return false;if(upperSymbol.charAt(0)=='6'&&upperSymbol.charAt(1)=='8'&&upperSymbol.charAt(2)=='8')return true;return false;},IsSHGEM:function IsSHGEM(symbol)//创业板(growth enterprise market) 30开头
+{if(!symbol)return false;var upperSymbol=symbol.toUpperCase();if(!this.IsSH(upperSymbol))return false;if(upperSymbol.charAt(0)=='3'&&upperSymbol.charAt(1)=='0')return true;return false;},GetMarketStatus:function GetMarketStatus(symbol)//获取市场状态 0=闭市 1=盘前 2=盘中 3=盘后
 {if(!symbol)return 0;var upperSymbol=symbol.toUpperCase();var nowDate=new Date();var day=nowDate.getDay();var time=nowDate.getHours()*100+nowDate.getMinutes();if(this.IsUSA(upperSymbol)){var usaDate=GetLocalTime(-4);var day=usaDate.getDay();var time=usaDate.getHours()*100+usaDate.getMinutes();if(day==6||day==0)return 0;//周末
 //9:30 - 16:00 考虑夏令时间时间增加1小时 9:30 - 17:00
 if(time>1730)return 3;if(time<930)return 1;return 2;}else if(this.IsBIT(upperSymbol))//数字货币24小时
@@ -8863,7 +8865,8 @@ if(time>=2100)return 2;if(time<=240)return 2;//8:55-11:30, 13:00-15:00
 if(time>=830&&time<=1510)return 2;return 1;}else//9:30 - 15:40  (默认9:10-15:40)
 {if(day==6||day==0)return 0;//周末
 if(time>1540)return 3;if(time<910)return 1;return 2;}},GetLimitPriceRange:function GetLimitPriceRange(symbol,name)//涨停范围
-{if(!this.IsSHSZStockA(symbol))return null;if(this.IsSHStockSTAR(symbol))return{Max:0.2,Min:-0.2};//科创板 [20%- -20%]
+{if(!this.IsSHSZStockA(symbol))return null;if(this.IsSHStockSTAR(symbol))return{Max:0.2,Min:-0.2};//科创板 [20% - -20%]
+if(this.IsSHGEM(symbol))return{Max:0.2,Min:-0.2};//创业板 [20% - -20%]
 if(!name)return null;if(name.indexOf('ST')>=0)return{Max:0.05,Min:-0.05};//ST 股票 [5% - -5%]
 return{Max:0.1,Min:-0.1};//[10% - -10%]
 },GetDefaultDecimal:function GetDefaultDecimal(symbol)//默认小数位数
@@ -10662,7 +10665,7 @@ if(bindData.Period>0)//周期数据
 {var periodData=bindData.GetPeriodSingleData(bindData.Period);bindData.Data=periodData;}return bindData.GetValue();}else{return null;}};this.GetSymbolData=function(){if(this.Data)return this.Execute.RunNextJob();var self=this;if(this.DataType===HQ_DATA_TYPE.MINUTE_ID)//当天分钟数据
 {JSNetwork.HttpRequest({url:self.RealtimeApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol","amount","date","minute","time","minutecount"],"symbol":[self.Symbol],"start":-1},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvMinuteData(recvData);self.Execute.RunNextJob();}});return;}if(this.DataType===HQ_DATA_TYPE.MULTIDAY_MINUTE_ID){JSNetwork.HttpRequest({url:self.HistoryMinuteApiUrl,data:{"symbol":self.Symbol,"daycount":self.DayCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvMultiDayMinuteData(recvData);self.Execute.RunNextJob();}});return;}if(ChartData.IsDayPeriod(this.Period,true))//请求日线数据
 {if(this.NetworkFilter){var obj={Name:'JSSymbolData::GetSymbolData',Explain:"日线数据",Request:{Url:self.RealtimeApiUrl,Type:'POST',Data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestDataCount,"period":this.Period,"right":this.Right}},Self:this,PreventDefault:false};if(this.KLineDateTimeRange){obj.Request.KLineDataTimeRange={Start:{Date:this.KLineDateTimeRange.Start.Date},End:{Date:this.KLineDateTimeRange.End.Date}};if(this.IsNumber(this.KLineDateTimeRange.Start.Time))obj.Request.KLineDataTimeRange.Start.Time=this.KLineDateTimeRange.Start.Time;if(this.IsNumber(this.KLineDateTimeRange.End.Time))obj.Request.KLineDataTimeRange.End.Time=this.KLineDateTimeRange.End.Time;}this.NetworkFilter(obj,function(data){self.RecvHistroyData(data);self.Execute.RunNextJob();});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
-}JSNetwork.HttpRequest({url:self.KLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestDataCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvHistroyData(recvData);self.Execute.RunNextJob();},error:function error(request){self.RecvError(request);}});}else if(ChartData.IsMinutePeriod(this.Period,true))//请求分钟数据
+}JSNetwork.HttpRequest({url:self.KLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestDataCount},type:"post",dataType:"json",async:true,success:function success(recvData){self.RecvHistroyData(recvData);self.Execute.RunNextJob();},error:function error(request){self.RecvError(request);}});}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period))//请求分钟数据
 {if(this.NetworkFilter){var obj={Name:'JSSymbolData::GetSymbolData',Explain:"分钟K线数据",Request:{Url:self.MinuteKLineApiUrl,Type:'POST',Data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestMinuteDayCount,"period":this.Period,"right":this.Right}},Self:this,PreventDefault:false};if(this.KLineDateTimeRange){obj.Request.KLineDataTimeRange={Start:{Date:this.KLineDateTimeRange.Start.Date},End:{Date:this.KLineDateTimeRange.End.Date}};if(this.IsNumber(this.KLineDateTimeRange.Start.Time))obj.Request.KLineDataTimeRange.Start.Time=this.KLineDateTimeRange.Start.Time;if(this.IsNumber(this.KLineDateTimeRange.End.Time))obj.Request.KLineDataTimeRange.End.Time=this.KLineDateTimeRange.End.Time;}this.NetworkFilter(obj,function(data){self.RecvMinuteHistroyData(data);self.Execute.RunNextJob();});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
 }JSNetwork.HttpRequest({url:this.MinuteKLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestMinuteDayCount},type:"post",dataType:"json",async:true,success:function success(data){self.RecvMinuteHistroyData(data);self.Execute.RunNextJob();},error:function error(request){self.RecvError(request);}});}};this.RecvHistroyData=function(data){JSConsole.Complier.Log('[JSSymbolData::RecvHistroyData] recv data',data);var hisData=this.JsonDataToHistoryData(data);this.Data=new ChartData();this.Data.DataType=0;/*日线数据 */this.Data.Data=hisData;this.SourceData=new ChartData();this.SourceData.Data=hisData;if(this.IsApiPeriod)//后台周期 前端不处理
 {}else{if(this.Right>0)//复权
@@ -12659,7 +12662,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.12579";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.12584";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.12580",
+  "version": "1.1.12585",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.complier.js

@@ -12540,7 +12540,7 @@ function JSSymbolData(ast,option,jsExecute)
                 }
             });
         }
-        else if (ChartData.IsMinutePeriod(this.Period, true))               //请求分钟数据
+        else if (ChartData.IsMinutePeriod(this.Period, true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))               //请求分钟数据
         {
             if (this.NetworkFilter)
             {

package/src/jscommon/umychart.js

@@ -2830,6 +2830,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
+    this.StockCache={ Data:null };        //扩展数据缓存数据
+
+
+    this.ClearStockCache=function()
+    {
+        this.StockCache.Data=null;
+    }
+
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
     {
@@ -68760,6 +68768,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ResetScrollBar();
         this.ClearIndexRunCount();
         
+        
         this.Symbol=symbol;
         if (!symbol)
         {
@@ -68822,15 +68831,18 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Frame.ClearUpDonwFrameYData();
         if (ChartData.IsDayPeriod(this.Period,true))
         {
+            this.ClearStockCache();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
+            this.ClearStockCache();
             this.ReqeustHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
+            this.ClearStockCache();
             this.RequestTickData();
         } 
     }
@@ -73869,6 +73881,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ResetOverlaySymbolStatus();
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
+        this.ClearStockCache();
 
         if (option)
         {
@@ -86093,6 +86106,17 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    IsSHGEM:function(symbol)    //创业板(growth enterprise market) 30开头
+    {
+        if (!symbol) return false;
+        var upperSymbol=symbol.toUpperCase();
+        if (!this.IsSH(upperSymbol)) return false;
+        if (upperSymbol.charAt(0)=='3' && upperSymbol.charAt(1)=='0')
+            return true;
+        
+        return false;
+    },
+
     GetMarketStatus:function(symbol)    //获取市场状态 0=闭市 1=盘前 2=盘中 3=盘后
     {
         if (!symbol) return 0;
@@ -86217,7 +86241,8 @@ var MARKET_SUFFIX_NAME=
     GetLimitPriceRange:function(symbol, name) //涨停范围
     {
         if (!this.IsSHSZStockA(symbol)) return null;
-        if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20%- -20%]
+        if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20% - -20%]
+        if (this.IsSHGEM(symbol)) return { Max:0.2 , Min:-0.2};         //创业板 [20% - -20%]
         
         if (!name) return null;
         if (name.indexOf('ST')>=0) return { Max:0.05, Min:-0.05 }; //ST 股票 [5% - -5%]

package/src/jscommon/umychart.resource/css/tools.css

@@ -1011,7 +1011,7 @@ td.context-menu {
 .jchart-chartdrawsvg-tooltip{
     position: absolute;
     z-index: 10;
-    max-height: 270px;
+    /*max-height: 270px;*/
     line-height: 28px;
     box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.23);
     border: solid 1px rgba(200, 210, 219, 0.92);

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

@@ -6910,6 +6910,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
+    this.StockCache={ Data:null };        //扩展数据缓存数据
+
+
+    this.ClearStockCache=function()
+    {
+        this.StockCache.Data=null;
+    }
+
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
     {
@@ -72840,6 +72848,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ResetScrollBar();
         this.ClearIndexRunCount();
         
+        
         this.Symbol=symbol;
         if (!symbol)
         {
@@ -72902,15 +72911,18 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Frame.ClearUpDonwFrameYData();
         if (ChartData.IsDayPeriod(this.Period,true))
         {
+            this.ClearStockCache();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
+            this.ClearStockCache();
             this.ReqeustHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
+            this.ClearStockCache();
             this.RequestTickData();
         } 
     }
@@ -77949,6 +77961,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ResetOverlaySymbolStatus();
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
+        this.ClearStockCache();
 
         if (option)
         {
@@ -90173,6 +90186,17 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    IsSHGEM:function(symbol)    //创业板(growth enterprise market) 30开头
+    {
+        if (!symbol) return false;
+        var upperSymbol=symbol.toUpperCase();
+        if (!this.IsSH(upperSymbol)) return false;
+        if (upperSymbol.charAt(0)=='3' && upperSymbol.charAt(1)=='0')
+            return true;
+        
+        return false;
+    },
+
     GetMarketStatus:function(symbol)    //获取市场状态 0=闭市 1=盘前 2=盘中 3=盘后
     {
         if (!symbol) return 0;
@@ -90297,7 +90321,8 @@ var MARKET_SUFFIX_NAME=
     GetLimitPriceRange:function(symbol, name) //涨停范围
     {
         if (!this.IsSHSZStockA(symbol)) return null;
-        if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20%- -20%]
+        if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20% - -20%]
+        if (this.IsSHGEM(symbol)) return { Max:0.2 , Min:-0.2};         //创业板 [20% - -20%]
         
         if (!name) return null;
         if (name.indexOf('ST')>=0) return { Max:0.05, Min:-0.05 }; //ST 股票 [5% - -5%]
@@ -106273,7 +106298,7 @@ function JSSymbolData(ast,option,jsExecute)
                 }
             });
         }
-        else if (ChartData.IsMinutePeriod(this.Period, true))               //请求分钟数据
+        else if (ChartData.IsMinutePeriod(this.Period, true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))               //请求分钟数据
         {
             if (this.NetworkFilter)
             {
@@ -129483,7 +129508,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12579";
+var HQCHART_VERSION="1.1.12584";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -6954,6 +6954,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
+    this.StockCache={ Data:null };        //扩展数据缓存数据
+
+
+    this.ClearStockCache=function()
+    {
+        this.StockCache.Data=null;
+    }
+
     //obj={ Element:, Canvas: }
     this.SetCorssCursorElement=function(obj)
     {
@@ -72884,6 +72892,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ResetScrollBar();
         this.ClearIndexRunCount();
         
+        
         this.Symbol=symbol;
         if (!symbol)
         {
@@ -72946,15 +72955,18 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Frame.ClearUpDonwFrameYData();
         if (ChartData.IsDayPeriod(this.Period,true))
         {
+            this.ClearStockCache();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
+            this.ClearStockCache();
             this.ReqeustHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
+            this.ClearStockCache();
             this.RequestTickData();
         } 
     }
@@ -77993,6 +78005,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ResetOverlaySymbolStatus();
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
+        this.ClearStockCache();
 
         if (option)
         {
@@ -90217,6 +90230,17 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    IsSHGEM:function(symbol)    //创业板(growth enterprise market) 30开头
+    {
+        if (!symbol) return false;
+        var upperSymbol=symbol.toUpperCase();
+        if (!this.IsSH(upperSymbol)) return false;
+        if (upperSymbol.charAt(0)=='3' && upperSymbol.charAt(1)=='0')
+            return true;
+        
+        return false;
+    },
+
     GetMarketStatus:function(symbol)    //获取市场状态 0=闭市 1=盘前 2=盘中 3=盘后
     {
         if (!symbol) return 0;
@@ -90341,7 +90365,8 @@ var MARKET_SUFFIX_NAME=
     GetLimitPriceRange:function(symbol, name) //涨停范围
     {
         if (!this.IsSHSZStockA(symbol)) return null;
-        if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20%- -20%]
+        if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20% - -20%]
+        if (this.IsSHGEM(symbol)) return { Max:0.2 , Min:-0.2};         //创业板 [20% - -20%]
         
         if (!name) return null;
         if (name.indexOf('ST')>=0) return { Max:0.05, Min:-0.05 }; //ST 股票 [5% - -5%]
@@ -106317,7 +106342,7 @@ function JSSymbolData(ast,option,jsExecute)
                 }
             });
         }
-        else if (ChartData.IsMinutePeriod(this.Period, true))               //请求分钟数据
+        else if (ChartData.IsMinutePeriod(this.Period, true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))               //请求分钟数据
         {
             if (this.NetworkFilter)
             {
@@ -129636,7 +129661,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12579";
+var HQCHART_VERSION="1.1.12584";
 
 function PrintHQChartVersion()
 {

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

@@ -1902,7 +1902,7 @@ function JSChartContainer(uielement)
         {
             var phonePinch = jsChart.PhonePinch;
             if (!phonePinch) return;
-
+            phonePinch.Operator=null;
             if (this.EnableZoomUpDown && this.EnableZoomUpDown.Touch===false) return;
 
             var yHeight = Math.abs(touches[0].pageY - touches[1].pageY);