Skip to content

Commit 85787f2

Browse files
authored
Merge branch 'apache:master' into fix-logarithmic-scale-negative-below-one
2 parents 17b68f2 + ef926fa commit 85787f2

File tree

13 files changed

+249
-80
lines changed

13 files changed

+249
-80
lines changed

build/source-release/prepareReleaseMaterials.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const stableVersion = `${major}.${minor}.${patch}`;
7777
const releaseFullName = `Apache ECharts ${stableVersion} (release candidate ${rc})`;
7878

7979
console.log('[Release Repo] ' + repo);
80-
console.log('[Release Verion] ' + rcVersion);
80+
console.log('[Release Version] ' + rcVersion);
8181
console.log('[Release Commit] ' + releaseCommit);
8282
console.log('[Release Name] ' + releaseFullName);
8383

@@ -161,4 +161,4 @@ https.get({
161161
});
162162
}).on('error', (e) => {
163163
throw e;
164-
});
164+
});

src/animation/customGraphicTransition.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@ export function applyLeaveTransition(
223223
// TODO Data index?
224224
const config = getElementAnimationConfig('update', el, elOption, animatableModel, 0);
225225
config.done = () => {
226-
parent.remove(el);
226+
parent && parent.remove(el);
227227
onRemove && onRemove();
228228
};
229229
el.animateTo(leaveToProps, config);
230230
}
231231
else {
232-
parent.remove(el);
232+
parent && parent.remove(el);
233233
onRemove && onRemove();
234234
}
235235
}

src/chart/bar/BarSeries.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ export interface BarSeriesOption
8181

8282
showBackground?: boolean
8383

84-
startValue?: number
85-
8684
backgroundStyle?: ItemStyleOption & {
8785
borderRadius?: number | number[]
8886
}
@@ -166,4 +164,4 @@ class BarSeriesModel extends BaseBarSeriesModel<BarSeriesOption> {
166164

167165
}
168166

169-
export default BarSeriesModel;
167+
export default BarSeriesModel;

src/chart/bar/BarView.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,14 @@ class BarView extends ChartView {
364364
}
365365
}
366366

367+
const roundCapChanged = el && (el.type === 'sector' && roundCap || el.type === 'sausage' && !roundCap);
368+
if (roundCapChanged) {
369+
// roundCap changed, there is no way to use animation from a `sector` to a `sausage` shape,
370+
// so remove the old one and create a new shape
371+
el && removeElementWithFadeOut(el, seriesModel, oldIndex);
372+
el = null;
373+
}
374+
367375
if (!el) {
368376
el = elementCreator[coord.type](
369377
seriesModel,
@@ -373,7 +381,7 @@ class BarView extends ChartView {
373381
isHorizontalOrRadial,
374382
animationModel,
375383
baseAxis.model,
376-
!!el,
384+
true,
377385
roundCap
378386
);
379387
}

src/chart/pie/PieView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class PiePiece extends graphic.Sector {
205205
z2: 10
206206
});
207207

208-
const labelPosition = seriesModel.get(['label', 'position']);
208+
const labelPosition = itemModel.get(['label', 'position']);
209209
if (labelPosition !== 'outside' && labelPosition !== 'outer') {
210210
sector.removeTextGuideLine();
211211
}

src/component/legend/LegendView.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ class LegendView extends ComponentView {
236236
ecData.ssrType = 'legend';
237237
});
238238
}
239-
itemGroup.eachChild(child => {
240-
if (triggerEvent) {
239+
if (triggerEvent) {
240+
itemGroup.eachChild(child => {
241241
this.packEventData(child, legendModel, seriesModel, dataIndex, name);
242-
}
243-
});
242+
});
243+
}
244244

245245
legendDrawnMap.set(name, true);
246246
}
@@ -294,11 +294,11 @@ class LegendView extends ComponentView {
294294
ecData.ssrType = 'legend';
295295
});
296296
}
297-
itemGroup.eachChild(child => {
298-
if (triggerEvent) {
297+
if (triggerEvent) {
298+
itemGroup.eachChild(child => {
299299
this.packEventData(child, legendModel, seriesModel, dataIndex, name);
300-
}
301-
});
300+
});
301+
}
302302
legendDrawnMap.set(name, true);
303303
}
304304

src/core/echarts.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -767,10 +767,6 @@ class ECharts extends Eventful<ECEventDefinition> {
767767
* Get svg data url
768768
*/
769769
getSvgDataURL(): string {
770-
if (!env.svgSupported) {
771-
return;
772-
}
773-
774770
const zr = this._zr;
775771
const list = zr.storage.getDisplayList();
776772
// Stop animations

test/custom-feature.html

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/legend.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/pie-label.html

Lines changed: 51 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)