Skip to content

Commit

Permalink
ver 13698
Browse files Browse the repository at this point in the history
13696 小程序K线增加拖动属性EnableMoveData
13695 GetFinance()支持错误信息设置
  • Loading branch information
jones2000 committed Aug 13, 2024
1 parent 3b68f31 commit c9fb485
Show file tree
Hide file tree
Showing 15 changed files with 179 additions and 48 deletions.
11 changes: 6 additions & 5 deletions umychart_uniapp_h5/umychart.uniapp.h5.js
Original file line number Diff line number Diff line change
Expand Up @@ -99580,11 +99580,11 @@ function JSParser(code)
return this.LookAhead.Type==7 /*Punctuator*/ && this.LookAhead.Value==value;
}

this.Expect=function(value)
this.Expect=function(value, message)
{
let token=this.NextToken();
if (token.Type!=7 /*Punctuator*/ || token.Value!=value)
this.ThrowUnexpectedToken(token);
this.ThrowUnexpectedToken(token, message);
}

//是否是赋值操作符
Expand Down Expand Up @@ -100009,7 +100009,7 @@ function JSParser(code)
// Quietly expect a comma when in tolerant mode, otherwise delegates to expect().
this.ExpectCommaSeparator=function()
{
this.Expect(',');
this.Expect(',',"函数参数格式错误");
}

// https://tc39.github.io/ecma262/#sec-primary-expression
Expand Down Expand Up @@ -112372,7 +112372,8 @@ function JSSymbolData(ast,option,jsExecute)
};
this.NetworkFilter(obj, function(recvData)
{
self.RecvStockValue(recvData,jobItem,key,0);
if (recvData.Error) self.AddStockValueError(key,recvData.Error);
else self.RecvStockValue(recvData,jobItem,key,0);
self.Execute.RunNextJob();
});

Expand Down Expand Up @@ -137750,7 +137751,7 @@ function ScrollBarBGChart()



var HQCHART_VERSION="1.1.13688";
var HQCHART_VERSION="1.1.13697";

function PrintHQChartVersion()
{
Expand Down
27 changes: 25 additions & 2 deletions vuehqchart/src/jscommon/umychart.NetworkFilterTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -49163,10 +49163,13 @@ HQData.RequestIndexVariantData=function(data,callback)
//测试数据
var kData=data.Self.Data;
var hqchartData={ DataType:2, Data:[] };
var testValue=0.15;
for(var i=0;i<kData.Data.length;++i)
{
var kItem=kData.Data[i];
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*0.15 });
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*testValue });
testValue+=0.01;
if (testValue>0.23) testValue=0.15;
}
callback(hqchartData);
}
Expand All @@ -49182,6 +49185,12 @@ HQData.RequestIndexVariantData=function(data,callback)
}
callback(hqchartData);
}
else
{
var error= `变量'${varName}' 没有对接数据. [HQData.RequestIndexVariantData]`;
var hqchartData={ Error:error };
callback(hqchartData);
}

}

Expand All @@ -49204,6 +49213,11 @@ HQData.CustomFunction_RequestData=function(data, callback)
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol/3 });
}
}
else
{
var error= `函数'${funcName}' 没有对接数据. [HQData.CustomFunction_RequestData]`;
var hqchartData={ Error:error };
}

callback(hqchartData);
}
Expand All @@ -49226,7 +49240,9 @@ HQData.CustomVarData_RequestData=function(data, callback)
}
else
{
throw `${varName} 没有对接. [HQData.CustomVarData_RequestData]`
var error= `变量'${varName}' 没有对接数据. [HQData.CustomVarData_RequestData]`;
var hqchartData={ Error:error };
callback(hqchartData);
}


Expand Down Expand Up @@ -49380,7 +49396,14 @@ HQData.Finance_RequestData=function(data,callback)
var id=data.Request.Data.id;
var hqchartData=null;
if (id==7) // 流通股本(随时间可能有变化)
{
hqchartData=TEST_FINANCE_7.data;
}
else
{
var error= `Finance(${id}) 没有对接数据. [HQData.Finance_RequestData]`;
hqchartData={ Error:error };
}

if (hqchartData) callback(hqchartData);
}
Expand Down
9 changes: 5 additions & 4 deletions vuehqchart/src/jscommon/umychart.complier.js
Original file line number Diff line number Diff line change
Expand Up @@ -1605,11 +1605,11 @@ function JSParser(code)
return this.LookAhead.Type==7 /*Punctuator*/ && this.LookAhead.Value==value;
}

this.Expect=function(value)
this.Expect=function(value, message)
{
let token=this.NextToken();
if (token.Type!=7 /*Punctuator*/ || token.Value!=value)
this.ThrowUnexpectedToken(token);
this.ThrowUnexpectedToken(token, message);
}

//是否是赋值操作符
Expand Down Expand Up @@ -2034,7 +2034,7 @@ function JSParser(code)
// Quietly expect a comma when in tolerant mode, otherwise delegates to expect().
this.ExpectCommaSeparator=function()
{
this.Expect(',');
this.Expect(',',"函数参数格式错误");
}

// https://tc39.github.io/ecma262/#sec-primary-expression
Expand Down Expand Up @@ -14397,7 +14397,8 @@ function JSSymbolData(ast,option,jsExecute)
};
this.NetworkFilter(obj, function(recvData)
{
self.RecvStockValue(recvData,jobItem,key,0);
if (recvData.Error) self.AddStockValueError(key,recvData.Error);
else self.RecvStockValue(recvData,jobItem,key,0);
self.Execute.RunNextJob();
});

Expand Down
2 changes: 1 addition & 1 deletion vuehqchart/src/jscommon/umychart.version.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@



var HQCHART_VERSION="1.1.13688";
var HQCHART_VERSION="1.1.13697";

function PrintHQChartVersion()
{
Expand Down
11 changes: 6 additions & 5 deletions vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
Original file line number Diff line number Diff line change
Expand Up @@ -99624,11 +99624,11 @@ function JSParser(code)
return this.LookAhead.Type==7 /*Punctuator*/ && this.LookAhead.Value==value;
}

this.Expect=function(value)
this.Expect=function(value, message)
{
let token=this.NextToken();
if (token.Type!=7 /*Punctuator*/ || token.Value!=value)
this.ThrowUnexpectedToken(token);
this.ThrowUnexpectedToken(token, message);
}

//是否是赋值操作符
Expand Down Expand Up @@ -100053,7 +100053,7 @@ function JSParser(code)
// Quietly expect a comma when in tolerant mode, otherwise delegates to expect().
this.ExpectCommaSeparator=function()
{
this.Expect(',');
this.Expect(',',"函数参数格式错误");
}

// https://tc39.github.io/ecma262/#sec-primary-expression
Expand Down Expand Up @@ -112416,7 +112416,8 @@ function JSSymbolData(ast,option,jsExecute)
};
this.NetworkFilter(obj, function(recvData)
{
self.RecvStockValue(recvData,jobItem,key,0);
if (recvData.Error) self.AddStockValueError(key,recvData.Error);
else self.RecvStockValue(recvData,jobItem,key,0);
self.Execute.RunNextJob();
});

Expand Down Expand Up @@ -142266,7 +142267,7 @@ function HQChartScriptWorker()



var HQCHART_VERSION="1.1.13688";
var HQCHART_VERSION="1.1.13697";

function PrintHQChartVersion()
{
Expand Down
27 changes: 25 additions & 2 deletions webhqchart.demo/jscommon/umychart.NetworkFilterTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -49163,10 +49163,13 @@ HQData.RequestIndexVariantData=function(data,callback)
//测试数据
var kData=data.Self.Data;
var hqchartData={ DataType:2, Data:[] };
var testValue=0.15;
for(var i=0;i<kData.Data.length;++i)
{
var kItem=kData.Data[i];
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*0.15 });
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*testValue });
testValue+=0.01;
if (testValue>0.23) testValue=0.15;
}
callback(hqchartData);
}
Expand All @@ -49182,6 +49185,12 @@ HQData.RequestIndexVariantData=function(data,callback)
}
callback(hqchartData);
}
else
{
var error= `变量'${varName}' 没有对接数据. [HQData.RequestIndexVariantData]`;
var hqchartData={ Error:error };
callback(hqchartData);
}

}

Expand All @@ -49204,6 +49213,11 @@ HQData.CustomFunction_RequestData=function(data, callback)
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol/3 });
}
}
else
{
var error= `函数'${funcName}' 没有对接数据. [HQData.CustomFunction_RequestData]`;
var hqchartData={ Error:error };
}

callback(hqchartData);
}
Expand All @@ -49226,7 +49240,9 @@ HQData.CustomVarData_RequestData=function(data, callback)
}
else
{
throw `${varName} 没有对接. [HQData.CustomVarData_RequestData]`
var error= `变量'${varName}' 没有对接数据. [HQData.CustomVarData_RequestData]`;
var hqchartData={ Error:error };
callback(hqchartData);
}


Expand Down Expand Up @@ -49380,7 +49396,14 @@ HQData.Finance_RequestData=function(data,callback)
var id=data.Request.Data.id;
var hqchartData=null;
if (id==7) // 流通股本(随时间可能有变化)
{
hqchartData=TEST_FINANCE_7.data;
}
else
{
var error= `Finance(${id}) 没有对接数据. [HQData.Finance_RequestData]`;
hqchartData={ Error:error };
}

if (hqchartData) callback(hqchartData);
}
Expand Down
9 changes: 5 additions & 4 deletions webhqchart.demo/jscommon/umychart.complier.js
Original file line number Diff line number Diff line change
Expand Up @@ -1605,11 +1605,11 @@ function JSParser(code)
return this.LookAhead.Type==7 /*Punctuator*/ && this.LookAhead.Value==value;
}

this.Expect=function(value)
this.Expect=function(value, message)
{
let token=this.NextToken();
if (token.Type!=7 /*Punctuator*/ || token.Value!=value)
this.ThrowUnexpectedToken(token);
this.ThrowUnexpectedToken(token, message);
}

//是否是赋值操作符
Expand Down Expand Up @@ -2034,7 +2034,7 @@ function JSParser(code)
// Quietly expect a comma when in tolerant mode, otherwise delegates to expect().
this.ExpectCommaSeparator=function()
{
this.Expect(',');
this.Expect(',',"函数参数格式错误");
}

// https://tc39.github.io/ecma262/#sec-primary-expression
Expand Down Expand Up @@ -14397,7 +14397,8 @@ function JSSymbolData(ast,option,jsExecute)
};
this.NetworkFilter(obj, function(recvData)
{
self.RecvStockValue(recvData,jobItem,key,0);
if (recvData.Error) self.AddStockValueError(key,recvData.Error);
else self.RecvStockValue(recvData,jobItem,key,0);
self.Execute.RunNextJob();
});

Expand Down
27 changes: 25 additions & 2 deletions webhqchart.demo/jscommon/umychart.testdata.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,13 @@ HQData.RequestIndexVariantData=function(data,callback)
//测试数据
var kData=data.Self.Data;
var hqchartData={ DataType:2, Data:[] };
var testValue=0.15;
for(var i=0;i<kData.Data.length;++i)
{
var kItem=kData.Data[i];
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*0.15 });
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*testValue });
testValue+=0.01;
if (testValue>0.23) testValue=0.15;
}
callback(hqchartData);
}
Expand All @@ -507,6 +510,12 @@ HQData.RequestIndexVariantData=function(data,callback)
}
callback(hqchartData);
}
else
{
var error= `变量'${varName}' 没有对接数据. [HQData.RequestIndexVariantData]`;
var hqchartData={ Error:error };
callback(hqchartData);
}

}

Expand All @@ -529,6 +538,11 @@ HQData.CustomFunction_RequestData=function(data, callback)
hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol/3 });
}
}
else
{
var error= `函数'${funcName}' 没有对接数据. [HQData.CustomFunction_RequestData]`;
var hqchartData={ Error:error };
}

callback(hqchartData);
}
Expand All @@ -551,7 +565,9 @@ HQData.CustomVarData_RequestData=function(data, callback)
}
else
{
throw `${varName} 没有对接. [HQData.CustomVarData_RequestData]`
var error= `变量'${varName}' 没有对接数据. [HQData.CustomVarData_RequestData]`;
var hqchartData={ Error:error };
callback(hqchartData);
}


Expand Down Expand Up @@ -705,7 +721,14 @@ HQData.Finance_RequestData=function(data,callback)
var id=data.Request.Data.id;
var hqchartData=null;
if (id==7) // 流通股本(随时间可能有变化)
{
hqchartData=TEST_FINANCE_7.data;
}
else
{
var error= `Finance(${id}) 没有对接数据. [HQData.Finance_RequestData]`;
hqchartData={ Error:error };
}

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



var HQCHART_VERSION="1.1.13688";
var HQCHART_VERSION="1.1.13697";

function PrintHQChartVersion()
{
Expand Down
Loading

0 comments on commit c9fb485

Please sign in to comment.