st-comp 0.0.92 → 0.0.94

package/package.json

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

package/packages/FactorWarning/index.vue

@@ -117,7 +117,7 @@ watch(
     <el-config-provider :locale="zhCn">
       <el-dialog
         v-model="visible"
-        width="840"
+        width="860"
         align-center
         destroy-on-close
         @closed="emit('closed')"
@@ -152,10 +152,20 @@ watch(
               label="交易类型:"
               prop="factorType"
             >
-              <el-radio-group v-model="ruleForm.factorType">
-                <el-radio :label="1">多</el-radio>
-                <el-radio :label="-1">空</el-radio>
-              </el-radio-group>
+              <el-button
+                type="danger"
+                :plain="ruleForm.factorType !== 1"
+                @click="ruleForm.factorType = 1"
+              >
+                多
+              </el-button>
+              <el-button
+                type="success"
+                :plain="ruleForm.factorType !== -1"
+                @click="ruleForm.factorType = -1"
+              >
+                空
+              </el-button>
             </el-form-item>
             <!-- 预警因子 -->
             <el-form-item
@@ -243,7 +253,7 @@ watch(
           >
             <el-table-column
               label="预警周期"
-              width="80"
+              width="70"
             >
               <template #default="scope">
                 {{ scope.row.freqName || "-" }}
@@ -251,17 +261,17 @@ watch(
             </el-table-column>
             <el-table-column
               label="交易类型"
-              width="80"
+              width="70"
             >
               <template #default="scope">
                 <span
                   v-if="scope.row.factorExtendValue == 1"
-                  style="color: #67c23a"
+                  style="color: #f56c6c"
                   >多</span
                 >
                 <span
                   v-else
-                  style="color: #f56c6c"
+                  style="color: #67c23a"
                   >空</span
                 >
               </template>
@@ -273,7 +283,7 @@ watch(
             </el-table-column>
             <el-table-column
               label="预警次数"
-              width="80"
+              width="70"
             >
               <template #default="scope">
                 {{ `${scope.row.currentCount} / ${scope.row.totalCount}` }}
@@ -282,7 +292,7 @@ watch(
             <el-table-column
               v-if="showConfig.tableStatus"
               label="状态"
-              width="80"
+              width="70"
             >
               <template #default="scope">
                 <div>
@@ -295,6 +305,7 @@ watch(
             <el-table-column
               v-if="showConfig.tableCreateTime"
               label="设置时间"
+              width="136"
             >
               <template #default="scope">
                 {{ scope.row.createdTime || "-" }}
@@ -303,6 +314,7 @@ watch(
             <el-table-column
               v-if="showConfig.tableMark"
               label="备注"
+              width="70"
             >
               <template #default="scope">
                 {{ scope.row.mark || "-" }}
@@ -362,9 +374,12 @@ watch(
   :deep(.el-dialog__body) {
     padding-top: 0;
     padding-bottom: 0;
+    .text-btn {
+      display: inline-block;
+      padding: 6px 8px;
+    }
     .el-table {
-      min-height: 470px;
-      max-height: 590px;
+      height: 590px;
     }
   }
 

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

@@ -2,14 +2,15 @@
 <script setup name="CommonIndicator">
 import { ref, watch, computed } from "vue";
 
+const data = defineModel("data", { default: [] });
 const props = defineProps({
   config: { type: Object, default: () => {} },
   varietyMarket: { type: null || Number, default: () => null }, // 已选品种市场
   commonOption: { type: Array, default: () => [] }, // 已选常用选项
 });
-const data = defineModel("data", { default: [] });
+const visible = ref(false);
 
-// 常用指标项(是否展示受到: 品种市场, 常用选项影响)
+// 常用指标项数据源 [受到: 品种市场, 常用选项影响]
 const commonIndicatorOptions = computed(() => {
   let result = [];
   // 如果品种市场和常用选项一个都没有选, 那么就展示全部的常用指标
@@ -32,124 +33,71 @@ const commonIndicatorOptions = computed(() => {
   }
   return result;
 });
-
-// 监视: 常用指标数据源
-watch(
-  () => commonIndicatorOptions.value,
-  () => {
-    // 如果常用指标已经进行了勾选, 则只保留常用指标中存在的值
-    if (data.value.length) {
-      data.value = data.value.filter(({ key }) => {
-        return commonIndicatorOptions.value.find((item) => item.key === key);
-      });
-    }
-  }
-);
-
-const visible = ref(false);
-// 当前点击的指标项type[用于弹窗判断是哪个指标]
+// 当前操作的指标项类型 [用于弹窗判断是哪个指标]
 const nowIndicator = ref({});
-// 当前指标项内容中的值[具体填写的数据]
+// 当前指标项内容中的值 [具体填写的数据]
 const indicatorValue = ref({});
 
-// 函数: 点击指标项 (新增custom配置项时, 需要改动)
+// 点击指标选项 (**新增custom配置项时, 需要改动**)
 const clickIndicator = (item) => {
-  // 存储目前点击的指标项相关配置
   nowIndicator.value = item;
-  // 初始化值---------------------------------
+  // 初始化指标值
   const baseParams = {
-    label: item.label,
     key: item.key,
     type: item.type,
+    label: item.label,
   };
-  if (item.type === undefined) {
-    indicatorValue.value = {
-      ...baseParams,
-      range: [null, null],
-      unit: item.defaultUnit.length ? [...item.defaultUnit] : [null, null],
-    };
-  }
-  // 是否ST
-  else if (item.key === "st") {
-    indicatorValue.value = { ...baseParams, st: null };
-  }
-  // 净利润
-  else if (item.key === "tFeaturelncomes") {
-    indicatorValue.value = {
-      ...baseParams,
-      rule: 1, // 1超 2跌
-      withFewYears: null,
-      yearsCount: null,
-      netProfit: null,
-    };
-  }
-  // 股价分位
-  else if (item.key === "priceLevels") {
-    indicatorValue.value = { ...baseParams, priceLevels: null };
-  }
-  // 认沽认购
-  else if (item.key === "optionsCpType") {
-    indicatorValue.value = {
-      ...baseParams,
-      optionsCpType: null, // 1看涨 2看跌
-    };
-  }
-  // -----------------------------------------
-  // 打开弹窗
-  visible.value = true;
-};
-// 函数: 点击快捷选项[type-undefined 通用性]
-const clickConvenientOption = (item) => {
-  indicatorValue.value.range = [...item.range];
-  indicatorValue.value.unit = [...item.unit];
-};
-// 函数: 点击快捷选项[特殊-净利润]
-const clicktFeaturelncomesOption = (value) => {
-  switch (value) {
-    case "≤0":
-      Object.assign(indicatorValue.value, {
-        rule: 2, // 1超 2跌
-        withFewYears: 1,
-        yearsCount: 1,
-        netProfit: 0,
-      });
+  switch (item.key) {
+    // 是否ST
+    case "st": {
+      indicatorValue.value = { ...baseParams, st: null };
       break;
-    case "≥0":
-      Object.assign(indicatorValue.value, {
-        rule: 1,
-        withFewYears: 1,
-        yearsCount: 1,
-        netProfit: 0,
-      });
+    }
+    // 净利润
+    case "tFeaturelncomes": {
+      indicatorValue.value = {
+        ...baseParams,
+        rule: 1, // 1超 2跌
+        withFewYears: null,
+        yearsCount: null,
+        netProfit: null,
+      };
       break;
-    case "五年内有四年以上盈利超过5千万":
-      Object.assign(indicatorValue.value, {
-        rule: 1,
-        withFewYears: 5,
-        yearsCount: 4,
-        netProfit: 0.5,
-      });
+    }
+    // 股价分位
+    case "priceLevels": {
+      indicatorValue.value = { ...baseParams, priceLevels: null };
       break;
-    case "≥10亿":
-      Object.assign(indicatorValue.value, {
-        rule: 1,
-        withFewYears: 1,
-        yearsCount: 1,
-        netProfit: 10,
-      });
+    }
+    // 认沽认购
+    case "optionsCpType": {
+      indicatorValue.value = {
+        ...baseParams,
+        optionsCpType: null, // 1看涨 2看跌
+      };
       break;
-    case "≥20亿":
-      Object.assign(indicatorValue.value, {
-        rule: 1,
-        withFewYears: 1,
-        yearsCount: 1,
-        netProfit: 20,
-      });
+    }
+    // 动量
+    case "momentum": {
+      indicatorValue.value = {
+        ...baseParams,
+        momentumType: 1,
+        momentumValue: [20],
+      };
       break;
+    }
+    // 其它的通用处理
+    default: {
+      indicatorValue.value = {
+        ...baseParams,
+        range: [null, null],
+        unit: item.defaultUnit.length ? [...item.defaultUnit] : [null, null],
+      };
+    }
   }
+  visible.value = true;
 };
-
-// 函数: 确定 (新增custom配置项时, 需要改动)
+// 确定指标选项 (**新增custom配置项时, 需要改动**)
 const submitDialog = () => {
   // 校验 + 格式化文案
   switch (indicatorValue.value.key) {
@@ -191,6 +139,43 @@ const submitDialog = () => {
       indicatorValue.value.tagText = `${label}: ${optionsCpType === 1 ? "看涨" : "看跌"}`;
       break;
     }
+    // 动量
+    case "momentum": {
+      const { label, momentumType, momentumValue } = indicatorValue.value;
+      const errorText = `格式错误, 请输入正整数或选择正确的时间项`;
+      let contentText = null;
+      // 校验
+      switch (momentumType) {
+        case 1: {
+          if (!handleValidInput(momentumValue[0])) return ElMessage.warning(errorText);
+          contentText = `现价相对于${momentumValue[0]}日前收盘价的涨幅`;
+          break;
+        }
+        case 2: {
+          if (!handleValidInput(momentumValue[0])) return ElMessage.warning(errorText);
+          contentText = `现价相对于${momentumValue[0]}日均线的涨幅`;
+          break;
+        }
+        case 3: {
+          if (!handleValidInput(momentumValue[0]) || !handleValidInput(momentumValue[1])) return ElMessage.warning(errorText);
+          contentText = `现价相对于${momentumValue[0]}日前${momentumValue[1]}日均线的涨幅`;
+          break;
+        }
+        case 4: {
+          if (!handleValidInput(momentumValue[0]) || !handleValidInput(momentumValue[1])) return ElMessage.warning(errorText);
+          contentText = `近${momentumValue[0]}日均线相对于近${momentumValue[1]}日均线的涨幅`;
+          break;
+        }
+        case 5: {
+          if (!handleValidInput(momentumValue[0]) || !handleValidInput(momentumValue[1]) || !handleValidInput(momentumValue[2])) return ElMessage.warning(errorText);
+          contentText = `近${momentumValue[0]}日均线相对于${momentumValue[1]}日前${momentumValue[2]}日均线的涨幅`;
+          break;
+        }
+      }
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: ${contentText}`;
+      break;
+    }
     // 其它的通用处理
     default: {
       const { label, range, unit } = indicatorValue.value;
@@ -217,17 +202,101 @@ const submitDialog = () => {
   }
   visible.value = false;
 };
-
-// 函数: 删除指标项Tag
-const deleteTag = (index) => {
-  data.value.splice(index, 1);
-};
-// 函数: 编辑指标项Tag
+// 编辑指标Tag
 const editTag = (item) => {
   nowIndicator.value = commonIndicatorOptions.value.find(({ key }) => key === item.key);
   indicatorValue.value = JSON.parse(JSON.stringify(item));
   visible.value = true;
 };
+// 删除指标Tag
+const deleteTag = (index) => {
+  data.value.splice(index, 1);
+};
+// 快捷项[通用: type-undefined]
+const clickConvenientOption = (item) => {
+  indicatorValue.value.range = [...item.range];
+  indicatorValue.value.unit = [...item.unit];
+};
+// 快捷项[自定义: type-custom-净利润]
+const clicktFeaturelncomesOption = (value) => {
+  switch (value) {
+    case "≤0":
+      Object.assign(indicatorValue.value, {
+        rule: 2, // 1超 2跌
+        withFewYears: 1,
+        yearsCount: 1,
+        netProfit: 0,
+      });
+      break;
+    case "≥0":
+      Object.assign(indicatorValue.value, {
+        rule: 1,
+        withFewYears: 1,
+        yearsCount: 1,
+        netProfit: 0,
+      });
+      break;
+    case "五年内有四年以上盈利超过5千万":
+      Object.assign(indicatorValue.value, {
+        rule: 1,
+        withFewYears: 5,
+        yearsCount: 4,
+        netProfit: 0.5,
+      });
+      break;
+    case "≥10亿":
+      Object.assign(indicatorValue.value, {
+        rule: 1,
+        withFewYears: 1,
+        yearsCount: 1,
+        netProfit: 10,
+      });
+      break;
+    case "≥20亿":
+      Object.assign(indicatorValue.value, {
+        rule: 1,
+        withFewYears: 1,
+        yearsCount: 1,
+        netProfit: 20,
+      });
+      break;
+  }
+};
+// 快捷项[自定义: type-custom-动量]
+const handleMomentumTypeChange = (type) => {
+  const defaultValueMap = new Map([
+    [1, [20]],
+    [2, [20]],
+    [3, [20, 3]],
+    [4, [3, 20]],
+    [5, [3, 20, 3]],
+  ]);
+  indicatorValue.value.momentumValue = defaultValueMap.get(type);
+};
+const handleMomentumInputOptions = (queryString, cb) => {
+  cb([
+    { label: "本周", value: "本周" },
+    { label: "本月", value: "本月" },
+    { label: "近一月", value: "近一月" },
+    { label: "本年", value: "本年" },
+  ]);
+};
+const handleValidInput = (value) => {
+  const isInt = /^[1-9]\d*$/.test(value);
+  const isOption = /^(本周|本月|近一月|本年)$/i.test(value);
+  return isInt || isOption;
+};
+// 监视: 常用指标数据源 => 已勾选且新的数据源中也有它,则要进行勾选保留
+watch(
+  () => commonIndicatorOptions.value,
+  () => {
+    if (data.value.length) {
+      data.value = data.value.filter(({ key }) => {
+        return commonIndicatorOptions.value.find((item) => item.key === key);
+      });
+    }
+  }
+);
 </script>
 
 <template>
@@ -235,7 +304,7 @@ const editTag = (item) => {
     class="common-indicator"
     v-if="config.show && commonIndicatorOptions.length"
   >
-    <!-- 指标项展示区域 -->
+    <!-- 指标选项 -->
     <div class="indicator">
       <div class="title">
         <span>常用指标: </span>
@@ -251,6 +320,7 @@ const editTag = (item) => {
         </span>
       </div>
     </div>
+    <!-- 指标Tag -->
     <div class="tags">
       <el-tag
         v-for="(item, index) in data"
@@ -266,7 +336,8 @@ const editTag = (item) => {
         >
       </el-tag>
     </div>
-    <!-- 指标具体弹窗 -->
+
+    <!-- 指标弹窗 -->
     <el-dialog
       v-model="visible"
       :title="nowIndicator.label"
@@ -405,7 +476,85 @@ const editTag = (item) => {
             <el-radio :label="2">看跌</el-radio>
           </el-radio-group>
         </div>
+        <!-- 动量 -->
+        <div v-if="nowIndicator.key === 'momentum'">
+          <!-- 便捷配置项区域 -->
+          <el-radio-group
+            v-model="indicatorValue.momentumType"
+            @change="handleMomentumTypeChange"
+          >
+            <el-radio :label="1">动量1</el-radio>
+            <el-radio :label="2">动量2</el-radio>
+            <el-radio :label="3">动量3</el-radio>
+            <el-radio :label="4">动量4</el-radio>
+            <el-radio :label="5">动量5</el-radio>
+          </el-radio-group>
+          <!-- 输入框区域 -->
+          <div class="momentum-out-box">
+            <div v-if="indicatorValue.momentumType === 1">
+              <span>现价相对于</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[0]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日前收盘价的涨幅</span>
+            </div>
+            <div v-if="indicatorValue.momentumType === 2">
+              <span>现价相对于</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[0]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日均线的涨幅</span>
+            </div>
+            <div v-if="indicatorValue.momentumType === 3">
+              <span>现价相对于</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[0]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日前</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[1]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日均线的涨幅</span>
+            </div>
+            <div v-if="indicatorValue.momentumType === 4">
+              <span>近</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[0]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日均线相对于近</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[1]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日均线的涨幅</span>
+            </div>
+            <div v-if="indicatorValue.momentumType === 5">
+              <span>近</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[0]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日均线相对于</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[1]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日前</span>
+              <el-autocomplete
+                v-model="indicatorValue.momentumValue[2]"
+                :fetch-suggestions="handleMomentumInputOptions"
+              />
+              <span>日均线的涨幅</span>
+            </div>
+          </div>
+        </div>
       </template>
+      <!-- 确定 -->
       <template #footer>
         <div class="dialog-footer">
           <el-button
@@ -488,6 +637,7 @@ const editTag = (item) => {
       margin-right: 10px;
     }
   }
+  // 净利润弹窗样式
   .tFeaturelncomes-option-box {
     display: grid;
     grid-template-columns: 20% 20% 60%;
@@ -510,5 +660,13 @@ const editTag = (item) => {
       width: 100px;
     }
   }
+  // 动量弹窗样式
+  .momentum-out-box {
+    margin-top: 10px;
+    :deep(.el-autocomplete) {
+      width: 100px;
+      margin: 0 4px;
+    }
+  }
 }
 </style>

package/packages/VarietySearch/config.js

@@ -1,5 +1,4 @@
 // 品种池搜索组件的默认配置项
-
 export default {
   // 品种市场 [选项: 前端默认]
   varietyMarket: {
@@ -340,7 +339,19 @@ export default {
         },
         type: "custom",
       },
+      // 动量
+      {
+        key: "momentum",
+        label: "动量",
+        parent: {
+          varietyMarketIds: [2, 3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15],
+        },
+        type: "custom",
+      },
+
       // ----------期权-----------
+
       // 过期天数
       {
         key: "expireDays",

package/packages/VarietySearch/index.vue

@@ -274,6 +274,14 @@ defineExpose({
       if (Object.keys(searchOptionDto).length) {
         params.searchOptionDto = searchOptionDto;
       }
+      // 6.常用指标-动量
+      const momentumIndicator = data.commonIndicator.find(({ key }) => key === "momentum");
+      if (momentumIndicator) {
+        params.momentumIndicator = {
+          momentumType: momentumIndicator.momentumType,
+          momentumValue: momentumIndicator.momentumValue.join(","),
+        };
+      }
     }
     console.log("%c[st-varietySearch]: 接口传参数据生成完毕", "color: green", params);
     return params;