hqchart 1.1.13299 → 1.1.13304

package/lib/umychart.vue.js

@@ -1490,7 +1490,9 @@ CMD_SHOW_OVERLAY_INDEX_ID:28,//显示隐藏叠加指标
 CMD_DELETE_OVERLAY_INDEX_ID:29,//删除叠加指标
 CMD_SHOW_OVERLAY_Y_AXIS_ID:30,//显示隐藏Y轴叠加指标
 CMD_ENABLE_OVERLAY_SHARE_Y_ID:31,//和主图指标共享Y轴坐标
-CMD_CHANGE_DEFAULTCURSOR_ID:32//修改鼠标形状
+CMD_CHANGE_DEFAULTCURSOR_ID:32,//修改鼠标形状
+CMD_CHANGE_API_INDEX_ID:33,//切换后台接口指标
+CMD_CHANGE_SCRIPT_INDEX_ID:34//切换成自定义的脚本指标
 };function PhoneDBClick(){this.Start=[];this.Clear=function(){this.Start=[];};this.AddTouchStart=function(x,y,time){if(this.Start.length>0){var item=this.Start[this.Start.length-1];var spanTime=time-item.Time;if(spanTime>0&&spanTime<300){this.Start.push({X:x,Y:y,Time:time});}else{this.Start=[];}}else{this.Start.push({X:x,Y:y,Time:time});}};this.IsVaildDBClick=function(){if(this.Start.length==2)return true;return false;};this.AddTouchEnd=function(time){if(this.Start.length<=0)return;var item=this.Start[this.Start.length-1];var spanTime=time-item.Time;if(spanTime>=0&&spanTime<150){}else{this.Start=[];}};}/*
     图形控件
 */function JSChartContainer(uielement,OffscreenElement,cacheElement){var _this5=this;this.ClassName='JSChartContainer';var _self=this;this.Frame;//框架画法
@@ -1988,7 +1990,7 @@ this.PopupMenuByTab=function(menuData,rtTab){if(!this.JSPopMenu)return;var pixel
 this.PopupMenuByDrapdown=function(menuData,rtButton){if(!this.JSPopMenu)return;var pixelRatio=GetDevicePixelRatio();var rtCell={Left:rtButton.Left/pixelRatio,Right:rtButton.Right/pixelRatio,Bottom:rtButton.Bottom/pixelRatio,Top:rtButton.Top/pixelRatio};rtCell.Width=rtCell.Right-rtCell.Left;rtCell.Height=rtCell.Bottom-rtCell.Top;var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();var offsetLeft=rtClient.left+rtScroll.Left;var offsetTop=rtClient.top+rtScroll.Top;rtCell.Left+=offsetLeft;rtCell.Right+=offsetLeft;rtCell.Top+=offsetTop;rtCell.Bottom+=offsetTop;this.JSPopMenu.CreatePopMenu(menuData);this.JSPopMenu.PopupMenuByDrapdown(rtCell);};//右键菜单
 this.PopupMenuByRClick=function(menuData,x,y){var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();x+=rtClient.left+rtScroll.Left;y+=rtClient.top+rtScroll.Top;this.JSPopMenu.CreatePopMenu(menuData);this.JSPopMenu.PopupMenuByRight(x,y);};//菜单命令
 this.ExecuteMenuCommand=function(cmdID,aryArgs){JSConsole.Chart.Log('[JSChartContainer::ExecuteMenuCommand] cmdID=, aryArgs=',cmdID,aryArgs);var param=null,srcParam=null;//原始值
-if(IFrameSplitOperator.IsNonEmptyArray(aryArgs)){srcParam=aryArgs[0];if(IFrameSplitOperator.IsNumber(aryArgs[0]))param=aryArgs[0];}switch(cmdID){case JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID:if(this.ChangePeriod&&param!=null)this.ChangePeriod(param);break;case JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID:if(this.ChangeIndexWindowCount&&param!=null)this.ChangeIndexWindowCount(param);break;case JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID:if(this.ChangeRight&&param!=null)this.ChangeRight(param);break;case JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID:if(this.ChangeIndex&&param!=null&&aryArgs[1])this.ChangeIndex(param,aryArgs[1]);break;case JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID:case JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID:if(this.ChangeInstructionIndex&&aryArgs[0])this.ChangeInstructionIndex(aryArgs[0]);break;case JSCHART_MENU_ID.CMD_DELETE_COLOR_INDEX_ID://删除五彩K线指标
+if(IFrameSplitOperator.IsNonEmptyArray(aryArgs)){srcParam=aryArgs[0];if(IFrameSplitOperator.IsNumber(aryArgs[0]))param=aryArgs[0];}switch(cmdID){case JSCHART_MENU_ID.CMD_CHANGE_PERIOD_ID:if(this.ChangePeriod&&param!=null)this.ChangePeriod(param);break;case JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID:if(this.ChangeIndexWindowCount&&param!=null)this.ChangeIndexWindowCount(param);break;case JSCHART_MENU_ID.CMD_CHANGE_RIGHT_ID:if(this.ChangeRight&&param!=null)this.ChangeRight(param);break;case JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID:if(this.ChangeIndex&&param!=null&&aryArgs[1])this.ChangeIndex(param,aryArgs[1]);break;case JSCHART_MENU_ID.CMD_CHANGE_API_INDEX_ID:if(this.ChangeAPIIndex&&param!=null&&aryArgs[1])this.ChangeAPIIndex(param,aryArgs[1]);break;case JSCHART_MENU_ID.CMD_CHANGE_SCRIPT_INDEX_ID:if(this.ChangeScriptIndex&&param!=null&&aryArgs[1])this.ChangeScriptIndex(param,aryArgs[1],aryArgs[2]);break;case JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID:case JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID:if(this.ChangeInstructionIndex&&aryArgs[0])this.ChangeInstructionIndex(aryArgs[0]);break;case JSCHART_MENU_ID.CMD_DELETE_COLOR_INDEX_ID://删除五彩K线指标
 case JSCHART_MENU_ID.CMD_DELETE_TRADE_INDEX_ID://删除专家系统(交易指标)
 if(this.CancelInstructionIndex)this.CancelInstructionIndex();break;case JSCHART_MENU_ID.CMD_CHANGE_KLINE_TYPE_ID://切换K线类型
 if(this.ChangeKLineDrawType&&param!=null)this.ChangeKLineDrawType(param,aryArgs[1],aryArgs[2]);break;case JSCHART_MENU_ID.CMD_CHANGE_PRICE_GAP_ID://缺口提示
@@ -13235,7 +13237,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.13298";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.13303";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13299",
+  "version": "1.1.13304",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -2677,6 +2677,8 @@ var JSCHART_MENU_ID=
     CMD_ENABLE_OVERLAY_SHARE_Y_ID:31,   //和主图指标共享Y轴坐标
 
     CMD_CHANGE_DEFAULTCURSOR_ID:32,     //修改鼠标形状
+    CMD_CHANGE_API_INDEX_ID:33,         //切换后台接口指标
+    CMD_CHANGE_SCRIPT_INDEX_ID:34,      //切换成自定义的脚本指标
 }
 
 
@@ -9198,6 +9200,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.ChangeIndex && param!=null && aryArgs[1]) 
                     this.ChangeIndex(param,aryArgs[1]);
                 break;
+            case JSCHART_MENU_ID.CMD_CHANGE_API_INDEX_ID:
+                if (this.ChangeAPIIndex && param!=null && aryArgs[1]) 
+                    this.ChangeAPIIndex(param, aryArgs[1]);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_SCRIPT_INDEX_ID:
+                if (this.ChangeScriptIndex && param!=null && aryArgs[1]) 
+                    this.ChangeScriptIndex(param,aryArgs[1],aryArgs[2]);
+                break;
 
             case JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID:
             case JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID:

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -6569,6 +6569,8 @@ var JSCHART_MENU_ID=
     CMD_ENABLE_OVERLAY_SHARE_Y_ID:31,   //和主图指标共享Y轴坐标
 
     CMD_CHANGE_DEFAULTCURSOR_ID:32,     //修改鼠标形状
+    CMD_CHANGE_API_INDEX_ID:33,         //切换后台接口指标
+    CMD_CHANGE_SCRIPT_INDEX_ID:34,      //切换成自定义的脚本指标
 }
 
 
@@ -13090,6 +13092,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.ChangeIndex && param!=null && aryArgs[1]) 
                     this.ChangeIndex(param,aryArgs[1]);
                 break;
+            case JSCHART_MENU_ID.CMD_CHANGE_API_INDEX_ID:
+                if (this.ChangeAPIIndex && param!=null && aryArgs[1]) 
+                    this.ChangeAPIIndex(param, aryArgs[1]);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_SCRIPT_INDEX_ID:
+                if (this.ChangeScriptIndex && param!=null && aryArgs[1]) 
+                    this.ChangeScriptIndex(param,aryArgs[1],aryArgs[2]);
+                break;
 
             case JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID:
             case JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID:
@@ -132477,7 +132487,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13298";
+var HQCHART_VERSION="1.1.13303";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.13298";
+var HQCHART_VERSION="1.1.13303";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -6613,6 +6613,8 @@ var JSCHART_MENU_ID=
     CMD_ENABLE_OVERLAY_SHARE_Y_ID:31,   //和主图指标共享Y轴坐标
 
     CMD_CHANGE_DEFAULTCURSOR_ID:32,     //修改鼠标形状
+    CMD_CHANGE_API_INDEX_ID:33,         //切换后台接口指标
+    CMD_CHANGE_SCRIPT_INDEX_ID:34,      //切换成自定义的脚本指标
 }
 
 
@@ -13134,6 +13136,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.ChangeIndex && param!=null && aryArgs[1]) 
                     this.ChangeIndex(param,aryArgs[1]);
                 break;
+            case JSCHART_MENU_ID.CMD_CHANGE_API_INDEX_ID:
+                if (this.ChangeAPIIndex && param!=null && aryArgs[1]) 
+                    this.ChangeAPIIndex(param, aryArgs[1]);
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_SCRIPT_INDEX_ID:
+                if (this.ChangeScriptIndex && param!=null && aryArgs[1]) 
+                    this.ChangeScriptIndex(param,aryArgs[1],aryArgs[2]);
+                break;
 
             case JSCHART_MENU_ID.CMD_CHANGE_COLOR_INDEX_ID:
             case JSCHART_MENU_ID.CMD_CHANGE_TRADE_INDEX_ID:
@@ -135945,7 +135955,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13298";
+var HQCHART_VERSION="1.1.13303";
 
 function PrintHQChartVersion()
 {