Merge pull request #1079 from ecomfe/master

Merge master to release for v5.6.0

README.md

@@ -41,3 +41,7 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Notice
+
+The Apache Software Foundation [Apache ECharts, ECharts](https://echarts.apache.org/), Apache, the Apache feather, and the Apache ECharts project logo are either registered trademarks or trademarks of the [Apache Software Foundation](https://www.apache.org/).

src/core/platform.ts

@@ -75,7 +75,7 @@ export const platformApi: Platform = {
  text = text || '';
  font = font || DEFAULT_FONT;
  // Use font size if there is no other method can be used.
- const res = /(\d+)px/.exec(font);
+ const res = /((?:\d+)?\.?\d*)px/.exec(font);
  const fontSize = res && +res[1] || DEFAULT_FONT_SIZE;
  let width = 0;
  if (font.indexOf('mono') >= 0) { // is monospace
@@ -108,4 +108,4 @@ export function setPlatformAPI(newPlatformApis: Partial<Platform>) {
  (platformApi as any)[key] = (newPlatformApis as any)[key];
  }
  }
-}
+}