@operato/scene-scichart 7.2.1 → 7.2.3

package/src/charts/scichart-builder.ts

@@ -25,6 +25,7 @@ import {
   ZoomPanModifier,
   ZoomExtentsModifier,
   RolloverModifier,
+  NumericLabelProvider,
   SmartDateLabelProvider,
   EllipsePointMarker,
   SquarePointMarker,
@@ -78,6 +79,16 @@ function convertColor(color: string | string[] | undefined, defaultColor?: strin
   return tinyColor.toHex8String() || defaultColor
 }
 
+export function calculatePrecision(format: string | number = '') {
+  const formatString = format.toString()
+
+  if (formatString.indexOf('.') !== -1) {
+    return formatString.split('.')[1].length
+  }
+
+  return 0
+}
+
 function createPointMarker(wasmContext: any, dataset: any, color: string = DEFAULT_COLOR) {
   const { pointStyle, pointRadius = POINT_MARKER_SIZE } = dataset || {}
 
@@ -115,6 +126,7 @@ function createAxis(
   fontColor: string,
   fontFamily?: string,
   fontSize?: number,
+  precision?: number,
   options?: any
 ) {
   const { axisTitle, ticks } = axis
@@ -126,7 +138,8 @@ function createAxis(
     stepSize,
     beginAtZero,
     color = fontColor,
-    textStrokeColor = fontColor
+    textStrokeColor = fontColor,
+    display
   } = ticks || {}
 
   const axisOptions = {
@@ -149,21 +162,32 @@ function createAxis(
     ...options
   }
 
-  const labelProvider = new SmartDateLabelProvider({
-    labelFormat: ENumericFormat.Date_HHMMSS,
-    showWiderDateOnFirstLabel: true,
-    showYearOnWiderDate: true,
-    dateOffset: getLocalTimeOffset()
-  })
+  const labelProvider = isXAxis
+    ? new SmartDateLabelProvider({
+        showWiderDateOnFirstLabel: true,
+        showYearOnWiderDate: false,
+        dateOffset: getLocalTimeOffset()
+      })
+    : new NumericLabelProvider()
 
-  labelProvider.cursorNumericFormat = ENumericFormat.Date_DDMMHHMM
+  if (isXAxis) {
+    labelProvider.cursorNumericFormat = ENumericFormat.Date_HHMMSS
+  } else {
+    labelProvider.numericFormat = ENumericFormat.Decimal
+    labelProvider.precision = precision || calculatePrecision(stepSize || 0.1)
+    labelProvider.cursorNumericFormat = ENumericFormat.NoFormat
+  }
 
   return isXAxis
     ? new DateTimeNumericAxis(wasmContext, {
         ...axisOptions,
         labelProvider
       })
-    : new NumericAxis(wasmContext, { ...axisOptions, id: index !== 0 ? `yAxis${index}` : undefined })
+    : new NumericAxis(wasmContext, {
+        ...axisOptions,
+        id: index !== 0 ? `yAxis${index}` : undefined,
+        labelProvider
+      })
 }
 
 function createSeries(
@@ -235,7 +259,7 @@ export async function buildSciChart(
   config: OperatoChart.ChartConfig | undefined | null,
   container: any,
   { fontSize = 14, fontFamily = 'Roboto', fontColor }: { fontSize?: number; fontFamily?: string; fontColor?: string },
-  grouped?: string
+  { grouped, precision }: { grouped?: string; precision?: number }
 ): Promise<{ chart: any; dataSeries: any[] } | undefined> {
   if (!config) return
 
@@ -281,7 +305,7 @@ export async function buildSciChart(
 
   // Y 축 설정
   ;(multiAxis ? yAxes : [yAxes[0]]).forEach((axis, index) => {
-    const yAxis = createAxis(wasmContext, axis, index, false, fontColor, fontFamily, fontSize)
+    const yAxis = createAxis(wasmContext, axis, index, false, fontColor, fontFamily, fontSize, precision)
     sciChartSurface.yAxes.add(yAxis)
   })
 
@@ -295,7 +319,7 @@ export async function buildSciChart(
     if (tooltip) {
       const rolloverModifier = new RolloverModifier({
         showTooltip: true,
-        showAxisLabel: true,
+        showAxisLabel: true /* 한글의 크기를 잘 계산하지 못하므로 false */,
         modifierGroup: grouped
       })
 
@@ -478,7 +502,7 @@ export async function buildSciChartOverview(
 
   // Y 축 설정
   ;(multiAxis ? yAxes : [yAxes[0]]).forEach((axis, index) => {
-    const yAxis = createAxis(wasmContext, axis, index, false, fontColor, fontFamily, fontSize, {
+    const yAxis = createAxis(wasmContext, axis, index, false, fontColor, fontFamily, fontSize, undefined, {
       drawLabels: false,
       drawMajorTicks: false,
       drawMinorTicks: false,