st-comp 0.0.110 → 0.0.112

package/package.json

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

package/packages/VarietySearch/components/CommonIndicator/index.vue

@@ -154,13 +154,15 @@ const submitDialog = () => {
       if (["", null].includes(range[0]) && ["", null].includes(range[1])) {
         return ElMessage.warning("格式错误: 请至少填写一个值");
       }
+      const unitLeft = radioType === '1' ? "" : (unit[0] ?? "")
+      const unitRight = radioType === '1' ? "" : (unit[1] ?? "")
       // 格式化文案
       if (!["", null].includes(range[0]) && !["", null].includes(range[1])) {
-        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ${range[0]}${unit[0] ?? ""} ~ ${range[1]}${unit[1] ?? ""}`;
+        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ${range[0]}${unitLeft} ~ ${range[1]}${unitRight}`;
       } else if (!["", null].includes(range[0])) {
-        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ≥${range[0]}${unit[0] ?? ""}`;
+        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ≥${range[0]}${unitLeft}`;
       } else {
-        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ≤${range[1]}${unit[1] ?? ""}`;
+        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ≤${range[1]}${unitRight}`;
       }
     }
   }

package/packages/VarietySearch/index.vue

@@ -109,7 +109,6 @@ defineExpose({
   formatData: (data) => {
     console.log("%c[st-varietySearch]: 正在生成接口传参结构的数据...", "color: tomato");
     const params = {};
-    const searchOptionDto = { rangeDtoList: [] }; // 期权相关筛选
     // 1.品种市场
     if (data.varietyMarket) {
       params.exchangeId = String(data.varietyMarket);
@@ -201,12 +200,13 @@ defineExpose({
     {
       const QIQUANKYES = ["expireDays", "virtualRealDegree", "yearProfitRate", "impliedVolatility", "levelMultiplier", "turnover", "volume", "openInterest", "optionsCpType", "optionGear"];
       // 1.常用指标-基本面(type:undefined的指标, 且[期权]的常用指标不计入基本面)
+      const rangeDtoList = []; // 期权排序相关筛选
       const query = data.commonIndicator.reduce((result, item) => {
         const { key, type, range, unit, radioType, rankRange } = item;
         // 排名模式
         if (radioType === '1') {
           if (QIQUANKYES.includes(key)) {
-            searchOptionDto.rangeDtoList.push({
+            rangeDtoList.push({
               column: item.key,
               start: rankRange[0] || null,
               end: rankRange[1] || null,
@@ -268,6 +268,9 @@ defineExpose({
         }
         return result;
       }, []);
+      if (rangeDtoList.length) {
+        params.searchOptionDto = { rangeDtoList }
+      }
       if (query.length) {
         params.query = query;
       }
@@ -292,6 +295,7 @@ defineExpose({
         params.peTtmLevels = peTtmLevelIndicator.peTtmLevels;
       }
       // 6.常用指标-期权相关参数
+      const searchOptionDto = {};
       data.commonIndicator.forEach((item) => {
         const { key } = item;
         switch (key) {
@@ -347,7 +351,10 @@ defineExpose({
         }
       });
       if (Object.keys(searchOptionDto).length) {
-        params.searchOptionDto = searchOptionDto;
+        params.searchOptionDto = {
+          ...params.searchOptionDto,
+          ...searchOptionDto,
+        };
       }
     }
     console.log("%c[st-varietySearch]: 接口传参数据生成完毕", "color: green", params);