From 66d6a396ff2d48f01310251a25af91cfb7b19d73 Mon Sep 17 00:00:00 2001 From: jones2000 Date: Tue, 21 Apr 2020 19:05:07 +0800 Subject: [PATCH] ver 8304 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 8302 k线训练增加十字光标设置 --- umychart_uniapp_h5/umychart.uniapp.h5.js | 34 ++++++++++++++++--- vuehqchart/src/jscommon/umychart.js | 34 ++++++++++++++++--- .../src/jscommon/umychart.vue/umychart.vue.js | 34 ++++++++++++++++--- webhqchart.demo/jscommon/umychart.js | 34 ++++++++++++++++--- webhqchart/umychart.js | 34 ++++++++++++++++--- 5 files changed, 145 insertions(+), 25 deletions(-) diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js index 323f2f9..3d45bef 100644 --- a/umychart_uniapp_h5/umychart.uniapp.h5.js +++ b/umychart_uniapp_h5/umychart.uniapp.h5.js @@ -4120,6 +4120,21 @@ function JSChart(divElement) if (option.IsCorssOnlyDrawKLine===true) chart.ChartCorssCursor.IsOnlyDrawKLine=option.IsCorssOnlyDrawKLine; if (option.CorssCursorTouchEnd===true) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd; if (option.IsClickShowCorssCursor==true) chart.IsClickShowCorssCursor=option.IsClickShowCorssCursor; + if (option.CorssCursorInfo) + { + if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left; + if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right; + if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom; + if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss; + if (option.CorssCursorInfo.IsShowClose == true) chart.ChartCorssCursor.IsShowClose = option.CorssCursorInfo.IsShowClose; //Y轴显示收盘价 + if (option.CorssCursorInfo.PressTime) chart.PressTime=option.CorssCursorInfo.PressTime; //长按显示十字光标的时间 + if (option.CorssCursorInfo.HPenType>0) chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType; + if (option.CorssCursorInfo.VPenType>0) chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType; + } + + //保存十字光标文字高度 + option.CorssCursor={}; + option.CorssCursor.TitleHeight=chart.ChartCorssCursor.TextHeight; if (option.Frame) { @@ -4134,6 +4149,20 @@ function JSChart(divElement) } } + if (option.KLine) + { + if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false; + if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition; + if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice; + } + + if(option.KLineTitle) //股票名称 日期 周期 + { + if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false; + if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false; + if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false; + } + if (option.ExtendChart) { for(var i in option.ExtendChart) @@ -4143,11 +4172,6 @@ function JSChart(divElement) } } - //股票名称 日期 周期都不显示 - chart.TitlePaint[0].IsShowName=false; - chart.TitlePaint[0].IsShowSettingInfo=false; - chart.TitlePaint[0].IsShowDateTime=false; - //创建子窗口的指标 let scriptData = new JSIndexScript(); for(var i in option.Windows) diff --git a/vuehqchart/src/jscommon/umychart.js b/vuehqchart/src/jscommon/umychart.js index 05848e8..27a8106 100644 --- a/vuehqchart/src/jscommon/umychart.js +++ b/vuehqchart/src/jscommon/umychart.js @@ -751,6 +751,21 @@ function JSChart(divElement) if (option.IsCorssOnlyDrawKLine===true) chart.ChartCorssCursor.IsOnlyDrawKLine=option.IsCorssOnlyDrawKLine; if (option.CorssCursorTouchEnd===true) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd; if (option.IsClickShowCorssCursor==true) chart.IsClickShowCorssCursor=option.IsClickShowCorssCursor; + if (option.CorssCursorInfo) + { + if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left; + if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right; + if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom; + if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss; + if (option.CorssCursorInfo.IsShowClose == true) chart.ChartCorssCursor.IsShowClose = option.CorssCursorInfo.IsShowClose; //Y轴显示收盘价 + if (option.CorssCursorInfo.PressTime) chart.PressTime=option.CorssCursorInfo.PressTime; //长按显示十字光标的时间 + if (option.CorssCursorInfo.HPenType>0) chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType; + if (option.CorssCursorInfo.VPenType>0) chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType; + } + + //保存十字光标文字高度 + option.CorssCursor={}; + option.CorssCursor.TitleHeight=chart.ChartCorssCursor.TextHeight; if (option.Frame) { @@ -765,6 +780,20 @@ function JSChart(divElement) } } + if (option.KLine) + { + if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false; + if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition; + if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice; + } + + if(option.KLineTitle) //股票名称 日期 周期 + { + if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false; + if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false; + if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false; + } + if (option.ExtendChart) { for(var i in option.ExtendChart) @@ -774,11 +803,6 @@ function JSChart(divElement) } } - //股票名称 日期 周期都不显示 - chart.TitlePaint[0].IsShowName=false; - chart.TitlePaint[0].IsShowSettingInfo=false; - chart.TitlePaint[0].IsShowDateTime=false; - //创建子窗口的指标 let scriptData = new JSIndexScript(); for(var i in option.Windows) diff --git a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js index a45c183..5992a36 100644 --- a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js +++ b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js @@ -4164,6 +4164,21 @@ function JSChart(divElement) if (option.IsCorssOnlyDrawKLine===true) chart.ChartCorssCursor.IsOnlyDrawKLine=option.IsCorssOnlyDrawKLine; if (option.CorssCursorTouchEnd===true) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd; if (option.IsClickShowCorssCursor==true) chart.IsClickShowCorssCursor=option.IsClickShowCorssCursor; + if (option.CorssCursorInfo) + { + if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left; + if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right; + if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom; + if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss; + if (option.CorssCursorInfo.IsShowClose == true) chart.ChartCorssCursor.IsShowClose = option.CorssCursorInfo.IsShowClose; //Y轴显示收盘价 + if (option.CorssCursorInfo.PressTime) chart.PressTime=option.CorssCursorInfo.PressTime; //长按显示十字光标的时间 + if (option.CorssCursorInfo.HPenType>0) chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType; + if (option.CorssCursorInfo.VPenType>0) chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType; + } + + //保存十字光标文字高度 + option.CorssCursor={}; + option.CorssCursor.TitleHeight=chart.ChartCorssCursor.TextHeight; if (option.Frame) { @@ -4178,6 +4193,20 @@ function JSChart(divElement) } } + if (option.KLine) + { + if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false; + if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition; + if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice; + } + + if(option.KLineTitle) //股票名称 日期 周期 + { + if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false; + if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false; + if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false; + } + if (option.ExtendChart) { for(var i in option.ExtendChart) @@ -4187,11 +4216,6 @@ function JSChart(divElement) } } - //股票名称 日期 周期都不显示 - chart.TitlePaint[0].IsShowName=false; - chart.TitlePaint[0].IsShowSettingInfo=false; - chart.TitlePaint[0].IsShowDateTime=false; - //创建子窗口的指标 let scriptData = new JSIndexScript(); for(var i in option.Windows) diff --git a/webhqchart.demo/jscommon/umychart.js b/webhqchart.demo/jscommon/umychart.js index 05848e8..27a8106 100644 --- a/webhqchart.demo/jscommon/umychart.js +++ b/webhqchart.demo/jscommon/umychart.js @@ -751,6 +751,21 @@ function JSChart(divElement) if (option.IsCorssOnlyDrawKLine===true) chart.ChartCorssCursor.IsOnlyDrawKLine=option.IsCorssOnlyDrawKLine; if (option.CorssCursorTouchEnd===true) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd; if (option.IsClickShowCorssCursor==true) chart.IsClickShowCorssCursor=option.IsClickShowCorssCursor; + if (option.CorssCursorInfo) + { + if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left; + if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right; + if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom; + if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss; + if (option.CorssCursorInfo.IsShowClose == true) chart.ChartCorssCursor.IsShowClose = option.CorssCursorInfo.IsShowClose; //Y轴显示收盘价 + if (option.CorssCursorInfo.PressTime) chart.PressTime=option.CorssCursorInfo.PressTime; //长按显示十字光标的时间 + if (option.CorssCursorInfo.HPenType>0) chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType; + if (option.CorssCursorInfo.VPenType>0) chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType; + } + + //保存十字光标文字高度 + option.CorssCursor={}; + option.CorssCursor.TitleHeight=chart.ChartCorssCursor.TextHeight; if (option.Frame) { @@ -765,6 +780,20 @@ function JSChart(divElement) } } + if (option.KLine) + { + if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false; + if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition; + if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice; + } + + if(option.KLineTitle) //股票名称 日期 周期 + { + if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false; + if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false; + if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false; + } + if (option.ExtendChart) { for(var i in option.ExtendChart) @@ -774,11 +803,6 @@ function JSChart(divElement) } } - //股票名称 日期 周期都不显示 - chart.TitlePaint[0].IsShowName=false; - chart.TitlePaint[0].IsShowSettingInfo=false; - chart.TitlePaint[0].IsShowDateTime=false; - //创建子窗口的指标 let scriptData = new JSIndexScript(); for(var i in option.Windows) diff --git a/webhqchart/umychart.js b/webhqchart/umychart.js index 05848e8..27a8106 100644 --- a/webhqchart/umychart.js +++ b/webhqchart/umychart.js @@ -751,6 +751,21 @@ function JSChart(divElement) if (option.IsCorssOnlyDrawKLine===true) chart.ChartCorssCursor.IsOnlyDrawKLine=option.IsCorssOnlyDrawKLine; if (option.CorssCursorTouchEnd===true) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd; if (option.IsClickShowCorssCursor==true) chart.IsClickShowCorssCursor=option.IsClickShowCorssCursor; + if (option.CorssCursorInfo) + { + if (!isNaN(option.CorssCursorInfo.Left)) chart.ChartCorssCursor.ShowTextMode.Left=option.CorssCursorInfo.Left; + if (!isNaN(option.CorssCursorInfo.Right)) chart.ChartCorssCursor.ShowTextMode.Right=option.CorssCursorInfo.Right; + if (!isNaN(option.CorssCursorInfo.Bottom)) chart.ChartCorssCursor.ShowTextMode.Bottom=option.CorssCursorInfo.Bottom; + if (option.CorssCursorInfo.IsShowCorss===false) chart.ChartCorssCursor.IsShowCorss=option.CorssCursorInfo.IsShowCorss; + if (option.CorssCursorInfo.IsShowClose == true) chart.ChartCorssCursor.IsShowClose = option.CorssCursorInfo.IsShowClose; //Y轴显示收盘价 + if (option.CorssCursorInfo.PressTime) chart.PressTime=option.CorssCursorInfo.PressTime; //长按显示十字光标的时间 + if (option.CorssCursorInfo.HPenType>0) chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType; + if (option.CorssCursorInfo.VPenType>0) chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType; + } + + //保存十字光标文字高度 + option.CorssCursor={}; + option.CorssCursor.TitleHeight=chart.ChartCorssCursor.TextHeight; if (option.Frame) { @@ -765,6 +780,20 @@ function JSChart(divElement) } } + if (option.KLine) + { + if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false; + if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition; + if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice; + } + + if(option.KLineTitle) //股票名称 日期 周期 + { + if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false; + if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false; + if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false; + } + if (option.ExtendChart) { for(var i in option.ExtendChart) @@ -774,11 +803,6 @@ function JSChart(divElement) } } - //股票名称 日期 周期都不显示 - chart.TitlePaint[0].IsShowName=false; - chart.TitlePaint[0].IsShowSettingInfo=false; - chart.TitlePaint[0].IsShowDateTime=false; - //创建子窗口的指标 let scriptData = new JSIndexScript(); for(var i in option.Windows) -- GitLab