Skip to content

hqchart
hqchart

bluefrankey / hqchart
与 Fork 源项目一致

从无法访问的项目Fork

通知 5
Star 0
Fork 0
hqchart
hqchart

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 93c9ad2b 编写于 作者: HQChart's avatar HQChart
浏览文件
操作

ver 8875 

8874 ChangeIndex() 修正API指标设置无法修改工具栏
上级 9b14a125
隐藏空白更改
内联 并排
Showing with 225 addition and 65 deletion
umychart_uniapp_h5/umychart.uniapp.h5.js
浏览文件 @ 93c9ad2b
......@@ -32988,6 +32988,45 @@ function KLineChartContainer(uielement)
this.Draw();
}
this.SetFrameToolbar=function(windowIndex,window)
{
if (!window || !this.Frame.SubFrame[windowIndex] || !this.Frame.SubFrame[windowIndex].Frame) return;
var frame=this.Frame.SubFrame[windowIndex].Frame;
var bChanged=false;
if (IFrameSplitOperator.IsBool(window.Modify))
{
frame.ModifyIndex=window.Modify;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Change))
{
frame.ChangeIndex=window.Change;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Close))
{
frame.CloseIndex=window.Close;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Overlay))
{
frame.OverlayIndex=window.Overlay;
bChanged=true;
}
//工具栏变 先刷新工具栏
if (bChanged)
{
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
frame.DrawToolbar();
}
}
//切换成 脚本指标
this.ChangeScriptIndex=function(windowIndex,indexData,option)
{
......@@ -32996,19 +33035,7 @@ function KLineChartContainer(uielement)
if (option)
{
var window=option.Window;
if (option.Window && this.Frame.SubFrame[windowIndex] && this.Frame.SubFrame[windowIndex].Frame)
{
var frame=this.Frame.SubFrame[windowIndex].Frame;
if (IFrameSplitOperator.IsBool(window.Modify)) frame.ModifyIndex=window.Modify;
if (IFrameSplitOperator.IsBool(window.Change)) frame.ChangeIndex=window.Change;
if (IFrameSplitOperator.IsBool(window.Close)) frame.CloseIndex=window.Close;
if (IFrameSplitOperator.IsBool(window.Overlay)) frame.OverlayIndex=window.Overlay;
//工具栏变 先刷新工具栏
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
this.Draw();
}
if (option.Window) this.SetFrameToolbar(windowIndex,option.Window);
}
var bindData=this.ChartPaint[0].Data;
......@@ -33027,6 +33054,11 @@ function KLineChartContainer(uielement)
var apiItem=indexData.API;
this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
if (indexData)
{
if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
}
var bindData=this.ChartPaint[0].Data;
this.BindIndexData(windowIndex,bindData); //执行脚本
vuehqchart/src/jscommon/umychart.js
浏览文件 @ 93c9ad2b
......@@ -29301,6 +29301,45 @@ function KLineChartContainer(uielement)
this.Draw();
}
this.SetFrameToolbar=function(windowIndex,window)
{
if (!window || !this.Frame.SubFrame[windowIndex] || !this.Frame.SubFrame[windowIndex].Frame) return;
var frame=this.Frame.SubFrame[windowIndex].Frame;
var bChanged=false;
if (IFrameSplitOperator.IsBool(window.Modify))
{
frame.ModifyIndex=window.Modify;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Change))
{
frame.ChangeIndex=window.Change;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Close))
{
frame.CloseIndex=window.Close;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Overlay))
{
frame.OverlayIndex=window.Overlay;
bChanged=true;
}
//工具栏变 先刷新工具栏
if (bChanged)
{
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
frame.DrawToolbar();
}
}
//切换成 脚本指标
this.ChangeScriptIndex=function(windowIndex,indexData,option)
{
......@@ -29309,19 +29348,7 @@ function KLineChartContainer(uielement)
if (option)
{
var window=option.Window;
if (option.Window && this.Frame.SubFrame[windowIndex] && this.Frame.SubFrame[windowIndex].Frame)
{
var frame=this.Frame.SubFrame[windowIndex].Frame;
if (IFrameSplitOperator.IsBool(window.Modify)) frame.ModifyIndex=window.Modify;
if (IFrameSplitOperator.IsBool(window.Change)) frame.ChangeIndex=window.Change;
if (IFrameSplitOperator.IsBool(window.Close)) frame.CloseIndex=window.Close;
if (IFrameSplitOperator.IsBool(window.Overlay)) frame.OverlayIndex=window.Overlay;
//工具栏变 先刷新工具栏
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
this.Draw();
}
if (option.Window) this.SetFrameToolbar(windowIndex,option.Window);
}
var bindData=this.ChartPaint[0].Data;
......@@ -29340,6 +29367,11 @@ function KLineChartContainer(uielement)
var apiItem=indexData.API;
this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
if (indexData)
{
if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
}
var bindData=this.ChartPaint[0].Data;
this.BindIndexData(windowIndex,bindData); //执行脚本
vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
浏览文件 @ 93c9ad2b
......@@ -33032,6 +33032,45 @@ function KLineChartContainer(uielement)
this.Draw();
}
this.SetFrameToolbar=function(windowIndex,window)
{
if (!window || !this.Frame.SubFrame[windowIndex] || !this.Frame.SubFrame[windowIndex].Frame) return;
var frame=this.Frame.SubFrame[windowIndex].Frame;
var bChanged=false;
if (IFrameSplitOperator.IsBool(window.Modify))
{
frame.ModifyIndex=window.Modify;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Change))
{
frame.ChangeIndex=window.Change;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Close))
{
frame.CloseIndex=window.Close;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Overlay))
{
frame.OverlayIndex=window.Overlay;
bChanged=true;
}
//工具栏变 先刷新工具栏
if (bChanged)
{
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
frame.DrawToolbar();
}
}
//切换成 脚本指标
this.ChangeScriptIndex=function(windowIndex,indexData,option)
{
......@@ -33040,19 +33079,7 @@ function KLineChartContainer(uielement)
if (option)
{
var window=option.Window;
if (option.Window && this.Frame.SubFrame[windowIndex] && this.Frame.SubFrame[windowIndex].Frame)
{
var frame=this.Frame.SubFrame[windowIndex].Frame;
if (IFrameSplitOperator.IsBool(window.Modify)) frame.ModifyIndex=window.Modify;
if (IFrameSplitOperator.IsBool(window.Change)) frame.ChangeIndex=window.Change;
if (IFrameSplitOperator.IsBool(window.Close)) frame.CloseIndex=window.Close;
if (IFrameSplitOperator.IsBool(window.Overlay)) frame.OverlayIndex=window.Overlay;
//工具栏变 先刷新工具栏
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
this.Draw();
}
if (option.Window) this.SetFrameToolbar(windowIndex,option.Window);
}
var bindData=this.ChartPaint[0].Data;
......@@ -33071,6 +33098,11 @@ function KLineChartContainer(uielement)
var apiItem=indexData.API;
this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
if (indexData)
{
if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
}
var bindData=this.ChartPaint[0].Data;
this.BindIndexData(windowIndex,bindData); //执行脚本
webhqchart.demo/jscommon/umychart.js
浏览文件 @ 93c9ad2b
......@@ -29301,6 +29301,45 @@ function KLineChartContainer(uielement)
this.Draw();
}
this.SetFrameToolbar=function(windowIndex,window)
{
if (!window || !this.Frame.SubFrame[windowIndex] || !this.Frame.SubFrame[windowIndex].Frame) return;
var frame=this.Frame.SubFrame[windowIndex].Frame;
var bChanged=false;
if (IFrameSplitOperator.IsBool(window.Modify))
{
frame.ModifyIndex=window.Modify;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Change))
{
frame.ChangeIndex=window.Change;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Close))
{
frame.CloseIndex=window.Close;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Overlay))
{
frame.OverlayIndex=window.Overlay;
bChanged=true;
}
//工具栏变 先刷新工具栏
if (bChanged)
{
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
frame.DrawToolbar();
}
}
//切换成 脚本指标
this.ChangeScriptIndex=function(windowIndex,indexData,option)
{
......@@ -29309,19 +29348,7 @@ function KLineChartContainer(uielement)
if (option)
{
var window=option.Window;
if (option.Window && this.Frame.SubFrame[windowIndex] && this.Frame.SubFrame[windowIndex].Frame)
{
var frame=this.Frame.SubFrame[windowIndex].Frame;
if (IFrameSplitOperator.IsBool(window.Modify)) frame.ModifyIndex=window.Modify;
if (IFrameSplitOperator.IsBool(window.Change)) frame.ChangeIndex=window.Change;
if (IFrameSplitOperator.IsBool(window.Close)) frame.CloseIndex=window.Close;
if (IFrameSplitOperator.IsBool(window.Overlay)) frame.OverlayIndex=window.Overlay;
//工具栏变 先刷新工具栏
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
this.Draw();
}
if (option.Window) this.SetFrameToolbar(windowIndex,option.Window);
}
var bindData=this.ChartPaint[0].Data;
......@@ -29340,6 +29367,11 @@ function KLineChartContainer(uielement)
var apiItem=indexData.API;
this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
if (indexData)
{
if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
}
var bindData=this.ChartPaint[0].Data;
this.BindIndexData(windowIndex,bindData); //执行脚本
webhqchart/umychart.js
浏览文件 @ 93c9ad2b
......@@ -29301,6 +29301,45 @@ function KLineChartContainer(uielement)
this.Draw();
}
this.SetFrameToolbar=function(windowIndex,window)
{
if (!window || !this.Frame.SubFrame[windowIndex] || !this.Frame.SubFrame[windowIndex].Frame) return;
var frame=this.Frame.SubFrame[windowIndex].Frame;
var bChanged=false;
if (IFrameSplitOperator.IsBool(window.Modify))
{
frame.ModifyIndex=window.Modify;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Change))
{
frame.ChangeIndex=window.Change;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Close))
{
frame.CloseIndex=window.Close;
bChanged=true;
}
if (IFrameSplitOperator.IsBool(window.Overlay))
{
frame.OverlayIndex=window.Overlay;
bChanged=true;
}
//工具栏变 先刷新工具栏
if (bChanged)
{
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
frame.DrawToolbar();
}
}
//切换成 脚本指标
this.ChangeScriptIndex=function(windowIndex,indexData,option)
{
......@@ -29309,19 +29348,7 @@ function KLineChartContainer(uielement)
if (option)
{
var window=option.Window;
if (option.Window && this.Frame.SubFrame[windowIndex] && this.Frame.SubFrame[windowIndex].Frame)
{
var frame=this.Frame.SubFrame[windowIndex].Frame;
if (IFrameSplitOperator.IsBool(window.Modify)) frame.ModifyIndex=window.Modify;
if (IFrameSplitOperator.IsBool(window.Change)) frame.ChangeIndex=window.Change;
if (IFrameSplitOperator.IsBool(window.Close)) frame.CloseIndex=window.Close;
if (IFrameSplitOperator.IsBool(window.Overlay)) frame.OverlayIndex=window.Overlay;
//工具栏变 先刷新工具栏
frame.SizeChange=true;
frame.ToolbarRect=null; //清空工具栏缓存
this.Draw();
}
if (option.Window) this.SetFrameToolbar(windowIndex,option.Window);
}
var bindData=this.ChartPaint[0].Data;
......@@ -29340,6 +29367,11 @@ function KLineChartContainer(uielement)
var apiItem=indexData.API;
this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
if (indexData)
{
if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
}
var bindData=this.ChartPaint[0].Data;
this.BindIndexData(windowIndex,bindData); //执行脚本
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或