st-comp 0.0.155 → 0.0.157

package/package.json

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

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

@@ -106,7 +106,7 @@ const clickIndicator = (item) => {
     case "mainFlow": {
       indicatorValue.value = {
         ...baseParams,
-        mainFlowRadioType: '0',
+        radioType: '0',
         rankRange: [null, null],
       };
       break;
@@ -191,7 +191,7 @@ const submitDialog = () => {
     }
     // 主力净流入资金
     case "mainFlow": {
-      const { label, mainFlowRadioType, radio, rankRange } = indicatorValue.value;
+      const { label, radioType, radio, rankRange } = indicatorValue.value;
       const checkNumber = (val) => {
         if (val === '' || val === null || val === undefined) return false;
         const num = Number(val)
@@ -201,21 +201,21 @@ const submitDialog = () => {
       // 校验
       if (!radio) return ElMessage.warning("格式错误: 请选择时间");
       if (!checkNumber(rankRange[0]) && !checkNumber(rankRange[1])) {
-        return ElMessage.warning(`格式错误: 请填写${mainFlowRadioType === '0' ? '涨幅范围' : '排名范围'}`);
+        return ElMessage.warning(`格式错误: 请填写${radioType === '0' ? '涨幅范围' : '排名范围'}`);
       }
       // 格式化文案
       if (!["", null].includes(rankRange[0]) && !["", null].includes(rankRange[1])) {
         indicatorValue.value.tagText = `${label}: ${radio}日${
-          mainFlowRadioType === '0' ? '涨幅范围' : '排名范围'
-        }: ${rankRange[0]}${mainFlowRadioType === '0' ? '%' : ''} ~ ${rankRange[1]}${mainFlowRadioType === '0' ? '%' : ''}`;
+          radioType === '0' ? '涨幅范围' : '排名范围'
+        }: ${rankRange[0]}${radioType === '0' ? '%' : ''} ~ ${rankRange[1]}${radioType === '0' ? '%' : ''}`;
       } else if (!["", null].includes(rankRange[0])) {
         indicatorValue.value.tagText = `${label}: ${radio}日${
-          mainFlowRadioType === '0' ? '涨幅范围' : '排名范围'
-        }: ≥${rankRange[0]}${mainFlowRadioType === '0' ? '%' : ''}`;
+          radioType === '0' ? '涨幅范围' : '排名范围'
+        }: ≥${rankRange[0]}${radioType === '0' ? '%' : ''}`;
       } else {
         indicatorValue.value.tagText = `${label}: ${radio}日${
-          mainFlowRadioType === '0' ? '涨幅范围' : '排名范围'
-        }: ≤${rankRange[1]}${mainFlowRadioType === '0' ? '%' : ''}`;
+          radioType === '0' ? '涨幅范围' : '排名范围'
+        }: ≤${rankRange[1]}${radioType === '0' ? '%' : ''}`;
       }
       break;
     }
@@ -393,12 +393,12 @@ const changeMainFlowRadioType = () => {
       <template #header v-else-if="nowIndicator.key === 'mainFlow'">
         <span style="font-size: 18px;">{{ nowIndicator.label }}</span>
         <el-radio-group
-          v-model="indicatorValue.mainFlowRadioType"
+          v-model="indicatorValue.radioType"
           style="vertical-align: 4px; margin-left: 12px;"
           @change="changeMainFlowRadioType"
         >
           <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>
       
@@ -610,7 +610,7 @@ const changeMainFlowRadioType = () => {
             <el-radio value="20">20日</el-radio>
           </el-radio-group>
           <div style="display: flex; align-items: center;">
-            <span>{{ indicatorValue.mainFlowRadioType === '0' ? '涨幅范围' : '排名范围' }}:&nbsp;</span>
+            <span>{{ indicatorValue.radioType === '0' ? '涨幅范围' : '排名范围' }}:&nbsp;</span>
             <el-input
               v-model="indicatorValue.rankRange[0]"
               style="flex: 1"

package/packages/VarietySearch/index.vue

@@ -266,9 +266,15 @@ 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, radioType, mainFlowRadioType, radio, rankRange } = item;
+        const { key, type, range, unit, radioType, radio, rankRange } = item;
+        // 主力净流入资金
+        if (key === 'mainFlow') {
+          let [start, end] = rankRange;
+          let column = radioType === '0' ? `netInfow${radio}d` : `last${radio}DayMainFlowRank`
+          result.push({ column, start, end });
+        }
         // 排名模式
-        if (radioType === "1") {
+        else if (radioType === "1") {
           params.sortBy = {
             column: item.key,
             start: rankRange[0] || null,
@@ -286,12 +292,6 @@ defineExpose({
             end,
           });
         }
-        // 主力净流入资金
-        else if (key === 'mainFlow') {
-          let [start, end] = rankRange;
-          let column = mainFlowRadioType === '0' ? `netInfow${radio}d` : `last${radio}DayMianFlowRank`
-          result.push({ column, start, end });
-        }
         // 其它基本面指标
         else if (type === undefined && !QIQUANKYES.includes(key)) {
           let [start, end] = range;