hqchart 1.1.15134 → 1.1.15147

package/src/jscommon/umychart.resource/css/tools.css

@@ -1349,15 +1349,16 @@ input[type="color"] {
 {
     font-family: "微软雅黑";
     /*display: flex;*/
-    border: 2px solid; 
+    border: 1px solid; 
     width:fit-content;
-    border-color: rgb(204,204,204);
+    border-color: var(--HQChart-DialogDrawTool-BorderColor);
     visibility:hidden;
     position: absolute;
-    background-color: rgba(250,250,250,1);
+    background-color: var(--HQChart-DialogDrawTool-BGColor);
     left:1px;
     top:1px;
     z-index: 99;
+    color:var(--HQChart-DialogDrawTool-Color);
 }
 
 .UMyChart_DrawTool_Title_Div
@@ -1365,11 +1366,12 @@ input[type="color"] {
     padding-left: 2px;
     height:20px;
     border-bottom: 1px solid;
-    border-color: rgb(204,204,204);
+    border-color: var(--HQChart-DialogDrawTool-BorderColor);
     display: flex;
     cursor: default;
     user-select: none;
-    background-color:rgb(222,222,222)
+    color:var(--HQChart-DialogDrawTool-TitleColor);
+    background-color:var(--HQChart-DialogDrawTool-TitleBGColor);
 }
 
 .UMyChart_DrawTool_Close_Div
@@ -1377,6 +1379,7 @@ input[type="color"] {
     margin-left: auto;
     padding-right: 4px;
     cursor:pointer;
+    color:var(--HQChart-DialogDrawTool-CloseColor);
 }
 
 .UMyChart_DrawTool_Table
@@ -1400,9 +1403,9 @@ input[type="color"] {
 {
     font-size:22px;
     border: 1px solid;
-    border-color: rgb(128,128,128);
-    background: rgb(234,85,4);
-    color: rgb(255,255,255);
+    border-color: var(--HQChart-DialogDrawTool-Selected_ButtonBorderColor);
+    background: var(--HQChart-DialogDrawTool-Selected_ButtonBGColor);
+    color: var(--HQChart-DialogDrawTool-Selected_ButtonColor);
 }
 
 .UMyChart_DrawTool_Td
@@ -1414,8 +1417,8 @@ input[type="color"] {
 {
     font-size:22px;
     border: 1px solid;
-    border-color: rgb(128,128,128);
-    color: rgb(77,77,77);
+    border-color: var(--HQChart-DialogDrawTool-ButtonBorderColor);
+    color: var(--HQChart-DialogDrawTool-ButtonColor);
 }
 
 .UMyChart_DrawTool_Group_Tr
@@ -1434,7 +1437,7 @@ input[type="color"] {
 {
     height:5px;
     border-bottom: 1px solid;
-    border-color: rgb(204,204,204);
+    border-color:var(--HQChart-DialogDrawTool-DividingLineColor); 
 }
 
 
@@ -1455,12 +1458,14 @@ input[type="color"] {
 {
     font-family: "微软雅黑";
     /*display: flex;*/
-    border: 2px solid; 
+    border-top: 1px solid; 
+    border-bottom: 1px solid;
+    border-left: 1px solid;
     width:fit-content;
-    border-color: rgb(204,204,204);
+    border-color: var(--HQChart-DialogModifyDraw-BorderColor);
     visibility:hidden;
     position: absolute;
-    background-color: rgba(250,250,250,1);
+    background-color: var(--HQChart-DialogModifyDraw-BGColor);
     left:1px;
     top:1px;
     display: flex;
@@ -1469,13 +1474,35 @@ input[type="color"] {
 
 .UMyChart_Draw_Modify_Dialog_Drag_Div
 {
-    width:24px;
+    width:22px;
     user-select: none;
+    border: 1px solid; 
+    background-color:var(--HQChart-DialogModifyDraw-DragBGColor);
+    border-color: var(--HQChart-DialogModifyDraw-DragBGColor);
+}
+
+.UMyChart_Draw_Modify_Dialog_Drag_Span
+{
+    font-size:22px;
+    color:var(--HQChart-DialogModifyDraw-DragColor);
 }
 
 .UMyChart_Draw_Modify_Dialog_Button_Div
 {
-    
+    border-right: 1px solid; 
+    border-color:var(--HQChart-DialogModifyDraw-ButtonBorderColor);
+}
+
+.UMyChart_Draw_Modify_Dialog_Button_Span
+{
+    font-size:22px;
+    color:var(--HQChart-DialogModifyDraw-ButtonColor);
+}
+
+.UMyChart_Draw_Modify_Dialog_Unlock_Button_Span
+{
+    font-size:22px;
+    color:var(--HQChart-DialogModifyDraw-UnlockButtonColor);
 }
 
 .UMyChart_Draw_Modify_Tooltip
@@ -2113,10 +2140,11 @@ input[type="color"] {
     /*display: flex;*/
     border: 1px solid; 
     width:fit-content;
-    border-color: rgb(204,204,204);
+    border-color: var(--HQChart-DialogSearchIndex-BorderColor);
     visibility:hidden;
     position: absolute;
-    background-color: rgba(20,20,20,1);
+    background-color: var(--HQChart-DialogSearchIndex-BGColor);
+    color:var(--HQChart-DialogSearchIndex-Color);
     left:1px;
     top:1px;
     z-index: 99;
@@ -2131,13 +2159,13 @@ input[type="color"] {
     display: flex;
     cursor: default;
     user-select: none;
-    background-color:rgb(200, 66, 69)
+    background-color:var(--HQChart-DialogSearchIndex-TitleBGColor);
 }
 
 .UMyChart_SearchIndex_Name_Div
 {
     margin-left: 5px;
-    color:rgb(250,250,250)
+    color:var(--HQChart-DialogSearchIndex-TitleColor);
 }
 
 .UMyChart_SearchIndex_Close_Div
@@ -2145,7 +2173,7 @@ input[type="color"] {
     margin-left: auto;
     padding-right: 4px;
     cursor:pointer;
-    color:rgb(180,180,180)
+    color:var(--HQChart-DialogSearchIndex-CloseColor);
 }
 
 .UMyChart_SearchIndex_Table_Div
@@ -2188,6 +2216,7 @@ input[type="color"] {
     background-color: transparent;
     width: 99%;
     margin-left: 10px;
+    color:var(--HQChart-DialogSearchIndex-InputColor);
 }
 
 .UMyChart_SearchIndex_Container_Div
@@ -2236,10 +2265,10 @@ input[type="color"] {
     /*display: flex;*/
     border: 1px solid; 
     width:fit-content;
-    border-color: rgb(204,204,204);
+    border-color: var(--HQChart-DialogModifyIndexParam-BorderColor);
     visibility:hidden;
     position: absolute;
-    background-color: rgba(20,20,20,1);
+    background-color:var(--HQChart-DialogModifyIndexParam-BGColor);
     left:1px;
     top:1px;
     z-index: 99;
@@ -2254,13 +2283,13 @@ input[type="color"] {
     display: flex;
     cursor: default;
     user-select: none;
-    background-color:rgb(200, 66, 69)
+    background-color:var(--HQChart-DialogModifyIndexParam-TitleBGColor);
 }
 
 .UMyChart_ModifyIndexParam_Name_Div
 {
     margin-left: 5px;
-    color:rgb(250,250,250)
+    color:var(--HQChart-DialogModifyIndexParam-TitleColor);
 }
 
 .UMyChart_ModifyIndexParam_Close_Div
@@ -2268,7 +2297,7 @@ input[type="color"] {
     margin-left: auto;
     padding-right: 4px;
     cursor:pointer;
-    color:rgb(180,180,180)
+    color:var(--HQChart-DialogModifyIndexParam-CloseColor);
 }
 
 .UMyChart_ModifyIndexParam_Table_Div
@@ -2306,6 +2335,7 @@ input[type="color"] {
 .UMyChart_ModifyIndexParam_Name_Span
 {
     margin-left: 10px;
+    color:var(--HQChart-DialogModifyIndexParam-ParamNameColor);
 }
 
 .UMyChart_ModifyIndexParam_Value_Td
@@ -2321,6 +2351,7 @@ input[type="color"] {
     line-height: 16px;
     background-color: transparent;
     width: 60px;
+    color:var(--HQChart-DialogModifyIndexParam-InputTextColor);
 }
 
 .UMyChart_ModifyIndexParam_Button_Div
@@ -2402,6 +2433,183 @@ input[type="color"] {
 
 
 
+:root 
+{
+    /*
+        JSDialogDrawTool 配色 画图工具
+    */
+
+    --HQChart-DialogDrawTool-BGColor: rgb(250,250,250);
+    --HQChart-DialogDrawTool-BorderColor: rgb(20,20,20);
+    --HQChart-DialogDrawTool-Color: rgb(20,20,20);
+    --HQChart-DialogDrawTool-TitleColor: rgb(250,250,250);
+    --HQChart-DialogDrawTool-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogDrawTool-CloseColor:rgb(180,180,180);
+    --HQChart-DialogDrawTool-ButtonColor:rgb(77,77,77);
+    --HQChart-DialogDrawTool-ButtonBorderColor:rgb(128,128,128);
+    --HQChart-DialogDrawTool-Selected_ButtonColor:rgb(255,255,255);
+    --HQChart-DialogDrawTool-Selected_ButtonBGColor:rgb(234,85,4);
+    --HQChart-DialogDrawTool-Selected_ButtonBorderColor:rgb(128,128,128);
+    --HQChart-DialogDrawTool-DividingLineColor:rgb(204,204,204);
+
+    /*
+        JSDialogModifyDraw
+    */
+
+    --HQChart-DialogModifyDraw-BGColor: rgb(250,250,250);
+    --HQChart-DialogModifyDraw-BorderColor: rgb(20,20,20);
+    --HQChart-DialogModifyDraw-DragColor: rgb(250,250,250);
+    --HQChart-DialogModifyDraw-DragBGColor: rgb(200, 66, 69);
+    --HQChart-DialogModifyDraw-ButtonColor:rgb(77,77,77);
+    --HQChart-DialogModifyDraw-ButtonBorderColor:rgb(20,20,20);
+    --HQChart-DialogModifyDraw-UnlockButtonColor:rgb(220,220,220);
+
+    /*
+        JSDialogSearchIndex
+    */
+
+    --HQChart-DialogSearchIndex-BGColor: rgb(250,250,250);
+    --HQChart-DialogSearchIndex-BorderColor: rgb(20,20,20);
+    --HQChart-DialogSearchIndex-Color: rgb(20,20,20);
+    --HQChart-DialogSearchIndex-TitleColor: rgb(250,250,250);
+    --HQChart-DialogSearchIndex-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogSearchIndex-CloseColor:rgb(180,180,180);
+    --HQChart-DialogSearchIndex-InputColor:rgb(20,20,20);
+
+
+    /*
+        JSDialogModifyIndexParam
+    */
+    --HQChart-DialogModifyIndexParam-BGColor: rgb(250,250,250);
+    --HQChart-DialogModifyIndexParam-BorderColor: rgb(20,20,20);
+    --HQChart-DialogModifyIndexParam-Color: rgb(20,20,20);
+    --HQChart-DialogModifyIndexParam-TitleColor: rgb(250,250,250);
+    --HQChart-DialogModifyIndexParam-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogModifyIndexParam-CloseColor:rgb(180,180,180);
+    --HQChart-DialogModifyIndexParam-ParamNameColor:rgb(20,20,20);
+    --HQChart-DialogModifyIndexParam-InputTextColor:rgb(20,20,20);
+    
+}
+
+/*
+    白色风格
+*/
+:root[hqchart_style='0'],
+:root[hqchart_style='defined']
+{
+    /*
+        JSDialogDrawTool 配色 画图工具
+    */
+
+    --HQChart-DialogDrawTool-BGColor: rgb(250,250,250);
+    --HQChart-DialogDrawTool-BorderColor: rgb(20,20,20);
+    --HQChart-DialogDrawTool-Color: rgb(20,20,20);
+    --HQChart-DialogDrawTool-TitleColor: rgb(250,250,250);
+    --HQChart-DialogDrawTool-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogDrawTool-ButtonColor:rgb(77,77,77);
+    --HQChart-DialogDrawTool-ButtonBorderColor:rgb(128,128,128);
+    --HQChart-DialogDrawTool-Selected_ButtonColor:rgb(255,255,255);
+    --HQChart-DialogDrawTool-Selected_ButtonBGColor:rgb(234,85,4);
+    --HQChart-DialogDrawTool-Selected_ButtonBorderColor:rgb(128,128,128);
+    --HQChart-DialogDrawTool-DividingLineColor:rgb(204,204,204);
+
+
+    
+    /*
+        JSDialogModifyDraw
+    */
+
+    --HQChart-DialogModifyDraw-BGColor: rgb(250,250,250);
+    --HQChart-DialogModifyDraw-BorderColor: rgb(20,20,20);
+    --HQChart-DialogModifyDraw-DragColor: rgb(250,250,250);
+    --HQChart-DialogModifyDraw-DragBGColor: rgb(200, 66, 69);
+    --HQChart-DialogModifyDraw-ButtonColor:rgb(77,77,77);
+    --HQChart-DialogModifyDraw-ButtonBorderColor:rgb(20,20,20);
+    --HQChart-DialogModifyDraw-UnlockButtonColor:rgb(220,220,220);
+
+
+    /*
+        JSDialogSearchIndex
+    */
+
+    --HQChart-DialogSearchIndex-BGColor: rgb(250,250,250);
+    --HQChart-DialogSearchIndex-BorderColor: rgb(20,20,20);
+    --HQChart-DialogSearchIndex-Color: rgb(20,20,20);
+    --HQChart-DialogSearchIndex-TitleColor: rgb(250,250,250);
+    --HQChart-DialogSearchIndex-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogSearchIndex-CloseColor:rgb(180,180,180);
+    --HQChart-DialogSearchIndex-InputColor:rgb(20,20,20);
+
+
+    /*
+        JSDialogModifyIndexParam
+    */
+    --HQChart-DialogModifyIndexParam-BGColor: rgb(250,250,250);
+    --HQChart-DialogModifyIndexParam-BorderColor: rgb(20,20,20);
+    --HQChart-DialogModifyIndexParam-Color: rgb(20,20,20);
+    --HQChart-DialogModifyIndexParam-TitleColor: rgb(250,250,250);
+    --HQChart-DialogModifyIndexParam-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogModifyIndexParam-CloseColor:rgb(180,180,180);
+    --HQChart-DialogModifyIndexParam-ParamNameColor:rgb(20,20,20);
+    --HQChart-DialogModifyIndexParam-InputTextColor:rgb(20,20,20);
+}
+
+/*
+    黑色风格
+*/
+:root[hqchart_style='1']
+{
+    /*
+        JSDialogDrawTool 配色 画图工具
+    */
+
+    --HQChart-DialogDrawTool-BGColor: rgb(38,38,38);
+    --HQChart-DialogDrawTool-BorderColor: rgb(170,170,170);
+    --HQChart-DialogDrawTool-Color: rgb(210,210,210);
+    --HQChart-DialogDrawTool-TitleColor: rgb(250,250,250);
+    --HQChart-DialogDrawTool-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogDrawTool-ButtonColor:rgb(110,110,110);
+    --HQChart-DialogDrawTool-ButtonBorderColor:rgb(99,99,99);
+    --HQChart-DialogDrawTool-Selected_ButtonColor:rgb(255,255,255);
+    --HQChart-DialogDrawTool-Selected_ButtonBGColor:rgb(234,85,4);
+    --HQChart-DialogDrawTool-Selected_ButtonBorderColor:rgb(128,128,128);
+    --HQChart-DialogDrawTool-DividingLineColor:rgb(150,150,150);
+
+    /*
+        JSDialogModifyDraw
+    */
+
+    --HQChart-DialogModifyDraw-BGColor:rgb(38,38,38);
+    --HQChart-DialogModifyDraw-BorderColor: rgb(170,170,170);
+    --HQChart-DialogModifyDraw-ButtonColor:rgb(110,110,110);
+    --HQChart-DialogModifyDraw-ButtonBorderColor:rgb(170,170,170);
+    --HQChart-DialogModifyDraw-UnlockButtonColor:rgb(60,60,60);
+
+
+     /*
+        JSDialogSearchIndex
+    */
+
+    --HQChart-DialogSearchIndex-BGColor: rgb(38,38,38);
+    --HQChart-DialogSearchIndex-BorderColor: rgb(170,170,170);
+    --HQChart-DialogSearchIndex-Color: rgb(210,210,210);
+    --HQChart-DialogSearchIndex-TitleColor: rgb(250,250,250);
+    --HQChart-DialogSearchIndex-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogSearchIndex-InputColor:rgb(210,210,210);
+
+    /*
+        JSDialogModifyIndexParam
+    */
+
+    --HQChart-DialogModifyIndexParam-BGColor: rgb(38,38,38);
+    --HQChart-DialogModifyIndexParam-BorderColor: rgb(170,170,170);
+    --HQChart-DialogModifyIndexParam-Color: rgb(210,210,210);
+    --HQChart-DialogModifyIndexParam-TitleColor: rgb(250,250,250);
+    --HQChart-DialogModifyIndexParam-TitleBGColor: rgb(200, 66, 69);
+    --HQChart-DialogModifyIndexParam-ParamNameColor:rgb(210,210,210);
+    --HQChart-DialogModifyIndexParam-InputTextColor:rgb(210,210,210);
+}
+
 
 
 

package/src/jscommon/umychart.style.js

@@ -517,17 +517,6 @@ function GetBlackStyle()
             PositionColor:"rgb(255,0,255)"            //持仓
         },
 
-        DialogSearchIndex:
-        {
-            BGColor:'rgb(20,20,20)',            //背景色
-            BorderColor:'rgb(170,170,170)',     //边框颜色
-            TitleColor:'rgb(230,230,230)',       //标题颜色
-
-            IndexNameColor:"rgb(210,210,210)",       
-            GroupNameColor:"rgb(210,210,210)",      
-            InputTextColor:"rgb(210,210,210)", 
-        },
-
         DialogPopKeyboard:
         {
             BGColor:'rgb(20,20,20)',            //背景色

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

@@ -6571,6 +6571,13 @@ JSChart.SetStyle=function(option)
     if (option) g_JSChartResource.SetStyle(option);
 }
 
+
+//CSS风格
+JSChart.SetCSSStyle=function(styleID)
+{
+    document.documentElement.setAttribute('hqchart_style', styleID);
+}
+
 //value { EN:'', CH:'' }
 JSChart.SetTextResource=function(key,value)
 {
@@ -17680,6 +17687,8 @@ function IChartFramePainting()
 
     this.CalculateLock=function(aryData)
     {
+        if (!this.LockPaint) return;
+
         this.LockPaint.SetData(aryData);
         this.LockPaint.Draw(false);
     }
@@ -17872,7 +17881,14 @@ function AverageWidthFrame()
             this.IndexHelpButton=CloneData(g_JSChartResource.Buttons.IndexHelp);
         }
 
-        if (this.DivFrameToolbar) this.DivFrameToolbar.ReloadResource(resource);
+        if (this.ToolbarButtonStyle==1)
+        {
+            this.ClearToolbar();
+        }
+        else
+        {
+            if (this.DivFrameToolbar) this.DivFrameToolbar.ReloadResource(resource);
+        }
     }
 
     this.DrawFrame=function()
@@ -22895,155 +22911,6 @@ function KLineFrame()
         if (!this.DivFrameToolbar) return;
 
         this.DivFrameToolbar.Show(this.Identify);
-
-        return;
-
-        if (typeof($)=="undefined") return;
-        
-        if (!this.ChartBorder.UIElement || !this.ChartBorder.UIElement.parentNode) return;
-
-        var divToolbar=document.getElementById(this.ToolbarID);
-        if (divToolbar && this.SizeChange==false && this.ReDrawToolbar==false)  return;
-
-        if (!divToolbar)
-        {
-            
-            divToolbar=document.createElement("div");
-            divToolbar.className='klineframe-toolbar';
-            divToolbar.id=this.ToolbarID;
-            divToolbar.oncontextmenu = function() { return false;}; //屏蔽右键系统菜单
-            //为divToolbar添加属性identify
-            divToolbar.setAttribute("identify",this.Identify.toString());
-            this.ChartBorder.UIElement.parentNode.appendChild(divToolbar);
-        }
-
-        if (!this.ModifyIndex && !this.ChangeIndex && !this.OverlayIndex && !this.CloseIndex && !IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar))
-        {
-            if (divToolbar.style.display!='none')
-                divToolbar.style.display='none';
-            return;
-        }
-
-        //使用外城div尺寸 画图尺寸是被放大的
-        var pixelTatio = GetDevicePixelRatio();
-        var chartWidth=parseInt(this.ChartBorder.UIElement.parentElement.style.width.replace("px",""));  
-        var chartHeight=parseInt(this.ChartBorder.UIElement.parentElement.style.height.replace("px",""));
-        //JSConsole.Chart.Log('[KLineFrame::DrawToolbar] ',chartWidth,chartHeight,pixelTatio);
-
-        var toolbarWidth=100;
-        var toolbarHeight=this.ChartBorder.GetTitleHeight();
-        var left=chartWidth-(this.ChartBorder.Right/pixelTatio)-toolbarWidth;
-        var top=this.ChartBorder.GetTop()/pixelTatio;
-
-        if (this.ToolbarRect)
-        {
-            //尺寸变动移动才重新设置DOM
-            if (this.ToolbarRect.Left==left && this.ToolbarRect.Top==top && 
-                this.ToolbarRect.Width==toolbarWidth && this.ToolbarRect.Height==toolbarHeight/pixelTatio)
-            {
-                return;
-            }
-        }
-
-        this.ToolbarRect={ Left:left, Top:top, Width:toolbarWidth, Height:toolbarHeight/pixelTatio };
-
-        const modifyButton=`<span class='index_param icon iconfont icon-index_param' id='modifyindex' style='cursor:pointer;margin-left:2px;margin-right:2px;' title='调整指标参数'></span>`;
-        const changeButton=`<span class='index_change icon iconfont icon-change_index' id='changeindex' style='cursor:pointer;margin-left:2px;margin-right:2px;' title='切换指标'></span>`;
-        const overlayButton=`<span class='index_overlay icon iconfont icon-overlay_index' id='overlayindex' style='cursor:pointer;margin-left:2px;margin-right:2px;' title='叠加指标'></span>`;
-        const closeButton=`<span class='index_close icon iconfont icon-close' id='closeindex' style='cursor:pointer;margin-left:2px;margin-right:2px;' title='关闭指标窗口'></span>`;
-
-        var spanIcon=modifyButton+changeButton+overlayButton;
-
-        if (this.Identify!==0 && this.CloseIndex)  //第1个窗口不能关闭
-        {
-            spanIcon+=closeButton;
-        }
-
-        if (IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar))
-        {
-            for(var i=0;i<this.CustomToolbar.length;++i)
-            {
-                var item=this.CustomToolbar[i];
-                spanIcon+=item.Html;
-            }
-        }
-
-        //var scrollPos=GetScrollPosition();
-        //left = left+scrollPos.Left;
-        //top = top+scrollPos.Top;
-        divToolbar.style.left = left + "px";
-        divToolbar.style.top = top + "px";
-        divToolbar.style.width=toolbarWidth+"px";                   //宽度先不调整吧
-        divToolbar.style.height=(toolbarHeight/pixelTatio)+'px';    //只调整高度
-        divToolbar.innerHTML=spanIcon;
-
-        var chart=this.ChartBorder.UIElement.JSChartContainer;
-        var identify=this.Identify;
-        if (!this.ModifyIndex)  //隐藏'改参数'
-            $("#"+divToolbar.id+" .index_param").hide();
-        else if (typeof(this.ModifyIndexEvent)=='function')  //绑定点击事件
-            $("#"+divToolbar.id+" .index_param").click(
-                {
-                    Chart:this.ChartBorder.UIElement.JSChartContainer,
-                    Identify:this.Identify
-                },this.ModifyIndexEvent);
-
-        if (!this.ChangeIndex)  //隐藏'换指标'
-        {
-            $("#"+divToolbar.id+" .index_change").hide();
-        }  
-        else if (typeof(this.ChangeIndexEvent)=='function')
-        {
-            $("#"+divToolbar.id+" .index_change").click(
-                {
-                    Chart:this.ChartBorder.UIElement.JSChartContainer,
-                    Identify:this.Identify,
-                    IsOverlay:false
-                },this.ChangeIndexEvent);
-        }
-
-        if (!this.OverlayIndex)
-        {
-            $("#"+divToolbar.id+" .index_overlay").hide();
-        }
-        else
-        {
-            $("#"+divToolbar.id+" .index_overlay").click(
-                {
-                    Chart:this.ChartBorder.UIElement.JSChartContainer,
-                    Identify:this.Identify,
-                    IsOverlay:true
-                },this.ChangeIndexEvent);
-        }
-        
-        $("#"+divToolbar.id+" .index_close").click(
-            {
-                Chart:this.ChartBorder.UIElement.JSChartContainer,
-                Identify:this.Identify
-            },
-            function(event)
-            {
-                var hqChart=event.data.Chart;
-                var id=event.data.Identify;
-                hqChart.RemoveIndexWindow(id);
-            });
-
-
-        if (IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar))
-        {
-            for(var i=0;i<this.CustomToolbar.length;++i)
-            {
-                var item=this.CustomToolbar[i];
-                $("#"+item.ID).click(
-                {
-                    Chart:this.ChartBorder.UIElement.JSChartContainer,
-                    Identify:this.Identify,
-                    ID:item.ID
-                },item.Click);
-            }
-        }
-
-        divToolbar.style.display = "block";
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -82143,30 +82010,6 @@ function JSChartResource()
         }
     };
 
-    //指标搜索
-    this.DialogSearchIndex=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        IndexNameColor:"rgb(0,0,0)",             //数值名称
-        GroupNameColor:"rgb(0,0,0)",
-        InputTextColor:"rgb(0,0,0)"
-    };
-
-    this.DialogModifyIndexParam=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        ParamNameColor:"rgb(0,0,0)",             //数值名称
-        InputTextColor:"rgb(0,0,0)"
-    };
-
     //弹幕
     this.Barrage= {
         Font:16*GetDevicePixelRatio() +'px 微软雅黑',   //字体
@@ -83391,20 +83234,6 @@ function JSChartResource()
             }
         }
 
-        if (style.DialogSearchIndex)
-        {
-            var item=style.DialogSearchIndex;
-
-            if (item.BGColor) this.DialogSearchIndex.BGColor=item.BGColor;
-            if (item.BorderColor) this.DialogSearchIndex.BorderColor=item.BorderColor;
-            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
-            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
-            
-            if (item.IndexNameColor) this.DialogSearchIndex.IndexNameColor=item.IndexNameColor;
-            if (item.GroupNameColor) this.DialogSearchIndex.GroupNameColor=item.GroupNameColor;
-            if (item.InputTextColor) this.DialogSearchIndex.InputTextColor=item.InputTextColor;
-        }
-
         if (style.MinuteInfo)
         {
             var item=style.MinuteInfo;
@@ -137271,17 +137100,6 @@ function GetBlackStyle()
             PositionColor:"rgb(255,0,255)"            //持仓
         },
 
-        DialogSearchIndex:
-        {
-            BGColor:'rgb(20,20,20)',            //背景色
-            BorderColor:'rgb(170,170,170)',     //边框颜色
-            TitleColor:'rgb(230,230,230)',       //标题颜色
-
-            IndexNameColor:"rgb(210,210,210)",       
-            GroupNameColor:"rgb(210,210,210)",      
-            InputTextColor:"rgb(210,210,210)", 
-        },
-
         DialogPopKeyboard:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -153915,7 +153733,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15133";
+var HQCHART_VERSION="1.1.15146";
 
 function PrintHQChartVersion()
 {