hqchart 1.1.15160 → 1.1.15170

package/package.json

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

package/src/jscommon/umychart.DialogTooltip.js

@@ -666,7 +666,7 @@ function JSDialogTooltip()
             if (titleChart.ClassName!="DynamicChartTitlePainting") continue;
             if (!IFrameSplitOperator.IsNonEmptyArray(titleChart.Data)) continue;
 
-            var indexName=titleChart.Title;
+            var indexName=titleChart.Title || "--";
             //if (titleChart.ArgumentsText) indexName+=titleChart.ArgumentsText;
             aryText.push({ Title:indexName, IsMergeCell:true, TitleClassName:this.TitleAlign.Center });
             for(j=0;j<titleChart.Data.length;++j)

package/src/jscommon/umychart.complier.js

@@ -333,12 +333,23 @@ var Character =
         return (cp >= 0x30 && cp <= 0x39) || (cp >= 0x41 && cp <= 0x46) || (cp >= 0x61 && cp <= 0x66); // a..f
     },
 
-    isOctalDigit: function (cp) 
+    IsOctalDigit: function (cp) 
     {
         return (cp >= 0x30 && cp <= 0x37); // 0..7
     }
 }
 
+
+function HexValue(ch)
+{
+    return '0123456789abcdef'.indexOf(ch.toLowerCase());
+}
+
+function OctalValue(ch)
+{
+    return '01234567'.indexOf(ch);
+}
+
 var TOKEN_NAME={};
 TOKEN_NAME[1 /* BooleanLiteral */] = 'Boolean';
 TOKEN_NAME[2 /* EOF */] = '<end>';
@@ -437,6 +448,7 @@ JSComplierHelper.GetConvertValueName=function(funcName)
 function ErrorHandler()
 {
     this.Error=[];
+    this.IsTolerant=false;
 
     this.RecordError=function(error)
     {
@@ -463,7 +475,7 @@ function ErrorHandler()
         return error;
     }
 
-    this.CreateError=function(index, line, col, description, word)
+    this.CreateError=function(index, line, col, description, word=null)
     {
         let msg='Line ' + line + ': ' + description;
         let error=this.ConstructError(msg,col);
@@ -480,6 +492,13 @@ function ErrorHandler()
         throw error;
     }
 
+    this.TolerateError=function(index, line, col, description) 
+    {
+        const error = this.CreateError(index, line, col, description);
+        if (this.IsTolerant)  this.RecordError(error);
+        else throw error;
+    }
+
     //重新下载数据
     this.ThrowDownloadJob=function(index, line, col, description,job)
     {
@@ -517,12 +536,22 @@ function Scanner(code, ErrorHandler)
         return this.Index>=this.Length;
     }
 
+    this.ThrowUnexpectedToken=function(message=Messages.UnexpectedTokenIllegal)
+    {
+        return this.ErrorHandler.ThrowError(this.Index, this.LineNumber, this.Index - this.LineStart + 1, message);
+    }
+
+    this.TolerateUnexpectedToken=function(message = Messages.UnexpectedTokenIllegal) 
+    {
+        this.ErrorHandler.TolerateError(this.Index, this.LineNumber, this.Index - this.LineStart + 1, message);
+    }
+
     this.IsKeyword=function(id)
     {
         return false;
     }
 
-    this.CodePointAt = function (i) 
+    this.CodePointAt=function (i) 
     {
         let cp = this.Source.charCodeAt(i);
         if (cp >= 0xD800 && cp <= 0xDBFF) 
@@ -536,6 +565,27 @@ function Scanner(code, ErrorHandler)
         return cp;
     }
 
+    //8进制->10进制
+    this.OctalToDecimal=function(ch) 
+    {
+        // \0 is not octal escape sequence
+        let octal = (ch !== '0');
+        let code = OctalValue(ch);
+
+        if (!this.IsEOF() && Character.IsOctalDigit(this.Source.charCodeAt(this.Index))) 
+        {
+            octal = true;
+            code = code * 8 + OctalValue(this.Source[this.Index++]);
+
+            // 3 digits are only allowed when string starts
+            // with 0, 1, 2, 3
+            if ('0123'.indexOf(ch) >= 0 && !this.IsEOF() && Character.IsOctalDigit(this.Source.charCodeAt(this.Index))) 
+                code = code * 8 + OctalValue(this.Source[this.Index++]);
+        }
+
+        return { Code: code, Octal: octal };
+    }
+
     this.Lex=function()
     {
         if (this.IsEOF()) return { Type:2/*EOF*/, Value:'', LineNumber:this.LineNumber, LineStart:this.LineStart, Start:this.Index, End:this.Index };
@@ -622,6 +672,123 @@ function Scanner(code, ErrorHandler)
         return this.Source.slice(start,this.Index);
     }
 
+    this.GetComplexIdentifier=function()
+    {
+        let cp = this.CodePointAt(this.Index);
+        let id = Character.FromCodePoint(cp);
+        this.Index += id.length;
+
+        // '\u' (U+005C, U+0075) denotes an escaped character.
+        let ch;
+        if (cp === 0x5C) 
+        {
+            if (this.Source.charCodeAt(this.Index) !== 0x75) 
+                this.ThrowUnexpectedToken();
+
+            ++this.Index;
+            if (this.Source[this.Index] === '{') 
+            {
+                ++this.Index;
+                ch = this.ScanUnicodeCodePointEscape();
+            } 
+            else 
+            {
+                ch = this.ScanHexEscape('u');
+                if (ch === null || ch === '\\' || !Character.IsIdentifierStart(ch.charCodeAt(0)))
+                    this.ThrowUnexpectedToken();
+            }
+            id = ch;
+        }
+
+        while (!this.IsEOF())
+        {
+            cp = this.CodePointAt(this.Index);
+            if (!Character.IsIdentifierPart(cp)) 
+                break;
+
+            ch = Character.FromCodePoint(cp);
+            id += ch;
+            this.Index += ch.length;
+
+            // '\u' (U+005C, U+0075) denotes an escaped character.
+            if (cp === 0x5C) 
+            {
+                id = id.substring(0, id.length - 1);
+                if (this.Source.charCodeAt(this.Index) !== 0x75) 
+                    this.ThrowUnexpectedToken();
+
+                ++this.Index;
+                if (this.Source[this.Index] === '{') 
+                {
+                    ++this.Index;
+                    ch = this.ScanUnicodeCodePointEscape();
+                } 
+                else 
+                {
+                    ch = this.ScanHexEscape('u');
+                    if (ch === null || ch === '\\' || !Character.IsIdentifierPart(ch.charCodeAt(0))) 
+                        this.ThrowUnexpectedToken();
+                }
+                id += ch;
+            }
+        }
+
+        return id;
+    }
+
+    this.ScanUnicodeCodePointEscape=function()
+    {
+        const result = this.TryToScanUnicodeCodePointEscape();
+        if (result === null) 
+            return this.ThrowUnexpectedToken();
+        
+        return result;
+    }
+
+    this.TryToScanUnicodeCodePointEscape=function()
+    {
+        let ch = this.Source[this.Index];
+        let code = 0;
+
+        // At least, one hex digit is required.
+        if (ch === '}') 
+            return null;
+
+        while (!this.IsEOF()) 
+        {
+            ch = this.Source[this.Index++];
+            if (!Character.IsHexDigit(ch.charCodeAt(0))) 
+                break;
+            
+            code = code * 16 + HexValue(ch);
+        }
+
+        if (code > 0x10FFFF || ch !== '}') 
+            return null;
+        
+        return Character.FromCodePoint(code);
+    }
+
+    this.ScanHexEscape=function(prefix)
+    {
+        const len = (prefix === 'u') ? 4 : 2;
+        let code = 0;
+
+        for (let i = 0; i < len; ++i) 
+        {
+            if (!this.IsEOF() && Character.IsHexDigit(this.Source.charCodeAt(this.Index))) 
+            {
+                code = code * 16 + HexValue(this.source[this.Index++]);
+            } 
+            else 
+            {
+                return null;
+            }
+        }
+
+        return String.fromCharCode(code);
+    }
+
     //操作符 https://tc39.github.io/ecma262/#sec-punctuators
     this.ScanPunctuator=function()
     {
@@ -693,7 +860,72 @@ function Scanner(code, ErrorHandler)
             }
             else if (ch=='\\')  //字符串转义
             {
-                throw "not complete";
+                ch = this.Source[this.Index++];
+                if (!ch || !Character.IsLineTerminator(ch.charCodeAt(0))) 
+                {
+                    switch (ch) 
+                    {
+                        case 'u':
+                            if (this.Source[this.Index] === '{') 
+                            {
+                                ++this.Index;
+                                str += this.ScanUnicodeCodePointEscape();
+                            } 
+                            else 
+                            {
+                                const unescapedChar = this.ScanHexEscape(ch);
+                                if (unescapedChar === null) 
+                                    this.ThrowUnexpectedToken();
+                                
+                                str += unescapedChar;
+                            }
+                            break;
+                         case 'x':  //十六进制 它的转义规则：\x<hex>，\x后跟上2位十六进制数
+                            const unescaped = this.ScanHexEscape(ch);
+                            if (unescaped === null) 
+                                this.ThrowUnexpectedToken(Messages.InvalidHexEscapeSequence);
+                            
+                            str += unescaped;
+                            break;
+                        case 'n':   //换行符
+                            str += '\n';
+                            break;
+                        case 'r':   //回车键
+                            str += '\r';    
+                            break;
+                        case 't':   //制表符
+                            str += '\t';
+                            break;
+                        case 'b':    //后退键
+                            str += '\b';   
+                            break;
+                        case 'f':   //换页符
+                            str += '\f';
+                            break;
+                        case 'v':   //垂直制表符
+                            str += '\x0B';
+                            break;
+                        case '8':
+                        case '9':
+                            str += ch;
+                            this.TolerateUnexpectedToken();
+                            break;
+                        default:
+                            if (ch && Character.IsOctalDigit(ch.charCodeAt(0))) //反斜杠后面跟3位八进制数，就代表一个转义字符
+                            {
+                                const octToDec = this.OctalToDecimal(ch);
+
+                                octal = octToDec.Octal || octal;
+                                str += String.fromCharCode(octToDec.Code);
+                            } 
+                            else 
+                            {
+                                str += ch;
+                            }
+                            break;
+                    }
+                }
+                
             }
             else if (Character.IsLineTerminator(ch.charCodeAt(0))) 
             {

package/src/jscommon/umychart.js

@@ -8503,7 +8503,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             pt.X=this.Frame.GetXFromIndex(this.CursorIndex);    //X轴动态变的
             if (this.ChartCorssCursor)
             {
-                if (this.ChartCorssCursor.Status==1)
+                if ((this.ChartCorssCursor.Status&JSCHART_CORSSCURSOR_STATUS_ID.LINE_ID)>0)
                 {
 
                 }
@@ -10128,6 +10128,60 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return true;
     }
 
+    /*
+    //对比画图
+    this.CompareChartDrawPicture=function(aryData)
+    {
+        var mapData=new Map();
+        if (IFrameSplitOperator.IsNonEmptyArray(aryData))
+        {
+            for(var i=0;i<aryData.length;++i)
+            {
+                var item=aryData[i];
+                if (!item.Guid) continue;
+                mapData.set(item.Guid, item);
+            }
+        }
+
+        var mapChart=new Map();
+        if (IFrameSplitOperator.IsNonEmptyArray(this.ChartDrawPicture))
+        {
+            for(var i=0;i<this.ChartDrawPicture.length;++i)
+            {
+                var item=this.ChartDrawPicture[i];
+                mapChart.set(item.Guid, item);
+            }
+        }
+
+        var aryDelete=[], aryEqual=[], aryNew=[];
+
+        for(var mapItem of mapData)
+        {
+            var item=mapItem[1];
+            if (mapChart.has(item.Guid))    //存在的
+            {
+                var chart=mapChart.get(item.Guid);
+                aryEqual.push({ Chart:chart, Data:item });
+            }
+            else
+            {
+                aryNew.push({ Data:item }); //新建
+            }
+        }
+
+        for(var mapItem of mapChart)
+        {
+            var item=mapItem[1];
+            if (!mapData.has(item.Guid))
+            {
+                aryDelete.push({ Chart:item }); //删除的
+            }
+        }
+        
+        return { AryDelete:aryDelete, AryNew:aryNew, AryEqual:aryEqual };
+    }
+    */
+
     //清空所有的画线工具 option={ Draw:false/true }
     this.ClearChartDrawPicture=function(drawPicture, option)
     {
@@ -15764,7 +15818,8 @@ function AverageWidthFrame()
                                 this.Canvas.fillRect(rectLeft,bgTop,itemText.Width,textHeight);
                             }
                             
-                            this.Canvas.fillStyle = item.TextColor;
+                            if (itemText.TextColor) this.Canvas.fillStyle=itemText.TextColor;
+                            else this.Canvas.fillStyle = item.TextColor;
                             this.Canvas.fillText(itemText.Text, textLeft - 1*pixelTatio, yText);
                         }
                         
@@ -15778,7 +15833,8 @@ function AverageWidthFrame()
                 }
             }
         }
-        else if (item.Message[1])   //右
+
+        if (item.Message[1])   // 右
         {
             if (borderRight<10 || position==1)
             {
@@ -62604,6 +62660,7 @@ function DynamicChartTitlePainting()
         if (option)
         {
             if (option.DynamicTitle===true) this.DynamicTitle={ OutName:null, OutValue:null };  //主图胴动态标题
+            if (option.ArgumentsText===true) this.ArgumentsText=null;
         }
     }
 
@@ -84552,7 +84609,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     this.RecvRealtimeData=function(data)
     {
-        if (this.IsOnTouch==true) return;           //正在操作手势不更新数据
+        if (this.IsOnTouch==true) return;               //正在操作手势不更新数据
         if (this.IsPauseUpdateByKeyboard()) return;     //正在操作键盘不更新数据
 
         if (data.Ver==3.0)
@@ -85636,7 +85693,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         //清空东条标题
         var titleIndex=windowIndex+1;
         var chartTitle=this.TitlePaint[titleIndex];
-        if (chartTitle) chartTitle.Clear({ DynamicTitle:true });
+        if (chartTitle) chartTitle.Clear({ DynamicTitle:true , ArgumentsText:true});
     }
 
     //显示隐藏主图K线