npm - hqchart - Versions diffs - 1.1.12851 → 1.1.12860 - Mend

hqchart 1.1.12851 → 1.1.12860

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/umychart.vue.js +40 -39
package/package.json +1 -1
package/src/jscommon/umychart.complier.js +182 -39
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +183 -40
package/src/jscommon/umychart.version.js +1 -1
package/src/jscommon/umychart.vue/umychart.vue.js +183 -40

package/src/jscommon/umychart.complier.js CHANGED Viewed

@@ -16955,6 +16955,36 @@ function JSExecute(ast,option)
                 if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
                 this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
             }
+            else if (item.Expression.Type==Syntax.UnaryExpression)
+            {
+                var varName="__temp_l_"+i+"__";
+                var argument=item.Expression.Argument;
+                var type=0;
+                let outVar=null;
+                if (argument.Type==Syntax.Literal)
+                {
+                    outVar=argument.Value;
+                    if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
+                }
+                else if (argument.Type==Syntax.Identifier)
+                {
+                    let varName=argument.Name;
+                    outVar=this.ReadVariable(varName,item.Expression);
+                    if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
+                }
+                else if (argument.Type==Syntax.BinaryExpression)
+                {
+                    outVar=argument.Out;
+                    if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
+                }
+                if (item.Expression.Operator=='-')
+                {
+                    if (outVar) outVar=this.Algorithm.Subtract(0,outVar);
+                }
+                if (outVar) this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
+            }
             else if (item.Expression.Type==Syntax.SequenceExpression)
             {
                 let varName;
@@ -17159,6 +17189,39 @@ function JSExecute(ast,option)
                         }
                     }
+                    else if (itemExpression.Type==Syntax.UnaryExpression)
+                    {
+                        if (j==0)
+                        {
+                            varName="__temp_sb_"+i+"__";
+                            var argument=itemExpression.Argument;
+                            let aryValue=null;
+                            if (argument.Type==Syntax.Literal)
+                            {
+                                aryValue=argument.Value;
+                                if (!Array.isArray(aryValue)) aryValue=this.SingleDataToArrayData(aryValue);
+                            }
+                            else if (argument.Type==Syntax.Identifier)
+                            {
+                                let varName=argument.Name;
+                                aryValue=this.ReadVariable(varName,item.Expression);
+                                if (!Array.isArray(aryValue)) aryValue=this.SingleDataToArrayData(aryValue);
+                            }
+                            else if (argument.Type==Syntax.BinaryExpression)
+                            {
+                                aryValue=argument.Out;
+                                if (!Array.isArray(aryValue)) aryValue=this.SingleDataToArrayData(aryValue);
+                            }
+                            if (itemExpression.Operator=='-')
+                            {
+                                if (aryValue) aryValue=this.Algorithm.Subtract(0,aryValue);
+                            }
+                            isNoneName=true;
+                            this.VarTable.set(varName,aryValue);
+                        }
+                    }
                 }
                 if (pointDot && varName)   //圆点
@@ -17440,7 +17503,25 @@ function JSExecute(ast,option)
             case Syntax.CallExpression:
                 this.VisitCallExpression(node);
                 break;
+            case Syntax.UnaryExpression:
+                this.VisitUnaryExpression(node);
+                break;
+        }
+    }
+    this.VisitUnaryExpression=function(node)
+    {
+        if (node.Operator=='-')
+        {
+            var tempValue=this.GetNodeValueEx(node.Argument);
+            var value=this.Algorithm.Subtract(0,tempValue);
+        }
+        else
+        {
+            var value=node.Argument.Value;
         }
+        return value;
     }
     this.VisitSequenceExpression=function(node)
@@ -17841,17 +17922,7 @@ function JSExecute(ast,option)
         else if (right.Type==Syntax.MemberExpression)
             value=this.ReadMemberVariable(right);
         else if (right.Type==Syntax.UnaryExpression)
-        {
-            if (right.Operator=='-')
-            {
-                var tempValue=this.GetNodeValue(right.Argument);
-                value=this.Algorithm.Subtract(0,tempValue);
-            }
-            else
-            {
-                value=right.Argument.Value;
-            }
-        }
+            value=this.VisitUnaryExpression(right);
         if (JS_EXECUTE_DEBUG_LOG) JSConsole.Complier.Log('[JSExecute::VisitAssignmentExpression]' , varName, ' = ',value);
@@ -17957,6 +18028,20 @@ function JSExecute(ast,option)
     }
+    //获取节点值，BinaryExpression，LogicalExpression会重新计算
+    this.GetNodeValueEx=function(item)
+    {
+        var value=null;
+        if (item.Type==Syntax.BinaryExpression || item.Type==Syntax.LogicalExpression)
+            value=this.VisitBinaryExpression(item);
+        else if (item.Type==Syntax.CallExpression)
+            value=this.VisitCallExpression(item);
+        else
+            value=this.GetNodeValue(item);
+        return value;
+    }
     this.GetNodeValue=function(node)
     {
         switch(node.Type)
@@ -17964,21 +18049,14 @@ function JSExecute(ast,option)
             case Syntax.Literal:    //数字
                 return node.Value;
             case Syntax.UnaryExpression:
-                if (node.Operator=='-')
-                {
-                    var value=this.GetNodeValue(node.Argument);
-                    return this.Algorithm.Subtract(0,value);
-                }
-                return node.Argument.Value;
+                var value=this.VisitUnaryExpression(node);
+                return value;
             case Syntax.Identifier:
                 var value=this.ReadVariable(node.Name,node);
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
-                if (node.Out) return node.Out;
-                //如果没有数据需要重新计算
-                JSConsole.Complier.Log('[JSExecute::GetNodeValue] VisitBinaryExpression', node);
-                return this.VisitBinaryExpression(node);
+                return node.Out;
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);
             case Syntax.MemberExpression:
@@ -18191,6 +18269,32 @@ function JSExplainer(ast,option)
                     let outVar=item.Expression.Out;
                     this.OutVarTable.push({Name:varName, Data:`输出: ${outVar}`,Type:0, NoneName:true});
                 }
+                else if (item.Expression.Type==Syntax.UnaryExpression) //一元运算 如-C, -7, -(C+10)
+                {
+                    var varName="__temp_l_"+i+"__";
+                    var argument=item.Expression.Argument;
+                    let outVar=null;
+                    if (argument.Type==Syntax.Literal)
+                    {
+                        outVar=argument.Value;
+                    }
+                    else if (argument.Type==Syntax.Identifier)
+                    {
+                        let varName=argument.Name;
+                        outVar=this.ReadVariable(varName,item.Expression);
+                    }
+                    else if (argument.Type==Syntax.BinaryExpression)
+                    {
+                        outVar=argument.Out;
+                    }
+                    if (item.Expression.Operator=='-')
+                    {
+                        outVar=`-${outVar}`;
+                    }
+                    this.OutVarTable.push({Name:varName, Data:`输出: ${outVar}`,Type:0, NoneName:true});
+                }
                 else if (item.Expression.Type==Syntax.SequenceExpression)
                 {
                     let varName;
@@ -18294,6 +18398,33 @@ function JSExplainer(ast,option)
                             isNoneName=true;
                             this.VarTable.set(varName,aryValue);
                         }
+                        else if (itemExpression.Type==Syntax.UnaryExpression)
+                        {
+                            varName="__temp_sb_"+i+"__";
+                            var argument=itemExpression.Argument;
+                            let aryValue=null;
+                            if (argument.Type==Syntax.Literal)
+                            {
+                                aryValue=argument.Value;
+                            }
+                            else if (argument.Type==Syntax.Identifier)
+                            {
+                                let varName=argument.Name;
+                                aryValue=this.ReadVariable(varName,item.Expression);
+                            }
+                            else if (argument.Type==Syntax.BinaryExpression)
+                            {
+                                aryValue=argument.Out;
+                            }
+                            if (itemExpression.Operator=='-')
+                            {
+                                aryValue=`-${aryValue}`;
+                            }
+                            isNoneName=true;
+                            this.VarTable.set(varName,aryValue);
+                        }
                     }
                     var outValue;
@@ -18386,6 +18517,9 @@ function JSExplainer(ast,option)
             case Syntax.CallExpression:
                 this.VisitCallExpression(node);
                 break;
+            case Syntax.UnaryExpression:
+                this.VisitUnaryExpression(node);
+                break;
         }
     }
@@ -18398,6 +18532,17 @@ function JSExplainer(ast,option)
         }
     }
+    this.VisitUnaryExpression=function(node)
+    {
+        if (node.Operator=='-')
+        {
+            let value=this.GetNodeValueEx(node.Argument);
+            return '-'+value;
+        }
+        return node.Argument.Value;
+    }
     //函数调用
     this.VisitCallExpression=function(node)
     {
@@ -18889,17 +19034,7 @@ function JSExplainer(ast,option)
         else if (right.Type==Syntax.MemberExpression)
             value=this.ReadMemberVariable(right);
         else if (right.Type==Syntax.UnaryExpression)
-        {
-            if (right.Operator=='-')
-            {
-                var tempValue=this.GetNodeValue(right.Argument);
-                value='-'+tempValue;
-            }
-            else
-            {
-                value=right.Argument.Value;
-            }
-        }
+            value=this.VisitUnaryExpression(right);
         JSConsole.Complier.Log('[JSExplainer::VisitAssignmentExpression]' , varName, ' = ',value);
         this.VarTable.set(varName,value);
@@ -19012,6 +19147,19 @@ function JSExplainer(ast,option)
     }
+    this.GetNodeValueEx=function(node)
+    {
+        var value=null;
+        if (node.Type==Syntax.BinaryExpression || node.Type==Syntax.LogicalExpression)
+            value=this.VisitBinaryExpression(node);
+        else if (node.Type==Syntax.CallExpression)
+            value=this.VisitCallExpression(node);
+        else
+            value=this.GetNodeValue(node);
+        return value;
+    }
     this.GetNodeValue=function(node)
     {
         switch(node.Type)
@@ -19019,18 +19167,13 @@ function JSExplainer(ast,option)
             case Syntax.Literal:    //数字
                 return node.Value;
             case Syntax.UnaryExpression:
-                if (node.Operator=='-')
-                {
-                    let value=this.GetNodeValue(node.Argument);
-                    return '-'+value;
-                }
-                return node.Argument.Value;
+                return this.VisitUnaryExpression(node);
             case Syntax.Identifier:
                 let value=this.ReadVariable(node.Name,node);
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
-                return this.VisitBinaryExpression(node);
+                return node.Out;
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);
             default:

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

@@ -112559,6 +112559,36 @@ function JSExecute(ast,option)
                 if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
                 this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
             }
+            else if (item.Expression.Type==Syntax.UnaryExpression)
+            {
+                var varName="__temp_l_"+i+"__";
+                var argument=item.Expression.Argument;
+                var type=0;
+                let outVar=null;
+                if (argument.Type==Syntax.Literal)
+                {
+                    outVar=argument.Value;
+                    if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
+                }
+                else if (argument.Type==Syntax.Identifier)
+                {
+                    let varName=argument.Name;
+                    outVar=this.ReadVariable(varName,item.Expression);
+                    if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
+                }
+                else if (argument.Type==Syntax.BinaryExpression)
+                {
+                    outVar=argument.Out;
+                    if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
+                }
+                if (item.Expression.Operator=='-')
+                {
+                    if (outVar) outVar=this.Algorithm.Subtract(0,outVar);
+                }
+                if (outVar) this.OutVarTable.push({Name:varName, Data:outVar,Type:type, NoneName:true});
+            }
             else if (item.Expression.Type==Syntax.SequenceExpression)
             {
                 let varName;
@@ -112763,6 +112793,39 @@ function JSExecute(ast,option)
                         }
                     }
+                    else if (itemExpression.Type==Syntax.UnaryExpression)
+                    {
+                        if (j==0)
+                        {
+                            varName="__temp_sb_"+i+"__";
+                            var argument=itemExpression.Argument;
+                            let aryValue=null;
+                            if (argument.Type==Syntax.Literal)
+                            {
+                                aryValue=argument.Value;
+                                if (!Array.isArray(aryValue)) aryValue=this.SingleDataToArrayData(aryValue);
+                            }
+                            else if (argument.Type==Syntax.Identifier)
+                            {
+                                let varName=argument.Name;
+                                aryValue=this.ReadVariable(varName,item.Expression);
+                                if (!Array.isArray(aryValue)) aryValue=this.SingleDataToArrayData(aryValue);
+                            }
+                            else if (argument.Type==Syntax.BinaryExpression)
+                            {
+                                aryValue=argument.Out;
+                                if (!Array.isArray(aryValue)) aryValue=this.SingleDataToArrayData(aryValue);
+                            }
+                            if (itemExpression.Operator=='-')
+                            {
+                                if (aryValue) aryValue=this.Algorithm.Subtract(0,aryValue);
+                            }
+                            isNoneName=true;
+                            this.VarTable.set(varName,aryValue);
+                        }
+                    }
                 }
                 if (pointDot && varName)   //圆点
@@ -113044,9 +113107,27 @@ function JSExecute(ast,option)
             case Syntax.CallExpression:
                 this.VisitCallExpression(node);
                 break;
+            case Syntax.UnaryExpression:
+                this.VisitUnaryExpression(node);
+                break;
         }
     }
+    this.VisitUnaryExpression=function(node)
+    {
+        if (node.Operator=='-')
+        {
+            var tempValue=this.GetNodeValueEx(node.Argument);
+            var value=this.Algorithm.Subtract(0,tempValue);
+        }
+        else
+        {
+            var value=node.Argument.Value;
+        }
+        return value;
+    }
     this.VisitSequenceExpression=function(node)
     {
         for(let i in node.Expression)
@@ -113445,17 +113526,7 @@ function JSExecute(ast,option)
         else if (right.Type==Syntax.MemberExpression)
             value=this.ReadMemberVariable(right);
         else if (right.Type==Syntax.UnaryExpression)
-        {
-            if (right.Operator=='-')
-            {
-                var tempValue=this.GetNodeValue(right.Argument);
-                value=this.Algorithm.Subtract(0,tempValue);
-            }
-            else
-            {
-                value=right.Argument.Value;
-            }
-        }
+            value=this.VisitUnaryExpression(right);
         if (JS_EXECUTE_DEBUG_LOG) JSConsole.Complier.Log('[JSExecute::VisitAssignmentExpression]' , varName, ' = ',value);
@@ -113561,6 +113632,20 @@ function JSExecute(ast,option)
     }
+    //获取节点值，BinaryExpression，LogicalExpression会重新计算
+    this.GetNodeValueEx=function(item)
+    {
+        var value=null;
+        if (item.Type==Syntax.BinaryExpression || item.Type==Syntax.LogicalExpression)
+            value=this.VisitBinaryExpression(item);
+        else if (item.Type==Syntax.CallExpression)
+            value=this.VisitCallExpression(item);
+        else
+            value=this.GetNodeValue(item);
+        return value;
+    }
     this.GetNodeValue=function(node)
     {
         switch(node.Type)
@@ -113568,21 +113653,14 @@ function JSExecute(ast,option)
             case Syntax.Literal:    //数字
                 return node.Value;
             case Syntax.UnaryExpression:
-                if (node.Operator=='-')
-                {
-                    var value=this.GetNodeValue(node.Argument);
-                    return this.Algorithm.Subtract(0,value);
-                }
-                return node.Argument.Value;
+                var value=this.VisitUnaryExpression(node);
+                return value;
             case Syntax.Identifier:
                 var value=this.ReadVariable(node.Name,node);
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
-                if (node.Out) return node.Out;
-                //如果没有数据需要重新计算
-                JSConsole.Complier.Log('[JSExecute::GetNodeValue] VisitBinaryExpression', node);
-                return this.VisitBinaryExpression(node);
+                return node.Out;
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);
             case Syntax.MemberExpression:
@@ -113795,6 +113873,32 @@ function JSExplainer(ast,option)
                     let outVar=item.Expression.Out;
                     this.OutVarTable.push({Name:varName, Data:`输出: ${outVar}`,Type:0, NoneName:true});
                 }
+                else if (item.Expression.Type==Syntax.UnaryExpression) //一元运算 如-C, -7, -(C+10)
+                {
+                    var varName="__temp_l_"+i+"__";
+                    var argument=item.Expression.Argument;
+                    let outVar=null;
+                    if (argument.Type==Syntax.Literal)
+                    {
+                        outVar=argument.Value;
+                    }
+                    else if (argument.Type==Syntax.Identifier)
+                    {
+                        let varName=argument.Name;
+                        outVar=this.ReadVariable(varName,item.Expression);
+                    }
+                    else if (argument.Type==Syntax.BinaryExpression)
+                    {
+                        outVar=argument.Out;
+                    }
+                    if (item.Expression.Operator=='-')
+                    {
+                        outVar=`-${outVar}`;
+                    }
+                    this.OutVarTable.push({Name:varName, Data:`输出: ${outVar}`,Type:0, NoneName:true});
+                }
                 else if (item.Expression.Type==Syntax.SequenceExpression)
                 {
                     let varName;
@@ -113898,6 +114002,33 @@ function JSExplainer(ast,option)
                             isNoneName=true;
                             this.VarTable.set(varName,aryValue);
                         }
+                        else if (itemExpression.Type==Syntax.UnaryExpression)
+                        {
+                            varName="__temp_sb_"+i+"__";
+                            var argument=itemExpression.Argument;
+                            let aryValue=null;
+                            if (argument.Type==Syntax.Literal)
+                            {
+                                aryValue=argument.Value;
+                            }
+                            else if (argument.Type==Syntax.Identifier)
+                            {
+                                let varName=argument.Name;
+                                aryValue=this.ReadVariable(varName,item.Expression);
+                            }
+                            else if (argument.Type==Syntax.BinaryExpression)
+                            {
+                                aryValue=argument.Out;
+                            }
+                            if (itemExpression.Operator=='-')
+                            {
+                                aryValue=`-${aryValue}`;
+                            }
+                            isNoneName=true;
+                            this.VarTable.set(varName,aryValue);
+                        }
                     }
                     var outValue;
@@ -113990,6 +114121,9 @@ function JSExplainer(ast,option)
             case Syntax.CallExpression:
                 this.VisitCallExpression(node);
                 break;
+            case Syntax.UnaryExpression:
+                this.VisitUnaryExpression(node);
+                break;
         }
     }
@@ -114002,6 +114136,17 @@ function JSExplainer(ast,option)
         }
     }
+    this.VisitUnaryExpression=function(node)
+    {
+        if (node.Operator=='-')
+        {
+            let value=this.GetNodeValueEx(node.Argument);
+            return '-'+value;
+        }
+        return node.Argument.Value;
+    }
     //函数调用
     this.VisitCallExpression=function(node)
     {
@@ -114493,17 +114638,7 @@ function JSExplainer(ast,option)
         else if (right.Type==Syntax.MemberExpression)
             value=this.ReadMemberVariable(right);
         else if (right.Type==Syntax.UnaryExpression)
-        {
-            if (right.Operator=='-')
-            {
-                var tempValue=this.GetNodeValue(right.Argument);
-                value='-'+tempValue;
-            }
-            else
-            {
-                value=right.Argument.Value;
-            }
-        }
+            value=this.VisitUnaryExpression(right);
         JSConsole.Complier.Log('[JSExplainer::VisitAssignmentExpression]' , varName, ' = ',value);
         this.VarTable.set(varName,value);
@@ -114616,6 +114751,19 @@ function JSExplainer(ast,option)
     }
+    this.GetNodeValueEx=function(node)
+    {
+        var value=null;
+        if (node.Type==Syntax.BinaryExpression || node.Type==Syntax.LogicalExpression)
+            value=this.VisitBinaryExpression(node);
+        else if (node.Type==Syntax.CallExpression)
+            value=this.VisitCallExpression(node);
+        else
+            value=this.GetNodeValue(node);
+        return value;
+    }
     this.GetNodeValue=function(node)
     {
         switch(node.Type)
@@ -114623,18 +114771,13 @@ function JSExplainer(ast,option)
             case Syntax.Literal:    //数字
                 return node.Value;
             case Syntax.UnaryExpression:
-                if (node.Operator=='-')
-                {
-                    let value=this.GetNodeValue(node.Argument);
-                    return '-'+value;
-                }
-                return node.Argument.Value;
+                return this.VisitUnaryExpression(node);
             case Syntax.Identifier:
                 let value=this.ReadVariable(node.Name,node);
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
-                return this.VisitBinaryExpression(node);
+                return node.Out;
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);
             default:
@@ -131883,7 +132026,7 @@ function ScrollBarBGChart()
-var HQCHART_VERSION="1.1.12850";
+var HQCHART_VERSION="1.1.12859";
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js CHANGED Viewed

@@ -5,7 +5,7 @@
-var HQCHART_VERSION="1.1.12850";
+var HQCHART_VERSION="1.1.12859";
 function PrintHQChartVersion()
 {