st-comp 0.0.39 → 0.0.41

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.39",
+  "version": "0.0.41",
   "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/utils.ts

@@ -538,9 +538,18 @@ const handleSellBuyConfig = (data: any[], originData: KlineDataType) => {
      * 因为传入参数数据时,已经对数据进行了合并处理,不会出现例如: 两个平空数据于一条K线上,这种情况,所以
      * 简单判断该条K线上是否有多个数据即可判断出是否是买卖同时存在,如果同时存在图标变成T
      */
+    const timeTradeList = data.filter((item: any) => item.time === next.time)
     let symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
-    if (data.filter((item: any) => item.time === next.time).length > 1) {
-      symbol = "image://" + new URL("./images/t.svg", import.meta.url).href;
+    if (timeTradeList.length > 1) {
+      // 存在多条数据, 处理出他们的交易类型, 进行去重
+      const timeTradeTypes = [...new Set(...timeTradeList.map(i => handleTradeType(i, "sellBuy")))]
+      if (timeTradeTypes.length > 1) {
+        symbol = "image://" + new URL("./images/t.svg", import.meta.url).href;
+      } else {
+        symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
+      }
+    } else {
+      symbol = "image://" + new URL(`./images/${tradeType === "买" ? "buy" : "sell"}.svg`, import.meta.url).href;
     }
     // 3.获取对应Y轴值
     const originDataItem = originData.find((item: any) => item[0] === next.time) ?? [];

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

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,12 +191,12 @@ const getKlineData = async () => {
   const params = {
     contractType: 0,
     cycle: cycle.value,
-    endTime: "2022-12-23 00:00:00",
+    endTime: "2015-04-09 15:00:00",
     preLimit: 800,
     queryType: 0,
     right: 0,
-    startTime: "2020-12-23 00:00:00",
-    variety: "FU",
+    startTime: "2015-02-08 15:00:00",
+    variety: "IF",
   };
   const res = await getSingleCycleSingleVariety(params);
   klineData.value = res.data.body;
@@ -206,10 +207,10 @@ const getKlineData = async () => {
 const getKlinePointData = async () => {
   // ------
   const params = {
-    analyseId: 2229,
+    analyseId: 2248,
     cycle: cycle.value,
     ifStock: 0,
-    varietyName: "燃料油",
+    varietyName: "沪深300",
   };
   const res = await queryPairedRecordByVariety(params);
   const body = res.data.body;