st-comp 0.0.18 → 0.0.19

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.18",
+  "version": "0.0.19",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -17,6 +17,7 @@
     "echarts": "^5.4.3",
     "element-plus": "^2.3.14",
     "pinia": "^2.1.6",
+    "st-func": "^0.0.14",
     "talib.js": "^0.1.0",
     "vue": "^3.3.4",
     "vue-router": "^4.2.5"

package/packages/Kline/formatKlineData.ts

@@ -9,144 +9,17 @@ interface InformatData {
   low: number[]
   kLineData: [number, number, number, number, number, number][]
 }
+interface indicatorInfoItemType {
+  calculationFn: Function
+  color: string
+  key: string
+}
 
 let isInit = false // 是否初始化
 let loading = true // 初始化loading
 let requestPromise: Function[] = [] // 用于存储loading中的计算请求
 
-// 指标线计算后处理
-function shiftList(list: any[], n: number) {
-  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)]
-}
-
-// BBI 完成
-// BBIROLL
-// BOLL
-// BTB
-// DKX 完成
-// DKX_EMA 完成
-// DKX_MA 完成
-// DKX_STD
-// MA 完成
-// TQA
-// Trade
-// ZIG
-
-// 指标线计算方法
-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 { 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 DKXData = talib.WMA({ inReal: midValue, timePeriod: 20 })
-    const { output } = talib.SMA({ inReal: DKXData.output, timePeriod: 10 })
-    return shiftList(output, 29)
-  },
-  // ?
-  EMA: (data: InformatData, cycle: number): number[] => {
-    const { close } = data
-    const { output } = talib.EMA({ inReal: close, timePeriod: cycle })
-    return shiftList(output, cycle)
-  },
-  // ?
-  EMA30: (data: InformatData): number[] => {
-    return fnMap.EMA(data, 30)
-  },
-  // ?
-  EMA60: (data: InformatData): number[] => {
-    return fnMap.EMA(data, 60)
-  },
-  // ?
-  EMA120: (data: InformatData): number[] => {
-    return fnMap.EMA(data, 120)
-  },
-  // ?
-  EMA240: (data: InformatData): number[] => {
-    return fnMap.EMA(data, 240)
-  },
-  // ?
-  EMA360: (data: InformatData): number[] => {
-    return fnMap.EMA(data, 240)
-  },
-  // ?
-  EMA720: (data: InformatData): number[] => {
-    return fnMap.EMA(data, 240)
-  },
-  // ?
-  HHV: (data: InformatData, cycle: number): number[] => {
-    const { high } = data
-    const { output } = talib.MAX({ inReal: high, timePeriod: cycle })
-    return shiftList(output, cycle)
-  },
-  // ?
-  HHV30: (data: InformatData): number[] => {
-    return fnMap.HHV(data, 30)
-  },
-  // ?
-  LLV: (data: InformatData, cycle: number): number[] => {
-    const { high } = data
-    const { output } = talib.MIN({ inReal: high, timePeriod: cycle })
-    return shiftList(output, cycle)
-  },
-  // ?
-  LLV30: (data: InformatData): number[] => {
-    return fnMap.LLV(data, 30)
-  },
-  // ?
-  MA: (data: InformatData, cycle: number): number[] => {
-    const { close } = data
-    const { output } = talib.SMA({ inReal: close, timePeriod: cycle })
-    return shiftList(output, cycle)
-  },
-  // ?
-  MA5: (data: InformatData): number[] => {
-    return fnMap.MA(data, 5)
-  },
-  // ?
-  MA10: (data: InformatData): number[] => {
-    return fnMap.MA(data, 10)
-  },
-  // ?
-  MA20: (data: InformatData): number[] => {
-    return fnMap.MA(data, 20)
-  },
-  // ?
-  MA60: (data: InformatData): number[] => {
-    return fnMap.MA(data, 60)
-  },
-  // ?
-  BBI: (data: InformatData): number[] => {
-    const MA3 = fnMap.MA(data, 3)
-    const MA6 = fnMap.MA(data, 6)
-    const MA12 = fnMap.MA(data, 12)
-    const MA24 = fnMap.MA(data, 24)
-    return MA3.map((item: number, index: number) => {
-      return (item + MA6[index] + MA12[index] + MA24[index]) / 4
-    })
-  },
-}
-
-// 获取指标线数据函数
-const getData = (key: string, data: InformatData) => {
-  if (fnMap[key]) {
-    return fnMap[key](data)
-  } else {
-    return new Array(data.time.length).fill(null)
-  }
-}
-
-// 数据初始化
+// 返回格式化基础数据
 const initData = (data: KlineDataItem[]): InformatData => {
   const time: string[] = []
   const open: number[] = []
@@ -166,11 +39,6 @@ const initData = (data: KlineDataItem[]): InformatData => {
   return { time, open, close, high, low, kLineData }
 }
 
-// 导出数据长度处理
-const sliceData = (data: any[], length: number) => {
-  return data.length > length ? data.slice(data.length - length) : data
-}
-
 // 初始化talib
 const init = async () => {
   if (!isInit) {
@@ -189,6 +57,20 @@ const init = async () => {
   }
 }
 
+// 导出数据长度处理
+const sliceData = (data: any[], length: number) => {
+  return data.length > length ? data.slice(data.length - length) : data
+}
+
+// 获取指标线数据函数
+const getData = (item: any, data: InformatData, otherData: InformatData) => {
+  if (item.calculationFn) {
+    return item.calculationFn(talib, data, otherData)
+  } else {
+    return new Array(data.time.length).fill(null)
+  }
+}
+
 // 主函数
 const formatKlineData = async (
   data: KlineDataItem[],
@@ -197,29 +79,30 @@ const formatKlineData = async (
 ): Promise<InFormatKlineData> => {
   const formatData: InformatData = initData(data)
 
+  /**
+   * @description: 用于提供重叠指标计算的额外K线数据逻辑
+   * @throws: 暂时置空数组,因为K线额外数据的请求位置暂定,可能会改成前端计算生成额外K线数据
+  */
+  let otherFormatData:any = []
+  // if(indicatorInfo.showFreq && indicatorInfo.showFreq.includes(freqName) && indicatorInfo.mergeFreq){
+
+  // }
+  otherFormatData = initData(otherFormatData)
+
   await init()
 
   return {
     originData: sliceData(data, totalBarCount),
     kLine: sliceData(formatData.kLineData, totalBarCount),
     time: sliceData(formatData.time, totalBarCount),
-    indicator: Object.keys(indicatorInfo).reduce((res: any[], key: string) => {
-      let color = 'rgba(238, 238, 238, 0.5)'
-      if (indicatorInfo[key]) {
-        color = `#${(indicatorInfo[key] as any).split('#')[1]}`
-      }
-      if (key !== 'WINDOW') {
-        return [
-          ...res,
-          {
-            key,
-            color,
-            data: sliceData(getData(key, formatData), totalBarCount),
-          },
-        ]
-      }
-      return res
-    }, []),
+    indicator: indicatorInfo.config.reduce((result: any[], next: indicatorInfoItemType) => {
+      result.push({
+        key: next.key,
+        color: next.color,
+        data: sliceData(getData(next, formatData, otherFormatData), totalBarCount)
+      })
+      return result
+    }, [])
   }
 }
 

package/packages/Kline/index.vue

@@ -22,14 +22,7 @@
   const props = defineProps({
     indicator: {
       type: Object,
-      default: () => ({
-        DKX: 'LINE#FFFFFF',
-        EMA120: 'LINE#E4007F',
-        EMA240: 'LINE#999999',
-        EMA60: 'LINE#00FF00',
-        MADKX: 'LINE#FFFF00',
-        WINDOW: '#0',
-      }),
+      default: () => ({}),
     },
     klineData: {
       type: Array,

package/packages/Kline/type.d.ts

@@ -166,11 +166,23 @@ export type LineDataType = LineDataItem[]
 
 /**
  * @description: 指标线配置类型
+ * @example
+ *  config: Array 内含哪些指标
+ *  label: 指标名称
+ *  mergeFreq: 需要合并的K线周期
+ *  showFreq: 哪些周期里展示
+ *  value: 指标名称
  */
 export interface IndicatorConfigType {
-  [key: string]: {
-    [key: string]: string
-  }
+  config: Array<{
+    key: string
+    color: string
+    calculationFn: Function
+  }>
+  label: string
+  mergeFreq: undefined | string
+  showFreq: undefined | string[]
+  value: string
 }
 
 /**

package/src/pages/Kline/api.ts

@@ -7,7 +7,7 @@ export const getSingleCycleSingleVariety = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: 'ee8f92ba3949d0173aaf244542cdcaf2',
+      token: '9593c16255001925afeed6dd2770eea7',
     },
     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: 'ee8f92ba3949d0173aaf244542cdcaf2',
+      token: '9593c16255001925afeed6dd2770eea7',
     },
     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: 'ee8f92ba3949d0173aaf244542cdcaf2',
+      token: '9593c16255001925afeed6dd2770eea7',
     },
     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: 'ee8f92ba3949d0173aaf244542cdcaf2',
+      token: '9593c16255001925afeed6dd2770eea7',
     },
     url: 'http://116.62.161.92:8005/get_indicator'
   })

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

@@ -7,7 +7,8 @@
   import { ElMessage } from 'element-plus'
   import 'element-plus/dist/index.css'
   import { formatValue } from '../../../../packages/Kline/utils'
-  import { getSingleCycleSingleVariety, getDict, getIndicatorConfig } from '../api.ts'
+  import { getSingleCycleSingleVariety, getDict } from '../api.ts'
+  import { mainIndicatorList } from 'st-func'
 
   dayjs.extend(isSameOrAfter)
 
@@ -37,7 +38,6 @@
     { label: '开平', value: 1 },
     { label: '买卖', value: 2 },
   ])
-  const indicatorOptions = ref<any>([])
 
   // 接口原生-点位数据
   const originPointData = ref<any>([])
@@ -63,7 +63,6 @@
   // 初始化
   const componentInit = async () => {
     try {
-      await getIndicatorOptions()
       await getDictCycle()
       await getKlineData()
       await getKlineExtendData()
@@ -90,27 +89,11 @@
         klineData: [],
         markData: [],
         netWorkErrorMsg: '',
-        indicator: indicatorOptions.value.find((i: any) => i.value === 'DKX_EMA').info,
+        indicator: mainIndicatorList.find((i: any) => i.value === 'DKX_EMA'),
         indicatorName: 'DKX_EMA',
       }
     })
   }
-  /**
-   * @description: 获取指标配置表
-   */
-  const getIndicatorOptions = async () => {
-    const res = await getIndicatorConfig()
-    indicatorOptions.value = Object.keys(res.data).reduce((result: any, key: any) => {
-      if (res.data[key].WINDOW === '#0') {
-        result.push({
-          value: key,
-          label: key,
-          info: res.data[key],
-        })
-      }
-      return result
-    }, [])
-  }
   /**
    * @description: 获取K线数据 / 点位数据
    */
@@ -313,7 +296,7 @@
    * @description: 切换指标
    */
   const indicatorChange = (item: any) => {
-    item.indicator = indicatorOptions.value.find((i: any) => i.value === item.indicatorName).info
+    item.indicator = mainIndicatorList.find((i: any) => i.value === item.indicatorName)
   }
 
   // 画线预警
@@ -574,7 +557,7 @@
               @change="indicatorChange(item)"
             >
               <el-option
-                v-for="(item, index) in indicatorOptions"
+                v-for="(item, index) in mainIndicatorList"
                 :key="index"
                 :label="item.label"
                 :value="item.value"

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

@@ -7,7 +7,8 @@
   import { ElMessage } from 'element-plus'
   import 'element-plus/dist/index.css'
   import { formatValue } from '../../../../packages/Kline/utils'
-  import { getSingleCycleSingleVariety, getDict, getIndicatorConfig } from '../api.ts'
+  import { getSingleCycleSingleVariety, getDict } from '../api.ts'
+  import { mainIndicatorList } from 'st-func'
 
   dayjs.extend(isSameOrAfter)
 
@@ -31,13 +32,12 @@
   const cycleOptions = ref<any>([]) // 周期下拉框数据
 
   const indicator = computed(() => {
-    if (indicatorOptions.value.length > 0) {
-      return indicatorOptions.value.find((item: any) => item.value === indicatorName.value).info
+    if (mainIndicatorList.length > 0) {
+      return mainIndicatorList.find((item: any) => item.value === indicatorName.value)
     }
     return null
   })
   const indicatorName = ref<any>('DKX_EMA')
-  const indicatorOptions = ref<any>([])
 
   const sellBuyType = ref(1)
   const sellBuyTypeName = computed(() => {
@@ -78,7 +78,6 @@
   const componentInit = async () => {
     try {
       loading.value = true
-      await getIndicatorOptions()
       await getDictCycle()
       await getKlineData()
       await getKlinePointData()
@@ -107,22 +106,6 @@
       }
     })
   }
-  /**
-   * @description: 获取指标配置表
-  */
-  const getIndicatorOptions = async () => {
-    const res = await getIndicatorConfig()
-    indicatorOptions.value = Object.keys(res.data).reduce((result:any,key:any)=>{
-      if(res.data[key].WINDOW === '#0'){
-        result.push({
-          value: key,
-          label: key,
-          info: res.data[key]
-        })
-      }
-      return result
-    },[])
-  }
   /**
    * @description: 获取K线数据
    */
@@ -498,7 +481,7 @@
             popper-class="element-dark"
           >
             <el-option
-              v-for="(item, index) in indicatorOptions"
+              v-for="(item, index) in mainIndicatorList"
               :key="index"
               :label="item.label"
               :value="item.value"

package/src/vite-env.d.ts

@@ -6,3 +6,4 @@ declare module '*.vue' {
   const component: DefineComponent<{}, {}, any>
   export default component
 }
+declare module 'st-func'