hqchart 1.1.15455 → 1.1.15480

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 (12) hide show
  1. package/lib/umychart.vue.js +58 -42
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.DialogDrawTool.js +3 -0
  4. package/src/jscommon/umychart.PopKeyboard.js +28 -0
  5. package/src/jscommon/umychart.StatusBar.js +13 -4
  6. package/src/jscommon/umychart.StockInfo.js +185 -3
  7. package/src/jscommon/umychart.complier.js +4 -4
  8. package/src/jscommon/umychart.js +55 -61
  9. package/src/jscommon/umychart.report.js +86 -50
  10. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +146 -116
  11. package/src/jscommon/umychart.version.js +1 -1
  12. package/src/jscommon/umychart.vue/umychart.vue.js +375 -123
package/src/jscommon/umychart.report.js CHANGED
@@ -535,6 +535,7 @@ function JSReportChartContainer(uielement)
535
535
  this.DestroyMinuteChartTooltip();
536
536
  this.DestroyKLineChartTooltip();
537
537
  this.DestroyFloatTooltip();
538
+ this.DestroyPopMenu();
538
539
  }
539
540
 
540
541
  this.StopAutoDragScrollTimer=function()
@@ -556,6 +557,14 @@ function JSReportChartContainer(uielement)
556
557
  this.JSPopMenu.Inital();
557
558
  }
558
559
 
560
+ this.DestroyPopMenu=function()
561
+ {
562
+ if (!this.JSPopMenu) return;
563
+
564
+ this.JSPopMenu.Destroy();
565
+ this.JSPopMenu=null;
566
+ }
567
+
559
568
  this.InitalMinuteChartTooltip=function(option)
560
569
  {
561
570
  if (this.TooltipMinuteChart) return;
@@ -1867,61 +1876,75 @@ function JSReportChartContainer(uielement)
1867
1876
  if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
1868
1877
  if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]; //扩展数据2
1869
1878
 
1879
+ function __Temp_IsNumberOrObject(value)
1880
+ {
1881
+ if (IFrameSplitOperator.IsNumber(value)) return true;
1882
+ if (IFrameSplitOperator.IsObject(value)) return true;
1883
+ return false;
1884
+ }
1885
+
1886
+ function __Temp_IsStringOrObject(value)
1887
+ {
1888
+ if (IFrameSplitOperator.IsString(value)) return true;
1889
+ if (IFrameSplitOperator.IsObject(value)) return true;
1890
+ return false;
1891
+ }
1892
+
1870
1893
  //10个数值型 101-199
1871
- if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
1872
- if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
1873
- if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
1874
- if (IFrameSplitOperator.IsNumber(item[104])) stock.ReserveNumber4=item[104];
1875
- if (IFrameSplitOperator.IsNumber(item[105])) stock.ReserveNumber5=item[105];
1876
- if (IFrameSplitOperator.IsNumber(item[106])) stock.ReserveNumber6=item[106];
1877
- if (IFrameSplitOperator.IsNumber(item[107])) stock.ReserveNumber7=item[107];
1878
- if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
1879
- if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
1880
- if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
1881
- if (IFrameSplitOperator.IsNumber(item[111])) stock.ReserveNumber11=item[111];
1882
- if (IFrameSplitOperator.IsNumber(item[112])) stock.ReserveNumber12=item[112];
1883
- if (IFrameSplitOperator.IsNumber(item[113])) stock.ReserveNumber13=item[113];
1884
- if (IFrameSplitOperator.IsNumber(item[114])) stock.ReserveNumber14=item[114];
1885
- if (IFrameSplitOperator.IsNumber(item[115])) stock.ReserveNumber15=item[115];
1886
- if (IFrameSplitOperator.IsNumber(item[116])) stock.ReserveNumber16=item[116];
1887
- if (IFrameSplitOperator.IsNumber(item[117])) stock.ReserveNumber17=item[117];
1888
- if (IFrameSplitOperator.IsNumber(item[118])) stock.ReserveNumber18=item[118];
1889
- if (IFrameSplitOperator.IsNumber(item[119])) stock.ReserveNumber19=item[119];
1890
- if (IFrameSplitOperator.IsNumber(item[120])) stock.ReserveNumber20=item[120];
1894
+ if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
1895
+ if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
1896
+ if (__Temp_IsNumberOrObject(item[103])) stock.ReserveNumber3=item[103];
1897
+ if (__Temp_IsNumberOrObject(item[104])) stock.ReserveNumber4=item[104];
1898
+ if (__Temp_IsNumberOrObject(item[105])) stock.ReserveNumber5=item[105];
1899
+ if (__Temp_IsNumberOrObject(item[106])) stock.ReserveNumber6=item[106];
1900
+ if (__Temp_IsNumberOrObject(item[107])) stock.ReserveNumber7=item[107];
1901
+ if (__Temp_IsNumberOrObject(item[108])) stock.ReserveNumber8=item[108];
1902
+ if (__Temp_IsNumberOrObject(item[109])) stock.ReserveNumber9=item[109];
1903
+ if (__Temp_IsNumberOrObject(item[110])) stock.ReserveNumber10=item[110];
1904
+ if (__Temp_IsNumberOrObject(item[111])) stock.ReserveNumber11=item[111];
1905
+ if (__Temp_IsNumberOrObject(item[112])) stock.ReserveNumber12=item[112];
1906
+ if (__Temp_IsNumberOrObject(item[113])) stock.ReserveNumber13=item[113];
1907
+ if (__Temp_IsNumberOrObject(item[114])) stock.ReserveNumber14=item[114];
1908
+ if (__Temp_IsNumberOrObject(item[115])) stock.ReserveNumber15=item[115];
1909
+ if (__Temp_IsNumberOrObject(item[116])) stock.ReserveNumber16=item[116];
1910
+ if (__Temp_IsNumberOrObject(item[117])) stock.ReserveNumber17=item[117];
1911
+ if (__Temp_IsNumberOrObject(item[118])) stock.ReserveNumber18=item[118];
1912
+ if (__Temp_IsNumberOrObject(item[119])) stock.ReserveNumber19=item[119];
1913
+ if (__Temp_IsNumberOrObject(item[120])) stock.ReserveNumber20=item[120];
1891
1914
 
1892
1915
  //10个字符型 201-299
1893
- if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
1894
- if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
1895
- if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
1896
- if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
1897
- if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
1898
- if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
1899
- if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
1900
- if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
1901
- if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
1902
- if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
1903
- if (IFrameSplitOperator.IsString(item[211]) || IFrameSplitOperator.IsObject(item[211])) stock.ReserveString11=item[211];
1904
- if (IFrameSplitOperator.IsString(item[212]) || IFrameSplitOperator.IsObject(item[212])) stock.ReserveString12=item[212];
1905
- if (IFrameSplitOperator.IsString(item[213]) || IFrameSplitOperator.IsObject(item[213])) stock.ReserveString13=item[213];
1906
- if (IFrameSplitOperator.IsString(item[214]) || IFrameSplitOperator.IsObject(item[214])) stock.ReserveString14=item[214];
1907
- if (IFrameSplitOperator.IsString(item[215]) || IFrameSplitOperator.IsObject(item[215])) stock.ReserveString15=item[215];
1908
- if (IFrameSplitOperator.IsString(item[216]) || IFrameSplitOperator.IsObject(item[216])) stock.ReserveString16=item[216];
1909
- if (IFrameSplitOperator.IsString(item[217]) || IFrameSplitOperator.IsObject(item[217])) stock.ReserveString17=item[217];
1910
- if (IFrameSplitOperator.IsString(item[218]) || IFrameSplitOperator.IsObject(item[218])) stock.ReserveString18=item[218];
1911
- if (IFrameSplitOperator.IsString(item[219]) || IFrameSplitOperator.IsObject(item[219])) stock.ReserveString19=item[219];
1912
- if (IFrameSplitOperator.IsString(item[220]) || IFrameSplitOperator.IsObject(item[220])) stock.ReserveString20=item[220];
1916
+ if (__Temp_IsStringOrObject(item[201])) stock.ReserveString1=item[201];
1917
+ if (__Temp_IsStringOrObject(item[202])) stock.ReserveString2=item[202];
1918
+ if (__Temp_IsStringOrObject(item[203])) stock.ReserveString3=item[203];
1919
+ if (__Temp_IsStringOrObject(item[204])) stock.ReserveString4=item[204];
1920
+ if (__Temp_IsStringOrObject(item[205])) stock.ReserveString5=item[205];
1921
+ if (__Temp_IsStringOrObject(item[206])) stock.ReserveString6=item[206];
1922
+ if (__Temp_IsStringOrObject(item[207])) stock.ReserveString7=item[207];
1923
+ if (__Temp_IsStringOrObject(item[208])) stock.ReserveString8=item[208];
1924
+ if (__Temp_IsStringOrObject(item[209])) stock.ReserveString9=item[209];
1925
+ if (__Temp_IsStringOrObject(item[210])) stock.ReserveString10=item[210];
1926
+ if (__Temp_IsStringOrObject(item[211])) stock.ReserveString11=item[211];
1927
+ if (__Temp_IsStringOrObject(item[212])) stock.ReserveString12=item[212];
1928
+ if (__Temp_IsStringOrObject(item[213])) stock.ReserveString13=item[213];
1929
+ if (__Temp_IsStringOrObject(item[214])) stock.ReserveString14=item[214];
1930
+ if (__Temp_IsStringOrObject(item[215])) stock.ReserveString15=item[215];
1931
+ if (__Temp_IsStringOrObject(item[216])) stock.ReserveString16=item[216];
1932
+ if (__Temp_IsStringOrObject(item[217])) stock.ReserveString17=item[217];
1933
+ if (__Temp_IsStringOrObject(item[218])) stock.ReserveString18=item[218];
1934
+ if (__Temp_IsStringOrObject(item[219])) stock.ReserveString19=item[219];
1935
+ if (__Temp_IsStringOrObject(item[220])) stock.ReserveString20=item[220];
1913
1936
 
1914
1937
  //10个进度条 301-350 { Value:, BGColor: }
1915
- if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
1916
- if (IFrameSplitOperator.IsNumber(item[302]) || IFrameSplitOperator.IsObject(item[302])) stock.ReserveProgressBar2=item[302];
1917
- if (IFrameSplitOperator.IsNumber(item[303]) || IFrameSplitOperator.IsObject(item[303])) stock.ReserveProgressBar3=item[303];
1918
- if (IFrameSplitOperator.IsNumber(item[304]) || IFrameSplitOperator.IsObject(item[304])) stock.ReserveProgressBar4=item[304];
1919
- if (IFrameSplitOperator.IsNumber(item[305]) || IFrameSplitOperator.IsObject(item[305])) stock.ReserveProgressBar5=item[305];
1920
- if (IFrameSplitOperator.IsNumber(item[306]) || IFrameSplitOperator.IsObject(item[306])) stock.ReserveProgressBar6=item[306];
1921
- if (IFrameSplitOperator.IsNumber(item[307]) || IFrameSplitOperator.IsObject(item[307])) stock.ReserveProgressBar7=item[307];
1922
- if (IFrameSplitOperator.IsNumber(item[308]) || IFrameSplitOperator.IsObject(item[308])) stock.ReserveProgressBar8=item[308];
1923
- if (IFrameSplitOperator.IsNumber(item[309]) || IFrameSplitOperator.IsObject(item[309])) stock.ReserveProgressBar9=item[309];
1924
- if (IFrameSplitOperator.IsNumber(item[310]) || IFrameSplitOperator.IsObject(item[310])) stock.ReserveProgressBar10=item[310];
1938
+ if (__Temp_IsNumberOrObject(item[301])) stock.ReserveProgressBar1=item[301];
1939
+ if (__Temp_IsNumberOrObject(item[302])) stock.ReserveProgressBar2=item[302];
1940
+ if (__Temp_IsNumberOrObject(item[303])) stock.ReserveProgressBar3=item[303];
1941
+ if (__Temp_IsNumberOrObject(item[304])) stock.ReserveProgressBar4=item[304];
1942
+ if (__Temp_IsNumberOrObject(item[305])) stock.ReserveProgressBar5=item[305];
1943
+ if (__Temp_IsNumberOrObject(item[306])) stock.ReserveProgressBar6=item[306];
1944
+ if (__Temp_IsNumberOrObject(item[307])) stock.ReserveProgressBar7=item[307];
1945
+ if (__Temp_IsNumberOrObject(item[308])) stock.ReserveProgressBar8=item[308];
1946
+ if (__Temp_IsNumberOrObject(item[309])) stock.ReserveProgressBar9=item[309];
1947
+ if (__Temp_IsNumberOrObject(item[310])) stock.ReserveProgressBar10=item[310];
1925
1948
 
1926
1949
  //10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
1927
1950
  if (IFrameSplitOperator.IsObject(item[351])) stock.ReserveButton1=item[351];
@@ -7891,6 +7914,14 @@ function ChartReport()
7891
7914
  if (!data || !fieldName) return;
7892
7915
 
7893
7916
  var value=data[fieldName];
7917
+ var compareValue=null;
7918
+ if (IFrameSplitOperator.IsObject(data[fieldName]))
7919
+ {
7920
+ var item=data[fieldName];
7921
+ if (IFrameSplitOperator.IsNumber(item.Value)) value=item.Value;
7922
+ if (IFrameSplitOperator.IsNumber(item.CompareValue)) compareValue=item.CompareValue;
7923
+ }
7924
+
7894
7925
  if (!IFrameSplitOperator.IsNumber(value)) return;
7895
7926
 
7896
7927
  if (IFrameSplitOperator.IsNumber(column.ColorType))
@@ -7907,6 +7938,11 @@ function ChartReport()
7907
7938
  {
7908
7939
  drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
7909
7940
  }
7941
+ else if (column.ColorType==4)
7942
+ {
7943
+ if (IFrameSplitOperator.IsNumber(compareValue))
7944
+ drawInfo.TextColor=this.GetUpDownColor(value,compareValue);
7945
+ }
7910
7946
  }
7911
7947
 
7912
7948
  var text=value.toFixed(column.FloatPrecision);
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -6796,6 +6796,15 @@ JSChart.GetShortSymbol=function(symbol)
6796
6796
  return symbol.slice(0,pos);
6797
6797
  }
6798
6798
 
6799
+ JSChart.CancelEvent=function(e)
6800
+ {
6801
+ if (!e) return;
6802
+
6803
+ if (e.preventDefault) e.preventDefault();
6804
+ if (e.stopPropagation) e.stopPropagation();
6805
+ e.returnValue=false;
6806
+ }
6807
+
6799
6808
 
6800
6809
  var JSCHART_EVENT_ID=
6801
6810
  {
@@ -6884,9 +6893,6 @@ var JSCHART_EVENT_ID=
6884
6893
  ON_DRAG_SUB_SELECT_RECT:66, //拖拽区间选择子区域
6885
6894
  ON_DRAG_SUB_SELECT_RECT_MOUSEUP:67, //拖拽区间选择子区域鼠标松开
6886
6895
 
6887
- ON_KEYBOARD_SELECTED:68, //键盘精灵选中回车
6888
- ON_KEYBOARD_MOUSEUP:69,
6889
-
6890
6896
  ON_CLICK_DRAWPICTURE_BUTTON:70, //画图工具按钮
6891
6897
  ON_FINISH_MOVE_DRAWPICTURE:71, //画图工具移动完成
6892
6898
 
@@ -7032,6 +7038,15 @@ var JSCHART_EVENT_ID=
7032
7038
 
7033
7039
  //工具条
7034
7040
  ON_CLICK_STATUSBAR_ITEM:301,
7041
+ ON_RCLICK_STATUSBAR_ITEM:302,
7042
+
7043
+ //5档买卖
7044
+ ON_CLICK_STOCKINFO_ITEM:350,
7045
+ ON_RCLICK_STOCKINFO_ITEM:351,
7046
+
7047
+ ON_KEYBOARD_SHOW:350, //显示键盘精灵
7048
+ ON_KEYBOARD_SELECTED:351, //键盘精灵选中回车
7049
+ ON_KEYBOARD_MOUSEUP:352,
7035
7050
  }
7036
7051
 
7037
7052
  var JSCHART_OPERATOR_ID=
@@ -31474,6 +31489,7 @@ function IChartPainting()
31474
31489
  if (!this.IsShow || this.ChartFrame.IsMinSize) return;
31475
31490
  var bHScreen=(this.ChartFrame.IsHScreen===true);
31476
31491
  if (bHScreen) return;
31492
+ if (!this.Data) return;
31477
31493
 
31478
31494
  var isMinute=this.IsMinuteFrame();
31479
31495
  var dataWidth=this.ChartFrame.DataWidth;
@@ -31614,6 +31630,7 @@ function IChartPainting()
31614
31630
  if (!this.IsShow || this.ChartFrame.IsMinSize) return null;
31615
31631
  var bHScreen=(this.ChartFrame.IsHScreen===true);
31616
31632
  if (bHScreen) return null;
31633
+ if (!this.Data) return null;
31617
31634
 
31618
31635
  var dataWidth=this.ChartFrame.DataWidth;
31619
31636
  var distanceWidth=this.ChartFrame.DistanceWidth;
@@ -107151,6 +107168,24 @@ var MARKET_SUFFIX_NAME=
107151
107168
  return false;
107152
107169
  },
107153
107170
 
107171
+ //是否包含前缀
107172
+ IsPrefixIncludes:function(symbol, aryPrefix)
107173
+ {
107174
+ if (!symbol) return false;
107175
+ var shortSymbol=this.GetShortSymbol(symbol);
107176
+ if (!shortSymbol) return false;
107177
+ shortSymbol=shortSymbol.toUpperCase();
107178
+
107179
+ for(var i=0;i<aryPrefix.length;++i)
107180
+ {
107181
+ var strValue=aryPrefix[i];
107182
+ if (!strValue) continue;
107183
+ if (shortSymbol.search(strValue)===0) return true;
107184
+ }
107185
+
107186
+ return false;
107187
+ },
107188
+
107154
107189
  IsChinaFutures:function(upperSymbol) //是否是国内期货 /期权
107155
107190
  {
107156
107191
  if (!upperSymbol) return false;
@@ -107265,15 +107300,26 @@ var MARKET_SUFFIX_NAME=
107265
107300
  return false;
107266
107301
  },
107267
107302
 
107303
+ //北交所股票代码全面启用“920”开头的六位数编码规则（如 920XXX），已于 2025 年 10 月 9 日完成存量与增量股票的统一切换，标志着其与新三板代码的脱钩。
107304
+ // 新代码通常将原 43、83、87 开头的旧代码前三位变更为 920，后三位保持不变
107268
107305
  IsBJStock:function(symbol) //北交所股票
107269
107306
  {
107270
107307
  if (!symbol) return false;
107271
107308
  var upperSymbol=symbol.toUpperCase();
107272
107309
  if (!this.IsBJ(upperSymbol)) return false;
107273
107310
 
107274
- var value=upperSymbol.charAt(0);
107311
+ if (upperSymbol.charAt(0)=='9' && upperSymbol.charAt(1)=='2' && upperSymbol.charAt(2)=='0') return true;
107312
+
107313
+ return false;
107314
+ },
107275
107315
 
107276
- if (value=='4' || value=='8') return true;
107316
+ IsBJIndex:function(symbol) //北交所指数 北交所指数代码通常以“899”开头，采用6位数字序列
107317
+ {
107318
+ if (!symbol) return false;
107319
+ var upperSymbol=symbol.toUpperCase();
107320
+ if (!this.IsBJ(upperSymbol)) return false;
107321
+
107322
+ if (upperSymbol.charAt(0)=='8' && upperSymbol.charAt(1)=='9' && upperSymbol.charAt(2)=='9') return true;
107277
107323
 
107278
107324
  return false;
107279
107325
  },
@@ -107289,11 +107335,11 @@ var MARKET_SUFFIX_NAME=
107289
107335
  return false;
107290
107336
  },
107291
107337
 
107292
- IsSHGEM:function(symbol) //创业板(growth enterprise market) 30开头
107338
+ IsSZGEM:function(symbol) //创业板(growth enterprise market) 30开头
107293
107339
  {
107294
107340
  if (!symbol) return false;
107295
107341
  var upperSymbol=symbol.toUpperCase();
107296
- if (!this.IsSH(upperSymbol)) return false;
107342
+ if (!this.IsSZ(upperSymbol)) return false;
107297
107343
  if (upperSymbol.charAt(0)=='3' && upperSymbol.charAt(1)=='0')
107298
107344
  return true;
107299
107345
 
@@ -107437,7 +107483,7 @@ var MARKET_SUFFIX_NAME=
107437
107483
  {
107438
107484
  if (!this.IsSHSZStockA(symbol)) return null;
107439
107485
  if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2}; //科创板 [20% - -20%]
107440
- if (this.IsSHGEM(symbol)) return { Max:0.2 , Min:-0.2}; //创业板 [20% - -20%]
107486
+ if (this.IsSZGEM(symbol)) return { Max:0.2 , Min:-0.2}; //创业板 [20% - -20%]
107441
107487
 
107442
107488
  if (!name) return null;
107443
107489
  if (name.indexOf('ST')>=0) return { Max:0.05, Min:-0.05 }; //ST 股票 [5% - -5%]
@@ -109354,6 +109400,7 @@ function FuturesTimeData()
109354
109400
  [MARKET_SUFFIX_NAME.SHFE + '-AO', {Time:4,Decimal:0,Name:'氧化铝'}],
109355
109401
  [MARKET_SUFFIX_NAME.SHFE + '-BR', {Time:6,Decimal:0,Name:'合成橡胶'}],
109356
109402
  [MARKET_SUFFIX_NAME.SHFE + '-AD', {Time:4,Decimal:0,Name:"铝合金"}],
109403
+ [MARKET_SUFFIX_NAME.SHFE + '-OP', {Time:6,Decimal:0,Name:"胶版印刷纸"}],
109357
109404
 
109358
109405
  //上期所-能源
109359
109406
  [MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
@@ -110915,59 +110962,6 @@ function GetfloatPrecision(symbol) //获取小数位数
110915
110962
  return defaultfloatPrecision;
110916
110963
  }
110917
110964
 
110918
- //把不连续的分时数据转成连续的分时数据
110919
- function GenerateMinuteStockJsonData(data)
110920
- {
110921
- var stock =
110922
- {
110923
- symbol:data.symbol, name:data.name,time:data.time, date:data.date,
110924
- price:data.price, open:data.open, yclose:data.yclose, high:data.high, low:data.low, vol:data.vol,amount:data.amount,
110925
- minute:[]
110926
- };
110927
-
110928
- var mapMinute=new Map();
110929
- for(var i in data.minute)
110930
- {
110931
- var item=data.minute[i];
110932
- mapMinute.set(item.time,item);
110933
- }
110934
-
110935
- var timeData=g_MinuteTimeStringData.GetTimeData(stock.symbol);
110936
- for(var i in timeData) //根据交易时间产生数据
110937
- {
110938
- var time=timeData[i];
110939
- var minuteItem={ time:time, vaild:false };
110940
- if (mapMinute.has(time))
110941
- {
110942
- var find=mapMinute.get(time);
110943
- minuteItem.vaild=true;
110944
- minuteItem.price=find.price;
110945
- minuteItem.open=find.open;
110946
- minuteItem.high=find.high;
110947
- minuteItem.low=find.low;
110948
- minuteItem.avprice=find.avprice;
110949
- minuteItem.vol=find.vol;
110950
- minuteItem.amount=find.amount;
110951
- if (IFrameSplitOperator.IsNumber(find.increase)) minuteItem.increase=find.increase;
110952
- if (IFrameSplitOperator.IsNumber(find.risefall)) minuteItem.risefall=find.risefall;
110953
- if (IFrameSplitOperator.IsNumber(find.position)) minuteItem.position=find.position;
110954
- }
110955
- stock.minute.push(minuteItem);
110956
- }
110957
-
110958
- var vaildCount=0;
110959
- for(var i=stock.minute.length-1;i>=0;--i)
110960
- {
110961
- vaildCount=i+1;
110962
- var item=stock.minute[i];
110963
- if (item.vaild==true) break;
110964
- }
110965
-
110966
- stock.minute=stock.minute.slice(0,vaildCount); //去掉最后无用的数据
110967
-
110968
- return stock;
110969
- }
110970
-
110971
110965
  function GetLocalTime(i) //得到标准时区的时间的函数
110972
110966
  {
110973
110967
  if (typeof i !== 'number') return;
@@ -111815,8 +111809,8 @@ var Character =
111815
111809
  (cp >= 0x41 && cp <= 0x5A) ||
111816
111810
  (cp >= 0x61 && cp <= 0x7A) ||
111817
111811
  (cp === 0x5C) ||
111818
- //【】▲▼
111819
- (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
111812
+ //【】▲▼ ↓↑←→
111813
+ (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
111820
111814
  ((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp)));
111821
111815
  },
111822
111816
 
@@ -111827,8 +111821,8 @@ var Character =
111827
111821
  (cp >= 0x61 && cp <= 0x7A) ||
111828
111822
  (cp >= 0x30 && cp <= 0x39) ||
111829
111823
  (cp === 0x5C) || (cp===0x23) ||
111830
- //【】▲▼
111831
- (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
111824
+ //【】▲▼ ↓↑←→
111825
+ (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
111832
111826
  ((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp)));
111833
111827
  },
111834
111828
 
@@ -143078,6 +143072,7 @@ function JSReportChartContainer(uielement)
143078
143072
  this.DestroyMinuteChartTooltip();
143079
143073
  this.DestroyKLineChartTooltip();
143080
143074
  this.DestroyFloatTooltip();
143075
+ this.DestroyPopMenu();
143081
143076
  }
143082
143077
 
143083
143078
  this.StopAutoDragScrollTimer=function()
@@ -143099,6 +143094,14 @@ function JSReportChartContainer(uielement)
143099
143094
  this.JSPopMenu.Inital();
143100
143095
  }
143101
143096
 
143097
+ this.DestroyPopMenu=function()
143098
+ {
143099
+ if (!this.JSPopMenu) return;
143100
+
143101
+ this.JSPopMenu.Destroy();
143102
+ this.JSPopMenu=null;
143103
+ }
143104
+
143102
143105
  this.InitalMinuteChartTooltip=function(option)
143103
143106
  {
143104
143107
  if (this.TooltipMinuteChart) return;
@@ -144410,61 +144413,75 @@ function JSReportChartContainer(uielement)
144410
144413
  if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
144411
144414
  if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]; //扩展数据2
144412
144415
 
144416
+ function __Temp_IsNumberOrObject(value)
144417
+ {
144418
+ if (IFrameSplitOperator.IsNumber(value)) return true;
144419
+ if (IFrameSplitOperator.IsObject(value)) return true;
144420
+ return false;
144421
+ }
144422
+
144423
+ function __Temp_IsStringOrObject(value)
144424
+ {
144425
+ if (IFrameSplitOperator.IsString(value)) return true;
144426
+ if (IFrameSplitOperator.IsObject(value)) return true;
144427
+ return false;
144428
+ }
144429
+
144413
144430
  //10个数值型 101-199
144414
- if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
144415
- if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
144416
- if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
144417
- if (IFrameSplitOperator.IsNumber(item[104])) stock.ReserveNumber4=item[104];
144418
- if (IFrameSplitOperator.IsNumber(item[105])) stock.ReserveNumber5=item[105];
144419
- if (IFrameSplitOperator.IsNumber(item[106])) stock.ReserveNumber6=item[106];
144420
- if (IFrameSplitOperator.IsNumber(item[107])) stock.ReserveNumber7=item[107];
144421
- if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
144422
- if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
144423
- if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
144424
- if (IFrameSplitOperator.IsNumber(item[111])) stock.ReserveNumber11=item[111];
144425
- if (IFrameSplitOperator.IsNumber(item[112])) stock.ReserveNumber12=item[112];
144426
- if (IFrameSplitOperator.IsNumber(item[113])) stock.ReserveNumber13=item[113];
144427
- if (IFrameSplitOperator.IsNumber(item[114])) stock.ReserveNumber14=item[114];
144428
- if (IFrameSplitOperator.IsNumber(item[115])) stock.ReserveNumber15=item[115];
144429
- if (IFrameSplitOperator.IsNumber(item[116])) stock.ReserveNumber16=item[116];
144430
- if (IFrameSplitOperator.IsNumber(item[117])) stock.ReserveNumber17=item[117];
144431
- if (IFrameSplitOperator.IsNumber(item[118])) stock.ReserveNumber18=item[118];
144432
- if (IFrameSplitOperator.IsNumber(item[119])) stock.ReserveNumber19=item[119];
144433
- if (IFrameSplitOperator.IsNumber(item[120])) stock.ReserveNumber20=item[120];
144431
+ if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
144432
+ if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
144433
+ if (__Temp_IsNumberOrObject(item[103])) stock.ReserveNumber3=item[103];
144434
+ if (__Temp_IsNumberOrObject(item[104])) stock.ReserveNumber4=item[104];
144435
+ if (__Temp_IsNumberOrObject(item[105])) stock.ReserveNumber5=item[105];
144436
+ if (__Temp_IsNumberOrObject(item[106])) stock.ReserveNumber6=item[106];
144437
+ if (__Temp_IsNumberOrObject(item[107])) stock.ReserveNumber7=item[107];
144438
+ if (__Temp_IsNumberOrObject(item[108])) stock.ReserveNumber8=item[108];
144439
+ if (__Temp_IsNumberOrObject(item[109])) stock.ReserveNumber9=item[109];
144440
+ if (__Temp_IsNumberOrObject(item[110])) stock.ReserveNumber10=item[110];
144441
+ if (__Temp_IsNumberOrObject(item[111])) stock.ReserveNumber11=item[111];
144442
+ if (__Temp_IsNumberOrObject(item[112])) stock.ReserveNumber12=item[112];
144443
+ if (__Temp_IsNumberOrObject(item[113])) stock.ReserveNumber13=item[113];
144444
+ if (__Temp_IsNumberOrObject(item[114])) stock.ReserveNumber14=item[114];
144445
+ if (__Temp_IsNumberOrObject(item[115])) stock.ReserveNumber15=item[115];
144446
+ if (__Temp_IsNumberOrObject(item[116])) stock.ReserveNumber16=item[116];
144447
+ if (__Temp_IsNumberOrObject(item[117])) stock.ReserveNumber17=item[117];
144448
+ if (__Temp_IsNumberOrObject(item[118])) stock.ReserveNumber18=item[118];
144449
+ if (__Temp_IsNumberOrObject(item[119])) stock.ReserveNumber19=item[119];
144450
+ if (__Temp_IsNumberOrObject(item[120])) stock.ReserveNumber20=item[120];
144434
144451
 
144435
144452
  //10个字符型 201-299
144436
- if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
144437
- if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
144438
- if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
144439
- if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
144440
- if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
144441
- if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
144442
- if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
144443
- if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
144444
- if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
144445
- if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
144446
- if (IFrameSplitOperator.IsString(item[211]) || IFrameSplitOperator.IsObject(item[211])) stock.ReserveString11=item[211];
144447
- if (IFrameSplitOperator.IsString(item[212]) || IFrameSplitOperator.IsObject(item[212])) stock.ReserveString12=item[212];
144448
- if (IFrameSplitOperator.IsString(item[213]) || IFrameSplitOperator.IsObject(item[213])) stock.ReserveString13=item[213];
144449
- if (IFrameSplitOperator.IsString(item[214]) || IFrameSplitOperator.IsObject(item[214])) stock.ReserveString14=item[214];
144450
- if (IFrameSplitOperator.IsString(item[215]) || IFrameSplitOperator.IsObject(item[215])) stock.ReserveString15=item[215];
144451
- if (IFrameSplitOperator.IsString(item[216]) || IFrameSplitOperator.IsObject(item[216])) stock.ReserveString16=item[216];
144452
- if (IFrameSplitOperator.IsString(item[217]) || IFrameSplitOperator.IsObject(item[217])) stock.ReserveString17=item[217];
144453
- if (IFrameSplitOperator.IsString(item[218]) || IFrameSplitOperator.IsObject(item[218])) stock.ReserveString18=item[218];
144454
- if (IFrameSplitOperator.IsString(item[219]) || IFrameSplitOperator.IsObject(item[219])) stock.ReserveString19=item[219];
144455
- if (IFrameSplitOperator.IsString(item[220]) || IFrameSplitOperator.IsObject(item[220])) stock.ReserveString20=item[220];
144453
+ if (__Temp_IsStringOrObject(item[201])) stock.ReserveString1=item[201];
144454
+ if (__Temp_IsStringOrObject(item[202])) stock.ReserveString2=item[202];
144455
+ if (__Temp_IsStringOrObject(item[203])) stock.ReserveString3=item[203];
144456
+ if (__Temp_IsStringOrObject(item[204])) stock.ReserveString4=item[204];
144457
+ if (__Temp_IsStringOrObject(item[205])) stock.ReserveString5=item[205];
144458
+ if (__Temp_IsStringOrObject(item[206])) stock.ReserveString6=item[206];
144459
+ if (__Temp_IsStringOrObject(item[207])) stock.ReserveString7=item[207];
144460
+ if (__Temp_IsStringOrObject(item[208])) stock.ReserveString8=item[208];
144461
+ if (__Temp_IsStringOrObject(item[209])) stock.ReserveString9=item[209];
144462
+ if (__Temp_IsStringOrObject(item[210])) stock.ReserveString10=item[210];
144463
+ if (__Temp_IsStringOrObject(item[211])) stock.ReserveString11=item[211];
144464
+ if (__Temp_IsStringOrObject(item[212])) stock.ReserveString12=item[212];
144465
+ if (__Temp_IsStringOrObject(item[213])) stock.ReserveString13=item[213];
144466
+ if (__Temp_IsStringOrObject(item[214])) stock.ReserveString14=item[214];
144467
+ if (__Temp_IsStringOrObject(item[215])) stock.ReserveString15=item[215];
144468
+ if (__Temp_IsStringOrObject(item[216])) stock.ReserveString16=item[216];
144469
+ if (__Temp_IsStringOrObject(item[217])) stock.ReserveString17=item[217];
144470
+ if (__Temp_IsStringOrObject(item[218])) stock.ReserveString18=item[218];
144471
+ if (__Temp_IsStringOrObject(item[219])) stock.ReserveString19=item[219];
144472
+ if (__Temp_IsStringOrObject(item[220])) stock.ReserveString20=item[220];
144456
144473
 
144457
144474
  //10个进度条 301-350 { Value:, BGColor: }
144458
- if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
144459
- if (IFrameSplitOperator.IsNumber(item[302]) || IFrameSplitOperator.IsObject(item[302])) stock.ReserveProgressBar2=item[302];
144460
- if (IFrameSplitOperator.IsNumber(item[303]) || IFrameSplitOperator.IsObject(item[303])) stock.ReserveProgressBar3=item[303];
144461
- if (IFrameSplitOperator.IsNumber(item[304]) || IFrameSplitOperator.IsObject(item[304])) stock.ReserveProgressBar4=item[304];
144462
- if (IFrameSplitOperator.IsNumber(item[305]) || IFrameSplitOperator.IsObject(item[305])) stock.ReserveProgressBar5=item[305];
144463
- if (IFrameSplitOperator.IsNumber(item[306]) || IFrameSplitOperator.IsObject(item[306])) stock.ReserveProgressBar6=item[306];
144464
- if (IFrameSplitOperator.IsNumber(item[307]) || IFrameSplitOperator.IsObject(item[307])) stock.ReserveProgressBar7=item[307];
144465
- if (IFrameSplitOperator.IsNumber(item[308]) || IFrameSplitOperator.IsObject(item[308])) stock.ReserveProgressBar8=item[308];
144466
- if (IFrameSplitOperator.IsNumber(item[309]) || IFrameSplitOperator.IsObject(item[309])) stock.ReserveProgressBar9=item[309];
144467
- if (IFrameSplitOperator.IsNumber(item[310]) || IFrameSplitOperator.IsObject(item[310])) stock.ReserveProgressBar10=item[310];
144475
+ if (__Temp_IsNumberOrObject(item[301])) stock.ReserveProgressBar1=item[301];
144476
+ if (__Temp_IsNumberOrObject(item[302])) stock.ReserveProgressBar2=item[302];
144477
+ if (__Temp_IsNumberOrObject(item[303])) stock.ReserveProgressBar3=item[303];
144478
+ if (__Temp_IsNumberOrObject(item[304])) stock.ReserveProgressBar4=item[304];
144479
+ if (__Temp_IsNumberOrObject(item[305])) stock.ReserveProgressBar5=item[305];
144480
+ if (__Temp_IsNumberOrObject(item[306])) stock.ReserveProgressBar6=item[306];
144481
+ if (__Temp_IsNumberOrObject(item[307])) stock.ReserveProgressBar7=item[307];
144482
+ if (__Temp_IsNumberOrObject(item[308])) stock.ReserveProgressBar8=item[308];
144483
+ if (__Temp_IsNumberOrObject(item[309])) stock.ReserveProgressBar9=item[309];
144484
+ if (__Temp_IsNumberOrObject(item[310])) stock.ReserveProgressBar10=item[310];
144468
144485
 
144469
144486
  //10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
144470
144487
  if (IFrameSplitOperator.IsObject(item[351])) stock.ReserveButton1=item[351];
@@ -150434,6 +150451,14 @@ function ChartReport()
150434
150451
  if (!data || !fieldName) return;
150435
150452
 
150436
150453
  var value=data[fieldName];
150454
+ var compareValue=null;
150455
+ if (IFrameSplitOperator.IsObject(data[fieldName]))
150456
+ {
150457
+ var item=data[fieldName];
150458
+ if (IFrameSplitOperator.IsNumber(item.Value)) value=item.Value;
150459
+ if (IFrameSplitOperator.IsNumber(item.CompareValue)) compareValue=item.CompareValue;
150460
+ }
150461
+
150437
150462
  if (!IFrameSplitOperator.IsNumber(value)) return;
150438
150463
 
150439
150464
  if (IFrameSplitOperator.IsNumber(column.ColorType))
@@ -150450,6 +150475,11 @@ function ChartReport()
150450
150475
  {
150451
150476
  drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
150452
150477
  }
150478
+ else if (column.ColorType==4)
150479
+ {
150480
+ if (IFrameSplitOperator.IsNumber(compareValue))
150481
+ drawInfo.TextColor=this.GetUpDownColor(value,compareValue);
150482
+ }
150453
150483
  }
150454
150484
 
150455
150485
  var text=value.toFixed(column.FloatPrecision);
@@ -156526,7 +156556,7 @@ function ScrollBarBGChart()
156526
156556
 
156527
156557
 
156528
156558
 
156529
- var HQCHART_VERSION="1.1.15454";
156559
+ var HQCHART_VERSION="1.1.15479";
156530
156560
 
156531
156561
  function PrintHQChartVersion()
156532
156562
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.15454";
8
+ var HQCHART_VERSION="1.1.15479";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {