Skip to content

Commit 98707bd

Browse files
authored
Merge pull request #992 from wf123537200/release-dev
prepare to release v5.4.2
2 parents 4ff64f3 + 840b5fa commit 98707bd

6 files changed

+16
-43
lines changed

dist/zrender.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -7238,7 +7238,7 @@
72387238
function registerPainter(name, Ctor) {
72397239
painterCtors[name] = Ctor;
72407240
}
7241-
var version = '5.4.1';
7241+
var version = '5.4.2';
72427242

72437243
var STYLE_MAGIC_KEY = '__zr_style_' + Math.round((Math.random() * 10));
72447244
var DEFAULT_COMMON_STYLE = {
@@ -12791,16 +12791,19 @@
1279112791
}
1279212792
}
1279312793
}
12794-
function isLatin(ch) {
12794+
function isAlphabeticLetter(ch) {
1279512795
var code = ch.charCodeAt(0);
12796-
return code >= 0x21 && code <= 0x17F;
12796+
return code >= 0x20 && code <= 0x24F
12797+
|| code >= 0x370 && code <= 0x10FF
12798+
|| code >= 0x1200 && code <= 0x13FF
12799+
|| code >= 0x1E00 && code <= 0x206F;
1279712800
}
1279812801
var breakCharMap = reduce(',&?/;] '.split(''), function (obj, ch) {
1279912802
obj[ch] = true;
1280012803
return obj;
1280112804
}, {});
1280212805
function isWordBreakChar(ch) {
12803-
if (isLatin(ch)) {
12806+
if (isAlphabeticLetter(ch)) {
1280412807
if (breakCharMap[ch]) {
1280512808
return true;
1280612809
}
@@ -15900,9 +15903,9 @@
1590015903
opts = opts || {};
1590115904
var S = opts.newline ? '\n' : '';
1590215905
function convertElToString(el) {
15903-
var children = el.children, tag = el.tag, attrs = el.attrs;
15906+
var children = el.children, tag = el.tag, attrs = el.attrs, text = el.text;
1590415907
return createElementOpen(tag, attrs)
15905-
+ encodeHTML(el.text)
15908+
+ (tag !== 'style' ? encodeHTML(text) : text || '')
1590615909
+ (children ? "" + S + map(children, function (child) { return convertElToString(child); }).join(S) + S : '')
1590715910
+ createElementClose(tag);
1590815911
}

dist/zrender.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/zrender.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

+3-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zrender",
3-
"version": "5.4.1",
3+
"version": "5.4.2",
44
"description": "A lightweight graphic library providing 2d draw for Apache ECharts",
55
"keywords": [
66
"canvas",

src/zrender.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ export function registerPainter(name: string, Ctor: PainterBaseCtor) {
485485
/**
486486
* @type {string}
487487
*/
488-
export const version = '5.4.1';
488+
export const version = '5.4.2';
489489

490490

491491
export interface ZRenderType extends ZRender {};

0 commit comments

Comments
 (0)