Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Five-菜鸟级
echarts
提交
76a446da
E
echarts
项目概览
Five-菜鸟级
/
echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
76a446da
编写于
4月 27, 2020
作者:
1
100pah
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ts: tweak
上级
df990d9b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
24 deletion
+17
-24
src/chart/bar/BarView.ts
src/chart/bar/BarView.ts
+14
-18
src/component/helper/MapDraw.ts
src/component/helper/MapDraw.ts
+3
-6
未找到文件。
src/chart/bar/BarView.ts
浏览文件 @
76a446da
...
@@ -91,15 +91,15 @@ class BarView extends ChartView {
...
@@ -91,15 +91,15 @@ class BarView extends ChartView {
static
type
=
'
bar
'
as
const
;
static
type
=
'
bar
'
as
const
;
type
=
BarView
.
type
;
type
=
BarView
.
type
;
_data
:
List
;
private
_data
:
List
;
_isLargeDraw
:
boolean
;
private
_isLargeDraw
:
boolean
;
_backgroundGroup
:
Group
;
private
_backgroundGroup
:
Group
;
_backgroundEls
:
(
Rect
|
Sector
)[];
private
_backgroundEls
:
(
Rect
|
Sector
)[];
render
(
seriesModel
:
BarSeriesModel
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
)
{
render
(
seriesModel
:
BarSeriesModel
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
)
:
void
{
this
.
_updateDrawMode
(
seriesModel
);
this
.
_updateDrawMode
(
seriesModel
);
const
coordinateSystemType
=
seriesModel
.
get
(
'
coordinateSystem
'
);
const
coordinateSystemType
=
seriesModel
.
get
(
'
coordinateSystem
'
);
...
@@ -114,22 +114,19 @@ class BarView extends ChartView {
...
@@ -114,22 +114,19 @@ class BarView extends ChartView {
else
if
(
__DEV__
)
{
else
if
(
__DEV__
)
{
console
.
warn
(
'
Only cartesian2d and polar supported for bar.
'
);
console
.
warn
(
'
Only cartesian2d and polar supported for bar.
'
);
}
}
return
this
.
group
;
}
}
incrementalPrepareRender
(
seriesModel
:
BarSeriesModel
)
{
incrementalPrepareRender
(
seriesModel
:
BarSeriesModel
)
:
void
{
this
.
_clear
();
this
.
_clear
();
this
.
_updateDrawMode
(
seriesModel
);
this
.
_updateDrawMode
(
seriesModel
);
}
}
incrementalRender
(
incrementalRender
(
params
:
StageHandlerProgressParams
,
seriesModel
:
BarSeriesModel
):
void
{
params
:
StageHandlerProgressParams
,
seriesModel
:
BarSeriesModel
)
{
// Do not support progressive in normal mode.
// Do not support progressive in normal mode.
this
.
_incrementalRenderLarge
(
params
,
seriesModel
);
this
.
_incrementalRenderLarge
(
params
,
seriesModel
);
}
}
_updateDrawMode
(
seriesModel
:
BarSeriesModel
)
{
private
_updateDrawMode
(
seriesModel
:
BarSeriesModel
):
void
{
const
isLargeDraw
=
seriesModel
.
pipelineContext
.
large
;
const
isLargeDraw
=
seriesModel
.
pipelineContext
.
large
;
if
(
this
.
_isLargeDraw
==
null
||
isLargeDraw
!==
this
.
_isLargeDraw
)
{
if
(
this
.
_isLargeDraw
==
null
||
isLargeDraw
!==
this
.
_isLargeDraw
)
{
this
.
_isLargeDraw
=
isLargeDraw
;
this
.
_isLargeDraw
=
isLargeDraw
;
...
@@ -137,7 +134,7 @@ class BarView extends ChartView {
...
@@ -137,7 +134,7 @@ class BarView extends ChartView {
}
}
}
}
_renderNormal
(
seriesModel
:
BarSeriesModel
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
)
{
private
_renderNormal
(
seriesModel
:
BarSeriesModel
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
):
void
{
const
group
=
this
.
group
;
const
group
=
this
.
group
;
const
data
=
seriesModel
.
getData
();
const
data
=
seriesModel
.
getData
();
const
oldData
=
this
.
_data
;
const
oldData
=
this
.
_data
;
...
@@ -282,10 +279,9 @@ class BarView extends ChartView {
...
@@ -282,10 +279,9 @@ class BarView extends ChartView {
this
.
_data
=
data
;
this
.
_data
=
data
;
}
}
_renderLarge
(
seriesModel
:
BarSeriesModel
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
)
{
private
_renderLarge
(
seriesModel
:
BarSeriesModel
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
):
void
{
this
.
_clear
();
this
.
_clear
();
createLarge
(
seriesModel
,
this
.
group
);
createLarge
(
seriesModel
,
this
.
group
);
// Use clipPath in large mode.
// Use clipPath in large mode.
const
clipPath
=
seriesModel
.
get
(
'
clip
'
,
true
)
const
clipPath
=
seriesModel
.
get
(
'
clip
'
,
true
)
?
createClipPath
(
seriesModel
.
coordinateSystem
,
false
,
seriesModel
)
?
createClipPath
(
seriesModel
.
coordinateSystem
,
false
,
seriesModel
)
...
@@ -298,16 +294,16 @@ class BarView extends ChartView {
...
@@ -298,16 +294,16 @@ class BarView extends ChartView {
}
}
}
}
_incrementalRenderLarge
(
params
:
StageHandlerProgressParams
,
seriesModel
:
BarSeriesModel
)
{
private
_incrementalRenderLarge
(
params
:
StageHandlerProgressParams
,
seriesModel
:
BarSeriesModel
):
void
{
this
.
_removeBackground
();
this
.
_removeBackground
();
createLarge
(
seriesModel
,
this
.
group
,
true
);
createLarge
(
seriesModel
,
this
.
group
,
true
);
}
}
remove
(
ecModel
?:
GlobalModel
)
{
remove
(
ecModel
?:
GlobalModel
)
:
void
{
this
.
_clear
(
ecModel
);
this
.
_clear
(
ecModel
);
}
}
_clear
(
ecModel
?:
GlobalModel
)
{
private
_clear
(
ecModel
?:
GlobalModel
):
void
{
const
group
=
this
.
group
;
const
group
=
this
.
group
;
const
data
=
this
.
_data
;
const
data
=
this
.
_data
;
if
(
ecModel
&&
ecModel
.
get
(
'
animation
'
)
&&
data
&&
!
this
.
_isLargeDraw
)
{
if
(
ecModel
&&
ecModel
.
get
(
'
animation
'
)
&&
data
&&
!
this
.
_isLargeDraw
)
{
...
@@ -329,7 +325,7 @@ class BarView extends ChartView {
...
@@ -329,7 +325,7 @@ class BarView extends ChartView {
this
.
_data
=
null
;
this
.
_data
=
null
;
}
}
_removeBackground
()
{
private
_removeBackground
():
void
{
this
.
group
.
remove
(
this
.
_backgroundGroup
);
this
.
group
.
remove
(
this
.
_backgroundGroup
);
this
.
_backgroundGroup
=
null
;
this
.
_backgroundGroup
=
null
;
}
}
...
...
src/component/helper/MapDraw.ts
浏览文件 @
76a446da
...
@@ -356,7 +356,7 @@ class MapDraw {
...
@@ -356,7 +356,7 @@ class MapDraw {
}
}
private
_updateController
(
private
_updateController
(
mapOrGeoModel
:
GeoModel
|
MapSeries
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
this
:
MapDraw
,
mapOrGeoModel
:
GeoModel
|
MapSeries
,
ecModel
:
GlobalModel
,
api
:
ExtensionAPI
):
void
{
):
void
{
const
geo
=
mapOrGeoModel
.
coordinateSystem
;
const
geo
=
mapOrGeoModel
.
coordinateSystem
;
const
controller
=
this
.
_controller
;
const
controller
=
this
.
_controller
;
...
@@ -380,8 +380,7 @@ class MapDraw {
...
@@ -380,8 +380,7 @@ class MapDraw {
return
action
;
return
action
;
}
}
// @ts-ignore FIXME:TS
controller
.
off
(
'
pan
'
).
on
(
'
pan
'
,
function
(
e
)
{
controller
.
off
(
'
pan
'
).
on
(
'
pan
'
,
function
(
this
:
MapDraw
,
e
)
{
this
.
_mouseDownFlag
=
false
;
this
.
_mouseDownFlag
=
false
;
roamHelper
.
updateViewOnPan
(
controllerHost
,
e
.
dx
,
e
.
dy
);
roamHelper
.
updateViewOnPan
(
controllerHost
,
e
.
dx
,
e
.
dy
);
...
@@ -392,8 +391,7 @@ class MapDraw {
...
@@ -392,8 +391,7 @@ class MapDraw {
}));
}));
},
this
);
},
this
);
// @ts-ignore FIXME:TS
controller
.
off
(
'
zoom
'
).
on
(
'
zoom
'
,
function
(
e
)
{
controller
.
off
(
'
zoom
'
).
on
(
'
zoom
'
,
function
(
this
:
MapDraw
,
e
)
{
this
.
_mouseDownFlag
=
false
;
this
.
_mouseDownFlag
=
false
;
roamHelper
.
updateViewOnZoom
(
controllerHost
,
e
.
scale
,
e
.
originX
,
e
.
originY
);
roamHelper
.
updateViewOnZoom
(
controllerHost
,
e
.
scale
,
e
.
originX
,
e
.
originY
);
...
@@ -415,7 +413,6 @@ class MapDraw {
...
@@ -415,7 +413,6 @@ class MapDraw {
}
}
},
this
);
},
this
);
// @ts-ignore FIXME:TS
controller
.
setPointerChecker
(
function
(
e
,
x
,
y
)
{
controller
.
setPointerChecker
(
function
(
e
,
x
,
y
)
{
return
geo
.
getViewRectAfterRoam
().
contain
(
x
,
y
)
return
geo
.
getViewRectAfterRoam
().
contain
(
x
,
y
)
&&
!
onIrrelevantElement
(
e
,
api
,
mapOrGeoModel
);
&&
!
onIrrelevantElement
(
e
,
api
,
mapOrGeoModel
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录