hqchart 1.1.12875 → 1.1.12881

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 (6) hide show
  1. package/lib/umychart.vue.js +4 -2
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.complier.js +2 -1
  4. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +3 -2
  5. package/src/jscommon/umychart.version.js +1 -1
  6. package/src/jscommon/umychart.vue/umychart.vue.js +3 -2
package/lib/umychart.vue.js CHANGED
@@ -11888,7 +11888,9 @@ var aryPoint=[];for(var i in sourceData){var item=sourceData[i];for(var j in ite
11888
11888
  sourceData.sort(function(a,b){return a.Date-b.Date;});kdata.GetDateIndex(sourceData);return sourceData;}else if(ChartData.IsMinutePeriod(hqChart.Period,true)||ChartData.IsTickPeriod(hqChart.Period)||ChartData.IsSecondPeriod(hqChart.Period)||ChartData.IsMilliSecondPeriod(hqChart.Period))//分钟线
11889
11889
  {var kdata=hqChart.ChartPaint[0].Data;//K线
11890
11890
  sourceData.sort(function(a,b){if(a.Date==b.Date)return a.Time-b.Time;return a.Date-b.Date;});kdata.GetDateTimeIndex(sourceData);return sourceData;}else if(this.HQDataType==HQ_DATA_TYPE.MINUTE_ID||this.HQDataType==HQ_DATA_TYPE.MULTIDAY_MINUTE_ID){var minuteData=hqChart.SourceData;sourceData.sort(function(a,b){if(a.Date==b.Date)return a.Time-b.Time;return a.Date-b.Date;});minuteData.GetDateTimeIndex(sourceData);return sourceData;}return null;};this.FittingData=function(jsonData,hqChart){var outVar=jsonData.outvar;var date=jsonData.date;var time=jsonData.time;var kdata=hqChart.ChartPaint[0].Data;//把数据拟合到kdata上
11891
- var result=[];if(!outVar)return result;for(var i=0;i<outVar.length;++i){var item=outVar[i];var indexData=[];var outVarItem={Name:item.name,Type:item.type};if(item.color)outVarItem.Color=item.color;if(item.data){outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);if(item.color)outVarItem.Color=item.color;if(item.linewidth)outVarItem.LineWidth=item.linewidth;if(item.isshow==false)outVarItem.IsShow=false;if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.BreakPoint=item.BreakPoint;result.push(outVarItem);}else if(item.Draw){var draw=item.Draw;var drawItem={};if(draw.DrawType=='DRAWICON')//图标
11891
+ var result=[];if(!outVar)return result;for(var i=0;i<outVar.length;++i){var item=outVar[i];var indexData=[];var outVarItem={Name:item.name,Type:item.type};if(item.color)outVarItem.Color=item.color;if(IFrameSplitOperator.IsBool(item.IsShowTitle))outVarItem.IsShowTitle=item.IsShowTitle;//是否显示指标标题
11892
+ if(item.data){outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);if(item.color)outVarItem.Color=item.color;if(item.linewidth)outVarItem.LineWidth=item.linewidth;if(IFrameSplitOperator.IsBool(item.isshow))outVarItem.IsShow=item.isshow;//是否绘制线段
11893
+ if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.BreakPoint=item.BreakPoint;result.push(outVarItem);}else if(item.Draw){var draw=item.Draw;var drawItem={};if(draw.DrawType=='DRAWICON')//图标
11892
11894
  {drawItem.Icon=draw.Icon;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='DRAWTEXT')//文本
11893
11895
  {drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='STICKLINE')//柱子
11894
11896
  {drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.Width=draw.Width;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAWBAND"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);drawItem.Color=draw.Color;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_LINE'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);if(IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData)){for(var k=0;k<drawItem.DrawData.length;++k){this.GetKLineData(drawItem.DrawData[k].Point,hqChart);}}outVarItem.Draw=drawItem;if(draw.LineDash)drawItem.LineDash=draw.LineDash;if(IFrameSplitOperator.IsBool(draw.IsFullRangeMaxMin))drawItem.IsFullRangeMaxMin=draw.IsFullRangeMaxMin;if(draw.Arrow)drawItem.Arrow=draw.Arrow;if(IFrameSplitOperator.IsNumber(draw.LineWidth))drawItem.LineWidth=draw.LineWidth;result.push(outVarItem);}else if(draw.DrawType=='MULTI_POINT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);if(IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData)){for(var k=0;k<drawItem.DrawData.length;++k){this.GetKLineData(drawItem.DrawData[k].Point,hqChart);}}outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_BAR'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.OVERLAY_BARS){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.BarName=draw.BarName;drawItem.BarColor=draw.BarColor;drawItem.LineWidth=draw.LineWidth;drawItem.BarType=draw.BarType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.SCATTER_PLOT){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);//默认的值
@@ -13033,7 +13035,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
13033
13035
  this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
13034
13036
  * 版本信息输出
13035
13037
  *
13036
- */var HQCHART_VERSION="1.1.12874";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();//把给外界调用的方法暴露出来
13038
+ */var HQCHART_VERSION="1.1.12880";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();//把给外界调用的方法暴露出来
13037
13039
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
13038
13040
  // BaseIndex:BaseIndex,
13039
13041
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.12875",
3
+ "version": "1.1.12881",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.complier.js CHANGED
@@ -23621,13 +23621,14 @@ function APIScriptIndex(name,script,args,option, isOverlay)
23621
23621
  var indexData=[];
23622
23622
  var outVarItem={Name:item.name,Type:item.type};
23623
23623
  if (item.color) outVarItem.Color=item.color;
23624
+ if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle; //是否显示指标标题
23624
23625
  if (item.data)
23625
23626
  {
23626
23627
  outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);
23627
23628
 
23628
23629
  if (item.color) outVarItem.Color=item.color;
23629
23630
  if (item.linewidth) outVarItem.LineWidth=item.linewidth;
23630
- if (item.isshow==false) outVarItem.IsShow = false;
23631
+ if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
23631
23632
  if (item.isexdata==true) outVarItem.IsExData = true;
23632
23633
  if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
23633
23634
 
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -119229,13 +119229,14 @@ function APIScriptIndex(name,script,args,option, isOverlay)
119229
119229
  var indexData=[];
119230
119230
  var outVarItem={Name:item.name,Type:item.type};
119231
119231
  if (item.color) outVarItem.Color=item.color;
119232
+ if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle; //是否显示指标标题
119232
119233
  if (item.data)
119233
119234
  {
119234
119235
  outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);
119235
119236
 
119236
119237
  if (item.color) outVarItem.Color=item.color;
119237
119238
  if (item.linewidth) outVarItem.LineWidth=item.linewidth;
119238
- if (item.isshow==false) outVarItem.IsShow = false;
119239
+ if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
119239
119240
  if (item.isexdata==true) outVarItem.IsExData = true;
119240
119241
  if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
119241
119242
 
@@ -132046,7 +132047,7 @@ function ScrollBarBGChart()
132046
132047
 
132047
132048
 
132048
132049
 
132049
- var HQCHART_VERSION="1.1.12874";
132050
+ var HQCHART_VERSION="1.1.12880";
132050
132051
 
132051
132052
  function PrintHQChartVersion()
132052
132053
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.12874";
8
+ var HQCHART_VERSION="1.1.12880";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -119273,13 +119273,14 @@ function APIScriptIndex(name,script,args,option, isOverlay)
119273
119273
  var indexData=[];
119274
119274
  var outVarItem={Name:item.name,Type:item.type};
119275
119275
  if (item.color) outVarItem.Color=item.color;
119276
+ if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle; //是否显示指标标题
119276
119277
  if (item.data)
119277
119278
  {
119278
119279
  outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);
119279
119280
 
119280
119281
  if (item.color) outVarItem.Color=item.color;
119281
119282
  if (item.linewidth) outVarItem.LineWidth=item.linewidth;
119282
- if (item.isshow==false) outVarItem.IsShow = false;
119283
+ if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
119283
119284
  if (item.isexdata==true) outVarItem.IsExData = true;
119284
119285
  if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
119285
119286
 
@@ -132204,7 +132205,7 @@ function HQChartScriptWorker()
132204
132205
 
132205
132206
 
132206
132207
 
132207
- var HQCHART_VERSION="1.1.12874";
132208
+ var HQCHART_VERSION="1.1.12880";
132208
132209
 
132209
132210
  function PrintHQChartVersion()
132210
132211
  {