hqchart 1.1.13318 → 1.1.13327

package/package.json

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

package/src/jscommon/umychart.DialogDrawTool.js

@@ -18,6 +18,9 @@ var JS_DRAWTOOL_MENU_ID=
     CMD_ERASE_DRAW_CHART_ID:4,
     CMD_ENABLE_MAGNET_ID:5,   //画图工具磁体功能
     CMD_DELETE_DRAW_CHART_ID:6,
+
+    CMD_CHANGE_FONT_COLOR_ID:7, //切换字体颜色
+    CMD_CHANGE_BG_COLOR_ID:8    //切换背景色
 };
 
 function JSDialogDrawTool()
@@ -545,16 +548,23 @@ function JSDialogModifyDraw()
     this.DivDialog=null;
     this.HQChart;
     this.ChartPicture;
+    //按钮
     this.ColorButton=null;
+    this.BGColorButton=null;
+    this.FontColorButton=null;
+
+    this.RandomLineColor=["rgb(255,69,0)", "rgb(173,255,47)", "rgb(238,154,73)", "rgb(255,105,180)"];               //线段颜色
+    this.RandomBGColor=["rgba(210,251,209，0.8)", "rgb(217,217,253)", "rgb(255,208,204)", "rgb(252,249,206)"];      //背景颜色
+    this.RandomFontColor=["rgb(0,0,0)", "rgb(255, 0, 0)", "rgb(20, 255, 0)", "rgb(255, 0, 255)"];                   //文字颜色
 
-    this.RandomLineColor=["rgb(255,69,0)", "rgb(173,255,47)", "rgb(238,154,73)", "rgb(255,105,180)"];
     this.AryButton=
     [
-        { Title:"点击切换颜色", ClassName: 'hqchart_drawtool icon-fangkuai', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
+        { Title:"点击线段颜色", ClassName: 'hqchart_drawtool icon-huabi', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID }},
+        { Title:"点击字体颜色", ClassName: 'hqchart_drawtool icon-zitiyanse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID }},
+        { Title:"点击背景色", ClassName: 'hqchart_drawtool icon-zitibeijingse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID }},
         { Title:"删除", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }}
     ];
-
-
+   
     this.Inital=function(hqchart)
     {
        this.HQChart=hqchart;
@@ -605,11 +615,23 @@ function JSDialogModifyDraw()
         spanDom.classList.add("UMyChart_DrawTool_Span");
         divItem.appendChild(spanDom);
 
-        var data={ Span:spanDom, Parent:parentDivDom, Item:item };
+        var data={ Div:divItem, Span:spanDom, Parent:parentDivDom, Item:item };
         divItem.onmousedown=(e)=> { this.OnClickButton(e, data); };   //点击
 
-        if (item.Data.ID==JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID)
-            this.ColorButton=data;
+        switch(item.Data.ID)
+        {
+            case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_LINE_COLOR_ID:
+                this.ColorButton=data;
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID:
+                this.BGColorButton=data;
+                divItem.style.display="none";
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID:
+                this.FontColorButton=data;
+                divItem.style.display="none";
+                break;
+        }
 
         parentDivDom.appendChild(divItem);
     }
@@ -628,6 +650,12 @@ function JSDialogModifyDraw()
             case JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID:
                 this.DeleteDrawPicture();
                 break;
+            case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID:
+                this.ModifyBGColor();
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID:
+                this.ModifyFontColor();
+                break;
         }
     }
 
@@ -655,23 +683,35 @@ function JSDialogModifyDraw()
         this.Close();
     }
 
-    this.ModifyLineColor=function()
+    this.ShowButton=function(dom, diaplay)
     {
-        if (!this.ChartPicture || !this.HQChart) return;
+        if (dom.style.display==diaplay) return;
+        dom.style.display=diaplay;
+    }
 
-        var color=this.ChartPicture.LineColor;
+    this.GetRandomColor=function(currentColor, randomLineColor)
+    {
         var colorIndex=0;
-        for(var i=0;i<this.RandomLineColor.length;++i)
+        for(var i=0;i<randomLineColor.length;++i)
         {
-            if (color==this.RandomLineColor[i]) 
+            if (currentColor==randomLineColor[i]) 
             {
                 colorIndex=i+1;
                 break;
             }
         }
 
-        colorIndex=colorIndex%this.RandomLineColor.length;
-        color=this.RandomLineColor[colorIndex];
+        colorIndex=colorIndex%randomLineColor.length;
+        var color=randomLineColor[colorIndex];
+
+        return color;
+    }
+
+    this.ModifyLineColor=function()
+    {
+        if (!this.ChartPicture || !this.HQChart) return;
+
+        var color=this.GetRandomColor(this.ChartPicture.LineColor, this.RandomLineColor);
 
         this.ChartPicture.LineColor = color;
         this.ChartPicture.PointColor = color;
@@ -683,6 +723,32 @@ function JSDialogModifyDraw()
         this.HQChart.Draw();
     }
 
+    this.ModifyFontColor=function()
+    {
+        if (!this.ChartPicture || !this.HQChart) return;
+
+        var color=this.GetRandomColor(this.ChartPicture.TextColor, this.RandomFontColor);
+        this.ChartPicture.TextColor=color;
+
+        if (this.FontColorButton) this.FontColorButton.Span.style['color']=color;
+
+        if (this.HQChart.ChartDrawStorage) this.HQChart.ChartDrawStorage.SaveDrawData(this.ChartPicture);   //保存下
+
+        this.HQChart.Draw();
+    }
+
+    this.ModifyBGColor=function()
+    {
+        if (!this.ChartPicture || !this.HQChart) return;
+        var color=this.GetRandomColor(this.ChartPicture.BGColor, this.RandomBGColor);
+
+        this.ChartPicture.BGColor=color;
+        if (this.BGColorButton) this.BGColorButton.Span.style['color']=color;
+        if (this.HQChart.ChartDrawStorage) this.HQChart.ChartDrawStorage.SaveDrawData(this.ChartPicture);   //保存下
+
+        this.HQChart.Draw();
+    }
+
     this.Show=function(x, y)
     {
         if (!this.DivDialog) this.Create();
@@ -695,10 +761,48 @@ function JSDialogModifyDraw()
     this.SetChartPicture=function(chart)
     {
         this.ChartPicture=chart;
+
+        var bShowLineColor=true, bShowBGColor=false, bShowFontColor=false;
+        var bgColor=null, fontColor=null;
+        var ARRAY_TEXT_CHART=['ChartDrawPriceLabel', "ChartDrawAnchoredText","ChartDrawPriceNote","ChartDrawNote"];
+        if (ARRAY_TEXT_CHART.includes(chart.ClassName))
+        {
+            bShowBGColor=true;
+            bShowFontColor=true;
+            bgColor=chart.BGColor;
+            fontColor=chart.TextColor;
+        }
+        
         if (this.ColorButton)
         {
-            this.ColorButton.Span.style['color']=chart.LineColor;
+            var item=this.ColorButton;
+            this.ShowButton(item.Div, bShowLineColor?"block":"none");
+            if (bShowLineColor)
+            {
+                item.Span.style['color']=chart.LineColor;
+            }
+        }
+
+        if (this.BGColorButton)
+        {
+            var item=this.BGColorButton;
+            this.ShowButton(item.Div, bShowBGColor?"block":"none");
+            if (bShowBGColor)
+            {
+                item.Span.style['color']=bgColor;
+            }
+        }
+
+        if (this.FontColorButton)
+        {
+            var item=this.FontColorButton;
+            this.ShowButton(item.Div, bShowFontColor?"block":"none");
+            if (bShowFontColor)
+            {
+                item.Span.style['color']=fontColor;
+            }
         }
+        
     }
 
     this.OnMouseDownTitle=function(e)

package/src/jscommon/umychart.complier.js

@@ -4847,6 +4847,35 @@ function JSAlgorithm(errorHandler,symbolData)
         return result;
     }
 
+    //反向过滤连续出现的信号.
+    //用法:FILTERX(X,N):X满足条件后,将其前N周期内的数据置为0,N为常量.
+    //例如:FILTERX(CLOSE>OPEN,5)查找阳线,前5天内出现过的阳线不被记录在内
+    this.FILTERX=function(data, n, node)
+    {
+        var result=[];
+        for(let i=0,j=0; i<data.length; ++i)
+        {
+            if (data[i])
+            {
+                result[i]=1;
+                for(j=0;j<n && i-j-1>=0;++j)
+                {
+                    result[i-j-1]=0;
+                }
+                i+=n;
+            }
+            else
+            {
+                result[i]=0;
+            }
+        }
+
+        return result;
+    }
+
+    //上一次条件成立到当前的周期数.
+    //用法:BARSLAST(X):上一次X不为0到现在的周期数
+    //例如:BARSLAST(CLOSE/REF(CLOSE,1)>=1.1)表示上一个涨停板到当前的周期数
     this.BARSLAST=function(data)
     {
         var result=[];
@@ -4866,6 +4895,52 @@ function JSAlgorithm(errorHandler,symbolData)
         return result;
     }
 
+    //倒数第N次成立时距今的周期数.
+    //用法:BARSLASTS(X,N):X倒数第N满足到现在的周期数,N支持变量
+    this.BARSLASTS=function(data, n, node)
+    {
+        var result=[];
+        if (!data) return result;
+        if (n<=0) n=data.length;
+
+        var day=null;
+        var SingleValue=0;  //单词数
+        var periodCount=0;
+        for(let i=0;i<data.length;++i)
+        {
+            result[i]=null;
+            var value=data[i];
+
+            if (value>0)  
+            {
+                if (day==null) 
+                {
+                    day=0;
+                    ++periodCount;
+                }
+                else
+                {
+                    ++periodCount;
+                    if (periodCount>n) day-=SingleValue;
+                }
+
+                SingleValue=0;
+            }
+            else 
+            {
+                if (day!=null) 
+                {
+                    ++day;
+                    ++SingleValue;
+                }
+            }
+
+            if (day!=null) result[i]=day;
+        }
+
+        return result;
+    }
+
     /*
     N周期内第一个条件成立到当前的周期数.
     用法:
@@ -8887,10 +8962,15 @@ function JSAlgorithm(errorHandler,symbolData)
                 return this.FILTER(args[0],args[1]);
             case 'TFILTER':
                 return this.TFILTER(args[0],args[1],args[2]);
+            case "FILTERX":
+                return this.FILTERX(args[0],args[1],node);
             case 'SLOPE':
                 return this.SLOPE(args[0],args[1]);
             case 'BARSLAST':
                 return this.BARSLAST(args[0]);
+            case "BARSLASTS":
+                //this.ThrowUnexpectedNode(node,`函数'BARSLASTS'还在开发中`, name);
+                return this.BARSLASTS(args[0],args[1],node);
             case 'BARSCOUNT':
                 return this.BARSCOUNT(args[0]);
             case 'BARSSINCEN':
@@ -18341,6 +18421,7 @@ function JSExplainer(ast,option)
     this.JobList=[];                //执行的任务队列
     this.VarTable=new Map();        //变量表
     this.OutVarTable=[];            //输出变量
+    this.MaxValueLength=150;        //最长的字符
 
     //脚本自动变量表, 只读
     this.ConstVarTable=new Map(
@@ -19290,7 +19371,7 @@ function JSExplainer(ast,option)
 
     this.ConvertToShortValue=function(value)
     {
-        var maxLength=80;
+        var maxLength=this.MaxValueLength;
         if (value && value.length>=maxLength)
         {
             var shortValue=value.slice(0, maxLength-10);

package/src/jscommon/umychart.resource/font/drawtool/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon hqchart_drawtool">&#xe656;</span>
+                <div class="name">字体背景色</div>
+                <div class="code-name">&amp;#xe656;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon hqchart_drawtool">&#xe686;</span>
+                <div class="name">字体颜色</div>
+                <div class="code-name">&amp;#xe686;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon hqchart_drawtool">&#xe663;</span>
+                <div class="name">画笔</div>
+                <div class="code-name">&amp;#xe663;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon hqchart_drawtool">&#xe6ff;</span>
                 <div class="name">拖动</div>
@@ -414,9 +432,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'hqchart_drawtool';
-  src: url('iconfont.woff2?t=1715878738024') format('woff2'),
-       url('iconfont.woff?t=1715878738024') format('woff'),
-       url('iconfont.ttf?t=1715878738024') format('truetype');
+  src: url('iconfont.woff2?t=1716173088340') format('woff2'),
+       url('iconfont.woff?t=1716173088340') format('woff'),
+       url('iconfont.ttf?t=1716173088340') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -442,6 +460,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon hqchart_drawtool icon-zitibeijingse"></span>
+            <div class="name">
+              字体背景色
+            </div>
+            <div class="code-name">.icon-zitibeijingse
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon hqchart_drawtool icon-zitiyanse"></span>
+            <div class="name">
+              字体颜色
+            </div>
+            <div class="code-name">.icon-zitiyanse
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon hqchart_drawtool icon-huabi"></span>
+            <div class="name">
+              画笔
+            </div>
+            <div class="code-name">.icon-huabi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon hqchart_drawtool icon-tuodong"></span>
             <div class="name">
@@ -982,6 +1027,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zitibeijingse"></use>
+                </svg>
+                <div class="name">字体背景色</div>
+                <div class="code-name">#icon-zitibeijingse</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zitiyanse"></use>
+                </svg>
+                <div class="name">字体颜色</div>
+                <div class="code-name">#icon-zitiyanse</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-huabi"></use>
+                </svg>
+                <div class="name">画笔</div>
+                <div class="code-name">#icon-huabi</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tuodong"></use>

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "hqchart_drawtool"; /* Project id 4529603 */
-  src: url('iconfont.woff2?t=1715878738024') format('woff2'),
-       url('iconfont.woff?t=1715878738024') format('woff'),
-       url('iconfont.ttf?t=1715878738024') format('truetype');
+  src: url('iconfont.woff2?t=1716173088340') format('woff2'),
+       url('iconfont.woff?t=1716173088340') format('woff'),
+       url('iconfont.ttf?t=1716173088340') format('truetype');
 }
 
 .hqchart_drawtool {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-zitibeijingse:before {
+  content: "\e656";
+}
+
+.icon-zitiyanse:before {
+  content: "\e686";
+}
+
+.icon-huabi:before {
+  content: "\e663";
+}
+
 .icon-tuodong:before {
   content: "\e6ff";
 }