Skip to content

Commit

Permalink
Merge pull request #410 from apache/fix-candlestick
Browse files Browse the repository at this point in the history
Merge fix-candlestick branch into dev
  • Loading branch information
plainheart authored Jul 17, 2024
2 parents 0b860ea + f468380 commit 95e2d75
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 19 deletions.
6 changes: 3 additions & 3 deletions en/option/partial/emphasis-common.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

{{ target: partial-emphasis-disabled }}

#${prefix} disabled(boolean)
#${prefix} disabled(boolean) = ${defaultValue|default(false)}

<ExampleUIControlBoolean default="false" />
<ExampleUIControlBoolean default="${defaultValue|default(false)}" />

{{ use: partial-version(
version = "5.3.0"
version = ${version|default('5.3.0')}
) }}

Whether to disable the emphasis state.
Expand Down
6 changes: 3 additions & 3 deletions en/option/partial/select-common.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

{{ target: partial-select-disabled }}

#${prefix} disabled(boolean)
#${prefix} disabled(boolean) = ${defaultValue|default(false)}

<ExampleUIControlBoolean default="false" />
<ExampleUIControlBoolean default="${defaultValue|default(false)}" />

{{ use: partial-version(
version = "5.3.0"
version = ${version|default('5.3.0')}
) }}

If data can be selected. Available when `selectedMode` is used. Can be used to disable selection for part of the data.
Expand Down
23 changes: 20 additions & 3 deletions en/option/series/candlestick.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ Item style of candlestick.

## emphasis(Object)

{{ use: partial-version(
version = "5.5.2"
) }}

Emphasis style of candlestick.

{{ use: partial-emphasis-disabled(
Expand All @@ -109,7 +113,7 @@ Emphasis style of candlestick.
## blur(Object)

{{ use: partial-version(
version = "5.0.0"
version = "5.5.2"
) }}

Configurations of blur state. Available when [emphasis.focus](~series-candlestick.emphasis.focus) is set.
Expand Down Expand Up @@ -137,7 +141,8 @@ Configurations of select state. Available when [selectedMode](~series-candlestic

{{ use: partial-candlestick-item-style-detail(
prefix = "###",
defaultBorderWidth = 2
defaultBorderWidth = 2,
option0Version = "5.5.2"
) }}

{{ use: partial-selected-mode(
Expand Down Expand Up @@ -315,6 +320,12 @@ Fill color of bullish candle stick.

<ExampleUIControlColor />

{{ if: ${option0Version} }}
{{ use: partial-version(
version = ${option0Version}
) }}
{{ /if }}

Fill color of bearish candle stick.

{{ use: partial-color-desc() }}
Expand All @@ -331,6 +342,12 @@ Border color of bullish candle stick.

<ExampleUIControlColor />

{{ if: ${option0Version} }}
{{ use: partial-version(
version = ${option0Version}
) }}
{{ /if }}

Border color of bearish candle stick.

{{ use: partial-color-desc() }}
Expand All @@ -340,7 +357,7 @@ Border color of bearish candle stick.
<ExampleUIControlColor />

{{ use: partial-version(
version = "5.4.1"
version = ${option0Version|default("5.4.1")}
) }}

Border color of doji (when the open price is the same as the close price).
Expand Down
6 changes: 3 additions & 3 deletions zh/option/partial/emphasis-common.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

{{ target: partial-emphasis-disabled }}

#${prefix} disabled(boolean)
#${prefix} disabled(boolean) = ${defaultValue|default(false)}

<ExampleUIControlBoolean default="false" />
<ExampleUIControlBoolean default="${defaultValue|default(false)}" />

{{ use: partial-version(
version = "5.3.0"
version = ${version|default('5.3.0')}
) }}

是否关闭高亮状态。
Expand Down
8 changes: 4 additions & 4 deletions zh/option/partial/select-common.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

{{ target: partial-select-disabled }}

#${prefix} disabled(boolean)
#${prefix} disabled(boolean) = ${defaultValue|default(false)}

<ExampleUIControlBoolean default="false" />
<ExampleUIControlBoolean default="${defaultValue|default(false)}" />

{{ use: partial-version(
version = "5.3.0"
version = ${version|default('5.3.0')}
) }}

是否可以被选中。在开启`selectedMode`的时候有效,可以用于关闭部分数据。
是否可以被选中。在开启 `selectedMode` 的时候有效,可以用于关闭部分数据。

23 changes: 20 additions & 3 deletions zh/option/series/candlestick.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,10 @@ K 线图的图形样式。

## emphasis(Object)

{{ use: partial-version(
version = "5.5.2"
) }}

K 线图的高亮状态。

{{ use: partial-emphasis-disabled(
Expand All @@ -295,7 +299,7 @@ K 线图的高亮状态。
## blur(Object)

{{ use: partial-version(
version = "5.0.0"
version = "5.5.2"
) }}

K 线图的淡出状态。开启 [emphasis.focus](~series-candlestick.emphasis.focus) 后有效
Expand Down Expand Up @@ -323,7 +327,8 @@ K 线图的选中状态。开启 [selectedMode](~series-candlestick.selectedMode

{{ use: partial-candlestick-item-style-detail(
prefix = "###",
defaultBorderWidth = 2
defaultBorderWidth = 2,
option0Version = "5.5.2"
) }}

{{ use: partial-selected-mode(
Expand Down Expand Up @@ -502,6 +507,12 @@ K 线图的选中状态。开启 [selectedMode](~series-candlestick.selectedMode

<ExampleUIControlColor />

{{ if: ${option0Version} }}
{{ use: partial-version(
version = ${option0Version}
) }}
{{ /if }}

`阴线` 图形的颜色。

{{ use: partial-color-desc() }}
Expand All @@ -520,14 +531,20 @@ K 线图的选中状态。开启 [selectedMode](~series-candlestick.selectedMode

`阴线` 图形的描边颜色。

{{ if: ${option0Version} }}
{{ use: partial-version(
version = ${option0Version}
) }}
{{ /if }}

{{ use: partial-color-desc() }}

#${prefix} borderColorDoji(Color) = null

<ExampleUIControlColor />

{{ use: partial-version(
version = "5.4.1"
version = ${option0Version|default("5.4.1")}
) }}

十字星(开盘价等于收盘价)的描边颜色。
Expand Down

0 comments on commit 95e2d75

Please sign in to comment.