Skip to content

Commit 873e5bc

Browse files
jones2000jones2000
committed
ver 15678
15675 小程序DRAW_HORIZONTAL_CHANNEL支持叠加 15674 K线增加水平通道 15670 CreateOverlayWindowsIndex()增加叠加框架SplitType属性设置 15669 增加指标临时属性 JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE 15668 指标临时属性增加MAINFRAME.SHOWLEFTTEXT，MAINFRAME.SHOWRIGHTTEXT 15667 水平通道支持叠加 15666 增加水平通道
1 parent 8b95d79 commit 873e5bc

34 files changed

Lines changed: 3694 additions & 476 deletions

‎umychart_uniapp_h5/umychart.uniapp.h5.js‎

Lines changed: 399 additions & 70 deletions
Large diffs are not rendered by default.

‎vuehqchart/src/jscommon/umychart.DialogSearchIndex.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,14 @@ function JSDialogSearchIndex()
311311
{
312312
var indexData={ ID:indexItem.ID, Name:indexItem.Name, Script:indexItem.Script, Args:indexItem.Args };
313313
if (indexItem.Lock) indexData.Lock=indexItem.Lock;
314+
if (IFrameSplitOperator.IsNonEmptyArray(indexItem.AryTemporaryAttribute)) indexData.AryTemporaryAttribute=indexItem.AryTemporaryAttribute;
314315
this.HQChart.ChangeScriptIndex(this.OpData.WindowIndex, indexData);
315316
}
316317
else if (indexItem.Type==2) //api指标
317318
{
318319
var indexData={ API: { ID:indexItem.ID, Name:indexItem.Name, Args:indexItem.Args, Url:'local'} };
319320
if (indexItem.Lock) indexData.Lock=indexItem.Lock;
321+
if (IFrameSplitOperator.IsNonEmptyArray(indexItem.AryTemporaryAttribute)) indexData.AryTemporaryAttribute=indexItem.AryTemporaryAttribute;
320322
this.HQChart.ChangeAPIIndex(this.OpData.WindowIndex, indexData);
321323
}
322324
else if (indexItem.Type==3) //指标模板
@@ -339,12 +341,16 @@ function JSDialogSearchIndex()
339341
{
340342
var obj={ WindowIndex:this.OpData.WindowIndex, IndexName:indexItem.ID, Name:indexItem.Name, Script:indexItem.Script, Args:indexItem.Args };
341343
if (indexItem.Lock) obj.Lock=indexItem.Lock;
344+
if (IFrameSplitOperator.IsNonEmptyArray(indexItem.AryTemporaryAttribute)) obj.AryTemporaryAttribute=indexItem.AryTemporaryAttribute;
345+
if (indexItem.OverlayFrame) obj.Frame=indexItem.OverlayFrame;
342346
this.HQChart.AddOverlayIndex(obj);
343347
}
344348
else if (indexItem.Type==2) //api指标
345349
{
346350
var obj={ WindowIndex:this.OpData.WindowIndex, API: { ID:indexItem.ID, Name:indexItem.Name, Args:indexItem.Args, Url:'local'} };
347351
if (indexItem.Lock) obj.Lock=indexItem.Lock;
352+
if (IFrameSplitOperator.IsNonEmptyArray(indexItem.AryTemporaryAttribute)) obj.AryTemporaryAttribute=indexItem.AryTemporaryAttribute;
353+
if (indexItem.OverlayFrame) obj.Frame=indexItem.OverlayFrame;
348354
this.HQChart.AddOverlayIndex(obj);
349355
}
350356
else if (indexItem.Type==3) //指标模板
@@ -777,7 +783,17 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
777783
[
778784
{ Name:"收盘线(后台指标)", ID:"API-DRAWTEXTREL", Type:2, Args:null },
779785
{ Name:"高低均价(自定义脚本)", ID:"HIGH_LOW_AV", Type:1, Script:"均价:(H+L)/2;高:H;低:L;", Args:[ { Name:'N', Value:20}, { Name:'M', Value:6}]},
780-
{ Name:"指标异常(后台指标)", ID:"API_ERRORMESSAGE", Type:2, Args:null,}
786+
{ Name:"指标异常(后台指标)", ID:"API_ERRORMESSAGE", Type:2, Args:null,},
787+
{
788+
Name:"水平通道(后台指标)", ID:"API_DRAWHORIZONTALCHANNEL", Type:2, Args:null,
789+
AryTemporaryAttribute:
790+
[
791+
{ Name:JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT, Value:false },
792+
{ Name:JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT, Value:false },
793+
{ Name:JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE, Value:1 },
794+
],
795+
OverlayFrame: { SplitType:1 }
796+
}
781797
]
782798
},
783799
{

‎vuehqchart/src/jscommon/umychart.NetworkFilterTest.js‎

Lines changed: 123 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vuehqchart/src/jscommon/umychart.complier.js‎

Lines changed: 69 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20785,6 +20785,7 @@ var SCRIPT_CHART_NAME=
2078520785
DRAW_KLINE:"DRAWKLINE",
2078620786
BASELINE_BAR:"BASELINE_BAR",
2078720787
DRAW_CHANNEL:"DRAWCHANNEL",
20788+
DRAW_HORIZONTAL_CHANNEL:"DRAWHORIZONTALCHANNEL", //水平通道
2078820789
}
2078920790

2079020791

@@ -22742,13 +22743,26 @@ function ScriptIndex(name,script,args,option)
2274222743
}
2274322744
}
2274422745

22745-
22746-
2274722746
//let titleIndex=windowIndex+1;
2274822747
chart.Data.Data=varItem.Draw.DrawData;
2274922748
hqChart.ChartPaint.push(chart);
2275022749
}
2275122750

22751+
//创建水平通道
22752+
this.CreateHorizontalChannel=function(hqChart,windowIndex,varItem,i)
22753+
{
22754+
var chart=new ChartHorizontalChannel();
22755+
chart.Canvas=hqChart.Canvas;
22756+
chart.Name=varItem.Name;
22757+
chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
22758+
chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
22759+
22760+
if (varItem.Draw.Config) chart.SetOption(varItem.Draw.Config);
22761+
22762+
chart.AryChannel=varItem.Draw.DrawData;
22763+
hqChart.ChartPaint.push(chart);
22764+
}
22765+
2275222766
this.CreatePartLine=function(hqChart,windowIndex,varItem,i)
2275322767
{
2275422768
var chart=new ChartPartLine();
@@ -23362,6 +23376,9 @@ function ScriptIndex(name,script,args,option)
2336223376
case 'DRAWCHANNEL':
2336323377
this.CreateChannel(hqChart,windowIndex,item,i);
2336423378
break;
23379+
case SCRIPT_CHART_NAME.DRAW_HORIZONTAL_CHANNEL:
23380+
this.CreateHorizontalChannel(hqChart,windowIndex,item,i);
23381+
break;
2336523382
case 'PARTLINE':
2336623383
this.CreatePartLine(hqChart,windowIndex,item,i);
2336723384
break;
@@ -23757,6 +23774,9 @@ function OverlayScriptIndex(name,script,args,option)
2375723774
case 'DRAWCHANNEL':
2375823775
this.CreateChannel(hqChart,windowIndex,item,i);
2375923776
break;
23777+
case SCRIPT_CHART_NAME.DRAW_HORIZONTAL_CHANNEL:
23778+
this.CreateHorizontalChannel(hqChart,windowIndex,item,i);
23779+
break;
2376023780
case 'DRAWTEXT_LINE':
2376123781
this.CreateTextLine(hqChart,windowIndex,item,i);
2376223782
break;
@@ -24872,21 +24892,51 @@ function OverlayScriptIndex(name,script,args,option)
2487224892
chart.ChartFrame=frame.Frame;
2487324893
chart.Identify=overlayIndex.Identify;
2487424894

24875-
if(varItem.Draw.AreaColor) chart.AreaColor=varItem.Draw.AreaColor;
24876-
else if (varItem.Color) chart.AreaColor=this.GetColor(varItem.Color);
24877-
else chart.AreaColor=this.GetDefaultColor(id);
24895+
if (varItem.Draw.Config)
24896+
{
24897+
var item=varItem.Draw.Config;
24898+
if (IFrameSplitOperator.IsObjectDefined(item.AreaColor)) chart.AreaColor=item.AreaColor;
24899+
if (IFrameSplitOperator.IsObjectDefined(item.LineColor)) chart.LineColor=item.LineColor;
24900+
if (IFrameSplitOperator.IsObjectDefined(item.LineDotted)) chart.LineDotted=item.LineDotted;
24901+
if (IFrameSplitOperator.IsNumber(item.LineWidth)) chart.LineWidth=item.LineWidth;
24902+
}
24903+
else
24904+
{
24905+
if(varItem.Draw.AreaColor) chart.AreaColor=varItem.Draw.AreaColor;
24906+
else if (varItem.Color) chart.AreaColor=this.GetColor(varItem.Color);
24907+
else chart.AreaColor=this.GetDefaultColor(id);
2487824908

24879-
if (varItem.Draw.Border.Color) chart.LineColor=varItem.Draw.Border.Color;
24880-
else chart.LineColor=null;
24909+
if (varItem.Draw.Border.Color) chart.LineColor=varItem.Draw.Border.Color;
24910+
else chart.LineColor=null;
2488124911

24882-
if (varItem.Draw.Border.Dotted) chart.LineDotted=varItem.Draw.Border.Dotted;
24883-
if (varItem.Draw.Border.Width>0) chart.LineWidth=varItem.Draw.Border.Width;
24912+
if (varItem.Draw.Border.Dotted) chart.LineDotted=varItem.Draw.Border.Dotted;
24913+
if (varItem.Draw.Border.Width>0) chart.LineWidth=varItem.Draw.Border.Width;
24914+
}
2488424915

2488524916
//let titleIndex=windowIndex+1;
2488624917
chart.Data.Data=varItem.Draw.DrawData;
2488724918
frame.ChartPaint.push(chart);
2488824919
}
2488924920

24921+
//创建水平通道
24922+
this.CreateHorizontalChannel=function(hqChart,windowIndex,varItem,i)
24923+
{
24924+
var overlayIndex=this.OverlayIndex;
24925+
var frame=overlayIndex.Frame;
24926+
let chart=new ChartHorizontalChannel();
24927+
chart.Canvas=hqChart.Canvas;
24928+
chart.Name=varItem.Name;
24929+
chart.ChartBorder=frame.Frame.ChartBorder;
24930+
chart.ChartFrame=frame.Frame;
24931+
chart.Identify=overlayIndex.Identify;
24932+
24933+
if (varItem.Draw.Config) chart.SetOption(varItem.Draw.Config);
24934+
24935+
//let titleIndex=windowIndex+1;
24936+
chart.AryChannel=varItem.Draw.DrawData;
24937+
frame.ChartPaint.push(chart);
24938+
}
24939+
2489024940
//
2489124941
this.CreatePartLine=function(hqChart,windowIndex,varItem,i)
2489224942
{
@@ -26550,6 +26600,16 @@ function APIScriptIndex(name,script,args,option, isOverlay)
2655026600
outVarItem.Draw=drawItem;
2655126601
result.push(outVarItem);
2655226602
}
26603+
else if (draw.DrawType==SCRIPT_CHART_NAME.DRAW_HORIZONTAL_CHANNEL)
26604+
{
26605+
drawItem.Name=draw.Name;
26606+
drawItem.Type=draw.Type;
26607+
drawItem.DrawType=draw.DrawType;
26608+
drawItem.DrawData=draw.DrawData;
26609+
drawItem.Config=draw.Config;
26610+
outVarItem.Draw=drawItem;
26611+
result.push(outVarItem);
26612+
}
2655326613
else
2655426614
{
2655526615
var find=g_ScriptIndexChartFactory.Get(draw.DrawType); //外部挂接

0 commit comments

Comments
 (0)