This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/next by this push:
new 11e6626 fix type errors. styling tweak.
11e6626 is described below
commit 11e6626ca621617d1a2e3b4c471a2e9c18e32b83
Author: pissang <bm2736...@gmail.com>
AuthorDate: Thu Jul 30 12:14:01 2020 +0800
fix type errors. styling tweak.
---
src/chart/bar/BarView.ts | 1 -
src/component/tooltip/TooltipView.ts | 2 +-
src/coord/axisDefault.ts | 1 -
src/coord/axisHelper.ts | 7 +++++--
src/model/Series.ts | 2 +-
src/util/time.ts | 6 +++---
src/util/types.ts | 2 --
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 4655480..df189e5 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -276,7 +276,6 @@ class BarView extends ChartView {
// And return a boolean to determine if the shape are
fully clipped.
const isClipped = clip[coord.type](coordSysClipArea,
layout);
if (isClipped) {
- // group.remove(el);
return;
}
}
diff --git a/src/component/tooltip/TooltipView.ts
b/src/component/tooltip/TooltipView.ts
index 4f99ece..4203d04 100644
--- a/src/component/tooltip/TooltipView.ts
+++ b/src/component/tooltip/TooltipView.ts
@@ -542,7 +542,7 @@ class TooltipView extends ComponentView {
dataParams.axisIndex = item.axisIndex;
dataParams.axisType = item.axisType;
dataParams.axisId = item.axisId;
- dataParams.axisValue =
axisHelper.getAxisRawValue(axisModel.axis, axisValue);
+ dataParams.axisValue =
axisHelper.getAxisRawValue(axisModel.axis, { value: axisValue as number });
dataParams.axisValueLabel = valueLabel;
dataParams.marker = formatUtil.getTooltipMarker({
color: dataParams.color as ColorString,
diff --git a/src/coord/axisDefault.ts b/src/coord/axisDefault.ts
index 70f8b36..43f11b2 100644
--- a/src/coord/axisDefault.ts
+++ b/src/coord/axisDefault.ts
@@ -178,7 +178,6 @@ const timeAxis: AxisBaseOption = zrUtil.merge({
showMaxLabel: false,
rich: {
primary: {
- color: '#000',
fontWeight: 'bold'
}
}
diff --git a/src/coord/axisHelper.ts b/src/coord/axisHelper.ts
index e5296a0..932e2a3 100644
--- a/src/coord/axisHelper.ts
+++ b/src/coord/axisHelper.ts
@@ -255,8 +255,11 @@ export function makeLabelFormatter(axis: Axis): (tick:
ScaleTick, idx?: number)
idx = tick.value - categoryTickStart;
}
return cb(
- getAxisRawValue(axis, tick) as (TimeScaleTick & string) |
(TimeScaleTick & number),
- idx
+ getAxisRawValue(axis, tick) as number,
+ idx,
+ (tick as TimeScaleTick).level != null ? {
+ level: (tick as TimeScaleTick).level
+ } : null
);
};
})(labelFormatter);
diff --git a/src/model/Series.ts b/src/model/Series.ts
index 1bd9f0d..5f3d46f 100644
--- a/src/model/Series.ts
+++ b/src/model/Series.ts
@@ -534,7 +534,7 @@ class SeriesModel<Opt extends SeriesOption = SeriesOption>
extends ComponentMode
: (tooltipDimLen > 1 || (isValueArr && !tooltipDimLen))
? '<div>'
+ formattedValue.content + '</div>'
- : '<span
style="float:right;margin-left:20px;color:#000;font-weight:900">'
+ : '<span
style="float:right;margin-left:20px;color:#464646;font-weight:bold">'
+ formattedValue.content + '</span>';
const markName = series.seriesIndex + 'at' + markerId;
diff --git a/src/util/time.ts b/src/util/time.ts
index bb55987..577d7f2 100644
--- a/src/util/time.ts
+++ b/src/util/time.ts
@@ -28,9 +28,9 @@ export const fullLeveledFormatter = {
year: '{yyyy}',
month: '{yyyy}:{MM}',
day: fullDayFormatter,
- hour: fullDayFormatter + defaultLeveledFormatter.hour,
- minute: fullDayFormatter + defaultLeveledFormatter.minute,
- second: fullDayFormatter + defaultLeveledFormatter.second,
+ hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
+ minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
+ second: fullDayFormatter + ' ' + defaultLeveledFormatter.second,
millisecond: defaultLeveledFormatter.none
};
diff --git a/src/util/types.ts b/src/util/types.ts
index 1534cce..d4b426d 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -112,8 +112,6 @@ export interface ECElement extends Element {
hoverState?: 0 | 1 | 2;
selected?: boolean;
- style?: Dictionary<unknown>;
-
z2EmphasisLift?: number;
z2SelectLift?: number;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
