Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs

@@ -38,6 +38,7 @@
            newstring = newstring.Replace("{1}", YvalueText);
            newstring = newstring.Replace("{10}", xTitle);
            newstring = newstring.Replace("{20}", yTitle);
            newstring = newstring.Replace(",,",",");
            return newstring;
        }

@@ -131,7 +132,7 @@
                         top: '10%',
                        left: '10%',
                        right: '10%',
                        bottom: '10%',
                        bottom: '15%',
                    },
                    xAxis: {
                        type: 'category',