hqchart 1.1.12570 → 1.1.12575

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 (8) hide show
  1. package/lib/umychart.vue.js +10 -9
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.js +43 -16
  4. package/src/jscommon/umychart.style.js +1 -1
  5. package/src/jscommon/umychart.testdata/if2312.cf.msecond.js +295412 -0
  6. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +45 -18
  7. package/src/jscommon/umychart.version.js +1 -1
  8. package/src/jscommon/umychart.vue/umychart.vue.js +45 -18
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -17643,14 +17643,14 @@ function KLineFrame()
17643
17643
  var distanceWidth=this.DistanceWidth;
17644
17644
  var dataWidth=this.DataWidth;
17645
17645
  var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;
17646
-
17646
+ var maxDataCount=10000*50;
17647
17647
  if (isLimit==false)
17648
17648
  {
17649
17649
  if (x<this.ChartBorder.GetLeft())
17650
17650
  {
17651
17651
  var index=-1;
17652
17652
  var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);
17653
- while(index>-10000)
17653
+ while(index>-maxDataCount)
17654
17654
  {
17655
17655
  if (xPoint<=x)
17656
17656
  break;
@@ -17664,7 +17664,7 @@ function KLineFrame()
17664
17664
  {
17665
17665
  var index=0;
17666
17666
  var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
17667
- while(index<10000) //自己算x的数值
17667
+ while(index<maxDataCount) //自己算x的数值
17668
17668
  {
17669
17669
  if (xPoint>=x) break;
17670
17670
  xPoint+=(dataWidth+distanceWidth);
@@ -17682,7 +17682,7 @@ function KLineFrame()
17682
17682
  var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;
17683
17683
  var index=0;
17684
17684
  var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
17685
- while(xPoint<right && index<10000 && index+1<this.XPointCount) //自己算x的数值
17685
+ while(xPoint<right && index<maxDataCount && index+1<this.XPointCount) //自己算x的数值
17686
17686
  {
17687
17687
  if (xPoint>=x) break;
17688
17688
  xPoint+=(dataWidth+distanceWidth);
@@ -19490,7 +19490,7 @@ function KLineHScreenFrame()
19490
19490
  var right=border.BottomEx;
19491
19491
  var distanceWidth=this.DistanceWidth;
19492
19492
  var dataWidth=this.DataWidth;
19493
- var maxDataCount=10000*50;
19493
+ var maxDataCount=10000*10;
19494
19494
  if (isLimit==false)
19495
19495
  {
19496
19496
  if (y<left)
@@ -41919,13 +41919,13 @@ function KLineTooltipPaint()
41919
41919
 
41920
41920
  //涨幅
41921
41921
  title=g_JSChartLocalization.GetText('Tooltip-Increase',this.LanguageID);
41922
- if (item.YFClose!=0 && MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
41922
+ if (IFrameSplitOperator.IsNumber(item.YFClose) && MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
41923
41923
  {
41924
41924
  var value=(item.Close-item.YFClose)/item.YFClose*100;
41925
41925
  color = this.KLineTitlePaint.GetColor(value, 0);
41926
41926
  text = value.toFixed(2)+'%';
41927
41927
  }
41928
- else if (item.YClose!=0)
41928
+ else if (IFrameSplitOperator.IsNumber(item.YClose))
41929
41929
  {
41930
41930
  var value=(item.Close-item.YClose)/item.YClose*100;
41931
41931
  color = this.KLineTitlePaint.GetColor(value, 0);
@@ -51504,9 +51504,22 @@ function HistoryDataStringFormat()
51504
51504
 
51505
51505
  if (data.Title)
51506
51506
  {
51507
- text=`<span class='tooltip-title'>${data.Title}</span>`;
51508
- strHtml+=text;
51509
- ++lineCount;
51507
+ if (Array.isArray(data.Title))
51508
+ {
51509
+ for(var i=0;i<data.Title.length;++i)
51510
+ {
51511
+ var item=data.Title[i];
51512
+ text=`<span class='tooltip-title'>${item}</span>`;
51513
+ strHtml+=text;
51514
+ ++lineCount;
51515
+ }
51516
+ }
51517
+ else
51518
+ {
51519
+ text=`<span class='tooltip-title'>${data.Title}</span>`;
51520
+ strHtml+=text;
51521
+ ++lineCount;
51522
+ }
51510
51523
  }
51511
51524
 
51512
51525
  if (IFrameSplitOperator.IsNonEmptyArray(data.AryText))
@@ -51533,22 +51546,36 @@ function HistoryDataStringFormat()
51533
51546
  var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
51534
51547
  var strDate=IFrameSplitOperator.FormatDateString(data.Date);
51535
51548
 
51536
- var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
51549
+ var title=strDate,value;
51537
51550
  var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
51538
- if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
51551
+ if (ChartData.IsDayPeriod(this.Value.ChartPaint.Data.Period,true)) //日线
51539
51552
  {
51540
- title2=IFrameSplitOperator.FormatTimeString(data.Time);
51553
+ value=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
51554
+ title=`${strDate}&nbsp&nbsp${value}`;
51555
+ }
51556
+ else if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
51557
+ {
51558
+ value=IFrameSplitOperator.FormatTimeString(data.Time);
51559
+ title=`${strDate}&nbsp&nbsp${value}`;
51541
51560
  }
51542
51561
  else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
51543
51562
  {
51544
- title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
51563
+ value=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
51564
+ title=`${strDate}&nbsp&nbsp${value}`;
51545
51565
  }
51546
51566
  else if (ChartData.IsMilliSecondPeriod(this.Value.ChartPaint.Data.Period))
51547
51567
  {
51548
- title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS.fff');
51568
+ value=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS.fff');
51569
+ title=
51570
+ [
51571
+ `${strDate}&nbsp&nbsp${g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID)}`,
51572
+ value
51573
+ ];
51549
51574
  }
51550
51575
 
51551
- var result={ AryText:null, Title:`${strDate}&nbsp&nbsp${title2}`, Name:null };
51576
+ var result={ AryText:null, Title:title, Name:null };
51577
+
51578
+
51552
51579
  if (isTickPeriod)
51553
51580
  {
51554
51581
  var aryText=
@@ -118739,7 +118766,7 @@ function GetBlackStyle()
118739
118766
  UpTextColor: "rgb(238,21,21)",
118740
118767
  DownTextColor: "rgb(25,158,0)",
118741
118768
  UnchagneTextColor: "rgb(190, 190 ,190)",
118742
- CloseLineColor: 'rgb(178,34,34)',
118769
+ CloseLineColor: 'rgb(250,250,250)',
118743
118770
 
118744
118771
  Title:
118745
118772
  {
@@ -129451,7 +129478,7 @@ function ScrollBarBGChart()
129451
129478
 
129452
129479
 
129453
129480
 
129454
- var HQCHART_VERSION="1.1.12569";
129481
+ var HQCHART_VERSION="1.1.12573";
129455
129482
 
129456
129483
  function PrintHQChartVersion()
129457
129484
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.12569";
8
+ var HQCHART_VERSION="1.1.12573";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -17687,14 +17687,14 @@ function KLineFrame()
17687
17687
  var distanceWidth=this.DistanceWidth;
17688
17688
  var dataWidth=this.DataWidth;
17689
17689
  var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;
17690
-
17690
+ var maxDataCount=10000*50;
17691
17691
  if (isLimit==false)
17692
17692
  {
17693
17693
  if (x<this.ChartBorder.GetLeft())
17694
17694
  {
17695
17695
  var index=-1;
17696
17696
  var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);
17697
- while(index>-10000)
17697
+ while(index>-maxDataCount)
17698
17698
  {
17699
17699
  if (xPoint<=x)
17700
17700
  break;
@@ -17708,7 +17708,7 @@ function KLineFrame()
17708
17708
  {
17709
17709
  var index=0;
17710
17710
  var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
17711
- while(index<10000) //自己算x的数值
17711
+ while(index<maxDataCount) //自己算x的数值
17712
17712
  {
17713
17713
  if (xPoint>=x) break;
17714
17714
  xPoint+=(dataWidth+distanceWidth);
@@ -17726,7 +17726,7 @@ function KLineFrame()
17726
17726
  var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;
17727
17727
  var index=0;
17728
17728
  var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
17729
- while(xPoint<right && index<10000 && index+1<this.XPointCount) //自己算x的数值
17729
+ while(xPoint<right && index<maxDataCount && index+1<this.XPointCount) //自己算x的数值
17730
17730
  {
17731
17731
  if (xPoint>=x) break;
17732
17732
  xPoint+=(dataWidth+distanceWidth);
@@ -19534,7 +19534,7 @@ function KLineHScreenFrame()
19534
19534
  var right=border.BottomEx;
19535
19535
  var distanceWidth=this.DistanceWidth;
19536
19536
  var dataWidth=this.DataWidth;
19537
- var maxDataCount=10000*50;
19537
+ var maxDataCount=10000*10;
19538
19538
  if (isLimit==false)
19539
19539
  {
19540
19540
  if (y<left)
@@ -41963,13 +41963,13 @@ function KLineTooltipPaint()
41963
41963
 
41964
41964
  //涨幅
41965
41965
  title=g_JSChartLocalization.GetText('Tooltip-Increase',this.LanguageID);
41966
- if (item.YFClose!=0 && MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
41966
+ if (IFrameSplitOperator.IsNumber(item.YFClose) && MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
41967
41967
  {
41968
41968
  var value=(item.Close-item.YFClose)/item.YFClose*100;
41969
41969
  color = this.KLineTitlePaint.GetColor(value, 0);
41970
41970
  text = value.toFixed(2)+'%';
41971
41971
  }
41972
- else if (item.YClose!=0)
41972
+ else if (IFrameSplitOperator.IsNumber(item.YClose))
41973
41973
  {
41974
41974
  var value=(item.Close-item.YClose)/item.YClose*100;
41975
41975
  color = this.KLineTitlePaint.GetColor(value, 0);
@@ -51548,9 +51548,22 @@ function HistoryDataStringFormat()
51548
51548
 
51549
51549
  if (data.Title)
51550
51550
  {
51551
- text=`<span class='tooltip-title'>${data.Title}</span>`;
51552
- strHtml+=text;
51553
- ++lineCount;
51551
+ if (Array.isArray(data.Title))
51552
+ {
51553
+ for(var i=0;i<data.Title.length;++i)
51554
+ {
51555
+ var item=data.Title[i];
51556
+ text=`<span class='tooltip-title'>${item}</span>`;
51557
+ strHtml+=text;
51558
+ ++lineCount;
51559
+ }
51560
+ }
51561
+ else
51562
+ {
51563
+ text=`<span class='tooltip-title'>${data.Title}</span>`;
51564
+ strHtml+=text;
51565
+ ++lineCount;
51566
+ }
51554
51567
  }
51555
51568
 
51556
51569
  if (IFrameSplitOperator.IsNonEmptyArray(data.AryText))
@@ -51577,22 +51590,36 @@ function HistoryDataStringFormat()
51577
51590
  var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
51578
51591
  var strDate=IFrameSplitOperator.FormatDateString(data.Date);
51579
51592
 
51580
- var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
51593
+ var title=strDate,value;
51581
51594
  var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
51582
- if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
51595
+ if (ChartData.IsDayPeriod(this.Value.ChartPaint.Data.Period,true)) //日线
51583
51596
  {
51584
- title2=IFrameSplitOperator.FormatTimeString(data.Time);
51597
+ value=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
51598
+ title=`${strDate}&nbsp&nbsp${value}`;
51599
+ }
51600
+ else if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
51601
+ {
51602
+ value=IFrameSplitOperator.FormatTimeString(data.Time);
51603
+ title=`${strDate}&nbsp&nbsp${value}`;
51585
51604
  }
51586
51605
  else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
51587
51606
  {
51588
- title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
51607
+ value=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
51608
+ title=`${strDate}&nbsp&nbsp${value}`;
51589
51609
  }
51590
51610
  else if (ChartData.IsMilliSecondPeriod(this.Value.ChartPaint.Data.Period))
51591
51611
  {
51592
- title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS.fff');
51612
+ value=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS.fff');
51613
+ title=
51614
+ [
51615
+ `${strDate}&nbsp&nbsp${g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID)}`,
51616
+ value
51617
+ ];
51593
51618
  }
51594
51619
 
51595
- var result={ AryText:null, Title:`${strDate}&nbsp&nbsp${title2}`, Name:null };
51620
+ var result={ AryText:null, Title:title, Name:null };
51621
+
51622
+
51596
51623
  if (isTickPeriod)
51597
51624
  {
51598
51625
  var aryText=
@@ -118783,7 +118810,7 @@ function GetBlackStyle()
118783
118810
  UpTextColor: "rgb(238,21,21)",
118784
118811
  DownTextColor: "rgb(25,158,0)",
118785
118812
  UnchagneTextColor: "rgb(190, 190 ,190)",
118786
- CloseLineColor: 'rgb(178,34,34)',
118813
+ CloseLineColor: 'rgb(250,250,250)',
118787
118814
 
118788
118815
  Title:
118789
118816
  {
@@ -129604,7 +129631,7 @@ function HQChartScriptWorker()
129604
129631
 
129605
129632
 
129606
129633
 
129607
- var HQCHART_VERSION="1.1.12569";
129634
+ var HQCHART_VERSION="1.1.12573";
129608
129635
 
129609
129636
  function PrintHQChartVersion()
129610
129637
  {