st-comp 0.0.107 → 0.0.110

package/package.json

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

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

@@ -88,6 +88,8 @@ const clickIndicator = (item) => {
         ...baseParams,
         range: [null, null],
         unit: item.defaultUnit.length ? [...item.defaultUnit] : [null, null],
+        radioType: item.defaultRadioType, // 0数值 1排名
+        rankRange: item.defaultRankRange || [null, null],// 默认排名 
       };
     }
   }
@@ -146,18 +148,19 @@ const submitDialog = () => {
     }
     // 其它的通用处理
     default: {
-      const { label, range, unit } = indicatorValue.value;
+      const { label, unit, radioType } = indicatorValue.value;
+      const range = radioType === '1' ? indicatorValue.value.rankRange : indicatorValue.value.range;
       // 校验
       if (["", null].includes(range[0]) && ["", null].includes(range[1])) {
         return ElMessage.warning("格式错误: 请至少填写一个值");
       }
       // 格式化文案
       if (!["", null].includes(range[0]) && !["", null].includes(range[1])) {
-        indicatorValue.value.tagText = `${label}: ${range[0]}${unit[0] ?? ""} ~ ${range[1]}${unit[1] ?? ""}`;
+        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ${range[0]}${unit[0] ?? ""} ~ ${range[1]}${unit[1] ?? ""}`;
       } else if (!["", null].includes(range[0])) {
-        indicatorValue.value.tagText = `${label}: ≥${range[0]}${unit[0] ?? ""}`;
+        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ≥${range[0]}${unit[0] ?? ""}`;
       } else {
-        indicatorValue.value.tagText = `${label}: ≤${range[1]}${unit[1] ?? ""}`;
+        indicatorValue.value.tagText = `${label}${radioType === '1' ? '排名' : ''}: ≤${range[1]}${unit[1] ?? ""}`;
       }
     }
   }
@@ -289,8 +292,34 @@ watch(
       align-center
       destroy-on-close
     >
+      <template #header v-if="nowIndicator.showRankType">
+        <span style="font-size: 18px;">{{ nowIndicator.label }}</span>
+        <el-radio-group
+          v-model="indicatorValue.radioType"
+          style="vertical-align: 4px; margin-left: 12px;"
+        >
+          <el-radio-button label="数值" value="0" />
+          <el-radio-button label="排名" value="1" />
+        </el-radio-group>
+      </template>
+      
+      <template v-if="nowIndicator.type === undefined && indicatorValue.radioType === '1'">
+        <!-- 输入框区域 -->
+        <div class="out-box">
+          <span>自定义: </span>
+          <el-input
+            v-model="indicatorValue.rankRange[0]"
+            style="flex: 1"
+          />
+          ~
+          <el-input
+            v-model="indicatorValue.rankRange[1]"
+            style="flex: 1"
+          />
+        </div>
+      </template>
       <!-- type: undefined 为默认便捷配置项 + 输入框形式 -->
-      <template v-if="nowIndicator.type === undefined">
+      <template v-else-if="nowIndicator.type === undefined">
         <!-- 便捷配置项区域 -->
         <div
           class="convenient-option-box"

package/packages/VarietySearch/config.js

@@ -276,6 +276,12 @@ export default {
         defaultUnit: ["亿", "亿"],
         // 单位下拉框选项
         unitOptions: ["元", "千万", "亿"],
+        // 是否展示排名类型
+        showRankType: true,
+        // 默认单选类型 0: 数值类型 1: 排名
+        defaultRadioType: '1',
+        // 默认数值
+        defaultRankRange: [0, 25],
       },
       // 净资产收益率roe
       {
@@ -441,6 +447,12 @@ export default {
         defaultUnit: ["万", "万"],
         // 单位下拉框选项
         unitOptions: ["万"],
+        // 是否展示排名类型
+        showRankType: true,
+        // 默认单选类型 0: 数值类型 1: 排名
+        defaultRadioType: '1',
+        // 默认数值
+        defaultRankRange: [0, 25],
       },
       // 成交量
       {
@@ -456,6 +468,12 @@ export default {
         defaultUnit: [],
         // 单位下拉框选项
         unitOptions: [],
+        // 是否展示排名类型
+        showRankType: true,
+        // 默认单选类型 0: 数值类型 1: 排名
+        defaultRadioType: '1',
+        // 默认数值
+        defaultRankRange: [0, 25],
       },
       // 持仓量
       {
@@ -471,6 +489,12 @@ export default {
         defaultUnit: [],
         // 单位下拉框选项
         unitOptions: [],
+        // 是否展示排名类型
+        showRankType: true,
+        // 默认单选类型 0: 数值类型 1: 排名
+        defaultRadioType: '1',
+        // 默认数值
+        defaultRankRange: [0, 25],
       },
       // 认沽认购
       {

package/packages/VarietySearch/index.vue

@@ -109,6 +109,7 @@ 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,9 +202,26 @@ defineExpose({
       const QIQUANKYES = ["expireDays", "virtualRealDegree", "yearProfitRate", "impliedVolatility", "levelMultiplier", "turnover", "volume", "openInterest", "optionsCpType", "optionGear"];
       // 1.常用指标-基本面(type:undefined的指标, 且[期权]的常用指标不计入基本面)
       const query = data.commonIndicator.reduce((result, item) => {
-        const { key, type, range, unit } = item;
+        const { key, type, range, unit, radioType, rankRange } = item;
+        // 排名模式
+        if (radioType === '1') {
+          if (QIQUANKYES.includes(key)) {
+            searchOptionDto.rangeDtoList.push({
+              column: item.key,
+              start: rankRange[0] || null,
+              end: rankRange[1] || null,
+            })
+          } else {
+            result.push({
+              column: item.key,
+              type: '1',
+              start: rankRange[0] || null,
+              end: rankRange[1] || null,
+            })
+          }
+        }
         // 股息率
-        if (key === "dividendYield") {
+        else if (key === "dividendYield") {
           let [start, end] = range;
           if (!["", null].includes(start)) start = start / 100;
           if (!["", null].includes(end)) end = end / 100;
@@ -274,7 +292,6 @@ defineExpose({
         params.peTtmLevels = peTtmLevelIndicator.peTtmLevels;
       }
       // 6.常用指标-期权相关参数
-      const searchOptionDto = {};
       data.commonIndicator.forEach((item) => {
         const { key } = item;
         switch (key) {