hqchart 1.1.14084 → 1.1.14097

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

@@ -4022,9 +4022,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     this.CacheCanvasElement=null;
     if (bCacheCanvas) this.CacheCanvasElement=document.createElement("canvas");
 
-    //改参数div
-    this.ModifyIndexDialog=new ModifyIndexDialog(divElement);
-
     //额外的画布
     this.MapExtraCanvasElement=new Map();   //key=画布名字, value={ Element:, Canvas:}
 
@@ -4257,9 +4254,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
-        //创建改参数div
-        chart.ModifyIndexDialog=this.ModifyIndexDialog;
-
         var pixelRatio=GetDevicePixelRatio();
         
         //右键菜单
@@ -4709,9 +4703,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     {
         var chart=new CustomKLineChartContainer(this.CanvasElement);
 
-        //创建改参数div
-        chart.ModifyIndexDialog=this.ModifyIndexDialog;
-        
         //右键菜单
         if (IFrameSplitOperator.IsBool(option.IsShowRightMenu)) chart.IsShowRightMenu=option.IsShowRightMenu;
 
@@ -4812,8 +4803,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.EventCallback) this.SetEventCallback(chart, option.EventCallback);
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
 
-        chart.ModifyIndexDialog=this.ModifyIndexDialog;
-
         var pixelRatio=GetDevicePixelRatio();
 
         var windowsCount=2;
@@ -5392,9 +5381,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.NetworkFilter) chart.NetworkFilter=option.NetworkFilter;
         if (option.IsApiPeriod==true) chart.IsApiPeriod=option.IsApiPeriod;
 
-        //创建改参数div
-        chart.ModifyIndexDialog=this.ModifyIndexDialog;
-
         if (option.ScriptError) chart.ScriptErrorCallback=option.ScriptError;
 
         if (option.KLine)   //k线图的属性设置
@@ -5692,6 +5678,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.SelectRectDialog && option.SelectRectDialog.Enable)
             chart.InitalSelectRectDialog(option.SelectRectDialog);
 
+        if (option.ModifyIndexParamDialog && option.ModifyIndexParamDialog.Enable)
+            chart.InitalModifyIndexParamDialog(option.ModifyIndexParamDialog);
+
         if (option.SearchIndexDialog && option.SearchIndexDialog.Enable)
             chart.InitalSearchIndexDialog(option.SearchIndexDialog);
 
@@ -6790,6 +6779,9 @@ var JSCHART_MENU_ID=
 
     CMD_DIALOG_TOOLTIP_ATTRIBUTE:65,    //修改K线信息框属性 Ary:[{ Enable:, Style:}, ]
     CMD_KLINE_TOOLTIP_ATTRIBUTE:66,     //修改K线提示框属性 Ary:[{ Enable:true/false, EnableKeyDown:true/false}]
+
+    CMD_MODIFY_INDEX_PARAM:67,          //指标删除修改  [windowIndex, ]
+    CMD_MODIFY_OVERLAY_INDEX_PARAM:68,  //叠加指标修改  [windowIndex, ID ]
 }
 
 
@@ -7018,6 +7010,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogSelectRect;  //区间统计
     this.FloatTooltip;      //浮动tooltip信息
     this.DialogSearchIndex; //指标搜索
+    this.DialogModifyIndexParam;    //指标参数修改
 
 
     this.ClearStockCache=function()
@@ -7087,6 +7080,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogSearchIndex.Create();
     }
 
+    this.InitalModifyIndexParamDialog=function(option)
+    {
+        if (this.DialogModifyIndexParam) return;
+
+        this.DialogModifyIndexParam=new JSDialogModifyIndexParam();
+        this.DialogModifyIndexParam.Inital(this, option);
+        this.DialogModifyIndexParam.Create();
+    }
+
     this.ShowChangeIndexDialog=function(data)
     {
         if (!data) return;
@@ -7106,6 +7108,46 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogSearchIndex.SetOpData(data);
         this.DialogSearchIndex.Show();
     }
+
+    //添加指标窗口
+    this.ShowAddIndexWindowDialog=function(option)
+    {
+        if (!this.DialogSearchIndex) return;
+        var data=option;
+        if (!data) data={ };
+
+        data.OpType=3;
+
+        data.Title=`增加指标窗口`;
+        this.DialogSearchIndex.SetOpData(data);
+        this.DialogSearchIndex.Show();
+    }
+
+    this.ShowModifyIndexParamDialog=function(data)
+    {
+        if (!this.DialogModifyIndexParam) return;
+
+        if (data.Type==1)
+        {
+            var indexScript=this.WindowIndex[data.WindowIndex];
+            if (!indexScript) return;
+
+            data.IndexScript=indexScript;
+            data.Title=`[${indexScript.Name}]参数修改 窗口[${data.WindowIndex+1}]`;
+        }
+        else if (data.Type==2)
+        {
+            var overlayIndex=this.GetOverlayIndexByIdentify(data.Identify);
+            if (!overlayIndex || !overlayIndex.OverlayItem.Script) return;
+            var indexScript=overlayIndex.OverlayItem.Script;
+
+            data.IndexScript=indexScript;
+            data.Title=`[${indexScript.Name}]参数修改 叠加窗口[${data.WindowIndex+1}]`;
+        }
+
+        this.DialogModifyIndexParam.SetIndexData(data);
+        this.DialogModifyIndexParam.Show();
+    }
     
 
     this.DrawSelectRectDialog=function()
@@ -12742,6 +12784,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsNumber(windowItem.IndexParamSpace)) frame.IndexParamSpace=windowItem.IndexParamSpace;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexTitleSpace)) frame.IndexTitleSpace=windowItem.IndexTitleSpace;
             if (!IFrameSplitOperator.IsUndefined(windowItem.HorizontalReserved)) frame.HorizontalReserved=windowItem.HorizontalReserved;    //Y轴上下预留
+            if (IFrameSplitOperator.IsBool(windowItem.IsShowNameArrow)) frame.IsShowNameArrow=windowItem.IsShowNameArrow;
         }
 
         if (frameItem)
@@ -13981,6 +14024,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (IFrameSplitOperator.IsBool(option.Enable)) this.KLineTooltipConfig.Enable=option.Enable;
                 if (IFrameSplitOperator.IsBool(option.EnableKeyDown)) this.KLineTooltipConfig.EnableKeyDown=option.EnableKeyDown;
                 break;
+            case JSCHART_MENU_ID.CMD_MODIFY_INDEX_PARAM:
+                if (param==null) return false;
+                var sendData={ e:null, WindowIndex:param, Type:1 }
+                this.ShowModifyIndexParamDialog(sendData);
+                break;
+            case JSCHART_MENU_ID.CMD_MODIFY_OVERLAY_INDEX_PARAM:
+                if (param==null) return false;
+                if (!aryArgs[1]) return false;
+                var sendData={ e:null, WindowIndex:param, Type:2, Identify:aryArgs[1] };
+                this.ShowModifyIndexParamDialog(sendData);
+                break;
         }
     }
 
@@ -13994,6 +14048,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return data;
     }
 
+    this.GetModifyIndexMenuData=function(windowIndex)
+    {
+        var data= { Name:"参数修改",  Data:{ ID: JSCHART_MENU_ID.CMD_MODIFY_INDEX_PARAM, Args:[windowIndex] } };
+        return data;
+    }
+
     this.GetShowOverlayIndexMenuData=function(indexGuid, showType)
     {
         var overlay=this.GetOverlayIndexByIdentify(indexGuid);
@@ -14005,6 +14065,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return data;
     }
 
+    this.GetModifyOverlayIndexMenuData=function(indexGuid)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay) return null;
+
+        var data= { Name:"参数修改",  Data:{ ID: JSCHART_MENU_ID.CMD_MODIFY_OVERLAY_INDEX_PARAM, Args:[overlay.WindowIndex,indexGuid] } };
+        return data;
+    }
+
     this.GetShowOverlayIndexYAxisMenuData=function(indexGuid, showType)
     {
         var overlay=this.GetOverlayIndexByIdentify(indexGuid);
@@ -17881,7 +17950,6 @@ function MinuteFrame()
     this.ExportData=g_JSChartResource.MinuteToolbar.ExportData;      //是否显示'导出数据'菜单
     this.OverlayIndex=g_JSChartResource.MinuteToolbar.OverlayIndex;    //是否显示叠加指标
 
-    this.ModifyIndexEvent;   //改参数 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
     this.IsShowPositionTitle=false; //是否显示持仓标题
 
@@ -20310,7 +20378,6 @@ function KLineFrame()
 
     this.SelBorderColor=g_JSChartResource.SelFrameBorderColor;
 
-    this.ModifyIndexEvent;   //改参数 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
     this.ReDrawToolbar=false;
 
@@ -38030,6 +38097,13 @@ function ChartStickLine()
         return (this.BarType==1 || this.BarType==-1);
     }
 
+    this.CalculateBarHeight=function(y,y2)
+    {
+        var barHeight=Math.abs(y-y2);
+        if (barHeight<=0) barHeight=1;
+        return barHeight;
+    }
+
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
@@ -38169,7 +38243,7 @@ function ChartStickLine()
                     }
                     else
                     {
-                        this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(Math.abs(y-y2)));
+                        this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(Math.min(y,y2)),ToFixedRect(width),ToFixedRect(this.CalculateBarHeight(y,y2)));
                     }
                 }
             }
@@ -38196,9 +38270,14 @@ function ChartStickLine()
                 else
                 {
                     if (isHScreen) 
+                    {
                         this.Canvas.fillRect(ToFixedRect(Math.min(y,y2)),ToFixedRect(xOffset),ToFixedRect(Math.abs(y-y2)),ToFixedRect(dataWidth));
+                    }
                     else 
-                        this.Canvas.fillRect(ToFixedRect(xOffset),ToFixedRect(Math.min(y,y2)),ToFixedRect(dataWidth),ToFixedRect(Math.abs(y-y2)));
+                    {
+                        this.Canvas.fillRect(ToFixedRect(xOffset),ToFixedRect(Math.min(y,y2)),ToFixedRect(dataWidth),ToFixedRect(this.CalculateBarHeight(y,y2)));
+                    }
+                        
                 }
             }
             else
@@ -38214,8 +38293,9 @@ function ChartStickLine()
                 {
                     var xFix=parseInt(x.toString())+0.5;
                     this.Canvas.beginPath();
-                    this.Canvas.moveTo(xFix,y);  
-                    this.Canvas.lineTo(xFix,y2);
+                    this.Canvas.moveTo(xFix,y);
+                    if (Math.abs(y-y2)>0) this.Canvas.lineTo(xFix,y2);
+                    else this.Canvas.lineTo(xFix,y+1);  //太窄了，就画一个像素的宽度
                     this.Canvas.stroke();
                 }
             }
@@ -52301,6 +52381,17 @@ IFrameSplitOperator.RemoveZero=function(strValue)
     return strValue;
 }
 
+//移除代码市场后缀
+IFrameSplitOperator.RemoveMarketSuffix=function(symbol)
+{
+    if (!symbol) return symbol;
+
+    var pos=symbol.lastIndexOf(".");
+    if (pos>0) return symbol.substring(0,pos);
+
+    return symbol;
+}
+
 function FrameSplitKLinePriceY()
 {
     this.newMethod=IFrameSplitOperator;   //派生
@@ -73284,6 +73375,17 @@ function JSChartResource()
         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 微软雅黑',   //字体
@@ -73698,7 +73800,7 @@ function JSChartResource()
         SortIcon:
         {
             Size:12, Family:"iconfont",
-            Arrow:[null, "\ue6b2", "\ue6b1"],
+            Arrow:[null, "\ue6b2", "\ue6b1"],           //[0]=默认排序的图标背景色
             Color:[null, "rgb(255,0,0)", "rgb(255,0,0)"],
             Margin:{ Left:0, Bottom:6 }
         },
@@ -77446,8 +77548,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.GlobalOption=this.GlobalOption;
 
-            if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
 
@@ -77530,8 +77630,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
         frame.GlobalOption=this.GlobalOption;
 
-        if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-
         frame.HorizontalMax=20;
         frame.HorizontalMin=10;
         frame.YSplitOperator=new FrameSplitY();
@@ -83516,9 +83614,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             var id=button.IndexID;
             var frame=button.Frame;
-            e.data={ Chart:this, Identify:id, IsOverlay:true };
-            if (frame.ModifyIndexEvent) 
-                frame.ModifyIndexEvent(e);
+            var sendData={ e:e, WindowIndex:frame.Identify, Type:2, Identify:id };
+            this.ShowModifyIndexParamDialog(sendData);
         }
         else if (button.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW)
         {
@@ -83539,9 +83636,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         else if (button.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM)
         {
             var frame=button.Frame;
-            e.data={ Chart:this, Identify:frame.Identify, IsOverlay:false };
-            if (frame.ModifyIndexEvent) 
-                frame.ModifyIndexEvent(e);
+            var sendData={ e:e, WindowIndex:frame.Identify, Type:1 }
+            this.ShowModifyIndexParamDialog(sendData);
         }
         else if (button.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX)
         {
@@ -84353,9 +84449,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         {
             var id=button.IndexID;
             var frame=button.Frame;
-            e.data={ Chart:this, Identify:id, IsOverlay:true };
-            if (frame.ModifyIndexEvent) 
-                frame.ModifyIndexEvent(e);
+            var sendData={ e:e, WindowIndex:frame.Identify, Type:2, Identify:id };
+            this.ShowModifyIndexParamDialog(sendData);
+
         }
         else if (button.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW)
         {
@@ -84371,9 +84467,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         else if (button.ID==JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM)
         {
             var frame=button.Frame;
-            e.data={ Chart:this, Identify:frame.Identify, IsOverlay:false };
-            if (frame.ModifyIndexEvent) 
-                frame.ModifyIndexEvent(e);
+            var sendData={ e:e, WindowIndex:frame.Identify, Type:1 }
+            this.ShowModifyIndexParamDialog(sendData);
         }
         else if (button.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX)
         {
@@ -86140,7 +86235,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
             if (i>=2)
             {
-                if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
+                
             }
 
             var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
@@ -86227,12 +86322,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         frame.GlobalOption=this.GlobalOption;
         frame.HQChart=this;
         frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
-        
-
-        if (id>=2)
-        {
-            if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-        }
 
         var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
         frame.HorizontalMax=DEFAULT_HORIZONTAL[0];
@@ -91805,8 +91894,6 @@ function KLineChartHScreenContainer(uielement)
             frame.Identify=i;                   //窗口序号
             frame.RightSpaceCount=this.RightSpaceCount; //右边
 
-            if (this.ModifyIndexDialog) frame.ModifyIndexEvent=this.ModifyIndexDialog.DoModal;        //绑定菜单事件
-
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
 
@@ -94411,230 +94498,6 @@ function IDivDialog(divElement)
     }
 }
 
-
-//修改指标
-function ModifyIndexDialog(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.Title={ ID:Guid() };      //标题
-    this.ParamList={ID:Guid() };   //参数列表  class='parameter-content'
-    this.ParamData=[];              //{ ID:参数ID, Value:参数值}
-    this.Identify;
-    this.HQChart;
-    this.IsOverlay=false;           //是否是叠加指标
-
-    this.IndexScript;
-
-    //创建
-    this.Create=function()
-    {
-        this.ID=Guid();
-
-        var div=document.createElement('div');
-        div.className='jchart-modifyindex-box';
-        div.id=this.ID;
-        div.innerHTML=
-        "<div class='parameter'>\
-            <div class='parameter-header'>\
-                <span></span>\
-                <strong id='close' class='icon iconfont icon-close'></strong>\
-            </div>\
-            <div class='parameter-content'><input/>MA</div>\
-            <div class='parameter-footer'>\
-                <button class='submit' >确定</button>\
-                <button class='cancel' >取消</button>\
-            </div>\
-        </div>";
-
-        this.DivElement.appendChild(div);
-
-        //确定按钮
-        $("#"+this.ID+" .submit").click(
-            {
-                divBox:this,
-            },
-            function(event)
-            {
-                event.data.divBox.Hide();
-            });
-
-        //给一个id 后面查找方便
-        var titleElement=div.getElementsByTagName('span')[0];
-        titleElement.id=this.Title.ID;
-
-        var paramListElement=div.getElementsByClassName('parameter-content')[0];
-        paramListElement.id=this.ParamList.ID;
-    }
-
-    //设置标题
-    this.SetTitle=function(title)
-    {
-        $("#"+this.Title.ID).html(title);
-    }
-
-    //清空参数
-    this.ClearParamList=function()
-    {
-        $("#"+this.ParamList.ID).empty();
-        this.ParamData=[];
-    }
-
-    this.BindParam=function()
-    {
-        for(var i=0; i<this.IndexScript.Arguments.length; ++i)
-        {
-            var item=this.IndexScript.Arguments[i];
-            if (item.Name==null || isNaN(item.Value)) break;
-
-            var guid=Guid();
-            var param = '<input class="row-line" id="'+guid+'" value="'+item.Value+'" type="number" step="1"/>'+ item.Name +'<br>';
-            $("#"+this.ParamList.ID).append(param);
-
-            this.ParamData.push({ID:guid,Value:item.Value});
-        }
-
-        //绑定参数修改事件
-        var self=this;
-        for(var i=0; i<this.ParamData.length; ++i)
-        {
-            var item=this.ParamData[i];
-            $("#"+item.ID).mouseup(
-                {
-                    ParamIndex:i   //参数序号
-                },
-                function(event)
-                {
-                    var value = parseInt($(this).val());                            //获取当前操作的input属性值，转化为整型
-                    if (!IFrameSplitOperator.IsNumber(value)) 
-                    {
-                        alert("参数不能为空");
-                        return;
-                    }
-                    var chart=self.HQChart;
-                    var identify=self.Identify;
-                    var paramIndex=event.data.ParamIndex;
-                    var script=self.IndexScript;
-                    var isOverlay=self.IsOverlay;
-
-                    script.Arguments[paramIndex].Value = value;         //为参数属性重新赋值
-                    if (isOverlay) chart.UpdateOverlayIndex(identify);
-                    else chart.UpdateWindowIndex(identify);              //调用更新窗口指标函数，参数用来定位窗口
-                }
-            )
-
-            $("#"+item.ID).keyup(
-                {
-                    ParamIndex:i   //参数序号
-                },
-                function(event)
-                {
-                    var value = parseInt($(this).val());                            //获取当前操作的input属性值，转化为整型
-                    if (!IFrameSplitOperator.IsNumber(value)) 
-                    {
-                        alert("参数不能为空");
-                        return;
-                    }
-                    var chart=self.HQChart;
-                    var identify=self.Identify;
-                    var paramIndex=event.data.ParamIndex;
-                    var script=self.IndexScript;
-                    var isOverlay=self.IsOverlay;
-
-                    script.Arguments[paramIndex].Value = value;    //为参数属性重新赋值
-                    if (isOverlay) chart.UpdateOverlayIndex(identify);
-                    else chart.UpdateWindowIndex(identify);                              //调用更新窗口指标函数，参数用来定位窗口
-                }
-            )
-        }
-    }
-
-    //绑定取消事件
-    this.BindCancel=function()
-    {
-        //取消按钮事件
-        var self=this;
-        var test=$("#"+this.ID+" .cancel");
-        $("#"+this.ID+" .cancel").unbind("click").click(
-            function(event)
-            {
-                var chart=self.HQChart;
-                var identify=self.Identify;
-                self.RestoreParam();
-                var isOverlay=self.IsOverlay;
-                if (isOverlay) chart.UpdateOverlayIndex(identify);
-                else chart.UpdateWindowIndex(identify);
-                self.IndexScript=null;
-                self.Hide();
-            }
-        );
-
-        //关闭和取消是一样的
-        $("#"+this.ID+" #close").unbind("click").click(
-            function(event)
-            {
-                var chart=self.HQChart;
-                var identify=self.Identify;
-                var isOverlay=self.IsOverlay;
-                self.RestoreParam();
-                if (isOverlay) chart.UpdateOverlayIndex(identify);
-                else chart.UpdateWindowIndex(identify);
-                self.IndexScript=null;
-                self.Hide();
-            }
-        );
-    }
-
-    //还原参数
-    this.RestoreParam=function()
-    {
-        if (!this.IndexScript) return;
-
-        for(var i=0; i<this.ParamData.length; ++i)
-        {
-            var item=this.ParamData[i];
-            this.IndexScript.Arguments[i].Value=item.Value;
-        }
-    }
-
-    //显示
-    this.DoModal=function(event)
-    {
-        var chart=event.data.Chart;
-        var identify=event.data.Identify;
-        var dialog=chart.ModifyIndexDialog;
-        var isOverlay=event.data.IsOverlay===true;
-
-        if(!dialog) return;
-
-        if (dialog.ID==null) dialog.Create();   //第1次 需要创建div
-        dialog.Identify=identify;
-        dialog.HQChart=chart;
-        dialog.IsOverlay=isOverlay
-
-        if (isOverlay)
-        {
-            var overlayIndex=chart.GetOverlayIndexByIdentify(identify);
-            if (!overlayIndex || !overlayIndex.OverlayItem.Script) return;
-            dialog.IndexScript=overlayIndex.OverlayItem.Script;
-            dialog.SetTitle(dialog.IndexScript.Name+" 叠加指标参数设置");   //设置标题
-        }
-        else
-        {
-            dialog.IndexScript=chart.WindowIndex[identify];
-            dialog.SetTitle(dialog.IndexScript.Name+" 指标参数设置");      //设置标题
-        }
-
-        dialog.ClearParamList();            //清空参数
-        dialog.BindParam(chart,identify);   //绑定参数
-        dialog.BindCancel();  //绑定取消和关闭事件
-
-        dialog.Show();//显示, 在css里调整居中
-    }
-}
-
 //等待动画窗口
 function WaitDialog(divElement)
 {
@@ -132210,6 +132073,7 @@ function ChartReport()
         var top=this.RectClient.Top;
         var y=top+this.HeaderMergin.Top+(this.HeaderHeight-this.HeaderMergin.Top-this.HeaderMergin.Bottom)/2;
         var yBottom=top+this.HeaderHeight;
+        var bDrawSortBG=this.IsDrawSortBGIcon();
 
         this.Canvas.font=this.HeaderFont;
         
@@ -132251,6 +132115,10 @@ function ChartReport()
             {
                 this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort, textSize);
             }
+            else if (item.Sort>0 && bDrawSortBG)
+            {
+                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,0,textSize);
+            }
             else
             {
                 this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
@@ -132304,6 +132172,10 @@ function ChartReport()
             {
                 this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort,textSize);
             }
+            else if (item.Sort>0)
+            {
+                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,0, textSize);
+            }
             else
             {
                 this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
@@ -132366,10 +132238,24 @@ function ChartReport()
         }
     }
 
+    //是否绘制排序背景图标
+    this.IsDrawSortBGIcon=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SortConfig.Arrow)) return false;
+        if (!this.SortConfig.Arrow[0]) return false;
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SortConfig.Color)) return false;
+        if (!this.SortConfig.Color[0]) return false;
+
+        return true;
+    }
+
     this.DrawSortHeader=function(text, textAlign, x, yBottom, width, sortType,textSize)
     {
         var pixelRatio=GetDevicePixelRatio();
         var sortText=this.SortConfig.Arrow[sortType];
+        var sortBGText=this.SortConfig.Arrow[0];
+        var sortBGColor=this.SortConfig.Color[0];
         this.Canvas.font=this.HeaderFont;
         var textWidth=this.Canvas.measureText(text).width;
         var sortTextWidth=this.SortConfig.Size*pixelRatio+this.SortConfig.Margin.Left;
@@ -132393,8 +132279,17 @@ function ChartReport()
 
         xText+=(textWidth+this.SortConfig.Margin.Left);
         this.Canvas.font=this.SortFont;
-        this.Canvas.fillStyle=this.SortConfig.Color[sortType];
-        this.Canvas.fillText(sortText,xText,yBottom-this.SortConfig.Margin.Bottom);
+        if (sortBGText && sortBGColor)
+        {
+            this.Canvas.fillStyle=sortBGColor;
+            this.Canvas.fillText(sortBGText,xText,yBottom-this.SortConfig.Margin.Bottom);
+        }
+
+        if (sortType>0)
+        {
+            this.Canvas.fillStyle=this.SortConfig.Color[sortType];
+            this.Canvas.fillText(sortText,xText,yBottom-this.SortConfig.Margin.Bottom);
+        }
 
         this.Canvas.font=this.HeaderFont;
         this.Canvas.fillStyle=this.HeaderColor;
@@ -132406,7 +132301,6 @@ function ChartReport()
         }
     }
 
-
     this.DrawBorder=function()
     {
         if (!this.IsDrawBorder) return;
@@ -133185,7 +133079,7 @@ function ChartReport()
     this.DrawSymbolName=function(data, column, left, top, rowType)
     {
         var stock=data.Stock;
-        var symbol=data.Symbol;
+        var symbol=IFrameSplitOperator.RemoveMarketSuffix(data.Symbol);
         var name;
         if (stock)
         {
@@ -133242,7 +133136,7 @@ function ChartReport()
     this.DrawSymbolNameV2=function(data, column, left, top, rowType)
     {
         var stock=data.Stock;
-        var symbol=data.Symbol;
+        var symbol=IFrameSplitOperator.RemoveMarketSuffix(data.Symbol);
         var name;
         if (stock)
         {
@@ -147110,7 +147004,7 @@ function JSDialogSelectRect()
  
    jones_2000@163.com
 
-   内置指标搜索对话框
+   内置指标搜索对话框 修改指标参数对话框
 */
 
 
@@ -147124,7 +147018,7 @@ function JSDialogSearchIndex()
 
     this.HQChart=null;
 
-    //{ WindowIndex:窗口索引, OpType:1=切换主图指标 2=添加叠加指标,  Title: };  
+    //{ WindowIndex:窗口索引, OpType:1=切换主图指标 2=添加叠加指标 3=新增指标窗口,  Title: };  
     this.OpData=null;        
 
     this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
@@ -147150,6 +147044,7 @@ function JSDialogSearchIndex()
         {
             if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
             if (option.IndexData) this.IndexData=option.IndexData;
+            if (IFrameSplitOperator.IsNumber(option.MaxRowCount)) this.MaxRowCount=option.MaxRowCount;
         }
     }
 
@@ -147159,7 +147054,8 @@ function JSDialogSearchIndex()
         this.AryGroup=[];
         this.IndexData=null;
         this.InputDom=null;
-       
+        this.HQChart=null;
+
         if (this.DivDialog) 
         {
             document.body.removeChild(this.DivDialog);
@@ -147426,6 +147322,24 @@ function JSDialogSearchIndex()
                 this.HQChart.AddOverlayIndex(obj);
             }
         }
+        else if (this.OpData.OpType==3) //新增加指标窗口
+        {
+            var indexItem=cellItem.IndexItem;
+            if (indexItem.Type==0)  //系统指标
+            {
+                this.HQChart.AddIndexWindow(indexItem.ID, this.OpData);
+            }
+            else if (indexItem.Type==1) //自定义脚本指标
+            {
+                var indexData={ ID:indexItem.ID, Name:indexItem.Name, Script:indexItem.Script, Args:indexItem.Args };
+                this.HQChart.AddScriptIndexWindow(indexData, this.OpData);
+            }
+            else if (indexItem.Type==2) //api指标
+            {
+                var indexData={ API: { ID:indexItem.ID, Name:indexItem.Name, Args:indexItem.Args, Url:'local'} };
+                this.HQChart.AddAPIIndexWindow(indexData, this.OpData);
+            }
+        }
         
     }
 
@@ -147698,7 +147612,7 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                 ]
             },
 
-            /*
+            
             {
                 Group:{ ID:"自定义", Name:"自定义"} , 
                 AryIndex:
@@ -147707,7 +147621,7 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                     { Name:"高低均价(自定义脚本)", ID:"HIGH_LOW_AV", Type:1, Args:null , Script:"均价:(H+L)/2;高:H;低:L;", Args:[ { Name:'N', Value:20}, { Name:'M', Value:6}]},
                 ]
             }
-            */
+            
         ]
        
     }
@@ -147717,6 +147631,410 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
 
 
 
+function JSDialogModifyIndexParam()
+{
+    this.DivDialog=null;
+    this.DragTitle=null;
+    this.TitleBox=null; //{ DivTitle, DivName, DivName }
+    this.Style=0;       //样式 预留
+
+    this.TitleColor=g_JSChartResource.DialogModifyIndexParam.TitleColor;
+    this.TitleBGColor=g_JSChartResource.DialogModifyIndexParam.TitleBGColor;
+    this.BGColor=g_JSChartResource.DialogModifyIndexParam.BGColor;
+    this.BorderColor=g_JSChartResource.DialogModifyIndexParam.BorderColor;
+    this.ParamNameColor=g_JSChartResource.DialogModifyIndexParam.ParamNameColor;
+    this.InputTextColor=g_JSChartResource.DialogModifyIndexParam.InputTextColor;
+
+    this.MaxRowCount=30;    //行
+
+    this.HQChart=null;
+
+    this.AryData=[];
+    this.IndexData=null;    //指标数据 { WindowsIndex:, Type:1=主图 2=叠加, Identify, IndexScript: }
+    this.Arguments=[];           //参数备份
+
+    this.Inital=function(hqchart, option)
+    {
+        this.HQChart=hqchart;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+            if (IFrameSplitOperator.IsNumber(option.MaxRowCount)) this.MaxRowCount=option.MaxRowCount;
+        }
+    }
+
+
+    this.Destroy=function()
+    {
+        this.AryData=[];
+        this.HQChart=null;
+
+        if (this.DivDialog) 
+        {
+            document.body.removeChild(this.DivDialog);
+            this.DivDialog=null;
+        }
+    }
+
+    this.Show=function(x,y)
+    {
+        if (!this.DivDialog) return;
+        //if (!this.HQChart) return;
+
+        this.UpdateParam();
+
+        if (this.IndexData && this.IndexData.Title) this.TitleBox.DivName.innerText=this.IndexData.Title;
+
+        if (!IFrameSplitOperator.IsNumber(x) || !IFrameSplitOperator.IsNumber(y))   //默认居中显示
+        {
+            var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+            x=rtClient.left+(rtClient.right-rtClient.left-this.DivDialog.offsetWidth)/2;
+            y=rtClient.top+(rtClient.bottom-rtClient.top-this.DivDialog.offsetHeight)/2;
+        }
+
+        this.DivDialog.style.visibility='visible';
+        this.DivDialog.style.top = y + "px";
+        this.DivDialog.style.left = x + "px";
+    }
+
+    this.OnClickColseButton=function(e)
+    {
+        this.RestoreParam();    //还原参数
+        this.Close(e);
+    }
+
+    this.OnClickRestoreButton=function(e)
+    {
+        var aryText=this.Arguments;
+        if (!aryText) aryText=[];
+        this.UpdateParamTable(aryText);
+        this.RestoreParam();
+    }
+
+    this.OnClickOkButton=function(e)
+    {
+        this.Close(e);
+    }
+
+    this.Close=function(e)
+    {
+        this.IndexData=null;
+        this.Arguments=[];
+        if (!this.DivDialog) return;
+
+        this.DivDialog.style.visibility='hidden';
+    }
+
+    this.SetIndexData=function(data)
+    {
+        this.IndexData=data;
+        this.BackupParam();
+    }
+
+    this.OnMouseDownTitle=function(e)
+    {
+        if (!this.DivDialog) return;
+
+        var dragData={ X:e.clientX, Y:e.clientY };
+        dragData.YOffset=e.clientX - this.DivDialog.offsetLeft;
+        dragData.XOffset=e.clientY - this.DivDialog.offsetTop;
+        this.DragTitle=dragData;
+
+        document.onmousemove=(e)=>{ this.DocOnMouseMoveTitle(e); }
+        document.onmouseup=(e)=>{ this.DocOnMouseUpTitle(e); }
+    }
+
+    this.DocOnMouseMoveTitle=function(e)
+    {
+        if (!this.DragTitle) return;
+
+        var left = e.clientX - this.DragTitle.YOffset;
+        var top = e.clientY - this.DragTitle.XOffset;
+
+        var right=left+this.DivDialog.offsetWidth;
+        var bottom=top+ this.DivDialog.offsetHeight;
+        
+        if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
+        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+
+        this.DivDialog.style.left = left + 'px';
+        this.DivDialog.style.top = top + 'px';
+
+        if(e.preventDefault) e.preventDefault();
+    }
+
+    this.DocOnMouseUpTitle=function(e)
+    {
+        this.DragTitle=null;
+        this.onmousemove = null;
+        this.onmouseup = null;
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement("div");
+        divDom.className='UMyChart_ModifyIndexParam_Dialog_Div';
+
+        //对话框标题栏
+        var divTitle=document.createElement("div");
+        divTitle.className='UMyChart_ModifyIndexParam_Title_Div';
+        divTitle.onmousedown=(e)=>{   this.OnMouseDownTitle(e);}
+        divDom.appendChild(divTitle);
+
+        var divName=document.createElement("div");
+        divName.className='UMyChart_ModifyIndexParam_Name_Div';
+        divName.innerText="指标参数修改";
+        divTitle.appendChild(divName);
+
+        var divClose=document.createElement("div");
+        divClose.className='UMyChart_ModifyIndexParam_Close_Div';
+        divClose.innerText="x";
+        divClose.onmousedown=(e)=>{ this.OnClickColseButton(e); }
+        divTitle.appendChild(divClose);
+        
+        //整个框子
+        var divFrame=document.createElement("div");
+        divFrame.className="UMyChart_ModifyIndexParam_Frome_Div";
+        divDom.appendChild(divFrame);
+
+        //表格
+        var divTable=document.createElement("div");
+        divTable.className='UMyChart_ModifyIndexParam_Table_Div';
+        divFrame.appendChild(divTable);
+        
+        var table=document.createElement("table");
+        table.className="UMyChart_ModifyIndexParam_Table";
+        divTable.appendChild(table);
+
+        /*
+        var thead=document.createElement("thead");
+        table.appendChild(thead);
+
+        var trDom=document.createElement("tr");
+        trDom.className='UMyChart_ModifyIndexParam_head_Tr';
+        thead.appendChild(trDom);
+
+        var thDom=document.createElement("th");
+        thDom.className="UMyChart_ModifyIndexParam_Th"; 
+        thDom.innerText="变量";
+        trDom.appendChild(thDom);
+
+        var thDom=document.createElement("th");
+        thDom.className="UMyChart_ModifyIndexParam_Th"; 
+        thDom.innerText="数值";
+        trDom.appendChild(thDom);
+
+        var thDom=document.createElement("th");
+        thDom.className="UMyChart_ModifyIndexParam_Th"; 
+        thDom.innerText="说明";
+        trDom.appendChild(thDom);
+        */
+
+
+        var tbody=document.createElement("tbody");
+        tbody.className="UMyChart_ModifyIndexParam_Tbody";
+        table.appendChild(tbody);
+
+        this.AryData=[];
+        for(var i=0;i<this.MaxRowCount;++i)
+        {
+            var rowItem=this.CreateRowDOM(i, tbody)
+
+            this.AryData.push(rowItem);
+        }
+
+        var divButton=document.createElement("div");
+        divButton.className='UMyChart_ModifyIndexParam_Button_Div';
+        divFrame.appendChild(divButton);
+
+        var btnRestore=document.createElement("button");
+        //btnRestore.className="UMyChart_ModifyIndexParam_button";
+        btnRestore.innerText="恢复默认";
+        btnRestore.addEventListener("mousedown", (e)=>{ this.OnClickRestoreButton(e); });
+        divButton.appendChild(btnRestore);
+
+        var btnOk=document.createElement("button");
+        //btnOk.className="UMyChart_ModifyIndexParam_button";
+        btnOk.innerText="确认";
+        btnOk.addEventListener("mousedown", (e)=>{ this.OnClickOkButton(e); })
+        divButton.appendChild(btnOk);
+        
+        document.body.appendChild(divDom);
+
+        this.DivName=divName;
+        this.DivDialog=divDom;
+        this.TitleBox={ DivTitle:divTitle, DivName:divName, DivColor:divClose };
+
+        this.UpdateStyle();
+    }
+
+    this.CreateRowDOM=function(index, tbody)
+    {
+        var rowItem={ Tr:null, TdName:null, SpanName:null, TdValue:null, Input:null, ParamItem:null };
+
+        var trDom=document.createElement("tr");
+        trDom.className='UMyChart_ModifyIndexParam_Tr';
+        tbody.appendChild(trDom);
+        rowItem.Tr=trDom;
+
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_ModifyIndexParam_Name_Td";   //指标名称
+        trDom.appendChild(tdDom);
+        rowItem.TdName=tdDom;
+
+        var spanDom=document.createElement("span");
+        spanDom.className='UMyChart_ModifyIndexParam_Name_Span';
+        spanDom.innerText='参数';
+        tdDom.appendChild(spanDom);
+        rowItem.SpanName=spanDom;
+
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_ModifyIndexParam_Value_Td";   //指标名称
+        trDom.appendChild(tdDom);
+        rowItem.TdValue=tdDom;
+
+        var input=document.createElement("input");
+        input.className='UMyChart_ModifyIndexParam_Input';
+        input.type="number";
+        input.step=1;
+        input.addEventListener("mouseup", (e)=>{ this.OnParamMouseUp(e)});
+        input.addEventListener("keyup", (e)=>{ this.OnParamKeyUp(e)})
+        tdDom.appendChild(input);
+        rowItem.Input=input;
+
+        return rowItem;
+    }
+
+    this.UpdateStyle=function()
+    {
+        if (!this.DivDialog) return;
+
+        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
+        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
+
+        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
+        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
+    };
+
+    this.UpdateParamTable=function(aryText)
+    {
+        var index=0;
+        for(index=0; index<aryText.length && index<this.AryData.length; ++index)
+        {
+            var item=aryText[index];
+            var row=this.AryData[index];
+            row.SpanName.innerText=`${item.Name}: `;
+            row.SpanName.style.color=this.ParamNameColor;
+
+            row.Input.value=item.Value;
+            row.Input.style.color=this.InputTextColor;
+            row.Input.dataset.paramid=item.Index;
+
+            if (row.Tr.style.display=="none") row.Tr.style.display="";
+        }
+
+        for(; index<this.AryData.length; ++index)
+        {
+            var row=this.AryData[index];
+            row.Tr.style.display="none";
+            row.Input.dataset.paramid=-1;
+        }
+    }
+
+    this.UpdateParam=function()
+    {
+        var aryText=[];
+        var indexScript=this.IndexData.IndexScript;
+        if (indexScript && IFrameSplitOperator.IsNonEmptyArray(indexScript.Arguments))
+        {
+            for(var i=0;i<indexScript.Arguments.length;++i)
+            {
+                var item=indexScript.Arguments[i];
+                aryText.push({ Name:item.Name, Value:item.Value, Index:i });
+            }
+        }
+
+        this.UpdateParamTable(aryText);
+    }
+
+    this.RestoreParam=function()
+    {
+        if (!this.IndexData || !this.IndexData.IndexScript) return;
+        var indexScript=this.IndexData.IndexScript;
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(indexScript.Arguments)) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Arguments)) return;
+
+        var bUpdate=false;
+        for(var i=0;i<this.Arguments.length;++i)
+        {
+            var oldItem=this.Arguments[i];
+            var item=indexScript.Arguments[i];
+            if (oldItem.Value!=item.Value)
+            {
+                item.Value=oldItem.Value;
+                bUpdate=true;
+            }
+        }
+
+        if (!bUpdate) return;
+
+        if (this.IndexData.Type==1) this.HQChart.UpdateWindowIndex(this.IndexData.WindowIndex);
+        else if (this.IndexData.Type==2) this.HQChart.UpdateOverlayIndex(this.IndexData.Identify);
+    }
+
+    this.BackupParam=function()
+    {
+        this.Arguments=[];
+
+        if (!this.IndexData || !this.IndexData.IndexScript) return;
+        var indexScript=this.IndexData.IndexScript;
+        if (IFrameSplitOperator.IsNonEmptyArray(indexScript.Arguments))
+        {
+            for(var i=0;i<indexScript.Arguments.length;++i)
+            {
+                var item=indexScript.Arguments[i];
+                this.Arguments.push({Name:item.Name, Value:item.Value, Index:i});
+            }
+        }
+    }
+
+    this.OnParamMouseUp=function(e)
+    {
+        var input=e.target;
+        var value=input.value;
+        var id=input.dataset.paramid;
+
+        this.ModifyParam(id, parseInt(value));
+    }
+
+    this.OnParamKeyUp=function(e)
+    {
+        var input=e.target;
+        var value=input.value;
+        var id=input.dataset.paramid;
+
+        this.ModifyParam(id, parseInt(value));
+    }
+
+    this.ModifyParam=function(id, value)
+    {   
+        if (!this.IndexData || !this.IndexData.IndexScript) return;
+
+        var indexScript=this.IndexData.IndexScript;
+        var item=indexScript.Arguments[id];
+        if (!item) return;
+        if (item.Value==value) return;
+
+        item.Value=value;
+
+        if (this.IndexData.Type==1) this.HQChart.UpdateWindowIndex(this.IndexData.WindowIndex);
+        else if (this.IndexData.Type==2) this.HQChart.UpdateOverlayIndex(this.IndexData.Identify);
+    }
+}
+
+
+
 
 ///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
@@ -147839,7 +148157,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14083";
+var HQCHART_VERSION="1.1.14096";
 
 function PrintHQChartVersion()
 {