st-comp 0.0.37 → 0.0.39

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.37",
+  "version": "0.0.39",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/packages/Kline/index.vue

@@ -78,6 +78,7 @@ const defaultConfig: InConfig = {
   totalBarCount: 2000,
   defaultShowBarCount: 200,
   preBarCount: 800,
+  maxValueSpan: 10000,
   gridLeft: 60,
   gridTop: 0,
   gridRight: 60,
@@ -295,6 +296,7 @@ const draw = async (type?: string) => {
                 type: "inside",
                 xAxisIndex: [0, 0],
                 zoomLock: config.value.zoomLock,
+                maxValueSpan: config.value.maxValueSpan,
                 startValue: chartOption.dataZoom[0].startValue + addDataLength,
                 endValue: chartOption.dataZoom[0].endValue + addDataLength,
               },
@@ -506,6 +508,7 @@ const keyDownEvent = (e: KeyboardEvent) => {
       type: "dataZoom",
       startValue,
       endValue,
+      maxValueSpan: config.value.maxValueSpan,
     });
   };
   const handleRight = () => {
@@ -518,6 +521,7 @@ const keyDownEvent = (e: KeyboardEvent) => {
         type: "dataZoom",
         startValue,
         endValue,
+        maxValueSpan: config.value.maxValueSpan,
       });
     } else {
       if (endValue === option.xAxis[0].data.length - 1) {
@@ -529,6 +533,7 @@ const keyDownEvent = (e: KeyboardEvent) => {
         type: "dataZoom",
         startValue,
         endValue,
+        maxValueSpan: config.value.maxValueSpan,
       });
     }
   };
@@ -547,6 +552,7 @@ const keyDownEvent = (e: KeyboardEvent) => {
       startValue,
       endValue,
       actionIsWheel: true, // 标记为缩放
+      maxValueSpan: config.value.maxValueSpan,
     });
   };
   const handleDown = () => {
@@ -559,6 +565,7 @@ const keyDownEvent = (e: KeyboardEvent) => {
       start,
       end,
       actionIsWheel: true, // 标记为缩放
+      maxValueSpan: config.value.maxValueSpan,
     });
   };
   const callBackMap = new Map([

package/packages/Kline/option.ts

@@ -28,7 +28,7 @@ export const getOption = async (
   config: InConfig,
   netPositionData: any
 ) => {
-  const { totalBarCount, defaultShowBarCount, gridLeft, gridTop, gridRight, gridBottom, zoomLock } = config;
+  const { totalBarCount, defaultShowBarCount, maxValueSpan, gridLeft, gridTop, gridRight, gridBottom, zoomLock } = config;
   /**
    * @todo: 1.数据处理
    * @returns {Array<'YYYY-MM-DD HH:mm:ss'>} time 用于X轴的时间数组
@@ -60,13 +60,6 @@ export const getOption = async (
    * @todo: 3.标注点位渲染项处理
    */
   const markPointData = handlePoint(markData, originData);
-  const timePointData = markData.reduce((result, next) => {
-    const { data } = next;
-    // 无数据直接循环下一组数据
-    if (data === null || data.length === 0) return result;
-    result.push(...data);
-    return result;
-  }, []);
   /**
    * @todo: 4.标注点位连线渲染处理
   */
@@ -116,10 +109,37 @@ export const getOption = async (
             body += `<div>资产持仓净值: ${item.data}</div>`;
           }
           if (item.componentSubType === "candlestick") {
-            // 买卖点tooltip渲染逻辑
-            timePointData.forEach((i) => {
-              if (i.time === item.axisValue) {
-                body += i.tooltip;
+            // 买卖/开平tooltip渲染逻辑
+            markData.forEach((mark) => {
+              const { key, data } = mark;
+              if (key === "sellBuy") {
+                // 买卖点渲染逻辑
+                const sellBuy = data.filter((i) => i.time === item.axisValue);
+                let buy = 0;
+                let sell = 0;
+                sellBuy.forEach((i) => {
+                  if (i.tradeType === "开多" || i.tradeType === "平空") {
+                    // 买
+                    buy += i.amount;
+                  } else {
+                    // 卖
+                    sell += i.amount;
+                  }
+                });
+                if (buy) {
+                  body += `<div>买: ${buy}</div>`;
+                }
+                if (sell) {
+                  body += `<div>卖: ${sell}</div>`;
+                }
+              }
+              if (key === "openClose") {
+                // 开平点渲染逻辑
+                data.forEach((i) => {
+                  if (i.time === item.axisValue) {
+                    body += i.tooltip;
+                  }
+                });
               }
             });
           }
@@ -186,6 +206,7 @@ export const getOption = async (
         type: "inside",
         xAxisIndex: [0, 0],
         zoomLock,
+        maxValueSpan,
         start: kLine.length >= defaultShowBarCount ? ((kLine.length - defaultShowBarCount) / kLine.length) * 100 : 0,
         end: 99.99,
         // startValue: kLine.length >= defaultShowBarCount ? kLine.length - defaultShowBarCount : 0,

package/packages/Kline/type.d.ts

@@ -19,6 +19,7 @@ export interface InConfig {
   totalBarCount: number // k线总条数
   defaultShowBarCount: number // k线默认展示条数
   preBarCount: number // k线预加载条数，用于计算指标线
+  maxValueSpan: number // k线一屏最大数量
   gridLeft: number // k线组件 grid.left
   gridTop: number // k线组件 grid.top
   gridRight: number // k线组件 grid.right

package/packages/TreeMap/index.vue

@@ -108,13 +108,17 @@
                 upperLabel: {
                   padding: [8, 0, 0, 0],
                   formatter: (params: any) => {
-                    return `{title|${params.data.name} ${params.data.labelValue}} {${params.data.percent >= 0 ? 'redPercent' : 'greenPercent'}|${params.data.percent}%}`
+                    return `{title|${params.data.name} ${params.data.labelValue}} ${params.data.percent === null ? '' : `{${params.data.percent >= 0 ? params.data.percent === 0 ? 'defaultPercent' : 'redPercent' : 'greenPercent'}|${params.data.percent}%}`}`
                   },
                   rich: {
                     title: {
                       color: '#fff',
                       fontSize: 14,
                     },
+                    defaultPercent: {
+                      color: '#fff',
+                      fontSize: 14,
+                    },
                     redPercent: {
                       color: 'red',
                       fontSize: 14,

package/src/pages/Kline/api.ts

@@ -77,7 +77,7 @@ export const queryPairedRecordByVariety = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: 'e077632625ea4b11506db312e186dd06',
+      token: 'b1ef55eb206f7ae49b85b528231c5d87',
     },
     url: 'http://192.168.12.49:88/invest/analysis/queryPairedRecordByVariety',
     data