st-comp 0.0.16 → 0.0.17

package/packages/Kline/formatKlineData.ts

@@ -2,12 +2,12 @@ import * as talib from 'talib.js'
 import type { KlineDataItem, IndicatorConfigType, InFormatKlineData } from './type.d.ts'
 
 interface InformatData {
-  time: string[];
-  open: number[];
-  close: number[];
-  high: number[];
-  low: number[];
-  kLineData: [number, number, number, number][];
+  time: string[]
+  open: number[]
+  close: number[]
+  high: number[]
+  low: number[]
+  kLineData: [number, number, number, number, number, number][]
 }
 
 let isInit = false // 是否初始化
@@ -16,14 +16,11 @@ let requestPromise: Function[] = [] // 用于存储loading中的计算请求
 
 // 指标线计算后处理
 function shiftList(list: any[], n: number) {
-  let len = list.length;
-  if (n <= 1 || n > len){
+  let len = list.length
+  if (n <= 1 || n > len) {
     return new Array(len).fill(null)
   }
-  return [
-    ...new Array(n - 1).fill(null),
-    ...list.slice(0, len - n + 1)
-  ]
+  return [...new Array(n - 1).fill(null), ...list.slice(0, len - n + 1)]
 }
 
 // BBI 完成
@@ -44,14 +41,14 @@ const fnMap: any = {
   // 多空线
   DKX: (data: InformatData) => {
     const { open, close, high, low } = data
-    const midValue = open.map((item, index) => (close[index] * 3 + high[index] + low[index] + item) / 6);
+    const midValue = open.map((item, index) => (close[index] * 3 + high[index] + low[index] + item) / 6)
     const { output } = talib.WMA({ inReal: midValue, timePeriod: 20 })
     return shiftList(output, 20)
   },
   // ?
   MADKX: (data: InformatData) => {
     const { open, close, high, low } = data
-    const midValue = open.map((item, index) => (close[index] * 3 + high[index] + low[index] + item) / 6);
+    const midValue = open.map((item, index) => (close[index] * 3 + high[index] + low[index] + item) / 6)
     const DKXData = talib.WMA({ inReal: midValue, timePeriod: 20 })
     const { output } = talib.SMA({ inReal: DKXData.output, timePeriod: 10 })
     return shiftList(output, 29)
@@ -156,14 +153,15 @@ const initData = (data: KlineDataItem[]): InformatData => {
   const close: number[] = []
   const high: number[] = []
   const low: number[] = []
-  const kLineData: [number, number, number, number][] = []
-  data.forEach(item => {
+  // 开 收 低 高 成交额 昨收
+  const kLineData: [number, number, number, number, number, number][] = []
+  data.forEach((item,index) => {
     time.push(item[0])
     open.push(item[1])
     close.push(item[4])
     high.push(item[2])
     low.push(item[3])
-    kLineData.push([item[1], item[4], item[3], item[2]])
+    kLineData.push([item[1], item[4], item[3], item[2], item[6], index === 0 ? item[4] : data[index - 1][4]])
   })
   return { time, open, close, high, low, kLineData }
 }
@@ -174,7 +172,7 @@ const sliceData = (data: any[], length: number) => {
 }
 
 // 初始化talib
-const init = async() => {
+const init = async () => {
   if (!isInit) {
     // 未初始化
     isInit = true
@@ -183,7 +181,7 @@ const init = async() => {
     requestPromise.forEach(resolve => {
       resolve()
     })
-  } else if(loading) {
+  } else if (loading) {
     // 正在初始化
     return new Promise((resolve: Function) => {
       requestPromise.push(resolve)
@@ -192,7 +190,11 @@ const init = async() => {
 }
 
 // 主函数
-const formatKlineData = async (data: KlineDataItem[], indicatorInfo: IndicatorConfigType, totalBarCount: number): Promise<InFormatKlineData> => {
+const formatKlineData = async (
+  data: KlineDataItem[],
+  indicatorInfo: IndicatorConfigType,
+  totalBarCount: number
+): Promise<InFormatKlineData> => {
   const formatData: InformatData = initData(data)
 
   await init()
@@ -212,8 +214,8 @@ const formatKlineData = async (data: KlineDataItem[], indicatorInfo: IndicatorCo
           {
             key,
             color,
-            data: sliceData(getData(key, formatData), totalBarCount)
-          }
+            data: sliceData(getData(key, formatData), totalBarCount),
+          },
         ]
       }
       return res
@@ -221,4 +223,4 @@ const formatKlineData = async (data: KlineDataItem[], indicatorInfo: IndicatorCo
   }
 }
 
-export default formatKlineData
+export default formatKlineData

package/packages/Kline/index.vue

@@ -114,31 +114,44 @@
   const option = ref<any>(null) // 处理后的echarts配置
   const activeIndex = ref(-1) // 当前鼠标激活的数据索引
 
-  // Tips: 开, 高, 低, 收
+  // Tips: [开, 收, 低, 高, 成交额, 昨收]
   const kLineTips = computed(() => {
     if (option.value && option.value.dataset[0]?.source?.klineData[activeIndex.value]) {
       const klineItem = option.value.dataset[0].source.klineData[activeIndex.value]
+      // 计算涨跌比
+      let ratio = (((klineItem[1] - klineItem[5]) / klineItem[1]) * 100).toFixed(2)
+      let ratioColor = +ratio === 0.0 ? 'white' : +ratio > 0 ? 'red' : '#00ff00'
       return [
         {
           label: '开',
-          value: klineItem[1],
+          value: klineItem[0],
           color: 'rgb(153, 153, 153)',
         },
         {
           label: '高',
-          value: klineItem[2],
+          value: klineItem[3],
           color: 'rgb(153, 153, 153)',
         },
         {
           label: '低',
-          value: klineItem[3],
+          value: klineItem[2],
           color: 'rgb(153, 153, 153)',
         },
         {
           label: '收',
-          value: klineItem[4],
+          value: klineItem[1],
           color: 'rgb(153, 153, 153)',
         },
+        {
+          label: '额',
+          value: formatPrice(klineItem[4]),
+          color: 'rgb(153, 153, 153)',
+        },
+        {
+          label: '涨跌',
+          value: `${ratio}%`,
+          color: ratioColor,
+        },
       ]
     }
     return []
@@ -150,7 +163,7 @@
         next.data[activeIndex.value] &&
           result.push({
             label: next.key,
-            value: formatPrice(next.data[activeIndex.value]),
+            value: (next.data[activeIndex.value]).toFixed(2),
             color: next.color,
           })
         return result

package/packages/Kline/option.ts

@@ -73,7 +73,7 @@ export const getOption = async (
     dataset: {
       id: 'data',
       source: {
-        klineData: originData,
+        klineData: kLine,
         indicatorData: indicator,
       },
     },

package/src/pages/Kline/api.ts

@@ -7,7 +7,7 @@ export const getSingleCycleSingleVariety = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: '49d4a41f8776c86d36dd560969117785',
+      token: 'ee8f92ba3949d0173aaf244542cdcaf2',
     },
     url: 'http://192.168.12.49:88/common/qt/getSingleCycleSingleVariety',
     data,
@@ -21,7 +21,7 @@ export const getMultiCycleSingleVariety = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: '49d4a41f8776c86d36dd560969117785',
+      token: 'ee8f92ba3949d0173aaf244542cdcaf2',
     },
     url: 'http://192.168.12.49:88/common/qt/getMultiCycleSingleVariety',
     data,
@@ -35,7 +35,7 @@ export const getDict = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: '49d4a41f8776c86d36dd560969117785',
+      token: 'ee8f92ba3949d0173aaf244542cdcaf2',
     },
     url: 'http://192.168.12.49:88/common/qt/getDict',
     data,
@@ -50,7 +50,7 @@ export const getIndicatorConfig = async () => {
   return axios({
     method: 'get',
     headers: {
-      token: '49d4a41f8776c86d36dd560969117785',
+      token: 'ee8f92ba3949d0173aaf244542cdcaf2',
     },
     url: 'http://116.62.161.92:8005/get_indicator'
   })

package/src/pages/Kline/components/MultiCycleSingleVariety.vue

@@ -80,7 +80,7 @@
       dictIds: [1002],
     }
     const res = await getDict(params)
-    multiCycleKline.value = res.data[1002].map((item: any) => {
+    multiCycleKline.value = res.data.body[1002].map((item: any) => {
       return {
         loading: true,
         cycle: Number(item.dictCode),

package/src/pages/Kline/components/SingleCycleSingleVariety.vue

@@ -99,7 +99,7 @@
       dictIds: [1002],
     }
     const res = await getDict(params)
-    cycleOptions.value = res.data[1002].map((item: any) => {
+    cycleOptions.value = res.data.body[1002].map((item: any) => {
       return {
         label: item.dictName,
         value: item.dictCode,