hqchart 1.1.15299 → 1.1.15304
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.
- package/lib/umychart.vue.js +5 -3
- package/package.json +1 -1
- package/src/jscommon/umychart.NetworkFilterTest.js +50 -1
- package/src/jscommon/umychart.complier.js +1 -1
- package/src/jscommon/umychart.js +13 -0
- package/src/jscommon/umychart.testdata.js +50 -1
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +15 -2
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +50 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +15 -2
package/lib/umychart.vue.js
CHANGED
|
@@ -4663,7 +4663,9 @@ this.newMethod();delete this.newMethod;this.ClassName='ChartDrawText_Fix';//类
|
|
|
4663
4663
|
this.Color="rgb(255,193,37)";//字颜色
|
|
4664
4664
|
this.TextFont=g_JSChartResource.DRAWTEXT_FIX.Font;this.PtPercentage=null;//{ X:, Y: } 百分比坐标
|
|
4665
4665
|
this.TextBaseline="top";this.TextAlign='center';this.ShowOffset={X:0,Y:0};//显示偏移
|
|
4666
|
-
this.MapCache;this.HQChart;this.AryText;this.BuildCacheData=function(kData,data){var mapData=new _map2.default();this.MapCache=mapData;if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return;if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.Value)||!IFrameSplitOperator.IsNonEmptyArray(data.Text))return;
|
|
4666
|
+
this.MapCache;this.HQChart;this.AryText;this.BuildCacheData=function(kData,data){var mapData=new _map2.default();this.MapCache=mapData;if(!kData||!IFrameSplitOperator.IsNonEmptyArray(kData.Data))return;if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.Value)||!IFrameSplitOperator.IsNonEmptyArray(data.Text))return;var splitWord="&";//内置分隔符
|
|
4667
|
+
for(var i=0;i<kData.Data.length;++i){var value=data.Value[i];if(value!==1)continue;var text=data.Text[i];if(!text)continue;var kItem=kData.Data[i];var item={Value:value,Text:text,Date:kItem.Date,Time:kItem.Time};if(text.includes(splitWord))//&自动换行
|
|
4668
|
+
{var aryText=[];var aryValue=text.split(splitWord);for(var j=0;j<aryValue.length;++j){var value=aryValue[j];if(value)aryText.push({Name:value});}if(IFrameSplitOperator.IsNonEmptyArray(aryText))item.Text=aryText;}var key=this.BuildKey(item);/* //测试
|
|
4667
4669
|
item.Text=
|
|
4668
4670
|
[
|
|
4669
4671
|
{ Name:`日期`, Text:`${item.Date}`, Margin:{ Bottom:10 }},
|
|
@@ -13096,7 +13098,7 @@ var result=[];if(!outVar)return result;for(var i=0;i<outVar.length;++i){var item
|
|
|
13096
13098
|
if(IFrameSplitOperator.IsNumber(item.DrawVAlign))outVarItem.DrawVAlign=item.DrawVAlign;if(IFrameSplitOperator.IsNumber(item.DrawAlign))outVarItem.DrawAlign=item.DrawAlign;if(item.Font)outVarItem.Font=item.Font;if(item.data){outVarItem.Data=this.FittingArray(item.data,date,time,hqChart);if(item.linewidth)outVarItem.LineWidth=item.linewidth;if(IFrameSplitOperator.IsBool(item.isshow))outVarItem.IsShow=item.isshow;//是否绘制线段
|
|
13097
13099
|
if(item.isexdata==true)outVarItem.IsExData=true;if(item.BreakPoint)outVarItem.BreakPoint=item.BreakPoint;if(item.UpColor)outVarItem.UpColor=item.UpColor;if(item.DownColor)outVarItem.DownColor=item.DownColor;if(IFrameSplitOperator.IsBool(item.isDotLine))outVarItem.IsDotLine=item.isDotLine;if(IFrameSplitOperator.IsNonEmptyArray(item.lineDash))outVarItem.LineDash=item.lineDash;if(IFrameSplitOperator.IsBool(item.isSingleLine))outVarItem.IsSingleLine=item.isSingleLine;if(IFrameSplitOperator.IsNumber(item.StickType))outVarItem.StickType=item.StickType;if(IFrameSplitOperator.IsNumber(item.BarColorType))outVarItem.BarColorType=item.BarColorType;if(IFrameSplitOperator.IsNonEmptyArray(item.AryBreakPoint))outVarItem.AryBreakPoint=item.AryBreakPoint;result.push(outVarItem);}else if(item.Draw){var draw=item.Draw;var drawItem={};if(draw.DrawType=='DRAWICON')//图标
|
|
13098
13100
|
{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')//文本
|
|
13099
|
-
{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=="DRAWTEXT_FIX"){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Value:null,Text:null};drawItem.DrawData.Value=this.FittingArray(draw.DrawData.Value,date,time,hqChart);drawItem.DrawData.Text=this.FittingArray(draw.DrawData.Text,date,time,hqChart);drawItem.Position=draw.Position;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="VERTLINE")//竖线
|
|
13101
|
+
{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=="DRAWTEXT_FIX"||draw.DrawType=="DRAWNUMBER_FIX"){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Value:null,Text:null};drawItem.DrawData.Value=this.FittingArray(draw.DrawData.Value,date,time,hqChart);drawItem.DrawData.Text=this.FittingArray(draw.DrawData.Text,date,time,hqChart);drawItem.Position=draw.Position;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="VERTLINE")//竖线
|
|
13100
13102
|
{drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Data:this.FittingArray(draw.DrawData.Data,date,time,hqChart)};outVarItem.Draw=drawItem;if(draw.Config){var config=draw.Config;if(IFrameSplitOperator.IsString(config.LineWidth))outVarItem.LineWidth=config.LineWidth;if(IFrameSplitOperator.IsNumber(config.LineType))drawItem.DrawData.LineType=config.LineType;if(config.Color)outVarItem.Color=config.Color;}result.push(outVarItem);}else if(draw.DrawType=='STICKLINE')//柱子
|
|
13101
13103
|
{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=draw.DrawData;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=draw.DrawData;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);//默认的值
|
|
13102
13104
|
drawItem.Color=draw.Color;drawItem.Radius=draw.Radius;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.SCATTER_PLOT_V2){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType==SCRIPT_CHART_NAME.KLINE_TABLE){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;drawItem.RowCount=draw.RowCount;drawItem.RowName=draw.RowName;drawItem.Config=draw.Config;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_TEXT'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='MULTI_SVGICON'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;drawItem.DrawData={Icon:draw.DrawData.Icon,Family:draw.DrawData.Family};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=='DRAWSVG'){drawItem.Text=draw.Text;drawItem.Name=draw.Name;drawItem.DrawType=draw.DrawType;if(draw.AutoPosition)drawItem.AutoPosition=draw.AutoPosition;drawItem.EnalbeDetailNoOverlap=draw.EnalbeDetailNoOverlap;drawItem.EnableClick=draw.EnableClick;if(draw.BuildKeyCallback)drawItem.BuildKeyCallback=draw.BuildKeyCallback;drawItem.DrawData={Data:draw.Data,Family:draw.Family,TextFont:draw.TextFont,EnableTooltip:draw.EnableTooltip,IsDrawFirst:draw.IsDrawFirst};outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="DRAWTITLE"){drawItem.Name=draw.Name;drawItem.Type=draw.Type;drawItem.DrawType=draw.DrawType;drawItem.DrawData=draw.DrawData;outVarItem.Draw=drawItem;result.push(outVarItem);}else if(draw.DrawType=="MULTI_HTMLDOM")//外部自己创建dom
|
|
@@ -15714,7 +15716,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15714
15716
|
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);};}/********************************************************************************
|
|
15715
15717
|
* 版本信息输出
|
|
15716
15718
|
*
|
|
15717
|
-
*/var HQCHART_VERSION="1.1.
|
|
15719
|
+
*/var HQCHART_VERSION="1.1.15303";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
15718
15720
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15719
15721
|
// BaseIndex:BaseIndex,
|
|
15720
15722
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -58276,6 +58276,8 @@ HQData.Report_APIIndex=function(data, callback)
|
|
|
58276
58276
|
HQData.APIIndex_VERTLINE(data, callback);
|
|
58277
58277
|
else if (request.Data.indexname=="API_DRAWTEXT_FIX")
|
|
58278
58278
|
HQData.APIIndex_DRAWTEXT_FIX(data, callback);
|
|
58279
|
+
else if (request.Data.indexname=="API_DRAWNUMBER_FIX")
|
|
58280
|
+
HQData.APIIndex_DRAWNUMBER_FIX(data, callback);
|
|
58279
58281
|
|
|
58280
58282
|
else if (request.Data.indexname=="API_ERRORMESSAGE")
|
|
58281
58283
|
HQData.APIIndex_ErrorMessage(data, callback);
|
|
@@ -59997,7 +59999,54 @@ HQData.APIIndex_DRAWTEXT_FIX=function(data, callback)
|
|
|
59997
59999
|
if (i%50==1)
|
|
59998
60000
|
{
|
|
59999
60001
|
textData.Draw.DrawData.Value[i]=1;
|
|
60000
|
-
textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
|
|
60002
|
+
//textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
|
|
60003
|
+
textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
|
|
60004
|
+
}
|
|
60005
|
+
else
|
|
60006
|
+
{
|
|
60007
|
+
textData.Draw.DrawData.Value[i]=0;
|
|
60008
|
+
}
|
|
60009
|
+
}
|
|
60010
|
+
|
|
60011
|
+
var apiData=
|
|
60012
|
+
{
|
|
60013
|
+
code:0,
|
|
60014
|
+
stock:{ name:hqchart.Name, symbol:hqchart.Symbol },
|
|
60015
|
+
outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[textData] }
|
|
60016
|
+
};
|
|
60017
|
+
|
|
60018
|
+
console.log('[HQData.APIIndex_PARTLINE] apiData ', apiData);
|
|
60019
|
+
callback(apiData);
|
|
60020
|
+
}
|
|
60021
|
+
|
|
60022
|
+
HQData.APIIndex_DRAWNUMBER_FIX=function(data, callback)
|
|
60023
|
+
{
|
|
60024
|
+
data.PreventDefault=true;
|
|
60025
|
+
var hqchart=data.HQChart;
|
|
60026
|
+
var kData=hqchart.GetKData();
|
|
60027
|
+
|
|
60028
|
+
var textData=
|
|
60029
|
+
{
|
|
60030
|
+
name:'DRAWNUMBER_FIX', type:1,
|
|
60031
|
+
Draw:
|
|
60032
|
+
{
|
|
60033
|
+
DrawType:'DRAWNUMBER_FIX',
|
|
60034
|
+
DrawData: { Value:[], Text:[] },
|
|
60035
|
+
Position:{ X:0.5, Y:0.2, Type:1 }
|
|
60036
|
+
},
|
|
60037
|
+
Color:"rgb(30,144,255)",
|
|
60038
|
+
Font:`italic bold 2.2em "Fira Sans", sans-serif`,
|
|
60039
|
+
};
|
|
60040
|
+
|
|
60041
|
+
for(var i=0;i<kData.Data.length;++i)
|
|
60042
|
+
{
|
|
60043
|
+
var kItem=kData.Data[i];
|
|
60044
|
+
|
|
60045
|
+
if (i%50==1)
|
|
60046
|
+
{
|
|
60047
|
+
textData.Draw.DrawData.Value[i]=1;
|
|
60048
|
+
textData.Draw.DrawData.Text[i]=`${i.toFixed(2)}`
|
|
60049
|
+
//textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
|
|
60001
60050
|
}
|
|
60002
60051
|
else
|
|
60003
60052
|
{
|
|
@@ -25865,7 +25865,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
|
|
|
25865
25865
|
|
|
25866
25866
|
result.push(outVarItem);
|
|
25867
25867
|
}
|
|
25868
|
-
else if (draw.DrawType=="DRAWTEXT_FIX")
|
|
25868
|
+
else if (draw.DrawType=="DRAWTEXT_FIX" || draw.DrawType=="DRAWNUMBER_FIX")
|
|
25869
25869
|
{
|
|
25870
25870
|
drawItem.Text=draw.Text;
|
|
25871
25871
|
drawItem.Name=draw.Name;
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -39674,6 +39674,7 @@ function ChartDrawText_Fix()
|
|
|
39674
39674
|
if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
|
|
39675
39675
|
if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Value) || !IFrameSplitOperator.IsNonEmptyArray(data.Text)) return;
|
|
39676
39676
|
|
|
39677
|
+
var splitWord="&"; //内置分隔符
|
|
39677
39678
|
for(var i=0;i<kData.Data.length;++i)
|
|
39678
39679
|
{
|
|
39679
39680
|
var value=data.Value[i];
|
|
@@ -39684,6 +39685,18 @@ function ChartDrawText_Fix()
|
|
|
39684
39685
|
|
|
39685
39686
|
var kItem=kData.Data[i];
|
|
39686
39687
|
var item={ Value:value, Text:text, Date:kItem.Date, Time:kItem.Time };
|
|
39688
|
+
if (text.includes(splitWord)) //&自动换行
|
|
39689
|
+
{
|
|
39690
|
+
var aryText=[];
|
|
39691
|
+
var aryValue=text.split(splitWord);
|
|
39692
|
+
for(var j=0;j<aryValue.length;++j)
|
|
39693
|
+
{
|
|
39694
|
+
var value=aryValue[j];
|
|
39695
|
+
if (value) aryText.push({ Name:value});
|
|
39696
|
+
}
|
|
39697
|
+
if (IFrameSplitOperator.IsNonEmptyArray(aryText)) item.Text=aryText;
|
|
39698
|
+
}
|
|
39699
|
+
|
|
39687
39700
|
var key=this.BuildKey(item);
|
|
39688
39701
|
|
|
39689
39702
|
/* //测试
|
|
@@ -2762,6 +2762,8 @@ HQData.Report_APIIndex=function(data, callback)
|
|
|
2762
2762
|
HQData.APIIndex_VERTLINE(data, callback);
|
|
2763
2763
|
else if (request.Data.indexname=="API_DRAWTEXT_FIX")
|
|
2764
2764
|
HQData.APIIndex_DRAWTEXT_FIX(data, callback);
|
|
2765
|
+
else if (request.Data.indexname=="API_DRAWNUMBER_FIX")
|
|
2766
|
+
HQData.APIIndex_DRAWNUMBER_FIX(data, callback);
|
|
2765
2767
|
|
|
2766
2768
|
else if (request.Data.indexname=="API_ERRORMESSAGE")
|
|
2767
2769
|
HQData.APIIndex_ErrorMessage(data, callback);
|
|
@@ -4483,7 +4485,54 @@ HQData.APIIndex_DRAWTEXT_FIX=function(data, callback)
|
|
|
4483
4485
|
if (i%50==1)
|
|
4484
4486
|
{
|
|
4485
4487
|
textData.Draw.DrawData.Value[i]=1;
|
|
4486
|
-
textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
|
|
4488
|
+
//textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
|
|
4489
|
+
textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
|
|
4490
|
+
}
|
|
4491
|
+
else
|
|
4492
|
+
{
|
|
4493
|
+
textData.Draw.DrawData.Value[i]=0;
|
|
4494
|
+
}
|
|
4495
|
+
}
|
|
4496
|
+
|
|
4497
|
+
var apiData=
|
|
4498
|
+
{
|
|
4499
|
+
code:0,
|
|
4500
|
+
stock:{ name:hqchart.Name, symbol:hqchart.Symbol },
|
|
4501
|
+
outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[textData] }
|
|
4502
|
+
};
|
|
4503
|
+
|
|
4504
|
+
console.log('[HQData.APIIndex_PARTLINE] apiData ', apiData);
|
|
4505
|
+
callback(apiData);
|
|
4506
|
+
}
|
|
4507
|
+
|
|
4508
|
+
HQData.APIIndex_DRAWNUMBER_FIX=function(data, callback)
|
|
4509
|
+
{
|
|
4510
|
+
data.PreventDefault=true;
|
|
4511
|
+
var hqchart=data.HQChart;
|
|
4512
|
+
var kData=hqchart.GetKData();
|
|
4513
|
+
|
|
4514
|
+
var textData=
|
|
4515
|
+
{
|
|
4516
|
+
name:'DRAWNUMBER_FIX', type:1,
|
|
4517
|
+
Draw:
|
|
4518
|
+
{
|
|
4519
|
+
DrawType:'DRAWNUMBER_FIX',
|
|
4520
|
+
DrawData: { Value:[], Text:[] },
|
|
4521
|
+
Position:{ X:0.5, Y:0.2, Type:1 }
|
|
4522
|
+
},
|
|
4523
|
+
Color:"rgb(30,144,255)",
|
|
4524
|
+
Font:`italic bold 2.2em "Fira Sans", sans-serif`,
|
|
4525
|
+
};
|
|
4526
|
+
|
|
4527
|
+
for(var i=0;i<kData.Data.length;++i)
|
|
4528
|
+
{
|
|
4529
|
+
var kItem=kData.Data[i];
|
|
4530
|
+
|
|
4531
|
+
if (i%50==1)
|
|
4532
|
+
{
|
|
4533
|
+
textData.Draw.DrawData.Value[i]=1;
|
|
4534
|
+
textData.Draw.DrawData.Text[i]=`${i.toFixed(2)}`
|
|
4535
|
+
//textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
|
|
4487
4536
|
}
|
|
4488
4537
|
else
|
|
4489
4538
|
{
|
|
@@ -43770,6 +43770,7 @@ function ChartDrawText_Fix()
|
|
|
43770
43770
|
if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
|
|
43771
43771
|
if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Value) || !IFrameSplitOperator.IsNonEmptyArray(data.Text)) return;
|
|
43772
43772
|
|
|
43773
|
+
var splitWord="&"; //内置分隔符
|
|
43773
43774
|
for(var i=0;i<kData.Data.length;++i)
|
|
43774
43775
|
{
|
|
43775
43776
|
var value=data.Value[i];
|
|
@@ -43780,6 +43781,18 @@ function ChartDrawText_Fix()
|
|
|
43780
43781
|
|
|
43781
43782
|
var kItem=kData.Data[i];
|
|
43782
43783
|
var item={ Value:value, Text:text, Date:kItem.Date, Time:kItem.Time };
|
|
43784
|
+
if (text.includes(splitWord)) //&自动换行
|
|
43785
|
+
{
|
|
43786
|
+
var aryText=[];
|
|
43787
|
+
var aryValue=text.split(splitWord);
|
|
43788
|
+
for(var j=0;j<aryValue.length;++j)
|
|
43789
|
+
{
|
|
43790
|
+
var value=aryValue[j];
|
|
43791
|
+
if (value) aryText.push({ Name:value});
|
|
43792
|
+
}
|
|
43793
|
+
if (IFrameSplitOperator.IsNonEmptyArray(aryText)) item.Text=aryText;
|
|
43794
|
+
}
|
|
43795
|
+
|
|
43783
43796
|
var key=this.BuildKey(item);
|
|
43784
43797
|
|
|
43785
43798
|
/* //测试
|
|
@@ -136298,7 +136311,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
|
|
|
136298
136311
|
|
|
136299
136312
|
result.push(outVarItem);
|
|
136300
136313
|
}
|
|
136301
|
-
else if (draw.DrawType=="DRAWTEXT_FIX")
|
|
136314
|
+
else if (draw.DrawType=="DRAWTEXT_FIX" || draw.DrawType=="DRAWNUMBER_FIX")
|
|
136302
136315
|
{
|
|
136303
136316
|
drawItem.Text=draw.Text;
|
|
136304
136317
|
drawItem.Name=draw.Name;
|
|
@@ -154998,7 +155011,7 @@ function ScrollBarBGChart()
|
|
|
154998
155011
|
|
|
154999
155012
|
|
|
155000
155013
|
|
|
155001
|
-
var HQCHART_VERSION="1.1.
|
|
155014
|
+
var HQCHART_VERSION="1.1.15303";
|
|
155002
155015
|
|
|
155003
155016
|
function PrintHQChartVersion()
|
|
155004
155017
|
{
|
|
@@ -58294,6 +58294,8 @@ HQData.Report_APIIndex=function(data, callback)
|
|
|
58294
58294
|
HQData.APIIndex_VERTLINE(data, callback);
|
|
58295
58295
|
else if (request.Data.indexname=="API_DRAWTEXT_FIX")
|
|
58296
58296
|
HQData.APIIndex_DRAWTEXT_FIX(data, callback);
|
|
58297
|
+
else if (request.Data.indexname=="API_DRAWNUMBER_FIX")
|
|
58298
|
+
HQData.APIIndex_DRAWNUMBER_FIX(data, callback);
|
|
58297
58299
|
|
|
58298
58300
|
else if (request.Data.indexname=="API_ERRORMESSAGE")
|
|
58299
58301
|
HQData.APIIndex_ErrorMessage(data, callback);
|
|
@@ -60015,7 +60017,54 @@ HQData.APIIndex_DRAWTEXT_FIX=function(data, callback)
|
|
|
60015
60017
|
if (i%50==1)
|
|
60016
60018
|
{
|
|
60017
60019
|
textData.Draw.DrawData.Value[i]=1;
|
|
60018
|
-
textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
|
|
60020
|
+
//textData.Draw.DrawData.Text[i]=`${kItem.Date}-${i}`;
|
|
60021
|
+
textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
|
|
60022
|
+
}
|
|
60023
|
+
else
|
|
60024
|
+
{
|
|
60025
|
+
textData.Draw.DrawData.Value[i]=0;
|
|
60026
|
+
}
|
|
60027
|
+
}
|
|
60028
|
+
|
|
60029
|
+
var apiData=
|
|
60030
|
+
{
|
|
60031
|
+
code:0,
|
|
60032
|
+
stock:{ name:hqchart.Name, symbol:hqchart.Symbol },
|
|
60033
|
+
outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[textData] }
|
|
60034
|
+
};
|
|
60035
|
+
|
|
60036
|
+
console.log('[HQData.APIIndex_PARTLINE] apiData ', apiData);
|
|
60037
|
+
callback(apiData);
|
|
60038
|
+
}
|
|
60039
|
+
|
|
60040
|
+
HQData.APIIndex_DRAWNUMBER_FIX=function(data, callback)
|
|
60041
|
+
{
|
|
60042
|
+
data.PreventDefault=true;
|
|
60043
|
+
var hqchart=data.HQChart;
|
|
60044
|
+
var kData=hqchart.GetKData();
|
|
60045
|
+
|
|
60046
|
+
var textData=
|
|
60047
|
+
{
|
|
60048
|
+
name:'DRAWNUMBER_FIX', type:1,
|
|
60049
|
+
Draw:
|
|
60050
|
+
{
|
|
60051
|
+
DrawType:'DRAWNUMBER_FIX',
|
|
60052
|
+
DrawData: { Value:[], Text:[] },
|
|
60053
|
+
Position:{ X:0.5, Y:0.2, Type:1 }
|
|
60054
|
+
},
|
|
60055
|
+
Color:"rgb(30,144,255)",
|
|
60056
|
+
Font:`italic bold 2.2em "Fira Sans", sans-serif`,
|
|
60057
|
+
};
|
|
60058
|
+
|
|
60059
|
+
for(var i=0;i<kData.Data.length;++i)
|
|
60060
|
+
{
|
|
60061
|
+
var kItem=kData.Data[i];
|
|
60062
|
+
|
|
60063
|
+
if (i%50==1)
|
|
60064
|
+
{
|
|
60065
|
+
textData.Draw.DrawData.Value[i]=1;
|
|
60066
|
+
textData.Draw.DrawData.Text[i]=`${i.toFixed(2)}`
|
|
60067
|
+
//textData.Draw.DrawData.Text[i]=[{ Name:`${kItem.Date}-${i}`}, { Name:`第2行${i}`}];
|
|
60019
60068
|
}
|
|
60020
60069
|
else
|
|
60021
60070
|
{
|
|
@@ -43814,6 +43814,7 @@ function ChartDrawText_Fix()
|
|
|
43814
43814
|
if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
|
|
43815
43815
|
if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Value) || !IFrameSplitOperator.IsNonEmptyArray(data.Text)) return;
|
|
43816
43816
|
|
|
43817
|
+
var splitWord="&"; //内置分隔符
|
|
43817
43818
|
for(var i=0;i<kData.Data.length;++i)
|
|
43818
43819
|
{
|
|
43819
43820
|
var value=data.Value[i];
|
|
@@ -43824,6 +43825,18 @@ function ChartDrawText_Fix()
|
|
|
43824
43825
|
|
|
43825
43826
|
var kItem=kData.Data[i];
|
|
43826
43827
|
var item={ Value:value, Text:text, Date:kItem.Date, Time:kItem.Time };
|
|
43828
|
+
if (text.includes(splitWord)) //&自动换行
|
|
43829
|
+
{
|
|
43830
|
+
var aryText=[];
|
|
43831
|
+
var aryValue=text.split(splitWord);
|
|
43832
|
+
for(var j=0;j<aryValue.length;++j)
|
|
43833
|
+
{
|
|
43834
|
+
var value=aryValue[j];
|
|
43835
|
+
if (value) aryText.push({ Name:value});
|
|
43836
|
+
}
|
|
43837
|
+
if (IFrameSplitOperator.IsNonEmptyArray(aryText)) item.Text=aryText;
|
|
43838
|
+
}
|
|
43839
|
+
|
|
43827
43840
|
var key=this.BuildKey(item);
|
|
43828
43841
|
|
|
43829
43842
|
/* //测试
|
|
@@ -136342,7 +136355,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
|
|
|
136342
136355
|
|
|
136343
136356
|
result.push(outVarItem);
|
|
136344
136357
|
}
|
|
136345
|
-
else if (draw.DrawType=="DRAWTEXT_FIX")
|
|
136358
|
+
else if (draw.DrawType=="DRAWTEXT_FIX" || draw.DrawType=="DRAWNUMBER_FIX")
|
|
136346
136359
|
{
|
|
136347
136360
|
drawItem.Text=draw.Text;
|
|
136348
136361
|
drawItem.Name=draw.Name;
|
|
@@ -167057,7 +167070,7 @@ function HQChartScriptWorker()
|
|
|
167057
167070
|
|
|
167058
167071
|
|
|
167059
167072
|
|
|
167060
|
-
var HQCHART_VERSION="1.1.
|
|
167073
|
+
var HQCHART_VERSION="1.1.15303";
|
|
167061
167074
|
|
|
167062
167075
|
function PrintHQChartVersion()
|
|
167063
167076
|
{
|