diff --git a/src/component/timeline/TimelineModel.ts b/src/component/timeline/TimelineModel.ts index a32218acb55e5d98f43b32ba393c83c1dca12412..4598abddbfecc119017122d9428e08d2736754bc 100644 --- a/src/component/timeline/TimelineModel.ts +++ b/src/component/timeline/TimelineModel.ts @@ -54,10 +54,10 @@ export interface TimelineControlStyle extends ItemStyleOption { nextIcon?: string // Can be a percent value relative to itemSize - playBtnSize: number | string - stopBtnSize: number | string - nextBtnSize: number | string - prevBtnSize: number | string + playBtnSize?: number | string + stopBtnSize?: number | string + nextBtnSize?: number | string + prevBtnSize?: number | string } export interface TimelineCheckpointStyle extends ItemStyleOption, diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts index bbdedade3d8f65e5560be30260e784b027f14bc6..a7b5494cb00599e28c1e1313a4d41cdb8dbdc8a5 100644 --- a/src/component/tooltip/TooltipHTMLContent.ts +++ b/src/component/tooltip/TooltipHTMLContent.ts @@ -63,6 +63,7 @@ function assembleFont(textStyleModel: Model): string cssText.push('font:' + textStyleModel.getFont()); fontSize + // @ts-ignore, leave it to the tooltip refactor. && cssText.push('line-height:' + Math.round(fontSize * 3 / 2) + 'px'); each(['decoration', 'align'] as const, function (name) { diff --git a/src/label/LabelManager.ts b/src/label/LabelManager.ts index 12ddbc792f313f76c40311bfc734956f26578f38..1358cd4cc589902765afe996030e57bf442690d2 100644 --- a/src/label/LabelManager.ts +++ b/src/label/LabelManager.ts @@ -81,7 +81,7 @@ interface SavedLabelAttr { verticalAlign: ZRTextVerticalAlign width: number height: number - fontSize: number + fontSize: number | string x: number y: number diff --git a/src/util/states.ts b/src/util/states.ts index 085ec6192943646eaa4e28ea0edf508194e3dc9d..4350facdc38f60c6e9ed62a2cdf3f159ff131afc 100644 --- a/src/util/states.ts +++ b/src/util/states.ts @@ -188,7 +188,7 @@ function getFromStateStyle( function createEmphasisDefaultState( el: Displayable, stateName: 'emphasis', - targetStates?: string[], + targetStates: string[], state: Displayable['states'][number] ) { const hasSelect = targetStates && indexOf(targetStates, 'select') >= 0; diff --git a/src/util/types.ts b/src/util/types.ts index 8d6ff52d2060b5456fb6d1559f3457ad5acc116c..a723cbf1d5346f63d6c33d3c6761552b75bea80f 100644 --- a/src/util/types.ts +++ b/src/util/types.ts @@ -776,7 +776,7 @@ export interface TextCommonOption extends ShadowOptionMixin { fontStyle?: ZRFontStyle fontWeight?: ZRFontWeight fontFamily?: string - fontSize?: number + fontSize?: number | string align?: HorizontalAlign verticalAlign?: VerticalAlign // @deprecated