Skip to content

Commit

Permalink
ver 13766
Browse files Browse the repository at this point in the history 
13762 小程序APIScriptIndex::FittingData()线段增属性IsShowTitle，BreakPoint，isDotLine，lineDash，isSingleLine
13761 APIScriptIndex::FittingData() 线段数据增加属性isDotLine，lineDash，isSingleLine
  • Loading branch information
@jones2000
jones2000 committed Aug 27, 2024
1 parent cba8c1c commit 1022dec
Show file tree
Hide file tree
Showing 12 changed files with 10,641 additions and 4,095 deletions.
14,698 changes: 10,610 additions & 4,088 deletions umychart_indexapi/jscommon/umychart.node.js
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions umychart_indexapi/jsindexcontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ function JSIndexController(req,res,next)
if (item.LineWidth) outItem.linewidth=item.LineWidth;
if (item.IsShow==false) outItem.isshow = false;
if (item.IsExData==true) outItem.isexdata = true;
if (item.IsDotLine==true) outItem.isDotLine=true;
if (item.IsShowTitle==false) outItem.isShowTitle=false;
if (item.LineDash) outItem.lineDash=item.LineDash;
if (item.IsSingleLine==true) outItem.IsSingleLine=item.isSingleLine;
if (item.Draw) outItem.Draw=item.Draw; //Draw里面数据太多了, 返回数据字段就不转写成小写了, 太麻烦了
this.OutData.outvar.push(outItem);
}
Expand Down
5 changes: 4 additions & 1 deletion umychart_uniapp_h5/umychart.uniapp.h5.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122966,6 +122966,9 @@ function APIScriptIndex(name,script,args,option, isOverlay)
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
if (item.isexdata==true) outVarItem.IsExData = true;
if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
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;

result.push(outVarItem);
}
Expand Down Expand Up @@ -138666,7 +138669,7 @@ function ScrollBarBGChart()



var HQCHART_VERSION="1.1.13759";
var HQCHART_VERSION="1.1.13763";

function PrintHQChartVersion()
{
Expand Down
3 changes: 3 additions & 0 deletions vuehqchart/src/jscommon/umychart.complier.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24349,6 +24349,9 @@ function APIScriptIndex(name,script,args,option, isOverlay)
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
if (item.isexdata==true) outVarItem.IsExData = true;
if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
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;

result.push(outVarItem);
}
Expand Down
2 changes: 1 addition & 1 deletion vuehqchart/src/jscommon/umychart.version.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@



var HQCHART_VERSION="1.1.13759";
var HQCHART_VERSION="1.1.13763";

function PrintHQChartVersion()
{
Expand Down
5 changes: 4 additions & 1 deletion vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123010,6 +123010,9 @@ function APIScriptIndex(name,script,args,option, isOverlay)
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
if (item.isexdata==true) outVarItem.IsExData = true;
if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
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;

result.push(outVarItem);
}
Expand Down Expand Up @@ -143222,7 +143225,7 @@ function HQChartScriptWorker()



var HQCHART_VERSION="1.1.13759";
var HQCHART_VERSION="1.1.13763";

function PrintHQChartVersion()
{
Expand Down
3 changes: 3 additions & 0 deletions webhqchart.demo/jscommon/umychart.complier.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24349,6 +24349,9 @@ function APIScriptIndex(name,script,args,option, isOverlay)
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
if (item.isexdata==true) outVarItem.IsExData = true;
if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
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;

result.push(outVarItem);
}
Expand Down
2 changes: 1 addition & 1 deletion webhqchart.demo/jscommon/umychart.version.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@



var HQCHART_VERSION="1.1.13759";
var HQCHART_VERSION="1.1.13763";

function PrintHQChartVersion()
{
Expand Down
3 changes: 3 additions & 0 deletions webhqchart/umychart.complier.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24349,6 +24349,9 @@ function APIScriptIndex(name,script,args,option, isOverlay)
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow; //是否绘制线段
if (item.isexdata==true) outVarItem.IsExData = true;
if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
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;

result.push(outVarItem);
}
Expand Down
2 changes: 1 addition & 1 deletion webhqchart/umychart.version.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@



var HQCHART_VERSION="1.1.13759";
var HQCHART_VERSION="1.1.13763";

function PrintHQChartVersion()
{
Expand Down
7 changes: 6 additions & 1 deletion wechathqchart/umychart.index.wechat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2714,14 +2714,19 @@ function APIScriptIndex(name, script, args, option, isOverlay) //后台执
var indexData = [];
var outVarItem = { Name: item.name, Type: item.type };
if (item.color) outVarItem.Color = item.color;
if (IFrameSplitOperator.IsBool(item.IsShowTitle)) outVarItem.IsShowTitle = item.IsShowTitle; //是否显示指标标题
if (item.data)
{
outVarItem.Data = this.FittingArray(item.data, date, time, hqChart);

if (item.color) outVarItem.Color = item.color;
if (item.linewidth >= 1) outVarItem.LineWidth = item.linewidth;
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = false;
if (IFrameSplitOperator.IsBool(item.isshow)) outVarItem.IsShow = item.isshow;
if (item.isexdata == true) outVarItem.IsExData = true;
if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
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;

result.push(outVarItem);
}
Expand Down
2 changes: 1 addition & 1 deletion wechathqchart/umychart.version.wechat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@



var HQCHART_VERSION="1.1.13752";
var HQCHART_VERSION="1.1.13762";

function PrintHQChartVersion()
{
Expand Down

0 comments on commit 1022dec

Please sign in to comment.