st-comp 0.0.38 → 0.0.40

package/package.json

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

package/packages/Kline/index.vue

@@ -310,6 +310,7 @@ const draw = async (type?: string) => {
     [
       "future",
       async () => {
+        const chartOption = echartsInstance.getOption();
         const newOption = await getOption(
           props.klineData as KlineDataType,
           props.markData,
@@ -318,7 +319,7 @@ const draw = async (type?: string) => {
           props.netPositionData
         );
         newOption.dataZoom[0].start =
-          ((props.klineData.length - config.value.defaultShowBarCount) / props.klineData.length) * 100;
+          ((props.klineData.length - chartOption.dataZoom[0].endValue + chartOption.dataZoom[0].startValue) / props.klineData.length) * 100;
         echartsInstance.setOption(newOption, true);
       },
     ],

package/packages/Kline/option.ts

@@ -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;
+                  }
+                });
               }
             });
           }

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

@@ -63,7 +63,7 @@ export const getNetPositionData = async (data: any) => {
   return axios({
     method: 'post',
     headers: {
-      token: 'e077632625ea4b11506db312e186dd06',
+      token: 'b1ef55eb206f7ae49b85b528231c5d87',
     },
     url: 'http://192.168.12.49:88/invest/analysis/queryVarietyNetPositionValue',
     data
@@ -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

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

@@ -116,16 +116,17 @@ const config = ref({
       const { totalBarCount, preBarCount } = config.value;
       // 1.如果当前K线数据量就小于API希望得到的数量,说明已经没有数据了,将API得到的数据作全部展示
       // 并且打上标记,此K线数据已无更多
-      if (klineData.value.length < totalBarCount + preBarCount) {
-        config.value.totalBarCount = klineData.value.length;
-        console.log("K线数据已无更多-1");
-        futureIsAllLoad.value = true;
-        return;
-      }
+      // if (klineData.value.length < totalBarCount + preBarCount) {
+      //   config.value.totalBarCount = klineData.value.length;
+      //   console.log("K线数据已无更多-1");
+      //   futureIsAllLoad.value = true;
+      //   return;
+      // }
       // 2.已当前存储的K线数据最后一条时间作为开始时间,往后再次请求
       const params = {
-        right: 1, // 复权方式
-        variety: "au8888", // 品种
+        contractType: 0,
+        right: 0, // 复权方式
+        variety: "FU", // 品种
         cycle: cycle.value, // 周期
         startTime: klineData.value[klineData.value.length - 1][0], // 开始
         limit: 20, // 总条数
@@ -190,7 +191,7 @@ const getKlineData = async () => {
   const params = {
     contractType: 0,
     cycle: cycle.value,
-    endTime: "2022-12-23 00:00:00",
+    endTime: "2021-01-23 00:00:00",
     preLimit: 800,
     queryType: 0,
     right: 0,