hqchart 1.1.15428 → 1.1.15438

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/lib/umychart.vue.js +33 -27
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.DialogTooltip.js +3 -5
  4. package/src/jscommon/umychart.StockInfo.js +18 -5
  5. package/src/jscommon/umychart.deal.js +31 -9
  6. package/src/jscommon/umychart.js +27 -5
  7. package/src/jscommon/umychart.report.js +50 -12
  8. package/src/jscommon/umychart.style.js +2 -2
  9. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +111 -29
  10. package/src/jscommon/umychart.version.js +1 -1
  11. package/src/jscommon/umychart.vue/umychart.vue.js +114 -34
package/src/jscommon/umychart.report.js CHANGED
@@ -1740,6 +1740,8 @@ function JSReportChartContainer(uielement)
1740
1740
  //80=整行背景色
1741
1741
  //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
1742
1742
 
1743
+ var upperSymbol=null;
1744
+ if (stock.Symbol) upperSymbol=stock.Symbol.toUpperCase();
1743
1745
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
1744
1746
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
1745
1747
  if (IFrameSplitOperator.IsNumber(item[3])) stock.Open=item[3];
@@ -1771,17 +1773,39 @@ function JSReportChartContainer(uielement)
1771
1773
 
1772
1774
  if (item[27]) stock.NameEx=item[27]; //扩展名字
1773
1775
 
1776
+ if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38]; //持仓量
1777
+ if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39]; //结算价
1778
+ if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40]; //昨结算价
1779
+ if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41]; //开仓量
1780
+ if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42]; //平仓量
1781
+
1774
1782
  //衍生数据计算
1775
1783
  if (!IFrameSplitOperator.IsNumber(item[21])) //涨幅%
1776
1784
  {
1777
- if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
1778
- stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
1785
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
1786
+ {
1787
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
1788
+ stock.Increase=(stock.Price-stock.YFClose)/stock.YFClose*100;
1789
+ }
1790
+ else
1791
+ {
1792
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
1793
+ stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
1794
+ }
1779
1795
  }
1780
1796
 
1781
1797
  if (!IFrameSplitOperator.IsNumber(item[22])) //涨跌
1782
1798
  {
1783
- if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
1784
- stock.UpDown=stock.Price-stock.YClose;
1799
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
1800
+ {
1801
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose))
1802
+ stock.UpDown=stock.Price-stock.YFClose;
1803
+ }
1804
+ else
1805
+ {
1806
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
1807
+ stock.UpDown=stock.Price-stock.YClose;
1808
+ }
1785
1809
  }
1786
1810
 
1787
1811
  if (!IFrameSplitOperator.IsNumber(item[23])) //换手率%
@@ -1792,8 +1816,17 @@ function JSReportChartContainer(uielement)
1792
1816
 
1793
1817
  if (!IFrameSplitOperator.IsNumber(item[24])) //振幅%
1794
1818
  {
1795
- if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
1796
- stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
1819
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
1820
+ {
1821
+ if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
1822
+ stock.Amplitude=(stock.High-stock.Low)/stock.YFClose*100;
1823
+ }
1824
+ else
1825
+ {
1826
+ if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
1827
+ stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
1828
+ }
1829
+
1797
1830
  }
1798
1831
 
1799
1832
  if (!IFrameSplitOperator.IsNumber(item[25])) //流通市值
@@ -1822,11 +1855,7 @@ function JSReportChartContainer(uielement)
1822
1855
 
1823
1856
  if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
1824
1857
 
1825
- if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38]; //持仓量
1826
- if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39]; //结算价
1827
- if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40]; //昨结算价
1828
- if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41]; //开仓量
1829
- if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42]; //平仓量
1858
+
1830
1859
 
1831
1860
  //1,3,5,10,15 涨速%
1832
1861
  if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43];
@@ -8116,7 +8145,16 @@ function ChartReport()
8116
8145
  }
8117
8146
  else //昨收价 计算颜色
8118
8147
  {
8119
- if (IFrameSplitOperator.IsNumber(stock.YClose)) yClose=stock.YClose;
8148
+ var upperSymbol=null;
8149
+ if (stock.Symbol) upperSymbol=stock.Symbol.toUpperCase();
8150
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol) && IFrameSplitOperator.IsNumber(stock.YFClose))
8151
+ {
8152
+ yClose=stock.YFClose;
8153
+ }
8154
+ else
8155
+ {
8156
+ if (IFrameSplitOperator.IsNumber(stock.YClose)) yClose=stock.YClose;
8157
+ }
8120
8158
  }
8121
8159
 
8122
8160
  if (!IFrameSplitOperator.IsNumber(yClose))
package/src/jscommon/umychart.style.js CHANGED
@@ -711,13 +711,13 @@ function GetBlackStyle()
711
711
  {
712
712
  Color:"RGB(245,245,245)",
713
713
  Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
714
- Font:{ Size:12, Name:"微软雅黑" }
714
+ //Font:{ Size:12, Name:"微软雅黑" }
715
715
  },
716
716
 
717
717
  Row:
718
718
  {
719
719
  Mergin:{ Top:2, Bottom:2 },
720
- Font:{ Size:15, Name:"微软雅黑"},
720
+ //Font:{ Size:15, Name:"微软雅黑"},
721
721
  BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
722
722
  },
723
723
 
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -83487,13 +83487,13 @@ function JSChartResource()
83487
83487
  {
83488
83488
  Color:"RGB(60,60,60)",
83489
83489
  Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
83490
- Font:{ Size:12, Name:"微软雅黑" }
83490
+ Font:{ Size:14, Name:"微软雅黑" }
83491
83491
  },
83492
83492
 
83493
83493
  Row:
83494
83494
  {
83495
83495
  Mergin:{ Top:2, Bottom:2 },
83496
- Font:{ Size:15, Name:"微软雅黑"},
83496
+ Font:{ Size:14, Name:"微软雅黑"},
83497
83497
  BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
83498
83498
  },
83499
83499
 
@@ -106598,6 +106598,7 @@ var MARKET_SUFFIX_NAME=
106598
106598
  DCE: '.DCE', //大连商品交易所(Dalian Commodity Exchange)
106599
106599
  CZCE: '.CZC', //郑州期货交易所
106600
106600
  GZFE:".GZFE", //广州期货交易所
106601
+ INE:".INE", //上海国际能源交易中心
106601
106602
 
106602
106603
  USA:'.USA', //美股
106603
106604
  FTSE:'.FTSE', //富时中国
@@ -106842,10 +106843,18 @@ var MARKET_SUFFIX_NAME=
106842
106843
  return upperSymbol.indexOf(this.GZFE) > 0;
106843
106844
  },
106844
106845
 
106846
+ IsINE:function(upperSymbol)
106847
+ {
106848
+ if (!upperSymbol) return false;
106849
+ return upperSymbol.indexOf(this.INE) > 0;
106850
+ },
106851
+
106845
106852
  IsChinaFutures:function(upperSymbol) //是否是国内期货 /期权
106846
106853
  {
106854
+ if (!upperSymbol) return false;
106855
+
106847
106856
  return this.IsSHO(upperSymbol) || this.IsSZO(upperSymbol) ||
106848
- this.IsGZFE(upperSymbol) ||
106857
+ this.IsGZFE(upperSymbol) || this.IsINE(upperSymbol) ||
106849
106858
  this.IsCFFEX(upperSymbol) || this.IsCZCE(upperSymbol) || this.IsDCE(upperSymbol) || this.IsSHFE(upperSymbol);
106850
106859
  },
106851
106860
 
@@ -107700,7 +107709,8 @@ function MinuteTimeStringData()
107700
107709
  if (MARKET_SUFFIX_NAME.IsTW(upperSymbol)) return this.GetTW(upperSymbol);
107701
107710
  if (MARKET_SUFFIX_NAME.IsJP(upperSymbol)) return this.GetJP(upperSymbol);
107702
107711
  if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol)) return this.GetUSA(upperSymbol);
107703
- if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
107712
+ if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) ||
107713
+ MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
107704
107714
  {
107705
107715
  var splitData = g_FuturesTimeData.GetSplitData(upperSymbol, option);
107706
107716
  if (!splitData) return null;
@@ -108192,7 +108202,7 @@ function MinuteCoordinateData()
108192
108202
  data=this.GetTWData(upperSymbol,width);
108193
108203
  else if (MARKET_SUFFIX_NAME.IsJP(upperSymbol))
108194
108204
  data=this.GetJPData(upperSymbol,width);
108195
- else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
108205
+ else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
108196
108206
  return this.GetChinatFuturesData(upperSymbol, width, option);
108197
108207
  else if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol))
108198
108208
  data = this.GetUSAData(upperSymbol,width);
@@ -109039,6 +109049,13 @@ function FuturesTimeData()
109039
109049
  [MARKET_SUFFIX_NAME.SHFE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
109040
109050
  [MARKET_SUFFIX_NAME.SHFE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
109041
109051
  [MARKET_SUFFIX_NAME.SHFE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
109052
+
109053
+ //上海国际能源交易中心 独立的一个市场
109054
+ [MARKET_SUFFIX_NAME.INE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
109055
+ [MARKET_SUFFIX_NAME.INE + '-SC', {Time:5,Decimal:1,Name:'原油'}],
109056
+ [MARKET_SUFFIX_NAME.INE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
109057
+ [MARKET_SUFFIX_NAME.INE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
109058
+ [MARKET_SUFFIX_NAME.INE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
109042
109059
 
109043
109060
  //郑州期货交易所
109044
109061
  [MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
@@ -109155,6 +109172,11 @@ function FuturesTimeData()
109155
109172
  oneWordName = MARKET_SUFFIX_NAME.GZFE + '-' + oneWord;
109156
109173
  twoWordsName = MARKET_SUFFIX_NAME.GZFE + '-' + twoWords;
109157
109174
  }
109175
+ else if (MARKET_SUFFIX_NAME.IsINE(upperSymbol)) //上海国际能源交易中心
109176
+ {
109177
+ oneWordName = MARKET_SUFFIX_NAME.INE + '-' + oneWord;
109178
+ twoWordsName = MARKET_SUFFIX_NAME.INE + '-' + twoWords;
109179
+ }
109158
109180
 
109159
109181
  if (this.MAP_TWOWORDS.has(twoWordsName))
109160
109182
  {
@@ -139395,13 +139417,13 @@ function GetBlackStyle()
139395
139417
  {
139396
139418
  Color:"RGB(245,245,245)",
139397
139419
  Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
139398
- Font:{ Size:12, Name:"微软雅黑" }
139420
+ //Font:{ Size:12, Name:"微软雅黑" }
139399
139421
  },
139400
139422
 
139401
139423
  Row:
139402
139424
  {
139403
139425
  Mergin:{ Top:2, Bottom:2 },
139404
- Font:{ Size:15, Name:"微软雅黑"},
139426
+ //Font:{ Size:15, Name:"微软雅黑"},
139405
139427
  BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
139406
139428
  },
139407
139429
 
@@ -140300,8 +140322,11 @@ function JSDealChartContainer(uielement)
140300
140322
  var chart=this.ChartPaint[0];
140301
140323
  if (chart) chart.Data=null;
140302
140324
 
140303
- if (option && IFrameSplitOperator.IsNumber(option.TradeDate))
140304
- this.TradeDate=option.TradeDate;
140325
+ if (option)
140326
+ {
140327
+ if (IFrameSplitOperator.IsNumber(option.TradeDate)) this.TradeDate=option.TradeDate;
140328
+ if (IFrameSplitOperator.IsNonEmptyArray(option.Column)) this.SetColumn(option.Column);
140329
+ }
140305
140330
 
140306
140331
  if (!this.Symbol)
140307
140332
  {
@@ -140409,6 +140434,7 @@ function JSDealChartContainer(uielement)
140409
140434
  chart.Data=this.Data;
140410
140435
  chart.Symbol=this.Symbol;
140411
140436
  chart.YClose=data.yclose;
140437
+ chart.YFClose=data.yfclose;
140412
140438
  chart.Open=data.open;
140413
140439
 
140414
140440
  if (this.IsShowLastPage) this.SetLastPageDataOffset(); //显示最后一屏
@@ -141076,8 +141102,6 @@ var DEAL_COLUMN_ID=
141076
141102
  SYMBOL_ID:11, //股票代码
141077
141103
  NAME_ID:12, //股票名称
141078
141104
 
141079
-
141080
-
141081
141105
  //预留数值类型 10个
141082
141106
  RESERVE_NUMBER1_ID:201, //ReserveNumber1:
141083
141107
  RESERVE_NUMBER2_ID:202,
@@ -141155,6 +141179,7 @@ function ChartDealList()
141155
141179
  //this.Data={Offset:0, Data:[ {Time:925, Price:20.1, Vol:10000050, BS:1, Deal:45 }, {Time:925, Price:18.2, Vol:1150, BS:1, Deal:5 }] };
141156
141180
  this.Symbol;
141157
141181
  this.YClose; //昨收
141182
+ this.YFClose; //昨结算
141158
141183
  this.Open; //开盘价
141159
141184
  this.Decimal=2; //小数位数
141160
141185
  this.IsSingleTable=false; //单表模式
@@ -141309,7 +141334,6 @@ function ChartDealList()
141309
141334
  { Type:DEAL_COLUMN_ID.STRING_TIME_ID, Title:"时间", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Time, MaxText:"88:88:88" },
141310
141335
  { Type:DEAL_COLUMN_ID.INDEX_ID, Title:"序号", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Index, MaxText:"88888" },
141311
141336
 
141312
-
141313
141337
  { Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
141314
141338
  { Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
141315
141339
 
@@ -141638,10 +141662,7 @@ function ChartDealList()
141638
141662
  }
141639
141663
  else if (item.Type==DEAL_COLUMN_ID.PRICE_ID)
141640
141664
  {
141641
- if (data.Price>this.YClose) textColor=this.UpColor;
141642
- else if (data.Price<this.YClose) textColor=this.DownColor;
141643
- else textColor=this.UnchangeColor;
141644
-
141665
+ textColor=this.GetPriceColor(data.Price);
141645
141666
  text=data.Price.toFixed(this.Decimal);
141646
141667
  }
141647
141668
  else if (item.Type==DEAL_COLUMN_ID.VOL_ID)
@@ -141742,6 +141763,29 @@ function ChartDealList()
141742
141763
  }
141743
141764
  }
141744
141765
 
141766
+ this.GetPriceColor=function(price)
141767
+ {
141768
+ var upperSymbol=null;
141769
+ if (this.Symbol) upperSymbol=this.Symbol.toUpperCase();
141770
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
141771
+ {
141772
+ if (!IFrameSplitOperator.IsNumber(this.YFClose)) return this.UnchangeColor;
141773
+ return this.GetUpDownColor(price, this.YFClose);
141774
+ }
141775
+ else
141776
+ {
141777
+ if (!IFrameSplitOperator.IsNumber(this.YClose)) return this.UnchangeColor;
141778
+ return this.GetUpDownColor(price, this.YClose);
141779
+ }
141780
+ }
141781
+
141782
+ this.GetUpDownColor=function(price, price2)
141783
+ {
141784
+ if (price>price2) return this.UpColor;
141785
+ else if (price<price2) return this.DownColor;
141786
+ else return this.UnchangeColor;
141787
+ }
141788
+
141745
141789
  this.FormatReserveNumber=function(column, data, drawInfo)
141746
141790
  {
141747
141791
  if (column.DefaultText) drawInfo.Text=column.DefaultText;
@@ -143883,6 +143927,8 @@ function JSReportChartContainer(uielement)
143883
143927
  //80=整行背景色
143884
143928
  //101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
143885
143929
 
143930
+ var upperSymbol=null;
143931
+ if (stock.Symbol) upperSymbol=stock.Symbol.toUpperCase();
143886
143932
  if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
143887
143933
  if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
143888
143934
  if (IFrameSplitOperator.IsNumber(item[3])) stock.Open=item[3];
@@ -143914,17 +143960,39 @@ function JSReportChartContainer(uielement)
143914
143960
 
143915
143961
  if (item[27]) stock.NameEx=item[27]; //扩展名字
143916
143962
 
143963
+ if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38]; //持仓量
143964
+ if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39]; //结算价
143965
+ if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40]; //昨结算价
143966
+ if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41]; //开仓量
143967
+ if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42]; //平仓量
143968
+
143917
143969
  //衍生数据计算
143918
143970
  if (!IFrameSplitOperator.IsNumber(item[21])) //涨幅%
143919
143971
  {
143920
- if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
143921
- stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
143972
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
143973
+ {
143974
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
143975
+ stock.Increase=(stock.Price-stock.YFClose)/stock.YFClose*100;
143976
+ }
143977
+ else
143978
+ {
143979
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
143980
+ stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
143981
+ }
143922
143982
  }
143923
143983
 
143924
143984
  if (!IFrameSplitOperator.IsNumber(item[22])) //涨跌
143925
143985
  {
143926
- if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
143927
- stock.UpDown=stock.Price-stock.YClose;
143986
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
143987
+ {
143988
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose))
143989
+ stock.UpDown=stock.Price-stock.YFClose;
143990
+ }
143991
+ else
143992
+ {
143993
+ if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
143994
+ stock.UpDown=stock.Price-stock.YClose;
143995
+ }
143928
143996
  }
143929
143997
 
143930
143998
  if (!IFrameSplitOperator.IsNumber(item[23])) //换手率%
@@ -143935,8 +144003,17 @@ function JSReportChartContainer(uielement)
143935
144003
 
143936
144004
  if (!IFrameSplitOperator.IsNumber(item[24])) //振幅%
143937
144005
  {
143938
- if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
143939
- stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
144006
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
144007
+ {
144008
+ if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
144009
+ stock.Amplitude=(stock.High-stock.Low)/stock.YFClose*100;
144010
+ }
144011
+ else
144012
+ {
144013
+ if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
144014
+ stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
144015
+ }
144016
+
143940
144017
  }
143941
144018
 
143942
144019
  if (!IFrameSplitOperator.IsNumber(item[25])) //流通市值
@@ -143965,11 +144042,7 @@ function JSReportChartContainer(uielement)
143965
144042
 
143966
144043
  if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
143967
144044
 
143968
- if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38]; //持仓量
143969
- if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39]; //结算价
143970
- if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40]; //昨结算价
143971
- if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41]; //开仓量
143972
- if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42]; //平仓量
144045
+
143973
144046
 
143974
144047
  //1,3,5,10,15 涨速%
143975
144048
  if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43];
@@ -150259,7 +150332,16 @@ function ChartReport()
150259
150332
  }
150260
150333
  else //昨收价 计算颜色
150261
150334
  {
150262
- if (IFrameSplitOperator.IsNumber(stock.YClose)) yClose=stock.YClose;
150335
+ var upperSymbol=null;
150336
+ if (stock.Symbol) upperSymbol=stock.Symbol.toUpperCase();
150337
+ if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol) && IFrameSplitOperator.IsNumber(stock.YFClose))
150338
+ {
150339
+ yClose=stock.YFClose;
150340
+ }
150341
+ else
150342
+ {
150343
+ if (IFrameSplitOperator.IsNumber(stock.YClose)) yClose=stock.YClose;
150344
+ }
150263
150345
  }
150264
150346
 
150265
150347
  if (!IFrameSplitOperator.IsNumber(yClose))
@@ -156088,7 +156170,7 @@ function ScrollBarBGChart()
156088
156170
 
156089
156171
 
156090
156172
 
156091
- var HQCHART_VERSION="1.1.15427";
156173
+ var HQCHART_VERSION="1.1.15437";
156092
156174
 
156093
156175
  function PrintHQChartVersion()
156094
156176
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.15427";
8
+ var HQCHART_VERSION="1.1.15437";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {