hqchart 1.1.15104 → 1.1.15106

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

@@ -6758,12 +6758,6 @@ JSChart.RegisterScriptIndexChart=function(name, option)
     return g_ScriptIndexChartFactory.Add(name, option);
 }
 
-//注册设置对话框类
-//option:{ Create:创建类方法 }
-JSChart.RegisterDialogClass=function(name, option)
-{
-    return g_DialogFactory.Add(name, option);
-}
 
 //注册框架类
 JSChart.RegisterChartFrameClass=function(name, option)
@@ -51951,17 +51945,40 @@ function ChartLock()
         if (!out || !IFrameSplitOperator.IsNonEmptyArray(aryText)) return false;
 
         this.Canvas.font=defaultFont;
-        var lineHeight=this.Canvas.measureText("擎").width; //行高
+        var defaultLineHeight=this.Canvas.measureText("擎").width; //行高
+        var lineHeight=defaultLineHeight;
         var height=0, width=0;
         out.AryText=[];
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
-            if (!item || !item.Text) continue;
-            var textWidth=this.Canvas.measureText(item.Text).width;
+            if (!item || (!item.Text && !item.Image)) continue;
+            if (item.Image)
+            {
+                textWidth=item.Image.Width;
+                lineHeight=item.Image.Height;
+            }
+            else
+            {
+                 if (item.Font) 
+                {
+                    this.Canvas.font=item.Font;
+                    lineHeight=this.Canvas.measureText("擎").width;
+                }
+                else 
+                {
+                    this.Canvas.font=defaultFont;
+                    lineHeight=defaultLineHeight;
+                }
+
+                var textWidth=this.Canvas.measureText(item.Text).width;
+            }
            
             var lineItem={ Text:item.Text, Width:textWidth, Height:lineHeight, Color:item.Color, TextMargin:{ Top:0, Bottom:0, Left:0, Right:0 }, YOffset:0 };
             if (IFrameSplitOperator.IsNumber(item.YOffset)) lineItem.YOffset=item.YOffset;
+            if (item.Font) lineItem.Font=item.Font;
+            if (IFrameSplitOperator.IsNumber(item.Align)) lineItem.Align=item.Align;    //左右对齐 0=左 1=中 2=右
+            if (item.Image) lineItem.Image=item.Image;
             if (item.TextMargin)
             {
                 var margin=item.TextMargin;
@@ -52085,6 +52102,9 @@ function ChartLock()
                 if (item.Color)  this.Canvas.fillStyle=item.Color;
                 else this.Canvas.fillStyle=this.TextColor;
 
+                if (item.Font) this.Canvas.font = item.Font;
+                else this.Canvas.font = this.Font;
+
                 yText+=item.Height;
                 this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
             } 
@@ -52101,11 +52121,35 @@ function ChartLock()
             for(var i=0;i<outSize.AryText.length;++i)
             {
                 var item=outSize.AryText[i];
-                if (item.Color)  this.Canvas.fillStyle=item.Color;
-                else this.Canvas.fillStyle=this.TextColor;
+                if (item.Image)
+                {
+                    xText=left;
+                    if (item.Align===1)
+                    {
+                        if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
+                    }
 
-                yText+=item.Height;
-                this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+                    this.Canvas.drawImage(item.Image.Data, xText, yText, item.Image.Width, item.Image.Height);
+
+                    yText+=item.Height;
+                }
+                else
+                {
+                    if (item.Color)  this.Canvas.fillStyle=item.Color;
+                    else this.Canvas.fillStyle=this.TextColor;
+
+                    if (item.Font) this.Canvas.font = item.Font;
+                    else this.Canvas.font = this.Font;
+
+                    yText+=item.Height;
+                    xText=left;
+                    if (item.Align===1)
+                    {
+                        if (outSize.Width>item.Width) xText+=(outSize.Width-item.Width)/2;
+                    }
+
+                    this.Canvas.fillText(item.Text, xText, yText+item.YOffset);
+                }
             } 
         }
     }
@@ -105103,239 +105147,9 @@ function IsFundSymbol(symbol)
     return false;
 }
 
-//设置对话框工厂类
-function DialogFactory()
-{
-    //[key:name, { Create:function(divElement) { return new class(divElement); }} ]
-    this.DataMap=new Map(
-    [
-        ["ChartPictureSettingMenu", { Create:function(divElement) { return new ChartPictureSettingMenu(divElement); } }],
-    ]); 
-
-    this.Create=function(name, option)
-    {
-        if (!this.DataMap.has(name)) 
-        {
-            JSConsole.Chart.Warn(`[DialogFactory::Create] can't find class=${name}.`);
-            return null;
-        }
-
-        var item=this.DataMap.get(name);
-        return item.Create(option);
-    }
-
-    this.Add=function(name, option)
-    {
-        this.DataMap.set(name, { Create:option.Create } );
-    }
-}
-
-var g_DialogFactory=new DialogFactory();
-
-//设置窗口基类
-function IDivDialog(divElement)
-{
-    this.DivElement=divElement;     //父节点
-    this.ID=null;                   //div id
-    this.TimeOut=null;              //定时器
-
-    //隐藏窗口
-    this.Hide=function()
-    {
-        $("#"+this.ID).hide();
-    }
-
-    //显示窗口
-    this.Show=function(left,top,width,height)
-    {
-        var cssData={display:'block'};
-        if (IFrameSplitOperator.IsNumber(left)) cssData.left=left+'px';
-        if (IFrameSplitOperator.IsNumber(top)) cssData.top=top+'px';
-        if (IFrameSplitOperator.IsNumber(width)) cssData.width=width+'px';
-        if (IFrameSplitOperator.IsNumber(height)) cssData.height=height+'px';
-
-        $("#"+this.ID).css(cssData);
-    }
-}
-
-//等待动画窗口
-function WaitDialog(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.Title='加载中......';
-    this.Dialog;
-
-    //隐藏窗口
-    this.Close=function()
-    {
-        if (this.Dialog) 
-        {
-            this.DivElement.removeChild(this.Dialog);
-            this.Dialog=null;
-        }
-    }
-
-    this.SetTitle=function(title)
-    {
-        this.Title=title;
-        if (!this.Dialog) return;
-        //TODO: 更新标题数据
-    }
-
-    this.Create=function()
-    {
-        this.ID=Guid();
-        var div=document.createElement('div');
-        div.className='jchart-wait-box';
-        div.id=this.ID;
-        div.innerHTML=
-        `<div class='parameter jchart-kline-match-box'>
-            <div class='parameter-header'>
-                <span>${this.Title}</span>
-            </div>
-        </div>`.trim();
-
-        this.DivElement.appendChild(div);
-        this.Dialog=div;
-    }
-
-    //显示
-    this.DoModal=function(event)
-    {
-        this.Title=event.data.Title;
-        var chart=event.data.Chart;
-        if (this.ID==null) this.Create();   //第1次 需要创建div
-        
-        //居中显示
-        var border=chart.Frame.ChartBorder;
-        var scrollPos=GetScrollPosition();
-        var left=border.GetWidth()/2;
-        var top=border.GetHeight()/2;
-
-        this.Show(left,top,200,40);      //显示
-    }
-}
-
-//画图工具 单个图形设置
-function ChartPictureSettingMenu(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.HQChart;
-    this.ChartPicture;
-    this.SubToolsDiv;
-    this.SettingMenu;
-    this.SettingPV;
-
-    this.DoModal=function(event)
-    {
-        var $body;
-        if (!this.SubToolsDiv)
-        {
-            this.ID=Guid();
-            var div=document.createElement("div");
-            div.className='subTolls';
-            div.id=this.ID;
-            this.DivElement.appendChild(div);
-            //$body = $("."+event.data.HQChart.ClassName).context.body;
-            //$body.append(div);
-            this.SubToolsDiv=div;
-        }
-        this.HQChart=event.data.HQChart;
-        this.ChartPicture=event.data.ChartPicture;
-
-        var pixelTatio = GetDevicePixelRatio();
-        var frame=this.HQChart.Frame.SubFrame[0].Frame;
-        // var top=frame.ChartBorder.GetTopTitle();
-        var top=frame.ChartBorder.Top + 40;
-        // var right=frame.ChartBorder.GetRight();
-        var right=frame.ChartBorder.Right;
-        var left=frame.ChartBorder.GetLeft();
-        var className = this.ChartPicture.ClassName; //='ChartDrawPictureText'时加“设置”
-        var lineColor=this.ChartPicture.LineColor;
-        if (lineColor.indexOf("rgb(")==0 || lineColor.indexOf("RGB(")==0)
-            lineColor=IChartDrawPicture.RGBToHex(lineColor.toLowerCase());
-        var toolsDiv = "";
-        if(className === 'ChartDrawPictureText')
-        {
-            toolsDiv = '<span class="changes-color" title="改变图形颜色">'+
-                           '<i class="iconfont icon-bianji"></i>'+
-                           '<input type="color" name="color" id="color" class="change-color" value="'+ lineColor +'">'+
-                        '</span>\n' +
-                        '<span class="subtool-set" title="设置"><i class="iconfont icon-shezhi"></i></span>'+
-                        '<span class="subtool-del"><i class="iconfont icon-recycle_bin"></i></span>';
-        }
-        else if (className=="ChartDrawVolProfile")
-        {
-            toolsDiv='<span class="vp-set" title="设置"><i class="iconfont icon-shezhi"></i></span>'+
-            '<span class="subtool-del"><i class="iconfont icon-recycle_bin"></i></span>';
-        }
-        else
-        {
-            toolsDiv =
-            '<p class="changes-color" title="改变图形颜色"><i class="iconfont icon-bianji"></i>' +
-            '<input type="color" name="color" id="color" class="change-color" value="'+ lineColor +'"></p>\n' +
-            '        <p class="subtool-del"><i class="iconfont icon-recycle_bin"></i></p>';
-        }
-
-        
-        this.SubToolsDiv.style.right = right/pixelTatio + "px";
-        this.SubToolsDiv.style.top = top/pixelTatio + "px";
-        this.SubToolsDiv.innerHTML = toolsDiv;
-        this.SubToolsDiv.style.position = "absolute";
-        this.SubToolsDiv.style.display = "block";
-
-        var hqChart = this.HQChart;
-        var picture = this.ChartPicture;
-        var subToolDiv = this.SubToolsDiv;
-        $(".subtool-del").click(function(){
-            hqChart.SelectChartDrawPicture=null;
-            hqChart.ClearChartDrawPicture(picture);
-            // subToolDiv.innerHTML = "";
-            $(".subTolls").css("display","none");
-        });
-        var self = this;
-        $(".subtool-set").click(function(){
-            $(self.SubToolsDiv).hide();
-            //创建div设置窗口
-            if (!self.SettingMenu) self.SettingMenu=new ChartPictureTextSettingMenu(frame.ChartBorder.UIElement.parentNode);
-
-            self.SettingMenu.ChartPicture=picture;
-            self.SettingMenu.HQChart=hqChart;
-            self.SettingMenu.Position={Left:right + 80,Top:top + 20};
-            self.SettingMenu.DoModal();
-        });
-        $(".changes-color").click(function () {
-            document.getElementById('color').click();
-            $(".change-color").change(function () {
-                var color = $(".change-color").val();
-                picture.LineColor = color;
-                picture.PointColor = color;
-                if (hqChart.ChartDrawStorage) hqChart.ChartDrawStorage.SaveDrawData(picture);   //保存下
-            });
-        });
-
-        //成交量分布图设置
-        $(".vp-set").click(function()
-        {
-            if (!self.SettingPV) self.SettingPV=new ChartPictureVolProfileSettingMenu(frame.ChartBorder.UIElement.parentNode);
-            self.SettingPV.ChartPicture=picture;
-            self.SettingPV.HQChart=hqChart;
-            self.SettingPV.Position={Left:right + 80,Top:top + 20};
-            self.SettingPV.DoModal();
-        });
-
-
-        JSConsole.Chart.Log("[ChartPictureSettingMenu::DoModal]", {Top:top,Left:left, Right:right});
-    }
-}
 
 
+/*
 function ChartPictureVolProfileSettingMenu(divElement)
 {
     this.newMethod=IDivDialog;   //派生
@@ -105424,6 +105238,7 @@ function ChartPictureVolProfileSettingMenu(divElement)
         }
     }
 }
+*/
 
 
 
@@ -158686,6 +158501,11 @@ function JSDialogModifyDraw()
         this.HQChart.Draw();
     }
 
+    this.AdvancedSetting=function()
+    {
+        
+    }
+
     this.GetRandomText=function(text)
     {
         var ARY_TEXT=["下跌形态","反转十字星","低位档五阳线","倒V型反转","双顶","持续整理形态"];
@@ -165782,7 +165602,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15103";
+var HQCHART_VERSION="1.1.15105";
 
 function PrintHQChartVersion()
 {