st-comp 0.0.20 → 0.0.21

package/packages/Kline/option.ts

@@ -144,19 +144,13 @@ export const getOption = async (
         },
         min: (value: any) => {
           const { min, max } = value
-          const minValue: number = min - (max - min) / 10 <= 0 ? 0 : (formatValue(min - (max - min) / 10) as number)
-          if (max - min > 10) {
-            return Math.floor(minValue)
-          }
-          return minValue
+          const interval = Math.abs((max - min) / 10)
+          return min - interval
         },
         max: (value: any) => {
           const { min, max } = value
-          const maxValue = formatValue(max + (max - min) / 10)
-          if (max - min > 10) {
-            return Math.ceil(maxValue as number)
-          }
-          return maxValue
+          const interval = Math.abs((max - min) / 10)
+          return max + interval
         },
         axisLine: {
           show: true,
@@ -222,93 +216,95 @@ export const getOption = async (
  */
 export const getLineOption = (data: LineDataType, config: InConfig, echartsInstance: EChartsType) => {
   const { gridLeft, gridRight, warningConfig, positionConfig, conditionConfig } = config
-  const [minValue, maxValue] = (echartsInstance as any).getModel().getComponent('yAxis').axis.scale._extent
-
-  // -----数据初始化----
   let elements: any = []
-  let warningData: WarningDataItem[] = []
-  let warningEvent: GraphicEvent = {}
-  let positionData: PositionDataItem[] = []
-  let positionEvent: GraphicEvent = {}
-  let conditionData: ConditionDataItem[] = []
-  let conditionEvent: GraphicEvent = {}
-  data.forEach(({ key, data, ...events }) => {
-    if (key === 'warning') {
-      warningData = data as WarningDataItem[]
-      warningEvent = events
-    } else if (key === 'position') {
-      positionData = data as PositionDataItem[]
-      positionEvent = events
-    } else if (key === 'condition') {
-      conditionData = data as ConditionDataItem[]
-      conditionEvent = events
-    }
-  })
 
-  // -----处理预警线-----
-  if (warningData.length > 0) {
-    elements = warningData.reduce((res, item: WarningDataItem) => {
-      const { value, text, info, config } = item
-      if (value > maxValue || value < minValue) {
-        // 当前数值超出图表范围，不绘制
-        return res
-      }
-      const params = {
-        y: echartsInstance.convertToPixel({ yAxisIndex: 0 }, value),
-        text,
-        info: { info, config: { ...warningConfig, ...config }, event: { ...warningEvent } },
-        gridLeft,
-        gridRight,
-        echartsWidth: echartsInstance.getWidth(),
-        echartsInstance,
-      }
-      return [...res, getWarningItem(params)]
-    }, elements)
-  }
-  // -----处理持仓线-----
-  if (positionData.length > 0) {
-    elements = positionData.reduce((res, item: PositionDataItem) => {
-      const { value, text, info, config } = item
-      // 数值超出图表范围的不绘制, 直接return
-      if (value > maxValue || value < minValue) {
-        // 当前数值超出图表范围，不绘制
-        return res
+  if ( (echartsInstance as any)?.getModel()?.getComponent ) {
+    const [minValue, maxValue] = (echartsInstance as any).getModel().getComponent('yAxis').axis.scale._extent
+    // -----数据初始化----
+    let warningData: WarningDataItem[] = []
+    let warningEvent: GraphicEvent = {}
+    let positionData: PositionDataItem[] = []
+    let positionEvent: GraphicEvent = {}
+    let conditionData: ConditionDataItem[] = []
+    let conditionEvent: GraphicEvent = {}
+    data.forEach(({ key, data, ...events }) => {
+      if (key === 'warning') {
+        warningData = data as WarningDataItem[]
+        warningEvent = events
+      } else if (key === 'position') {
+        positionData = data as PositionDataItem[]
+        positionEvent = events
+      } else if (key === 'condition') {
+        conditionData = data as ConditionDataItem[]
+        conditionEvent = events
       }
-      const params = {
-        y: echartsInstance.convertToPixel({ yAxisIndex: 0 }, value),
-        text,
-        info: { info, config: { ...positionConfig, ...config }, event: { ...positionEvent } },
-        gridLeft,
-        gridRight,
-        echartsWidth: echartsInstance.getWidth(),
-        echartsInstance,
-      }
-      return [...res, getPositionItem(params)]
-    }, elements)
-  }
-  // -----处理条件单-----
-  if (conditionData.length > 0) {
-    elements = conditionData.reduce((res, item: ConditionDataItem) => {
-      const { value, text, profitValue, profitText, lossValue, lossText, info, config } = item
-      // 数值超出图表范围的不绘制, 直接return
-      if (value > maxValue || value < minValue) {
-        return res
-      }
-      const params = {
-        y: echartsInstance.convertToPixel({ yAxisIndex: 0 }, value),
-        text,
-        profitY: echartsInstance.convertToPixel({ yAxisIndex: 0 }, profitValue),
-        profitText,
-        lossY: echartsInstance.convertToPixel({ yAxisIndex: 0 }, lossValue),
-        lossText,
-        info: { info, config: { ...conditionConfig, ...config }, event: { ...conditionEvent } },
-        gridLeft,
-        gridRight,
-        echartsWidth: echartsInstance.getWidth(),
-        echartsInstance,
-      }
-      return [...res, getConditionItem(params)]
-    }, elements)
+    })
+  
+    // -----处理预警线-----
+    if (warningData.length > 0) {
+      elements = warningData.reduce((res, item: WarningDataItem) => {
+        const { value, text, info, config } = item
+        if (value > maxValue || value < minValue) {
+          // 当前数值超出图表范围，不绘制
+          return res
+        }
+        const params = {
+          y: echartsInstance.convertToPixel({ yAxisIndex: 0 }, value),
+          text,
+          info: { info, config: { ...warningConfig, ...config }, event: { ...warningEvent } },
+          gridLeft,
+          gridRight,
+          echartsWidth: echartsInstance.getWidth(),
+          echartsInstance,
+        }
+        return [...res, getWarningItem(params)]
+      }, elements)
+    }
+    // -----处理持仓线-----
+    if (positionData.length > 0) {
+      elements = positionData.reduce((res, item: PositionDataItem) => {
+        const { value, text, info, config } = item
+        // 数值超出图表范围的不绘制, 直接return
+        if (value > maxValue || value < minValue) {
+          // 当前数值超出图表范围，不绘制
+          return res
+        }
+        const params = {
+          y: echartsInstance.convertToPixel({ yAxisIndex: 0 }, value),
+          text,
+          info: { info, config: { ...positionConfig, ...config }, event: { ...positionEvent } },
+          gridLeft,
+          gridRight,
+          echartsWidth: echartsInstance.getWidth(),
+          echartsInstance,
+        }
+        return [...res, getPositionItem(params)]
+      }, elements)
+    }
+    // -----处理条件单-----
+    if (conditionData.length > 0) {
+      elements = conditionData.reduce((res, item: ConditionDataItem) => {
+        const { value, text, profitValue, profitText, lossValue, lossText, info, config } = item
+        // 数值超出图表范围的不绘制, 直接return
+        if (value > maxValue || value < minValue) {
+          return res
+        }
+        const params = {
+          y: echartsInstance.convertToPixel({ yAxisIndex: 0 }, value),
+          text,
+          profitY: echartsInstance.convertToPixel({ yAxisIndex: 0 }, profitValue),
+          profitText,
+          lossY: echartsInstance.convertToPixel({ yAxisIndex: 0 }, lossValue),
+          lossText,
+          info: { info, config: { ...conditionConfig, ...config }, event: { ...conditionEvent } },
+          gridLeft,
+          gridRight,
+          echartsWidth: echartsInstance.getWidth(),
+          echartsInstance,
+        }
+        return [...res, getConditionItem(params)]
+      }, elements)
+    }
   }
 
   // -----return------

package/packages/Kline/type.d.ts

@@ -26,6 +26,7 @@ export interface InConfig {
   warningConfig: any // 预警线配置
   positionConfig: any // 持仓线配置
   conditionConfig: any // 条件单配置
+  tipsConfig: any // Tips展示配置
 }
 
 //----------------额外画线数据相关TS类型---------------------