st-comp 0.0.112 → 0.0.114

package/package.json

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

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

@@ -9,6 +9,9 @@ const props = defineProps({
   commonOption: { type: Array, default: () => [] }, // 已选常用选项
 });
 const visible = ref(false);
+const rankKey = computed(() => {
+  return props.data.find(i => i.radioType === '1')?.key;
+})
 
 // 常用指标项数据源 [受到: 品种市场, 常用选项影响]
 const commonIndicatorOptions = computed(() => {
@@ -88,7 +91,7 @@ const clickIndicator = (item) => {
         ...baseParams,
         range: [null, null],
         unit: item.defaultUnit.length ? [...item.defaultUnit] : [null, null],
-        radioType: item.defaultRadioType, // 0数值 1排名
+        radioType: rankKey.value && rankKey.value !== item.key ? '0' : item.defaultRadioType, // 0数值 1排名
         rankRange: item.defaultRankRange || [null, null],// 默认排名 
       };
     }
@@ -154,6 +157,14 @@ const submitDialog = () => {
       if (["", null].includes(range[0]) && ["", null].includes(range[1])) {
         return ElMessage.warning("格式错误: 请至少填写一个值");
       }
+      // 排名校验
+      if (radioType === '1') {
+        const rangeLeft = Number(range[0])
+        const rangeRight = Number(range[1])
+        if (isNaN(rangeLeft) || isNaN(rangeRight)) return ElMessage.warning("格式错误: 请填写数字");
+        if (rangeLeft < 0 || rangeRight < 0) return ElMessage.warning("格式错误: 请填写大于0的数字");
+        if (rangeLeft > rangeRight) return ElMessage.warning("格式错误: 请填写正确的排名范围");
+      }
       const unitLeft = radioType === '1' ? "" : (unit[0] ?? "")
       const unitRight = radioType === '1' ? "" : (unit[1] ?? "")
       // 格式化文案
@@ -301,7 +312,7 @@ watch(
           style="vertical-align: 4px; margin-left: 12px;"
         >
           <el-radio-button label="数值" value="0" />
-          <el-radio-button label="排名" value="1" />
+          <el-radio-button :disabled="rankKey && rankKey !== nowIndicator.key" label="排名" value="1" />
         </el-radio-group>
       </template>
       

package/packages/VarietySearch/index.vue

@@ -200,17 +200,16 @@ 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)) {
-            rangeDtoList.push({
+            params.sortBy = {
               column: item.key,
               start: rankRange[0] || null,
               end: rankRange[1] || null,
-            })
+            }
           } else {
             result.push({
               column: item.key,
@@ -268,9 +267,6 @@ defineExpose({
         }
         return result;
       }, []);
-      if (rangeDtoList.length) {
-        params.searchOptionDto = { rangeDtoList }
-      }
       if (query.length) {
         params.query = query;
       }