Skip to content

Commit 83aefff

Browse files
jones2000jones2000
committed
ver 15399
15397 小程序ChangeIndexTemplate()修正没有调用RestoreIndexWindows 15395 ChangeIndexTemplate增加调用RestoreIndexWindows 15393 ReadSymbolArgumentValue()修正小写无效
1 parent 9fbcda0 commit 83aefff

File tree

13 files changed

+107
-126
lines changed

13 files changed

+107
-126
lines changed

‎umychart_uniapp_h5/umychart.uniapp.h5.js‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -91399,6 +91399,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
9139991399
if (!option.Windows) return;
9140091400
var count=option.Windows.length;
9140191401
if (count<=0) return;
91402+
91403+
this.Frame.RestoreIndexWindows();
91404+
9140291405
var currentLength=this.Frame.SubFrame.length;
9140391406

9140491407
var period=null, right=null, symbol=null;
@@ -98329,6 +98332,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
9832998332
this.ChangeIndexTemplate=function(option) //切换指标模板 可以设置指标窗口个数 每个窗口的指标, 只能从第3个指标窗口开始设置，前面2个指标窗口固定无法设置
9833098333
{
9833198334
if (!Array.isArray(option.Windows)) return;
98335+
this.Frame.RestoreIndexWindows();
98336+
9833298337
var count=option.Windows.length;
9833398338
var currentLength=this.Frame.SubFrame.length;
9833498339
var startWindowIndex=2;
@@ -123375,13 +123380,13 @@ function JSSymbolData(ast,option,jsExecute)
123375123380

123376123381
this.GetDynaCacheData=function(name)
123377123382
{
123383+
var data=null;
123378123384
if (MAP_DYNAINFO_SHORTCUT.has(name))
123379123385
{
123380123386
var item=MAP_DYNAINFO_SHORTCUT.get(name);
123381-
return this.GetLatestCacheData(item.ID);
123387+
data=this.GetLatestCacheData(item.ID);
123382123388
}
123383-
123384-
return null;
123389+
return data;
123385123390
}
123386123391

123387123392
this.GetLatestIndexData=function()
@@ -124457,12 +124462,7 @@ function JSSymbolData(ast,option,jsExecute)
124457124462
{ Url:self.RealtimeApiUrl, Type:'POST' ,
124458124463
Data:
124459124464
{
124460-
"field": [ "name", "symbol","yclose","open","price","high","low","vol"],
124461-
"symbol": self.Symbol,
124462-
"start": -1,
124463-
"count": self.MaxRequestDataCount,
124464-
"period":this.Period,
124465-
"right":this.Right
124465+
symbol: self.Symbol,count: self.MaxRequestDataCount, period:this.Period,right:this.Right
124466124466
}
124467124467
},
124468124468
Self:this,
@@ -124474,6 +124474,7 @@ function JSSymbolData(ast,option,jsExecute)
124474124474
obj.Request.KLineDataTimeRange={Start:{ Date:this.KLineDateTimeRange.Start.Date}, End:{ Date:this.KLineDateTimeRange.End.Date} };
124475124475
if (this.IsNumber(this.KLineDateTimeRange.Start.Time)) obj.Request.KLineDataTimeRange.Start.Time=this.KLineDateTimeRange.Start.Time;
124476124476
if (this.IsNumber(this.KLineDateTimeRange.End.Time)) obj.Request.KLineDataTimeRange.End.Time=this.KLineDateTimeRange.End.Time;
124477+
obj.Request.Data.dateRange=obj.Request.KLineDataTimeRange;
124477124478
}
124478124479

124479124480
this.NetworkFilter(obj, function(data)
@@ -126835,13 +126836,14 @@ function JSSymbolData(ast,option,jsExecute)
126835126836
if (readArgument.Value=='') readArgument.Value=this.Symbol; //缺省使用股票代码
126836126837

126837126838
var symbol=readArgument.Value;
126839+
var upperSymbol=symbol.toUpperCase();
126838126840

126839126841
//支持 SH60000, SZ000001
126840126842
//A股后缀小写
126841-
if (symbol.indexOf('.SH')>0) result.Symbol=symbol.replace('.SH', ".sh");
126842-
else if (symbol.indexOf('.SZ')>0) result.Symbol=symbol.replace('.SZ', ".sz");
126843-
else if (symbol.indexOf("SH")==0) result.Symbol=symbol.slice(2)+".sh";
126844-
else if (symbol.indexOf("SZ")==0) result.Symbol=symbol.slice(2)+".sz";
126843+
if (upperSymbol.indexOf('.SH')>0) result.Symbol=symbol.replace('.SH', ".sh");
126844+
else if (upperSymbol.indexOf('.SZ')>0) result.Symbol=symbol.replace('.SZ', ".sz");
126845+
else if (upperSymbol.indexOf("SH")==0) result.Symbol=symbol.slice(2)+".sh";
126846+
else if (upperSymbol.indexOf("SZ")==0) result.Symbol=symbol.slice(2)+".sz";
126845126847
else result.Symbol=symbol;
126846126848

126847126849
return true;
@@ -128537,6 +128539,8 @@ function JSExecute(ast,option)
128537128539

128538128540
this.ReadSymbolData=function(name,node)
128539128541
{
128542+
if (MAP_DYNAINFO_SHORTCUT.has(name)) return this.SymbolData.GetDynaCacheData(name);
128543+
128540128544
switch(name)
128541128545
{
128542128546
case 'CLOSE':
@@ -128604,7 +128608,6 @@ function JSExecute(ast,option)
128604128608
case 'CAPITAL':
128605128609
case 'EXCHANGE':
128606128610
case "HSL":
128607-
128608128611
case "HYBLOCK":
128609128612
case "DYBLOCK":
128610128613
case "GNBLOCK":
@@ -128705,14 +128708,6 @@ function JSExecute(ast,option)
128705128708
return this.SymbolData.WEEKOFYEAR();
128706128709
case "DAYSTOTODAY":
128707128710
return this.SymbolData.DAYSTOTODAY();
128708-
128709-
case "DYNA_NOW":
128710-
case "DYNA_ZAF":
128711-
case "DYNA_LB":
128712-
case "DYNA_ZAS":
128713-
case "SELLVOL":
128714-
case "BUYVOL":
128715-
return this.SymbolData.GetDynaCacheData(name);
128716128711
}
128717128712

128718128713
this.ThrowUnexpectedNode(node, '变量'+name+'不存在', name);
@@ -138071,8 +138066,8 @@ function DownloadFinanceData(obj)
138071138066
{
138072138067
case 1: //FINANCE(1) 总股本(随时间可能有变化) 股
138073138068
case 7: //FINANCE(7) 流通股本(随时间可能有变化) 股
138074-
case "EXCHANGE": //换手率
138075138069
case "HSL"://换手率
138070+
case "EXCHANGE": //换手率
138076138071
this.DownloadHistoryData(id);
138077138072
break;
138078138073
case 3:
@@ -138333,7 +138328,7 @@ function DownloadFinanceData(obj)
138333138328
if (!item.capital) return null;
138334138329
return { Date:date, Value:item.capital.total };
138335138330
case 7:
138336-
case "HSL": //换手率
138331+
case "HSL":
138337138332
case "EXCHANGE": //换手率 历史流通股本
138338138333
if (!item.capital) return null;
138339138334
return { Date:date, Value:item.capital.a };
@@ -155762,7 +155757,7 @@ function ScrollBarBGChart()
155762155757

155763155758

155764155759

155765-
var HQCHART_VERSION="1.1.15389";
155760+
var HQCHART_VERSION="1.1.15398";
155766155761

155767155762
function PrintHQChartVersion()
155768155763
{

‎vuehqchart/src/jscommon/umychart.complier.js‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12424,13 +12424,13 @@ function JSSymbolData(ast,option,jsExecute)
1242412424

1242512425
this.GetDynaCacheData=function(name)
1242612426
{
12427+
var data=null;
1242712428
if (MAP_DYNAINFO_SHORTCUT.has(name))
1242812429
{
1242912430
var item=MAP_DYNAINFO_SHORTCUT.get(name);
12430-
return this.GetLatestCacheData(item.ID);
12431+
data=this.GetLatestCacheData(item.ID);
1243112432
}
12432-
12433-
return null;
12433+
return data;
1243412434
}
1243512435

1243612436
this.GetLatestIndexData=function()
@@ -13506,12 +13506,7 @@ function JSSymbolData(ast,option,jsExecute)
1350613506
{ Url:self.RealtimeApiUrl, Type:'POST' ,
1350713507
Data:
1350813508
{
13509-
"field": [ "name", "symbol","yclose","open","price","high","low","vol"],
13510-
"symbol": self.Symbol,
13511-
"start": -1,
13512-
"count": self.MaxRequestDataCount,
13513-
"period":this.Period,
13514-
"right":this.Right
13509+
symbol: self.Symbol,count: self.MaxRequestDataCount, period:this.Period,right:this.Right
1351513510
}
1351613511
},
1351713512
Self:this,
@@ -13523,6 +13518,7 @@ function JSSymbolData(ast,option,jsExecute)
1352313518
obj.Request.KLineDataTimeRange={Start:{ Date:this.KLineDateTimeRange.Start.Date}, End:{ Date:this.KLineDateTimeRange.End.Date} };
1352413519
if (this.IsNumber(this.KLineDateTimeRange.Start.Time)) obj.Request.KLineDataTimeRange.Start.Time=this.KLineDateTimeRange.Start.Time;
1352513520
if (this.IsNumber(this.KLineDateTimeRange.End.Time)) obj.Request.KLineDataTimeRange.End.Time=this.KLineDateTimeRange.End.Time;
13521+
obj.Request.Data.dateRange=obj.Request.KLineDataTimeRange;
1352613522
}
1352713523

1352813524
this.NetworkFilter(obj, function(data)
@@ -15884,13 +15880,14 @@ function JSSymbolData(ast,option,jsExecute)
1588415880
if (readArgument.Value=='') readArgument.Value=this.Symbol; //缺省使用股票代码
1588515881

1588615882
var symbol=readArgument.Value;
15883+
var upperSymbol=symbol.toUpperCase();
1588715884

1588815885
//支持 SH60000, SZ000001
1588915886
//A股后缀小写
15890-
if (symbol.indexOf('.SH')>0) result.Symbol=symbol.replace('.SH', ".sh");
15891-
else if (symbol.indexOf('.SZ')>0) result.Symbol=symbol.replace('.SZ', ".sz");
15892-
else if (symbol.indexOf("SH")==0) result.Symbol=symbol.slice(2)+".sh";
15893-
else if (symbol.indexOf("SZ")==0) result.Symbol=symbol.slice(2)+".sz";
15887+
if (upperSymbol.indexOf('.SH')>0) result.Symbol=symbol.replace('.SH', ".sh");
15888+
else if (upperSymbol.indexOf('.SZ')>0) result.Symbol=symbol.replace('.SZ', ".sz");
15889+
else if (upperSymbol.indexOf("SH")==0) result.Symbol=symbol.slice(2)+".sh";
15890+
else if (upperSymbol.indexOf("SZ")==0) result.Symbol=symbol.slice(2)+".sz";
1589415891
else result.Symbol=symbol;
1589515892

1589615893
return true;
@@ -17586,6 +17583,8 @@ function JSExecute(ast,option)
1758617583

1758717584
this.ReadSymbolData=function(name,node)
1758817585
{
17586+
if (MAP_DYNAINFO_SHORTCUT.has(name)) return this.SymbolData.GetDynaCacheData(name);
17587+
1758917588
switch(name)
1759017589
{
1759117590
case 'CLOSE':
@@ -17653,7 +17652,6 @@ function JSExecute(ast,option)
1765317652
case 'CAPITAL':
1765417653
case 'EXCHANGE':
1765517654
case "HSL":
17656-
1765717655
case "HYBLOCK":
1765817656
case "DYBLOCK":
1765917657
case "GNBLOCK":
@@ -17754,14 +17752,6 @@ function JSExecute(ast,option)
1775417752
return this.SymbolData.WEEKOFYEAR();
1775517753
case "DAYSTOTODAY":
1775617754
return this.SymbolData.DAYSTOTODAY();
17757-
17758-
case "DYNA_NOW":
17759-
case "DYNA_ZAF":
17760-
case "DYNA_LB":
17761-
case "DYNA_ZAS":
17762-
case "SELLVOL":
17763-
case "BUYVOL":
17764-
return this.SymbolData.GetDynaCacheData(name);
1776517755
}
1776617756

1776717757
this.ThrowUnexpectedNode(node, '变量'+name+'不存在', name);
@@ -27120,8 +27110,8 @@ function DownloadFinanceData(obj)
2712027110
{
2712127111
case 1: //FINANCE(1) 总股本(随时间可能有变化) 股
2712227112
case 7: //FINANCE(7) 流通股本(随时间可能有变化) 股
27123-
case "EXCHANGE": //换手率
2712427113
case "HSL"://换手率
27114+
case "EXCHANGE": //换手率
2712527115
this.DownloadHistoryData(id);
2712627116
break;
2712727117
case 3:
@@ -27382,7 +27372,7 @@ function DownloadFinanceData(obj)
2738227372
if (!item.capital) return null;
2738327373
return { Date:date, Value:item.capital.total };
2738427374
case 7:
27385-
case "HSL": //换手率
27375+
case "HSL":
2738627376
case "EXCHANGE": //换手率 历史流通股本
2738727377
if (!item.capital) return null;
2738827378
return { Date:date, Value:item.capital.a };

‎vuehqchart/src/jscommon/umychart.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87303,6 +87303,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
8730387303
if (!option.Windows) return;
8730487304
var count=option.Windows.length;
8730587305
if (count<=0) return;
87306+
87307+
this.Frame.RestoreIndexWindows();
87308+
8730687309
var currentLength=this.Frame.SubFrame.length;
8730787310

8730887311
var period=null, right=null, symbol=null;
@@ -94233,6 +94236,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
9423394236
this.ChangeIndexTemplate=function(option) //切换指标模板 可以设置指标窗口个数 每个窗口的指标, 只能从第3个指标窗口开始设置，前面2个指标窗口固定无法设置
9423494237
{
9423594238
if (!Array.isArray(option.Windows)) return;
94239+
this.Frame.RestoreIndexWindows();
94240+
9423694241
var count=option.Windows.length;
9423794242
var currentLength=this.Frame.SubFrame.length;
9423894243
var startWindowIndex=2;

‎vuehqchart/src/jscommon/umychart.version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77

8-
var HQCHART_VERSION="1.1.15389";
8+
var HQCHART_VERSION="1.1.15398";
99

1010
function PrintHQChartVersion()
1111
{

0 commit comments

Comments
 (0)