Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
4df0f4ab
I
incubator-echarts
项目概览
x649585723
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
4df0f4ab
编写于
10月 23, 2020
作者:
O
Ovilia
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(decal): fix types
上级
66035d3d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
10 deletion
+13
-10
src/component/legend/LegendView.ts
src/component/legend/LegendView.ts
+3
-2
src/util/decal.ts
src/util/decal.ts
+3
-3
src/util/types.ts
src/util/types.ts
+3
-1
src/visual/aria.ts
src/visual/aria.ts
+2
-2
src/visual/style.ts
src/visual/style.ts
+2
-2
未找到文件。
src/component/legend/LegendView.ts
浏览文件 @
4df0f4ab
...
...
@@ -42,6 +42,7 @@ import Displayable, { DisplayableState } from 'zrender/src/graphic/Displayable';
import
{
PathStyleProps
}
from
'
zrender/src/graphic/Path
'
;
import
{
parse
,
stringify
}
from
'
zrender/src/tool/color
'
;
import
{
Pattern
}
from
'
zrender/src/export
'
;
import
{
PatternObject
}
from
'
zrender/src/graphic/Pattern
'
;
const
curry
=
zrUtil
.
curry
;
const
each
=
zrUtil
.
each
;
...
...
@@ -336,7 +337,7 @@ class LegendView extends ComponentView {
itemAlign
:
LegendOption
[
'
align
'
],
color
:
ZRColor
,
borderColor
:
ZRColor
,
decal
:
Pattern
,
decal
:
Pattern
Object
,
selectMode
:
LegendOption
[
'
selectedMode
'
]
)
{
const
itemWidth
=
legendModel
.
get
(
'
itemWidth
'
);
...
...
@@ -554,7 +555,7 @@ function setSymbolStyle(
legendModelItemStyle
:
Model
<
ItemStyleOption
>
,
borderColor
:
ZRColor
,
inactiveBorderColor
:
ZRColor
,
decal
:
Pattern
,
decal
:
Pattern
Object
,
isSelected
:
boolean
)
{
let
itemStyle
;
...
...
src/util/decal.ts
浏览文件 @
4df0f4ab
...
...
@@ -8,7 +8,7 @@ import {util} from 'zrender/src/export';
import
ExtensionAPI
from
'
../ExtensionAPI
'
;
import
type
SVGPainter
from
'
zrender/src/svg/Painter
'
;
import
{
brushSingle
}
from
'
zrender/src/canvas/graphic
'
;
import
{
Decal
Object
,
DecalDashArrayX
,
DecalDashArrayY
}
from
'
./types
'
;
import
{
Decal
DashArrayX
,
DecalDashArrayY
,
InnerDecalObject
,
DecalObject
}
from
'
./types
'
;
const
decalMap
=
new
WeakMap
<
DecalObject
,
PatternObject
>
();
...
...
@@ -24,11 +24,11 @@ const decalKeys = [
/**
* Create or update pattern image from decal options
*
* @param {DecalObject} decalObject decal options
* @param {
Inner
DecalObject} decalObject decal options
* @return {Pattern} pattern with generated image
*/
export
function
createOrUpdatePatternFromDecal
(
decalObject
:
DecalObject
,
decalObject
:
Inner
DecalObject
,
api
:
ExtensionAPI
):
PatternObject
{
const
dpr
=
api
.
getDevicePixelRatio
();
...
...
src/util/types.ts
浏览文件 @
4df0f4ab
...
...
@@ -685,10 +685,12 @@ export interface DecalObject {
maxTileWidth
?:
number
,
// boundary of largest tile height
maxTileHeight
?:
number
};
export
interface
InnerDecalObject
extends
DecalObject
{
// If option has changed
dirty
?:
boolean
}
;
}
export
interface
MediaQuery
{
minWidth
?:
number
;
...
...
src/visual/aria.ts
浏览文件 @
4df0f4ab
...
...
@@ -26,7 +26,7 @@ import SeriesModel from '../model/Series';
import
{
AriaOption
}
from
'
../component/aria
'
;
import
{
TitleOption
}
from
'
../component/title
'
;
import
{
makeInner
}
from
'
../util/model
'
;
import
{
Dictionary
,
DecalObject
}
from
'
../util/types
'
;
import
{
Dictionary
,
DecalObject
,
InnerDecalObject
}
from
'
../util/types
'
;
import
{
LocaleOption
}
from
'
../locale
'
;
const
defaultOption
:
AriaOption
=
{
...
...
@@ -129,7 +129,7 @@ export default function (ecModel: GlobalModel, api: ExtensionAPI) {
const
decal
=
style
.
decal
?
zrUtil
.
defaults
(
style
.
decal
,
paletteDecal
)
:
paletteDecal
;
decal
.
dirty
=
true
;
(
decal
as
InnerDecalObject
)
.
dirty
=
true
;
data
.
setVisual
(
'
decal
'
,
decal
);
}
});
...
...
src/visual/style.ts
浏览文件 @
4df0f4ab
...
...
@@ -18,7 +18,7 @@
*/
import
{
isFunction
,
extend
,
createHashMap
}
from
'
zrender/src/core/util
'
;
import
{
StageHandler
,
CallbackDataParams
,
ZRColor
,
Dictionary
,
DecalObject
}
from
'
../util/types
'
;
import
{
StageHandler
,
CallbackDataParams
,
ZRColor
,
Dictionary
,
Inner
DecalObject
}
from
'
../util/types
'
;
import
makeStyleMapper
from
'
../model/mixin/makeStyleMapper
'
;
import
{
ITEM_STYLE_KEY_MAP
}
from
'
../model/mixin/itemStyle
'
;
import
{
LINE_STYLE_KEY_MAP
}
from
'
../model/mixin/lineStyle
'
;
...
...
@@ -76,7 +76,7 @@ const seriesStyleTask: StageHandler = {
const
globalStyle
=
getStyle
(
styleModel
);
const
decalOption
=
styleModel
.
getShallow
(
'
decal
'
)
as
DecalObject
;
const
decalOption
=
styleModel
.
getShallow
(
'
decal
'
)
as
Inner
DecalObject
;
if
(
decalOption
)
{
data
.
setVisual
(
'
decal
'
,
decalOption
);
decalOption
.
dirty
=
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录