hqchart 1.1.13019 → 1.1.13027
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 +14 -9
- package/package.json +1 -1
- package/src/jscommon/umychart.complier.js +25 -0
- package/src/jscommon/umychart.js +3 -0
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +29 -1
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +29 -1
package/lib/umychart.vue.js
CHANGED
|
@@ -7434,11 +7434,13 @@ if(upperSymbol)isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);var list=data
|
|
|
7434
7434
|
var bfactor=11,afactor=12;//前, 后复权因子
|
|
7435
7435
|
var bVirtual=13;//虚拟数据
|
|
7436
7436
|
var bNonTrade=14;//非交易日
|
|
7437
|
+
var flowCapital=15;//流通股本
|
|
7437
7438
|
var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;var colorData=JSCHART_DATA_FIELD_ID.KLINE_COLOR_DATA;var heatMapIndex=JSCHART_DATA_FIELD_ID.KLINE_HEATMAP;var extendDataIndex=JSCHART_DATA_FIELD_ID.KLINE_DAY_EXTENDDATA;//k线扩展数据
|
|
7438
7439
|
for(var i=0;i<list.length;++i){var item=new HistoryData();var jsData=list[i];item.Date=jsData[date];item.Open=jsData[open];item.YClose=jsData[yclose];item.Close=jsData[close];item.High=jsData[high];item.Low=jsData[low];item.Vol=jsData[vol];//原始单位股
|
|
7439
7440
|
item.Amount=jsData[amount];if(IFrameSplitOperator.IsNumber(jsData[position]))item.Position=jsData[position];//期货持仓
|
|
7440
7441
|
if(IFrameSplitOperator.IsNumber(jsData[fclose]))item.FClose=jsData[fclose];//期货结算价
|
|
7441
7442
|
if(IFrameSplitOperator.IsNumber(jsData[yfclose]))item.YFClose=jsData[yfclose];//期货前结算价
|
|
7443
|
+
if(IFrameSplitOperator.IsNumber(jsData[flowCapital]))item.FlowCapital=jsData[flowCapital];//流通股本
|
|
7442
7444
|
if(IFrameSplitOperator.IsNumber(jsData[bfactor]))item.BFactor=jsData[bfactor];//前复权因子
|
|
7443
7445
|
if(IFrameSplitOperator.IsNumber(jsData[afactor]))item.AFactor=jsData[afactor];//后复权因子
|
|
7444
7446
|
if(IFrameSplitOperator.IsBool(jsData[bVirtual]))item.IsVirtual=jsData[bVirtual];//虚拟数据
|
|
@@ -11074,21 +11076,24 @@ break;}}JSConsole.Complier.Log('[JSExecute::RunAST]',this.VarTable);return this.
|
|
|
11074
11076
|
if(item.Type==Syntax.ExpressionStatement&&item.Expression){if(item.Expression.Type==Syntax.AssignmentExpression){if(item.Expression.Operator==':'&&item.Expression.Left){var assignmentItem=item.Expression;var _varName=assignmentItem.Left.Name;var _outVar=this.VarTable.get(_varName);if(this.VarDrawTable.has(_varName))//绘图函数赋值
|
|
11075
11077
|
{var draw=this.VarDrawTable.get(_varName);this.OutVarTable.push({Name:draw.Name,Draw:draw,Type:1});}else{var type=0;if(_outVar&&(typeof _outVar==='undefined'?'undefined':(0,_typeof3.default)(_outVar))=='object'&&_outVar.__Type__=='Object'){type=1000;}else if(!this.IsSectionMode&&!Array.isArray(_outVar)){if(typeof _outVar=='string'){var floatValue=parseFloat(_outVar);if(IFrameSplitOperator.IsNumber(floatValue)){_outVar=this.SingleDataToArrayData(floatValue);}else{_outVar=this.SingleDataToArrayData(_outVar);type=1001;}}else _outVar=this.SingleDataToArrayData(_outVar);}this.OutVarTable.push({Name:_varName,Data:_outVar,Type:type});}}}else if(item.Expression.Type==Syntax.CallExpression){var callItem=item.Expression;if(this.Draw.IsDrawFunction(callItem.Callee.Name)){var _draw=callItem.Draw;_draw.Name=callItem.Callee.Name;this.OutVarTable.push({Name:_draw.Name,Draw:_draw,Type:1});}else if(callItem.Callee.Name==="IFC"&&callItem.Draw){var _draw2=callItem.Draw;_draw2.Name=_draw2.DrawType;this.OutVarTable.push({Name:_draw2.Name,Draw:_draw2,Type:1});}else{var _outVar2=callItem.Out;varName='__temp_c_'+callItem.Callee.Name+'_'+i+'__';var type=0;if(!Array.isArray(_outVar2))_outVar2=this.SingleDataToArrayData(_outVar2);this.OutVarTable.push({Name:varName,Data:_outVar2,Type:type,NoneName:true});}}else if(item.Expression.Type==Syntax.Identifier){var _varName2=item.Expression.Name;var _outVar3=this.ReadVariable(_varName2,item.Expression);var type=0;if(_outVar3&&(typeof _outVar3==='undefined'?'undefined':(0,_typeof3.default)(_outVar3))=='object'&&_outVar3.__Type__=='Object'){type=1000;}else if(!this.IsSectionMode&&!Array.isArray(_outVar3)){if(typeof _outVar3=='string')_outVar3=this.SingleDataToArrayData(parseFloat(_outVar3));else _outVar3=this.SingleDataToArrayData(_outVar3);}_varName2="__temp_i_"+i+"__";this.OutVarTable.push({Name:_varName2,Data:_outVar3,Type:type,NoneName:true});}else if(item.Expression.Type==Syntax.Literal)//常量
|
|
11076
11078
|
{var _outVar4=item.Expression.Value;if(IFrameSplitOperator.IsString(_outVar4)&&_outVar4.indexOf("$")>0)_outVar4=this.SymbolData.GetOtherSymolCacheData({Literal:_outVar4});varName="__temp_li_"+i+"__";var type=0;if(!Array.isArray(_outVar4))_outVar4=this.SingleDataToArrayData(_outVar4);this.OutVarTable.push({Name:varName,Data:_outVar4,Type:type,NoneName:true});}else if(item.Expression.Type==Syntax.BinaryExpression){var varName="__temp_b_"+i+"__";var _outVar5=item.Expression.Out;var type=0;if(!Array.isArray(_outVar5))_outVar5=this.SingleDataToArrayData(_outVar5);this.OutVarTable.push({Name:varName,Data:_outVar5,Type:type,NoneName:true});}else if(item.Expression.Type==Syntax.LogicalExpression)//逻辑语句 如 T1 AND T2
|
|
11077
|
-
{var varName="__temp_l_"+i+"__";var _outVar6=item.Expression.Out;var type=0;if(!Array.isArray(_outVar6))_outVar6=this.SingleDataToArrayData(_outVar6);this.OutVarTable.push({Name:varName,Data:_outVar6,Type:type,NoneName:true});}else if(item.Expression.Type==Syntax.UnaryExpression){var varName="__temp_u_"+i+"__";var varInfo={};if(this.ReadUnaryExpression(item.Expression,varInfo)){var type=0;this.OutVarTable.push({Name:varName,Data:varInfo.OutVar,Type:type,NoneName:true});}}else if(item.Expression.Type==Syntax.
|
|
11079
|
+
{var varName="__temp_l_"+i+"__";var _outVar6=item.Expression.Out;var type=0;if(!Array.isArray(_outVar6))_outVar6=this.SingleDataToArrayData(_outVar6);this.OutVarTable.push({Name:varName,Data:_outVar6,Type:type,NoneName:true});}else if(item.Expression.Type==Syntax.UnaryExpression){var varName="__temp_u_"+i+"__";var varInfo={};if(this.ReadUnaryExpression(item.Expression,varInfo)){var type=0;this.OutVarTable.push({Name:varName,Data:varInfo.OutVar,Type:type,NoneName:true});}}else if(item.Expression.Type==Syntax.MemberExpression)//MA.MA2
|
|
11080
|
+
{var outVar=this.ReadMemberVariable(item.Expression);if(outVar){var type=0;var varName="__temp_di_"+i+"__";if(!Array.isArray(outVar))outVar=this.SingleDataToArrayData(outVar);this.OutVarTable.push({Name:varName,Data:outVar,Type:type,NoneName:true});}}else if(item.Expression.Type==Syntax.SequenceExpression){var _varName3=void 0;var _draw3=void 0;var color=void 0,upColor=void 0,downColor=void 0;var lineWidth=void 0;var colorStick=false;var pointDot=false;var upDownDot=false;var circleDot=false;var lineStick=false;var stick=false;var volStick=false;var lineArea=false;var stepLine=false;var isShow=true;var isExData=false;var isDotLine=false;var isOverlayLine=false;//叠加线
|
|
11078
11081
|
var isNoneName=false;var isShowTitle=true;//显示在位置之上,对于DRAWTEXT和DRAWNUMBER等函数有用,放在语句的最后面(不能与LINETHICK等函数共用),比如:
|
|
11079
11082
|
//DRAWNUMBER(CLOSE>OPEN,HIGH,CLOSE),DRAWABOVE;
|
|
11080
11083
|
var isDrawAbove=false;var isDrawCenter=false;var isDrawBelow=false;//VALIGN0,VALIGN1,VALIGN2 设置文字垂直对齐方式（上中下）
|
|
11081
11084
|
//ALIGN0,ALIGN1,ALIGN2 设置文字水平对齐方式（左中右）
|
|
11082
11085
|
var drawAlign=-1,drawVAlign=-1;var fontSize=-1;var bgConfig=null;//背景设置
|
|
11083
|
-
var vLineConfig=null;var isFirstDraw=null;var xOffset=null,yOffset=null;for(var _j13=0;_j13<item.Expression.Expression.length;++_j13){var itemExpression=item.Expression.Expression[_j13];if(itemExpression.Type==Syntax.AssignmentExpression&&itemExpression.Operator==':'&&itemExpression.Left){if(_j13==0){_varName3=itemExpression.Left.Name;var
|
|
11084
|
-
{_draw3=this.VarDrawTable.get(_varName3);}else if(!Array.isArray(
|
|
11086
|
+
var vLineConfig=null;var isFirstDraw=null;var xOffset=null,yOffset=null;for(var _j13=0;_j13<item.Expression.Expression.length;++_j13){var itemExpression=item.Expression.Expression[_j13];if(itemExpression.Type==Syntax.AssignmentExpression&&itemExpression.Operator==':'&&itemExpression.Left){if(_j13==0){_varName3=itemExpression.Left.Name;var _varValue=this.VarTable.get(_varName3);if(this.VarDrawTable.has(_varName3))//绘图函数赋值
|
|
11087
|
+
{_draw3=this.VarDrawTable.get(_varName3);}else if(!Array.isArray(_varValue)){_varValue=this.SingleDataToArrayData(_varValue);this.VarTable.set(_varName3,_varValue);//把常量放到变量表里
|
|
11085
11088
|
}}else{}}else if(itemExpression.Type==Syntax.Identifier){var value=itemExpression.Name;if(value==='COLORSTICK')colorStick=true;else if(value==='POINTDOT')pointDot=true;else if(value==='CIRCLEDOT')circleDot=true;else if(value==='DOTLINE')isDotLine=true;else if(value=="UPDOWNDOT")upDownDot=true;else if(value==='LINESTICK')lineStick=true;else if(value==='STICK')stick=true;else if(value==='VOLSTICK')volStick=true;else if(value=="LINEAREA")lineArea=true;else if(value==="DRAWABOVE")isDrawAbove=true;else if(value==="DRAWCENTER")isDrawCenter=true;else if(value=="DRAWBELOW")isDrawBelow=true;else if(value=="STEPLINE")stepLine=true;else if(value.indexOf('COLOR')==0)color=value;else if(value.indexOf("RGBX")==0&&value.length==10)color=value;//RGBX+“RRGGBB”
|
|
11086
11089
|
else if(value.indexOf('LINETHICK')==0)lineWidth=value;else if(value=="ALIGN0")drawAlign=0;else if(value=="ALIGN1")drawAlign=1;else if(value=="ALIGN2")drawAlign=2;else if(value=="VALIGN0")drawVAlign=0;else if(value=="VALIGN1")drawVAlign=1;else if(value=="VALIGN2")drawVAlign=2;else if(value.indexOf('NODRAW')==0)isShow=false;else if(value.indexOf('EXDATA')==0)isExData=true;//扩展数据, 不显示再图形里面
|
|
11087
11090
|
else if(value.indexOf('LINEOVERLAY')==0)isOverlayLine=true;else if(value.indexOf("NOTEXT")==0||value.indexOf("NOTITLE")==0)isShowTitle=false;//标题不显示
|
|
11088
|
-
else if(value.indexOf("FONTSIZE")==0){var strFontSize=value.replace("FONTSIZE","");fontSize=parseInt(strFontSize);}else{if(_j13==0){_varName3=itemExpression.Name;var
|
|
11091
|
+
else if(value.indexOf("FONTSIZE")==0){var strFontSize=value.replace("FONTSIZE","");fontSize=parseInt(strFontSize);}else{if(_j13==0){_varName3=itemExpression.Name;var _varValue2=this.ReadVariable(_varName3,itemExpression);if(!Array.isArray(_varValue2))_varValue2=this.SingleDataToArrayData(_varValue2);_varName3="__temp_si_"+i+"__";isNoneName=true;this.VarTable.set(_varName3,_varValue2);//放到变量表里
|
|
11089
11092
|
}}}else if(itemExpression.Type==Syntax.Literal)//常量
|
|
11090
11093
|
{if(_j13==0){var aryValue=this.SingleDataToArrayData(itemExpression.Value);_varName3=itemExpression.Value.toString();this.VarTable.set(_varName3,aryValue);//把常量放到变量表里
|
|
11091
|
-
}}else if(itemExpression.Type==Syntax.CallExpression){if(_j13==0){if(this.Draw.IsDrawFunction(itemExpression.Callee.Name)){_draw3=itemExpression.Draw;_draw3.Name=itemExpression.Callee.Name;}else{var
|
|
11094
|
+
}}else if(itemExpression.Type==Syntax.CallExpression){if(_j13==0){if(this.Draw.IsDrawFunction(itemExpression.Callee.Name)){_draw3=itemExpression.Draw;_draw3.Name=itemExpression.Callee.Name;}else{var _varValue3=itemExpression.Out;_varName3='__temp_sc_'+itemExpression.Callee.Name+'_'+i+'__';isNoneName=true;this.VarTable.set(_varName3,_varValue3);}}else{if(itemExpression.Callee.Name=="RGB"||itemExpression.Callee.Name=="RGBA"){color=itemExpression.Out;}else if(itemExpression.Callee.Name=="UPCOLOR"){upColor=itemExpression.Out;}else if(itemExpression.Callee.Name=="DOWNCOLOR"){downColor=itemExpression.Out;}else if(itemExpression.Callee.Name=="XMOVE"){xOffset=itemExpression.Out;}else if(itemExpression.Callee.Name=="YMOVE"){yOffset=itemExpression.Out;}else if(itemExpression.Callee.Name=="FIRSTDRAW"){if(itemExpression.Out===0)isFirstDraw=false;else if(itemExpression.Out===1)isFirstDraw=true;}else if(itemExpression.Callee.Name=="SOUND"){var event=this.GetSoundEvent();if(event){}_varName3=null;}else if(itemExpression.Callee.Name=="ICON"){var drawCond=this.VarTable.get(_varName3);if(drawCond){_draw3=this.GetOutIconData(drawCond,itemExpression.Draw);if(_draw3)_draw3.Name=itemExpression.Callee.Name;}_varName3=null;}else if(itemExpression.Callee.Name=="BACKGROUND"){bgConfig=itemExpression.Draw;_varName3=null;}else if(itemExpression.Callee.Name=="CKLINE"){vLineConfig=itemExpression.Draw;_varName3=null;}}}else if(itemExpression.Type==Syntax.BinaryExpression){if(_j13==0){_varName3="__temp_sb_"+i+"__";var _aryValue=itemExpression.Out;isNoneName=true;this.VarTable.set(_varName3,_aryValue);}}else if(itemExpression.Type==Syntax.UnaryExpression){if(_j13==0){_varName3="__temp_su_"+i+"__";var varInfo={};if(this.ReadUnaryExpression(itemExpression,varInfo)){isNoneName=true;this.VarTable.set(_varName3,varInfo.OutVar);}}}else if(itemExpression.Type==Syntax.MemberExpression)//"MA.MA2"(5,12,29), COLORRED;
|
|
11095
|
+
{if(_j13==0){var outVar=this.ReadMemberVariable(itemExpression);if(outVar){if(!Array.isArray(outVar))varValue=this.SingleDataToArrayData(outVar);isNoneName=true;_varName3="__temp_di_"+i+"__";this.VarTable.set(_varName3,outVar);//把常量放到变量表里
|
|
11096
|
+
}}}}if(pointDot&&_varName3)//圆点
|
|
11092
11097
|
{var _outVar7=this.VarTable.get(_varName3);if(!Array.isArray(_outVar7))_outVar7=this.SingleDataToArrayData(_outVar7);var _value={Name:_varName3,Data:_outVar7,Radius:g_JSChartResource.POINTDOT.Radius,Type:3};if(color)_value.Color=color;if(lineWidth)_value.LineWidth=lineWidth;this.OutVarTable.push(_value);}else if(circleDot&&_varName3)//圆点
|
|
11093
11098
|
{var _outVar8=this.VarTable.get(_varName3);if(!Array.isArray(_outVar8))_outVar8=this.SingleDataToArrayData(_outVar8);var _value2={Name:_varName3,Data:_outVar8,Radius:g_JSChartResource.CIRCLEDOT.Radius,Type:3};if(color)_value2.Color=color;if(lineWidth)_value2.LineWidth=lineWidth;this.OutVarTable.push(_value2);}else if(upDownDot&&_varName3)//彩色点
|
|
11094
11099
|
{var _outVar9=this.VarTable.get(_varName3);if(!Array.isArray(_outVar9))_outVar9=this.SingleDataToArrayData(_outVar9);var _value3={Name:_varName3,Data:_outVar9,Radius:g_JSChartResource.CIRCLEDOT.Radius,Type:3,UpDownDot:true};if(color)_value3.Color=color;if(lineWidth)_value3.LineWidth=lineWidth;this.OutVarTable.push(_value3);}else if(lineStick&&_varName3)//LINESTICK 同时画出柱状线和指标线
|
|
@@ -11145,12 +11150,12 @@ if(_item22.Type==Syntax.ExpressionStatement&&_item22.Expression){if(_item22.Expr
|
|
|
11145
11150
|
{var varName="__temp_l_"+_i132+"__";var argument=_item22.Expression.Argument;var _outVar25=null;if(argument.Type==Syntax.Literal){_outVar25=argument.Value;}else if(argument.Type==Syntax.Identifier){var _varName7=argument.Name;_outVar25=this.ReadVariable(_varName7,_item22.Expression);}else if(argument.Type==Syntax.BinaryExpression){_outVar25=argument.Out;}if(_item22.Expression.Operator=='-'){_outVar25='-'+_outVar25;}this.OutVarTable.push({Name:varName,Data:'\u8F93\u51FA: '+_outVar25,Type:0,NoneName:true});}else if(_item22.Expression.Type==Syntax.SequenceExpression){var _varName8=void 0;var _drawName=void 0;var draw=void 0;var color=void 0;var lineWidth=void 0;var colorStick=false;var pointDot=false;var circleDot=false;var lineStick=false;var stick=false;var volStick=false;var isShow=true;var isExData=false;var isDotLine=false;var isOverlayLine=false;//叠加线
|
|
11146
11151
|
var isNoneName=false;var fontSize=-1;var drawAlign=-1,drawVAlign=-1;//显示在位置之上,对于DRAWTEXT和DRAWNUMBER等函数有用,放在语句的最后面(不能与LINETHICK等函数共用),比如:
|
|
11147
11152
|
//DRAWNUMBER(CLOSE>OPEN,HIGH,CLOSE),DRAWABOVE;
|
|
11148
|
-
var isDrawAbove=false;for(var _j14 in _item22.Expression.Expression){var itemExpression=_item22.Expression.Expression[_j14];if(itemExpression.Type==Syntax.AssignmentExpression&&itemExpression.Operator==':'&&itemExpression.Left){_varName8=itemExpression.Left.Name;var
|
|
11153
|
+
var isDrawAbove=false;for(var _j14 in _item22.Expression.Expression){var itemExpression=_item22.Expression.Expression[_j14];if(itemExpression.Type==Syntax.AssignmentExpression&&itemExpression.Operator==':'&&itemExpression.Left){_varName8=itemExpression.Left.Name;var _varValue4=this.VarTable.get(_varName8);this.VarTable.set(_varName8,_varValue4);//把常量放到变量表里
|
|
11149
11154
|
}else if(itemExpression.Type==Syntax.Identifier){var value=itemExpression.Name;if(value==='COLORSTICK')colorStick=true;else if(value==='POINTDOT')pointDot=true;else if(value==='CIRCLEDOT')circleDot=true;else if(value==='DOTLINE')isDotLine=true;else if(value==='LINESTICK')lineStick=true;else if(value==='STICK')stick=true;else if(value==='VOLSTICK')volStick=true;else if(value==="DRAWABOVE")isDrawAbove=true;else if(value.indexOf('COLOR')==0)color=value;else if(value.indexOf('LINETHICK')==0)lineWidth=value;else if(value=="ALIGN0")drawAlign=0;else if(value=="ALIGN1")drawAlign=1;else if(value=="ALIGN2")drawAlign=2;else if(value=="VALIGN0")drawVAlign=0;else if(value=="VALIGN1")drawVAlign=1;else if(value=="VALIGN2")drawVAlign=2;else if(value.indexOf('NODRAW')==0)isShow=false;else if(value.indexOf('EXDATA')==0)isExData=true;//扩展数据, 不显示再图形里面
|
|
11150
|
-
else if(value.indexOf('LINEOVERLAY')==0)isOverlayLine=true;else if(value.indexOf("FONTSIZE")==0){var strFontSize=value.replace("FONTSIZE","");fontSize=parseInt(strFontSize);}else{_varName8=itemExpression.Name;var
|
|
11155
|
+
else if(value.indexOf('LINEOVERLAY')==0)isOverlayLine=true;else if(value.indexOf("FONTSIZE")==0){var strFontSize=value.replace("FONTSIZE","");fontSize=parseInt(strFontSize);}else{_varName8=itemExpression.Name;var _varValue5=this.ReadVariable(_varName8,itemExpression);_varName8="__temp_si_"+_i132+"__";isNoneName=true;this.VarTable.set(_varName8,_varValue5);//放到变量表里
|
|
11151
11156
|
}}else if(itemExpression.Type==Syntax.Literal)//常量
|
|
11152
11157
|
{var aryValue=itemExpression.Value;_varName8=itemExpression.Value.toString();isNoneName=true;this.VarTable.set(_varName8,aryValue);//把常量放到变量表里
|
|
11153
|
-
}else if(itemExpression.Type==Syntax.CallExpression){if(_j14==0){if(this.IsDrawFunction(itemExpression.Callee.Name)){draw=itemExpression.Out;_drawName=itemExpression.Callee.Name;}else{var
|
|
11158
|
+
}else if(itemExpression.Type==Syntax.CallExpression){if(_j14==0){if(this.IsDrawFunction(itemExpression.Callee.Name)){draw=itemExpression.Out;_drawName=itemExpression.Callee.Name;}else{var _varValue6=itemExpression.Out;_varName8='__temp_sc_'+itemExpression.Callee.Name+'_'+_i132+'__';isNoneName=true;this.VarTable.set(_varName8,_varValue6);}}}else if(itemExpression.Type==Syntax.BinaryExpression){_varName8="__temp_sb_"+_i132+"__";var _aryValue2=itemExpression.Out;isNoneName=true;this.VarTable.set(_varName8,_aryValue2);}else if(itemExpression.Type==Syntax.UnaryExpression){_varName8="__temp_sb_"+_i132+"__";var argument=itemExpression.Argument;var _aryValue3=null;if(argument.Type==Syntax.Literal){_aryValue3=argument.Value;}else if(argument.Type==Syntax.Identifier){var _varName9=argument.Name;_aryValue3=this.ReadVariable(_varName9,_item22.Expression);}else if(argument.Type==Syntax.BinaryExpression){_aryValue3=argument.Out;}if(itemExpression.Operator=='-'){_aryValue3='-'+_aryValue3;}isNoneName=true;this.VarTable.set(_varName8,_aryValue3);}}var outValue;if(draw)outValue='\u8F93\u51FA: '+draw;else if(isNoneName)outValue='\u8F93\u51FA: '+this.VarTable.get(_varName8);else outValue='\u8F93\u51FA'+_varName8+': '+this.VarTable.get(_varName8);if(color)outValue+=',\u989C\u8272'+this.GetColorExplain(color);if(lineWidth)outValue+=',\u7EBF\u6BB5\u7C97\u7EC6'+this.GetLineWidthExplain(lineWidth);if(isShow==false)outValue+=",不显示";if(isDotLine==true)outValue+=",画虚线";if(isDrawAbove==true)outValue+=',显示在位置之上';if(pointDot&&_varName8)//圆点
|
|
11154
11159
|
{outValue+=",画小圆点线";var _value11={Name:_varName8,Draw:outValue,Radius:g_JSChartResource.POINTDOT.Radius,Type:3};this.OutVarTable.push(_value11);}else if(circleDot&&_varName8)//圆点
|
|
11155
11160
|
{outValue+=",画小圆圈线";var _value12={Name:_varName8,Draw:outValue,Radius:g_JSChartResource.CIRCLEDOT.Radius,Type:3};this.OutVarTable.push(_value12);}else if(lineStick&&_varName8)//LINESTICK 同时画出柱状线和指标线
|
|
11156
11161
|
{outValue+=",画出柱状线和指标线";var _value13={Name:_varName8,Draw:outValue,Type:4};this.OutVarTable.push(_value13);}else if(stick&&_varName8)//STICK 画柱状线
|
|
@@ -12655,7 +12660,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
12655
12660
|
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);};}/********************************************************************************
|
|
12656
12661
|
* 版本信息输出
|
|
12657
12662
|
*
|
|
12658
|
-
*/var HQCHART_VERSION="1.1.
|
|
12663
|
+
*/var HQCHART_VERSION="1.1.13026";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();//把给外界调用的方法暴露出来
|
|
12659
12664
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
12660
12665
|
// BaseIndex:BaseIndex,
|
|
12661
12666
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -17106,6 +17106,17 @@ function JSExecute(ast,option)
|
|
|
17106
17106
|
this.OutVarTable.push({Name:varName, Data:varInfo.OutVar,Type:type, NoneName:true});
|
|
17107
17107
|
}
|
|
17108
17108
|
}
|
|
17109
|
+
else if (item.Expression.Type==Syntax.MemberExpression) //MA.MA2
|
|
17110
|
+
{
|
|
17111
|
+
var outVar=this.ReadMemberVariable(item.Expression);
|
|
17112
|
+
if (outVar)
|
|
17113
|
+
{
|
|
17114
|
+
var type=0;
|
|
17115
|
+
var varName="__temp_di_"+i+"__";
|
|
17116
|
+
if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
|
|
17117
|
+
this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
|
|
17118
|
+
}
|
|
17119
|
+
}
|
|
17109
17120
|
else if (item.Expression.Type==Syntax.SequenceExpression)
|
|
17110
17121
|
{
|
|
17111
17122
|
let varName;
|
|
@@ -17323,6 +17334,20 @@ function JSExecute(ast,option)
|
|
|
17323
17334
|
}
|
|
17324
17335
|
}
|
|
17325
17336
|
}
|
|
17337
|
+
else if (itemExpression.Type==Syntax.MemberExpression) //"MA.MA2"(5,12,29), COLORRED;
|
|
17338
|
+
{
|
|
17339
|
+
if (j==0)
|
|
17340
|
+
{
|
|
17341
|
+
var outVar=this.ReadMemberVariable(itemExpression);
|
|
17342
|
+
if (outVar)
|
|
17343
|
+
{
|
|
17344
|
+
if (!Array.isArray(outVar)) varValue=this.SingleDataToArrayData(outVar);
|
|
17345
|
+
isNoneName=true;
|
|
17346
|
+
varName="__temp_di_"+i+"__";
|
|
17347
|
+
this.VarTable.set(varName,outVar); //把常量放到变量表里
|
|
17348
|
+
}
|
|
17349
|
+
}
|
|
17350
|
+
}
|
|
17326
17351
|
}
|
|
17327
17352
|
|
|
17328
17353
|
if (pointDot && varName) //圆点
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -72045,6 +72045,7 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
|
|
|
72045
72045
|
var bfactor=11, afactor=12; //前, 后复权因子
|
|
72046
72046
|
var bVirtual=13; //虚拟数据
|
|
72047
72047
|
var bNonTrade=14; //非交易日
|
|
72048
|
+
var flowCapital=15; //流通股本
|
|
72048
72049
|
var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;
|
|
72049
72050
|
var colorData=JSCHART_DATA_FIELD_ID.KLINE_COLOR_DATA;
|
|
72050
72051
|
var heatMapIndex=JSCHART_DATA_FIELD_ID.KLINE_HEATMAP;
|
|
@@ -72066,6 +72067,8 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
|
|
|
72066
72067
|
if (IFrameSplitOperator.IsNumber(jsData[fclose])) item.FClose=jsData[fclose]; //期货结算价
|
|
72067
72068
|
if (IFrameSplitOperator.IsNumber(jsData[yfclose])) item.YFClose=jsData[yfclose]; //期货前结算价
|
|
72068
72069
|
|
|
72070
|
+
if (IFrameSplitOperator.IsNumber(jsData[flowCapital])) item.FlowCapital=jsData[flowCapital]; //流通股本
|
|
72071
|
+
|
|
72069
72072
|
if (IFrameSplitOperator.IsNumber(jsData[bfactor])) item.BFactor=jsData[bfactor]; //前复权因子
|
|
72070
72073
|
if (IFrameSplitOperator.IsNumber(jsData[afactor])) item.AFactor=jsData[afactor]; //后复权因子
|
|
72071
72074
|
|
|
@@ -75937,6 +75937,7 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
|
|
|
75937
75937
|
var bfactor=11, afactor=12; //前, 后复权因子
|
|
75938
75938
|
var bVirtual=13; //虚拟数据
|
|
75939
75939
|
var bNonTrade=14; //非交易日
|
|
75940
|
+
var flowCapital=15; //流通股本
|
|
75940
75941
|
var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;
|
|
75941
75942
|
var colorData=JSCHART_DATA_FIELD_ID.KLINE_COLOR_DATA;
|
|
75942
75943
|
var heatMapIndex=JSCHART_DATA_FIELD_ID.KLINE_HEATMAP;
|
|
@@ -75958,6 +75959,8 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
|
|
|
75958
75959
|
if (IFrameSplitOperator.IsNumber(jsData[fclose])) item.FClose=jsData[fclose]; //期货结算价
|
|
75959
75960
|
if (IFrameSplitOperator.IsNumber(jsData[yfclose])) item.YFClose=jsData[yfclose]; //期货前结算价
|
|
75960
75961
|
|
|
75962
|
+
if (IFrameSplitOperator.IsNumber(jsData[flowCapital])) item.FlowCapital=jsData[flowCapital]; //流通股本
|
|
75963
|
+
|
|
75961
75964
|
if (IFrameSplitOperator.IsNumber(jsData[bfactor])) item.BFactor=jsData[bfactor]; //前复权因子
|
|
75962
75965
|
if (IFrameSplitOperator.IsNumber(jsData[afactor])) item.AFactor=jsData[afactor]; //后复权因子
|
|
75963
75966
|
|
|
@@ -110526,6 +110529,17 @@ function JSExecute(ast,option)
|
|
|
110526
110529
|
this.OutVarTable.push({Name:varName, Data:varInfo.OutVar,Type:type, NoneName:true});
|
|
110527
110530
|
}
|
|
110528
110531
|
}
|
|
110532
|
+
else if (item.Expression.Type==Syntax.MemberExpression) //MA.MA2
|
|
110533
|
+
{
|
|
110534
|
+
var outVar=this.ReadMemberVariable(item.Expression);
|
|
110535
|
+
if (outVar)
|
|
110536
|
+
{
|
|
110537
|
+
var type=0;
|
|
110538
|
+
var varName="__temp_di_"+i+"__";
|
|
110539
|
+
if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
|
|
110540
|
+
this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
|
|
110541
|
+
}
|
|
110542
|
+
}
|
|
110529
110543
|
else if (item.Expression.Type==Syntax.SequenceExpression)
|
|
110530
110544
|
{
|
|
110531
110545
|
let varName;
|
|
@@ -110743,6 +110757,20 @@ function JSExecute(ast,option)
|
|
|
110743
110757
|
}
|
|
110744
110758
|
}
|
|
110745
110759
|
}
|
|
110760
|
+
else if (itemExpression.Type==Syntax.MemberExpression) //"MA.MA2"(5,12,29), COLORRED;
|
|
110761
|
+
{
|
|
110762
|
+
if (j==0)
|
|
110763
|
+
{
|
|
110764
|
+
var outVar=this.ReadMemberVariable(itemExpression);
|
|
110765
|
+
if (outVar)
|
|
110766
|
+
{
|
|
110767
|
+
if (!Array.isArray(outVar)) varValue=this.SingleDataToArrayData(outVar);
|
|
110768
|
+
isNoneName=true;
|
|
110769
|
+
varName="__temp_di_"+i+"__";
|
|
110770
|
+
this.VarTable.set(varName,outVar); //把常量放到变量表里
|
|
110771
|
+
}
|
|
110772
|
+
}
|
|
110773
|
+
}
|
|
110746
110774
|
}
|
|
110747
110775
|
|
|
110748
110776
|
if (pointDot && varName) //圆点
|
|
@@ -130079,7 +130107,7 @@ function ScrollBarBGChart()
|
|
|
130079
130107
|
|
|
130080
130108
|
|
|
130081
130109
|
|
|
130082
|
-
var HQCHART_VERSION="1.1.
|
|
130110
|
+
var HQCHART_VERSION="1.1.13026";
|
|
130083
130111
|
|
|
130084
130112
|
function PrintHQChartVersion()
|
|
130085
130113
|
{
|
|
@@ -75981,6 +75981,7 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
|
|
|
75981
75981
|
var bfactor=11, afactor=12; //前, 后复权因子
|
|
75982
75982
|
var bVirtual=13; //虚拟数据
|
|
75983
75983
|
var bNonTrade=14; //非交易日
|
|
75984
|
+
var flowCapital=15; //流通股本
|
|
75984
75985
|
var orderFlow=JSCHART_DATA_FIELD_ID.KLINE_ORDERFLOW;
|
|
75985
75986
|
var colorData=JSCHART_DATA_FIELD_ID.KLINE_COLOR_DATA;
|
|
75986
75987
|
var heatMapIndex=JSCHART_DATA_FIELD_ID.KLINE_HEATMAP;
|
|
@@ -76002,6 +76003,8 @@ KLineChartContainer.JsonDataToHistoryData=function(data)
|
|
|
76002
76003
|
if (IFrameSplitOperator.IsNumber(jsData[fclose])) item.FClose=jsData[fclose]; //期货结算价
|
|
76003
76004
|
if (IFrameSplitOperator.IsNumber(jsData[yfclose])) item.YFClose=jsData[yfclose]; //期货前结算价
|
|
76004
76005
|
|
|
76006
|
+
if (IFrameSplitOperator.IsNumber(jsData[flowCapital])) item.FlowCapital=jsData[flowCapital]; //流通股本
|
|
76007
|
+
|
|
76005
76008
|
if (IFrameSplitOperator.IsNumber(jsData[bfactor])) item.BFactor=jsData[bfactor]; //前复权因子
|
|
76006
76009
|
if (IFrameSplitOperator.IsNumber(jsData[afactor])) item.AFactor=jsData[afactor]; //后复权因子
|
|
76007
76010
|
|
|
@@ -110570,6 +110573,17 @@ function JSExecute(ast,option)
|
|
|
110570
110573
|
this.OutVarTable.push({Name:varName, Data:varInfo.OutVar,Type:type, NoneName:true});
|
|
110571
110574
|
}
|
|
110572
110575
|
}
|
|
110576
|
+
else if (item.Expression.Type==Syntax.MemberExpression) //MA.MA2
|
|
110577
|
+
{
|
|
110578
|
+
var outVar=this.ReadMemberVariable(item.Expression);
|
|
110579
|
+
if (outVar)
|
|
110580
|
+
{
|
|
110581
|
+
var type=0;
|
|
110582
|
+
var varName="__temp_di_"+i+"__";
|
|
110583
|
+
if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
|
|
110584
|
+
this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
|
|
110585
|
+
}
|
|
110586
|
+
}
|
|
110573
110587
|
else if (item.Expression.Type==Syntax.SequenceExpression)
|
|
110574
110588
|
{
|
|
110575
110589
|
let varName;
|
|
@@ -110787,6 +110801,20 @@ function JSExecute(ast,option)
|
|
|
110787
110801
|
}
|
|
110788
110802
|
}
|
|
110789
110803
|
}
|
|
110804
|
+
else if (itemExpression.Type==Syntax.MemberExpression) //"MA.MA2"(5,12,29), COLORRED;
|
|
110805
|
+
{
|
|
110806
|
+
if (j==0)
|
|
110807
|
+
{
|
|
110808
|
+
var outVar=this.ReadMemberVariable(itemExpression);
|
|
110809
|
+
if (outVar)
|
|
110810
|
+
{
|
|
110811
|
+
if (!Array.isArray(outVar)) varValue=this.SingleDataToArrayData(outVar);
|
|
110812
|
+
isNoneName=true;
|
|
110813
|
+
varName="__temp_di_"+i+"__";
|
|
110814
|
+
this.VarTable.set(varName,outVar); //把常量放到变量表里
|
|
110815
|
+
}
|
|
110816
|
+
}
|
|
110817
|
+
}
|
|
110790
110818
|
}
|
|
110791
110819
|
|
|
110792
110820
|
if (pointDot && varName) //圆点
|
|
@@ -130237,7 +130265,7 @@ function HQChartScriptWorker()
|
|
|
130237
130265
|
|
|
130238
130266
|
|
|
130239
130267
|
|
|
130240
|
-
var HQCHART_VERSION="1.1.
|
|
130268
|
+
var HQCHART_VERSION="1.1.13026";
|
|
130241
130269
|
|
|
130242
130270
|
function PrintHQChartVersion()
|
|
130243
130271
|
{
|