Skip to content

Commit 15bd383

Browse files
committed
Improvement - Implemented new slicer version
1 parent 6ffbeeb commit 15bd383

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

src/components/vue-ui-candlestick.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ defineExpose({
404404
</script>
405405

406406
<template>
407-
<div ref="candlestickChart" :class="`vue-ui-candlestick ${isFullscreen ? 'vue-data-ui-wrapper-fullscreen' : ''} ${candlestickConfig.useCssAnimation ? '' : 'vue-ui-dna'}`" :style="`font-family:${candlestickConfig.style.fontFamily};width:100%; text-align:center;${!candlestickConfig.style.title.text ? 'padding-top:36px' : ''};background:${candlestickConfig.style.backgroundColor}`" :id="`vue-ui-candlestick_${uid}`">
407+
<div ref="candlestickChart" :class="`vue-ui-candlestick ${isFullscreen ? 'vue-data-ui-wrapper-fullscreen' : ''} ${candlestickConfig.useCssAnimation ? '' : 'vue-ui-dna'}`" :style="`position:relative;font-family:${candlestickConfig.style.fontFamily}; text-align:center;${!candlestickConfig.style.title.text ? 'padding-top:36px' : ''};background:${candlestickConfig.style.backgroundColor}`" :id="`vue-ui-candlestick_${uid}`">
408408
<div v-if="(!mutableConfig.inside || isPrinting) && candlestickConfig.style.title.text" :style="`width:100%;background:${candlestickConfig.style.backgroundColor}`">
409409
<!-- TITLE AS DIV -->
410410
<Title
@@ -688,6 +688,7 @@ defineExpose({
688688
:labelRight="dataset[slicer.end-1] ? dataset[slicer.end-1][0] : dataset.at(-1)[0]"
689689
:textColor="candlestickConfig.style.color"
690690
:inputColor="candlestickConfig.style.zoom.color"
691+
:selectColor="candlestickConfig.style.zoom.highlightColor"
691692
:max="len"
692693
:min="0"
693694
:valueStart="slicer.start"
@@ -748,7 +749,7 @@ defineExpose({
748749
}
749750
.vue-ui-candlestick {
750751
user-select: none;
751-
position: relative;
752+
width: 100%
752753
}
753754
754755
path, line, rect {

src/components/vue-ui-donut-evolution.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,7 @@ defineExpose({
874874
:labelRight="donutEvolutionConfig.style.chart.layout.grid.xAxis.dataLabels.values[Number(slicer.end)-1] || ''"
875875
:textColor="donutEvolutionConfig.style.chart.color"
876876
:inputColor="donutEvolutionConfig.style.chart.zoom.color"
877+
:selectColor="donutEvolutionConfig.style.chart.zoom.highlightColor"
877878
:max="maxLength"
878879
:min="0"
879880
:valueStart="slicer.start"

src/components/vue-ui-quick-chart.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,6 +1288,7 @@ defineExpose({
12881288
:labelRight="quickConfig.xyPeriods[slicer.end-1] ? quickConfig.xyPeriods[slicer.end-1] : ''"
12891289
:textColor="quickConfig.color"
12901290
:inputColor="quickConfig.zoomColor"
1291+
:selectColor="quickConfig.zoomHighlightColor"
12911292
:max="formattedDataset.maxSeriesLength"
12921293
:min="0"
12931294
:valueStart="slicer.start"

src/components/vue-ui-xy.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,7 @@
839839
:labelRight="chartConfig.chart.grid.labels.xAxisLabels.values[slicer.end-1]"
840840
:textColor="chartConfig.chart.color"
841841
:inputColor="chartConfig.chart.zoom.color"
842+
:selectColor="chartConfig.chart.zoom.highlightColor"
842843
:max="maxX"
843844
:min="0"
844845
:valueStart="slicer.start"
@@ -995,7 +996,7 @@ export default {
995996
BaseIcon,
996997
TableSparkline,
997998
Skeleton,
998-
Slicer
999+
Slicer,
9991000
},
10001001
data(){
10011002
this.dataset.forEach((ds, i) => {

src/default_configs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
"zoom": {
175175
"show": true,
176176
"color": "#CCCCCC",
177+
"highlightColor": "#4A4A4A",
177178
"fontSize": 14,
178179
"useResetSlot": false
179180
},
@@ -2189,6 +2190,7 @@
21892190
"zoom": {
21902191
"show": true,
21912192
"color": "#CCCCCC",
2193+
"highlightColor": "#4A4A4A",
21922194
"fontSize": 14,
21932195
"useResetSlot": false
21942196
},
@@ -3003,6 +3005,7 @@
30033005
"zoom": {
30043006
"show": true,
30053007
"color": "#CCCCCC",
3008+
"highlightColor":"#4A4A4A",
30063009
"fontSize": 14,
30073010
"useResetSlot": false
30083011
},
@@ -3809,6 +3812,7 @@
38093812
"yAxisLabel": "",
38103813
"zoomXy": true,
38113814
"zoomColor": "#CCCCCC",
3815+
"zoomHighlightColor": "#4A4A4A",
38123816
"zoomFontSize": 14,
38133817
"zoomUseResetSlot": false
38143818
},

types/vue-data-ui.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@ declare module 'vue-data-ui' {
808808
zoom?: {
809809
show?: boolean;
810810
color?: string;
811+
highlightColor?: string;
811812
fontSize?: number;
812813
useResetSlot?: boolean;
813814
};
@@ -1875,6 +1876,7 @@ declare module 'vue-data-ui' {
18751876
zoom?: {
18761877
show?: boolean;
18771878
color?: string;
1879+
highlightColor?: string;
18781880
fontSize?: number;
18791881
useResetSlot?: boolean;
18801882
};
@@ -2335,6 +2337,7 @@ declare module 'vue-data-ui' {
23352337
zoom?: {
23362338
show?: boolean;
23372339
color?: string;
2340+
highlightColor?: string;
23382341
fontSize?: number;
23392342
useResetSlot?: boolean;
23402343
};
@@ -4833,6 +4836,7 @@ declare module 'vue-data-ui' {
48334836
yAxisLabel?: string;
48344837
zoomXy?: boolean;
48354838
zoomColor?: string;
4839+
zoomHighlightColor?: string;
48364840
zoomFontSize?: number;
48374841
zoomUseResetSlot?: boolean;
48384842
};

0 commit comments

Comments
 (0)