hqchart 1.1.13265 → 1.1.13276

package/src/jscommon/umychart.resource/font/drawtool/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "icon-",
   "description": "hqchart画图工具",
   "glyphs": [
+    {
+      "icon_id": "5672309",
+      "name": "斐波那契速度阻力扇",
+      "font_class": "feibonaqisuduzulishan",
+      "unicode": "e620",
+      "unicode_decimal": 58912
+    },
+    {
+      "icon_id": "5672353",
+      "name": "斐波那契回撤",
+      "font_class": "feibonaqihuiche",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "5673045",
+      "name": "斐波那契契形",
+      "font_class": "feibonaqiqixing",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "34041367",
+      "name": "斐波那契周期线",
+      "font_class": "feibonaqizhouqixian",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "5671406",
+      "name": "江恩角度线",
+      "font_class": "jiangenjiaoduxian",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "36063035",
+      "name": "黄金分割线",
+      "font_class": "GoldenSection",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "36063039",
+      "name": "百分比线",
+      "font_class": "PercentageLine",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
     {
       "icon_id": "37278411",
       "name": "擦除",

package/src/jscommon/umychart.testdata.js

@@ -82,13 +82,38 @@ HQData.NetworkFilter=function(data, callback)
 HQData.RequestMinuteData=function(data, callback)
 {
     data.PreventDefault=true;
-    var symbol=data.Request.Data.symbol[0]; //请求的股票代码
-    var dayCount=data.Request.Data.daycount;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var callcation=data.Request.Data.callcation;        //集合竞价
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_1DAY_DATA;
-    hqchartData.stock[0].symbol=symbol;
-    hqchartData.stock[0].name=symbol;
+    var srcStock=MINUTE_1DAY_DATA.stock[0];
+    var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+    if (callcation.Before)
+    {
+        var before=
+        [
+            //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+            [915, srcStock.yclose,0,0],
+            [916, srcStock.yclose+0.01,0,0],
+            [917, srcStock.yclose+0.03,0,0],
+            [918, srcStock.yclose+0.02,0,0],
+            [919, srcStock.yclose+0.02,0,0],
+            [920, srcStock.yclose+0.01,0,0],
+            [921, srcStock.yclose,0,0],
+            [922, srcStock.yclose-0.02,0,0],
+            [923, srcStock.yclose-0.03,0,0],
+            [924, srcStock.yclose,0,0],
+            [925, srcStock.yclose,0,0],
+        ];
+
+        var beforeinfo={ totalcount:11, ver:1.0 };
+
+        stockItem.before=before;
+        stockItem.beforeinfo=beforeinfo;
+    }
+
+    var hqchartData={code:0, stock:[stockItem] };
+   
 
     callback(hqchartData);
 }
@@ -98,12 +123,44 @@ HQData.RequestMinuteDaysData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol; //请求的股票代码
     var dayCount=data.Request.Data.daycount;
+    var callcation=data.Request.Data.callcation;        //集合竞价
   
     console.log(`[HQData::RequestMinuteDaysData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_5DAY_DATA;
-    hqchartData.symbol=symbol;
-    hqchartData.name=symbol;
+    var hqchartData={code:0, data:[] };
+    hqchartData.symbol=MINUTE_5DAY_DATA.symbol;
+    hqchartData.name=MINUTE_5DAY_DATA.symbol;
+
+    for(var i=0;i<dayCount && i<MINUTE_5DAY_DATA.data.length;++i)
+    {
+        var item=MINUTE_5DAY_DATA.data[i];
+        var dayItem={minute:item.minute, yclose:item.yclose, date:item.date };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, item.yclose,0,0],
+                [916, item.yclose+0.01,0,0],
+                [917, item.yclose+0.03,0,0],
+                [918, item.yclose+0.02,0,0],
+                [919, item.yclose+0.02,0,0],
+                [920, item.yclose+0.01,0,0],
+                [921, item.yclose,0,0],
+                [922, item.yclose-0.02,0,0],
+                [923, item.yclose-0.03,0,0],
+                [924, item.yclose,0,0],
+                [925, item.yclose,0,0],
+            ];
+
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            dayItem.before=before;
+            dayItem.beforeinfo=beforeinfo;
+        }
+
+        hqchartData.data.push(dayItem);
+    }
    
     callback(hqchartData);
 }

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

@@ -4542,6 +4542,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (item.IsShowOverlayIndexName==false) chart.Frame.SubFrame[i].Frame.IsShowOverlayIndexName=false;
             if (IFrameSplitOperator.IsNumber(item.IndexParamSpace)) chart.Frame.SubFrame[i].Frame.IndexParamSpace=item.IndexParamSpace;
             if (IFrameSplitOperator.IsNumber(item.IndexTitleSpace)) chart.Frame.SubFrame[i].Frame.IndexTitleSpace=item.IndexTitleSpace;
+            if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) frame.HorizontalReserved=item.HorizontalReserved;
             
             if (item.OverlayIndexType)
             {
@@ -4988,6 +4989,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowTitleArrow)) chart.Frame.SubFrame[index].Frame.IsShowTitleArrow=item.IsShowTitleArrow;
                 if (item.IsShowIndexName==false) chart.Frame.SubFrame[index].Frame.IsShowIndexName=false;
                 if (item.IsShowOverlayIndexName==false) chart.Frame.SubFrame[index].Frame.IsShowOverlayIndexName=false;
+                if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) frame.HorizontalReserved=item.HorizontalReserved;
             }
         }
 
@@ -6563,6 +6565,8 @@ var JSCHART_MENU_ID=
     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,     //修改鼠标形状
 }
 
 
@@ -13271,6 +13275,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdateFrameMaxMin();          //调整坐标最大 最小值
                 this.Draw();
 
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID:
+                if (!IFrameSplitOperator.IsString(srcParam)) return;
+                this.DefaultCursor=srcParam;
+                this.UIElement.style.cursor=this.DefaultCursor;
                 break;
         }
     }
@@ -13355,6 +13364,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.PopupMenuByRClick(menuData, x, y);
     }
+
+    //指标窗口扩展图形
+    this.CreateChartPaintExtend=function(chart, windowIndex)
+    {
+        if (windowIndex<0) return false;
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!subFrame || !subFrame.Frame) return false;
+
+        var frame=subFrame.Frame;
+        chart.Canvas=this.Canvas;
+        chart.ChartBorder=frame.ChartBorder;
+        chart.ChartFrame=frame;
+       
+        this.ChartPaintEx.push(chart);
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -26834,9 +26860,9 @@ function IChartPainting()
         if (!IFrameSplitOperator.IsNumber(ptStart.X) || !IFrameSplitOperator.IsNumber(ptStart.Y)) return null;
         if (!IFrameSplitOperator.IsNumber(ptEnd.X) || !IFrameSplitOperator.IsNumber(ptEnd.Y)) return null;
 
-        if (x==ptStart.X || y==ptStart.Y) 
+        if (x==ptStart.X && y==ptStart.Y) 
             return { Identify:this.Identify, Chart:this };
-        if (x==ptEnd.X || y==ptEnd.Y) 
+        if (x==ptEnd.X && y==ptEnd.Y) 
             return { Identify:this.Identify, Chart:this };
 
         var lineWidth=5;
@@ -49571,6 +49597,11 @@ IFrameSplitOperator.IsVaild=function(value)
     return true;
 }
 
+IFrameSplitOperator.IsUndefined=function(value)
+{
+    return value===undefined;
+}
+
 IFrameSplitOperator.RemoveZero=function(strValue)
 {
     while(strValue.length>0)
@@ -76938,6 +76969,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog() },
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
+                    { Name:JSPopMenu.SEPARATOR_LINE_NAME },
+                    { 
+                        Name:"鼠标形状", 
+                        SubMenu:
+                        [
+                            { Name:"默认", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID, Args:["default"]}, Checked:this.DefaultCursor=="default" },
+                            { Name:"十字线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID, Args:["crosshair"]}, Checked:this.DefaultCursor=="crosshair" },
+                        ]
+                    }
                 ]
             }
         ];
@@ -78925,12 +78965,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.IsShowBeforeData=false;              //是否显示盘前集合竞价数据 (当日)
     this.BeforeOpenData=null;                 //盘前集合竞价数据
-    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据
+    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据(当日)
 
     this.IsShowAfterData=false;               //收盘集合竞价
     this.AfterCloseData=null;                 //收盘集合竞价数据
-    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据
-    this.ShareAfterVol=0;              //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
+    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据(当日)
+    this.ShareAfterVol=0;                     //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
     this.ExtendWidth={ Left: 120, Right:120 } ;      //单日分时图 左右扩展图形宽度
     
     this.IsShowLead=true;                     //指数是否显示领先指标
@@ -78940,7 +78980,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.IsShowMultiDayAfterData=false;             //多日分时图 是否显示收盘集合竞价
     this.MultiDayAfterCloseData=null;                //多日分时图 收盘集合竞价数据
 
-    this.MultiDayExtendWidth={ Left:20, Right:20 };   //多日分时图 左右扩展图形宽度
+    this.MultiDayExtendWidth={ Left:40, Right:20 };   //多日分时图 左右扩展图形宽度
 
     this.ChartDrawStorage=new ChartDrawStorage();
     this.ChartDrawStorageCache=null;         //首次需要创建的画图工具数据
@@ -81927,11 +81967,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.NetworkFilter)
         {
+            var callCation=
+            { 
+                Before:this.IsShowMultiDayBeforeData , 
+                After:this.IsShowMultiDayAfterData
+            }   //集合竞价
+
             var obj=
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -82311,11 +82357,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     dateRange=this.SourceData.GetDateRange();
             }
 
-            var callCation=
-            { 
-                Before:(this.IsShowBeforeData && this.DayCount===1), 
-                After:(this.IsShowAfterData && this.DayCount===1)
-            }   //集合竞价
+            var callCation={ Before:this.IsShowBeforeData, After:this.IsShowAfterData }   //集合竞价
+            if (this.DayCount>1) callCation={ Before:this.IsShowMultiDayBeforeData, After:this.IsShowMultiDayAfterData }   //多日集合竞价
+           
             var obj=
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名
@@ -132114,7 +132158,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13264";
+var HQCHART_VERSION="1.1.13275";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -48757,13 +48757,38 @@ HQData.NetworkFilter=function(data, callback)
 HQData.RequestMinuteData=function(data, callback)
 {
     data.PreventDefault=true;
-    var symbol=data.Request.Data.symbol[0]; //请求的股票代码
-    var dayCount=data.Request.Data.daycount;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var callcation=data.Request.Data.callcation;        //集合竞价
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_1DAY_DATA;
-    hqchartData.stock[0].symbol=symbol;
-    hqchartData.stock[0].name=symbol;
+    var srcStock=MINUTE_1DAY_DATA.stock[0];
+    var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+    if (callcation.Before)
+    {
+        var before=
+        [
+            //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+            [915, srcStock.yclose,0,0],
+            [916, srcStock.yclose+0.01,0,0],
+            [917, srcStock.yclose+0.03,0,0],
+            [918, srcStock.yclose+0.02,0,0],
+            [919, srcStock.yclose+0.02,0,0],
+            [920, srcStock.yclose+0.01,0,0],
+            [921, srcStock.yclose,0,0],
+            [922, srcStock.yclose-0.02,0,0],
+            [923, srcStock.yclose-0.03,0,0],
+            [924, srcStock.yclose,0,0],
+            [925, srcStock.yclose,0,0],
+        ];
+
+        var beforeinfo={ totalcount:11, ver:1.0 };
+
+        stockItem.before=before;
+        stockItem.beforeinfo=beforeinfo;
+    }
+
+    var hqchartData={code:0, stock:[stockItem] };
+   
 
     callback(hqchartData);
 }
@@ -48773,12 +48798,44 @@ HQData.RequestMinuteDaysData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol; //请求的股票代码
     var dayCount=data.Request.Data.daycount;
+    var callcation=data.Request.Data.callcation;        //集合竞价
   
     console.log(`[HQData::RequestMinuteDaysData] Symbol=${symbol}`);
     
-    var hqchartData=MINUTE_5DAY_DATA;
-    hqchartData.symbol=symbol;
-    hqchartData.name=symbol;
+    var hqchartData={code:0, data:[] };
+    hqchartData.symbol=MINUTE_5DAY_DATA.symbol;
+    hqchartData.name=MINUTE_5DAY_DATA.symbol;
+
+    for(var i=0;i<dayCount && i<MINUTE_5DAY_DATA.data.length;++i)
+    {
+        var item=MINUTE_5DAY_DATA.data[i];
+        var dayItem={minute:item.minute, yclose:item.yclose, date:item.date };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, item.yclose,0,0],
+                [916, item.yclose+0.01,0,0],
+                [917, item.yclose+0.03,0,0],
+                [918, item.yclose+0.02,0,0],
+                [919, item.yclose+0.02,0,0],
+                [920, item.yclose+0.01,0,0],
+                [921, item.yclose,0,0],
+                [922, item.yclose-0.02,0,0],
+                [923, item.yclose-0.03,0,0],
+                [924, item.yclose,0,0],
+                [925, item.yclose,0,0],
+            ];
+
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            dayItem.before=before;
+            dayItem.beforeinfo=beforeinfo;
+        }
+
+        hqchartData.data.push(dayItem);
+    }
    
     callback(hqchartData);
 }

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

@@ -4586,6 +4586,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (item.IsShowOverlayIndexName==false) chart.Frame.SubFrame[i].Frame.IsShowOverlayIndexName=false;
             if (IFrameSplitOperator.IsNumber(item.IndexParamSpace)) chart.Frame.SubFrame[i].Frame.IndexParamSpace=item.IndexParamSpace;
             if (IFrameSplitOperator.IsNumber(item.IndexTitleSpace)) chart.Frame.SubFrame[i].Frame.IndexTitleSpace=item.IndexTitleSpace;
+            if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) frame.HorizontalReserved=item.HorizontalReserved;
             
             if (item.OverlayIndexType)
             {
@@ -5032,6 +5033,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowTitleArrow)) chart.Frame.SubFrame[index].Frame.IsShowTitleArrow=item.IsShowTitleArrow;
                 if (item.IsShowIndexName==false) chart.Frame.SubFrame[index].Frame.IsShowIndexName=false;
                 if (item.IsShowOverlayIndexName==false) chart.Frame.SubFrame[index].Frame.IsShowOverlayIndexName=false;
+                if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) frame.HorizontalReserved=item.HorizontalReserved;
             }
         }
 
@@ -6607,6 +6609,8 @@ var JSCHART_MENU_ID=
     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,     //修改鼠标形状
 }
 
 
@@ -13315,6 +13319,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdateFrameMaxMin();          //调整坐标最大 最小值
                 this.Draw();
 
+                break;
+            case JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID:
+                if (!IFrameSplitOperator.IsString(srcParam)) return;
+                this.DefaultCursor=srcParam;
+                this.UIElement.style.cursor=this.DefaultCursor;
                 break;
         }
     }
@@ -13399,6 +13408,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.PopupMenuByRClick(menuData, x, y);
     }
+
+    //指标窗口扩展图形
+    this.CreateChartPaintExtend=function(chart, windowIndex)
+    {
+        if (windowIndex<0) return false;
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!subFrame || !subFrame.Frame) return false;
+
+        var frame=subFrame.Frame;
+        chart.Canvas=this.Canvas;
+        chart.ChartBorder=frame.ChartBorder;
+        chart.ChartFrame=frame;
+       
+        this.ChartPaintEx.push(chart);
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -26878,9 +26904,9 @@ function IChartPainting()
         if (!IFrameSplitOperator.IsNumber(ptStart.X) || !IFrameSplitOperator.IsNumber(ptStart.Y)) return null;
         if (!IFrameSplitOperator.IsNumber(ptEnd.X) || !IFrameSplitOperator.IsNumber(ptEnd.Y)) return null;
 
-        if (x==ptStart.X || y==ptStart.Y) 
+        if (x==ptStart.X && y==ptStart.Y) 
             return { Identify:this.Identify, Chart:this };
-        if (x==ptEnd.X || y==ptEnd.Y) 
+        if (x==ptEnd.X && y==ptEnd.Y) 
             return { Identify:this.Identify, Chart:this };
 
         var lineWidth=5;
@@ -49615,6 +49641,11 @@ IFrameSplitOperator.IsVaild=function(value)
     return true;
 }
 
+IFrameSplitOperator.IsUndefined=function(value)
+{
+    return value===undefined;
+}
+
 IFrameSplitOperator.RemoveZero=function(strValue)
 {
     while(strValue.length>0)
@@ -76982,6 +77013,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog() },
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
+                    { Name:JSPopMenu.SEPARATOR_LINE_NAME },
+                    { 
+                        Name:"鼠标形状", 
+                        SubMenu:
+                        [
+                            { Name:"默认", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID, Args:["default"]}, Checked:this.DefaultCursor=="default" },
+                            { Name:"十字线", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DEFAULTCURSOR_ID, Args:["crosshair"]}, Checked:this.DefaultCursor=="crosshair" },
+                        ]
+                    }
                 ]
             }
         ];
@@ -78969,12 +79009,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.IsShowBeforeData=false;              //是否显示盘前集合竞价数据 (当日)
     this.BeforeOpenData=null;                 //盘前集合竞价数据
-    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据
+    this.IsBeforeData=false;                  //是否支持显示盘前集合竞价数据(当日)
 
     this.IsShowAfterData=false;               //收盘集合竞价
     this.AfterCloseData=null;                 //收盘集合竞价数据
-    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据
-    this.ShareAfterVol=0;              //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
+    this.IsAfterData=false;                   //是否支持显示收盘集合竞价数据(当日)
+    this.ShareAfterVol=0;                     //1=盘后数据成交量Y坐标和主图共享 2=盘后数据成交量Y坐标和盘前共享
     this.ExtendWidth={ Left: 120, Right:120 } ;      //单日分时图 左右扩展图形宽度
     
     this.IsShowLead=true;                     //指数是否显示领先指标
@@ -78984,7 +79024,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.IsShowMultiDayAfterData=false;             //多日分时图 是否显示收盘集合竞价
     this.MultiDayAfterCloseData=null;                //多日分时图 收盘集合竞价数据
 
-    this.MultiDayExtendWidth={ Left:20, Right:20 };   //多日分时图 左右扩展图形宽度
+    this.MultiDayExtendWidth={ Left:40, Right:20 };   //多日分时图 左右扩展图形宽度
 
     this.ChartDrawStorage=new ChartDrawStorage();
     this.ChartDrawStorageCache=null;         //首次需要创建的画图工具数据
@@ -81971,11 +82011,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.NetworkFilter)
         {
+            var callCation=
+            { 
+                Before:this.IsShowMultiDayBeforeData , 
+                After:this.IsShowMultiDayAfterData
+            }   //集合竞价
+
             var obj=
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol}, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -82355,11 +82401,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     dateRange=this.SourceData.GetDateRange();
             }
 
-            var callCation=
-            { 
-                Before:(this.IsShowBeforeData && this.DayCount===1), 
-                After:(this.IsShowAfterData && this.DayCount===1)
-            }   //集合竞价
+            var callCation={ Before:this.IsShowBeforeData, After:this.IsShowAfterData }   //集合竞价
+            if (this.DayCount>1) callCation={ Before:this.IsShowMultiDayBeforeData, After:this.IsShowMultiDayAfterData }   //多日集合竞价
+           
             var obj=
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名
@@ -134961,6 +135005,8 @@ function JSDialogDrawTool()
                 { Title: '趋势线', ClassName: 'hqchart_drawtool icon-draw_trendline', Type:0, Data:{ ID:"趋势线" } },
                 { Title: '水平线', ClassName: 'hqchart_drawtool icon-draw_hline', Type:0, Data:{ ID:"水平线" } },
                 { Title: '涂鸦线段', ClassName: 'hqchart_drawtool icon-draw_line', Type:0, Data:{ ID:"涂鸦线段" } },
+                { Title: '阻速线', ClassName: 'hqchart_drawtool icon-draw_resline', Type:0, Data:{ ID:"阻速线" } },
+                { Title: '江恩角度线', ClassName: 'hqchart_drawtool icon-jiangenjiaoduxian', Type:0, Data:{ ID:"江恩角度线" } },
             ]
         }, 
         {
@@ -134972,13 +135018,21 @@ function JSDialogDrawTool()
                 { Title: '平行射线', ClassName: 'hqchart_drawtool icon-draw_p_rays_lines', Type:0, Data:{ ID:"平行射线" } }, 
                 { Title: '平行通道', ClassName: 'hqchart_drawtool icon-draw_parallelchannel',Type:0, Data:{ ID:"平行通道" } },
                 { Title: '价格通道线', ClassName: 'hqchart_drawtool icon-draw_pricechannel', Type:0, Data:{ ID:"价格通道线" } },
-                { Title: '箱型线', ClassName: 'iconfont icon-draw_box', Type:0, Data:{ ID:"箱型线" }  },
+                { Title: '箱型线', ClassName: 'hqchart_drawtool icon-draw_box', Type:0, Data:{ ID:"箱型线" }  },
                 { Title:"不相交通道", ClassName:"hqchart_drawtool icon-buxiangjiaojiao", Type:0, Data:{ ID:"DisjointChannel"} },
-                { Title:"平滑顶/底", ClassName:"hqchart_drawtool icon-tubiao_buxiangjiaotongdao", Type:0, Data:{ ID:"FlatTop"}}
+                { Title:"平滑顶/底", ClassName:"hqchart_drawtool icon-tubiao_buxiangjiaotongdao", Type:0, Data:{ ID:"FlatTop"}},
+
+                { Title: "波段线", ClassName:'hqchart_drawtool icon-draw_waveband',  Type:0, Data:{ ID:"波段线" }  },
+                { Title: "百分比线", ClassName:'hqchart_drawtool icon-PercentageLine',  Type:0, Data:{ ID:"百分比线" }  },
+                { Title: "黄金分割", ClassName:'hqchart_drawtool icon-GoldenSection',  Type:0, Data:{ ID:"黄金分割" }  },
+
+                { Title: "线形回归线", ClassName:'hqchart_drawtool icon-linear_3',  Type:0, Data:{ ID:"线形回归线" }  },
+                { Title: "线形回归带", ClassName:'hqchart_drawtool icon-linear_1',  Type:0, Data:{ ID:"线形回归带" }  },
+                { Title: "延长线形回归带", ClassName:'hqchart_drawtool icon-linear_2',  Type:0, Data:{ ID:"延长线形回归带" }  },
             ]
         },
         { 
-            Title:"多边形",
+            Title:"形状",
             AryChart:
             [
                 { Title: '圆弧线', ClassName: 'hqchart_drawtool icon-draw_arc', Type:0, Data:{ ID:"圆弧线" }  },
@@ -134997,6 +135051,17 @@ function JSDialogDrawTool()
                 { Title: '头肩型', ClassName: 'hqchart_drawtool icon-draw_head_shoulders_bt', Type:0, Data:{ ID:"头肩型" } },
                 { Title: '波浪尺', ClassName: 'hqchart_drawtool icon-waveruler', Type:0, Data:{ ID:"波浪尺" } },
                 { Title: 'AB波浪尺', ClassName: 'hqchart_drawtool icon-waveruler', Type:0, Data:{ ID:"AB波浪尺" } },
+                
+            ]
+        },
+        {
+            Title:"斐波那契",
+            AryChart:
+            [
+                { Title: '斐波那契周期线', ClassName: 'hqchart_drawtool icon-feibonaqizhouqixian', Type:0, Data:{ ID:"斐波那契周期线" } },
+                { Title: '斐波那契楔形', ClassName: 'hqchart_drawtool icon-feibonaqiqixing', Type:0, Data:{ ID:"FibWedge" } },
+                { Title: '斐波那契回撤', ClassName: 'hqchart_drawtool icon-feibonaqihuiche', Type:0, Data:{ ID:"FibRetracement" } },
+                { Title: '斐波那契速度阻力扇', ClassName: 'hqchart_drawtool icon-feibonaqisuduzulishan', Type:0, Data:{ ID:"FibSpeedResistanceFan" } },
             ]
         },
         {
@@ -135523,7 +135588,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13264";
+var HQCHART_VERSION="1.1.13275";
 
 function PrintHQChartVersion()
 {