st-comp 0.0.87 → 0.0.88

package/package.json

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

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

@@ -26,15 +26,14 @@ const commonIndicatorOptions = computed(() => {
       result = result.filter(({ parent }) => {
         const { commonOptionIds } = parent;
         // 只要选择了的常用选项里面, 有commonOptionIds中的值, 那么就展示, 即判断两个数组是否有重复元素
-        return (
-          [...new Set([...commonOptionIds, ...props.commonOption])].length !==
-          [...commonOptionIds, ...props.commonOption].length
-        );
+        return [...new Set([...commonOptionIds, ...props.commonOption])].length !== [...commonOptionIds, ...props.commonOption].length;
       });
     }
   }
   return result;
 });
+
+// 监视: 常用指标数据源
 watch(
   () => commonIndicatorOptions.value,
   () => {
@@ -84,6 +83,10 @@ const clickIndicator = (item) => {
       netProfit: null,
     };
   }
+  // 股价分位
+  else if (item.key === "priceLevels") {
+    indicatorValue.value = { ...baseParams, priceLevels: null };
+  }
   // 认沽认购
   else if (item.key === "optionsCpType") {
     indicatorValue.value = {
@@ -95,7 +98,6 @@ const clickIndicator = (item) => {
   // 打开弹窗
   visible.value = true;
 };
-
 // 函数: 点击快捷选项[type-undefined 通用性]
 const clickConvenientOption = (item) => {
   indicatorValue.value.range = [...item.range];
@@ -150,43 +152,98 @@ const clicktFeaturelncomesOption = (value) => {
 // 函数: 确定 (新增custom配置项时, 需要改动)
 const submitDialog = () => {
   // 校验 + 格式化文案
-  if (indicatorValue.value.type === undefined) {
-    const { label, range, unit } = indicatorValue.value;
-    // 校验
-    if (["", null].includes(range[0]) && ["", null].includes(range[1])) {
-      return ElMessage.warning("格式错误: 请至少填写一个值");
+  switch (indicatorValue.value.key) {
+    // 是否ST
+    case "st": {
+      const { label, st } = indicatorValue.value;
+      // 校验
+      if (st === null) return ElMessage.warning("格式错误: 请至少选择一个值");
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: ${st ? "是" : "否"}`;
+      break;
     }
-    // 格式化文案
-    if (!["", null].includes(range[0]) && !["", null].includes(range[1])) {
-      indicatorValue.value.tagText = `${label}: ${range[0]}${unit[0] ?? ""} ~ ${range[1]}${unit[1] ?? ""}`;
-    } else if (!["", null].includes(range[0])) {
-      indicatorValue.value.tagText = `${label}: ≥${range[0]}${unit[0] ?? ""}`;
-    } else {
-      indicatorValue.value.tagText = `${label}: ≤${range[1]}${unit[1] ?? ""}`;
+    // 净利润
+    case "tFeaturelncomes": {
+      const { label, rule, withFewYears, yearsCount, netProfit } = indicatorValue.value;
+      // 校验
+      if (["", null].includes(withFewYears) || ["", null].includes(yearsCount) || ["", null].includes(netProfit)) {
+        return ElMessage.warning("格式错误: 请填写完整");
+      }
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: ${withFewYears}年内${yearsCount}年以上盈利${rule === 1 ? "超" : "跌"}过${netProfit}亿`;
+      break;
     }
-  } else if (indicatorValue.value.key === "st") {
-    const { label, st } = indicatorValue.value;
-    // 校验
-    if (st === null) return ElMessage.warning("格式错误: 请至少选择一个值");
-    // 格式化文案
-    indicatorValue.value.tagText = `${label}: ${st ? "是" : "否"}`;
-  } else if (indicatorValue.value.key === "tFeaturelncomes") {
-    const { label, rule, withFewYears, yearsCount, netProfit } = indicatorValue.value;
-    // 校验
-    if (["", null].includes(withFewYears) || ["", null].includes(yearsCount) || ["", null].includes(netProfit)) {
-      return ElMessage.warning("格式错误: 请填写完整");
+    // 股价分位
+    case "priceLevels": {
+      const { label, priceLevels } = indicatorValue.value;
+      // 校验
+      if (!priceLevels || priceLevels.length === 0) return ElMessage.warning("格式错误: 请至少选择一个值");
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: 已选${priceLevels}分位`;
+      break;
+    }
+    // 认沽认购
+    case "optionsCpType": {
+      const { label, optionsCpType } = indicatorValue.value;
+      // 校验
+      if (optionsCpType === null) return ElMessage.warning("格式错误: 请至少选择一个值");
+      // 格式化文案
+      indicatorValue.value.tagText = `${label}: ${optionsCpType === 1 ? "看涨" : "看跌"}`;
+      break;
+    }
+    // 其它的通用处理
+    default: {
+      const { label, range, unit } = indicatorValue.value;
+      // 校验
+      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] ?? ""}`;
+      } else if (!["", null].includes(range[0])) {
+        indicatorValue.value.tagText = `${label}: ≥${range[0]}${unit[0] ?? ""}`;
+      } else {
+        indicatorValue.value.tagText = `${label}: ≤${range[1]}${unit[1] ?? ""}`;
+      }
     }
-    // 格式化文案
-    indicatorValue.value.tagText = `${label}: ${withFewYears}年内${yearsCount}年以上盈利${
-      rule === 1 ? "超" : "跌"
-    }过${netProfit}亿`;
-  } else if (indicatorValue.value.key === "optionsCpType") {
-    const { label, optionsCpType } = indicatorValue.value;
-    // 校验
-    if (optionsCpType === null) return ElMessage.warning("格式错误: 请至少选择一个值");
-    // 格式化文案
-    indicatorValue.value.tagText = `${label}: ${optionsCpType === 1 ? "看涨" : "看跌"}`;
   }
+  // 校验 + 格式化文案 废弃于: 2024-12-04 0.0.88版本
+  // if (indicatorValue.value.type === undefined) {
+  //   const { label, range, unit } = indicatorValue.value;
+  //   // 校验
+  //   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] ?? ""}`;
+  //   } else if (!["", null].includes(range[0])) {
+  //     indicatorValue.value.tagText = `${label}: ≥${range[0]}${unit[0] ?? ""}`;
+  //   } else {
+  //     indicatorValue.value.tagText = `${label}: ≤${range[1]}${unit[1] ?? ""}`;
+  //   }
+  // } else if (indicatorValue.value.key === "st") {
+  //   const { label, st } = indicatorValue.value;
+  //   // 校验
+  //   if (st === null) return ElMessage.warning("格式错误: 请至少选择一个值");
+  //   // 格式化文案
+  //   indicatorValue.value.tagText = `${label}: ${st ? "是" : "否"}`;
+  // } else if (indicatorValue.value.key === "tFeaturelncomes") {
+  //   const { label, rule, withFewYears, yearsCount, netProfit } = indicatorValue.value;
+  //   // 校验
+  //   if (["", null].includes(withFewYears) || ["", null].includes(yearsCount) || ["", null].includes(netProfit)) {
+  //     return ElMessage.warning("格式错误: 请填写完整");
+  //   }
+  //   // 格式化文案
+  //   indicatorValue.value.tagText = `${label}: ${withFewYears}年内${yearsCount}年以上盈利${rule === 1 ? "超" : "跌"}过${netProfit}亿`;
+  // } else if (indicatorValue.value.key === "optionsCpType") {
+  //   const { label, optionsCpType } = indicatorValue.value;
+  //   // 校验
+  //   if (optionsCpType === null) return ElMessage.warning("格式错误: 请至少选择一个值");
+  //   // 格式化文案
+  //   indicatorValue.value.tagText = `${label}: ${optionsCpType === 1 ? "看涨" : "看跌"}`;
+  // }
   // 判断data中是否已存在同样key的数据, 如果存在则替换, 如果不存在就push
   const keyIndex = data.value.findIndex(({ key }) => key === indicatorValue.value.key);
   if (keyIndex === -1) {
@@ -210,7 +267,10 @@ const editTag = (item) => {
 </script>
 
 <template>
-  <div class="common-indicator" v-if="config.show && commonIndicatorOptions.length">
+  <div
+    class="common-indicator"
+    v-if="config.show && commonIndicatorOptions.length"
+  >
     <!-- 指标项展示区域 -->
     <div class="indicator">
       <div class="title">
@@ -218,21 +278,45 @@ const editTag = (item) => {
         <span>不限</span>
       </div>
       <div class="options">
-        <span v-for="item in commonIndicatorOptions" :key="item.key" @click="clickIndicator(item)"> {{ item.label }} </span>
+        <span
+          v-for="item in commonIndicatorOptions"
+          :key="item.key"
+          @click="clickIndicator(item)"
+        >
+          {{ item.label }}
+        </span>
       </div>
     </div>
     <div class="tags">
-      <el-tag v-for="(item, index) in data" closable type="info" @close="deleteTag(index)">
+      <el-tag
+        v-for="(item, index) in data"
+        closable
+        type="info"
+        @close="deleteTag(index)"
+      >
         <span>{{ item.tagText }}</span>
-        <span class="edit" @click="editTag(item)">编辑</span>
+        <span
+          class="edit"
+          @click="editTag(item)"
+          >编辑</span
+        >
       </el-tag>
     </div>
     <!-- 指标具体弹窗 -->
-    <el-dialog v-model="visible" :title="nowIndicator.label" width="600" align-center destroy-on-close>
+    <el-dialog
+      v-model="visible"
+      :title="nowIndicator.label"
+      width="600"
+      align-center
+      destroy-on-close
+    >
       <!-- type: undefined 为默认便捷配置项 + 输入框形式 -->
       <template v-if="nowIndicator.type === undefined">
         <!-- 便捷配置项区域 -->
-        <div class="convenient-option-box" v-if="nowIndicator.convenientOptions.length">
+        <div
+          class="convenient-option-box"
+          v-if="nowIndicator.convenientOptions.length"
+        >
           <el-button
             v-for="item in nowIndicator.convenientOptions"
             :key="item.text"
@@ -243,30 +327,50 @@ const editTag = (item) => {
         <!-- 输入框区域 -->
         <div class="out-box">
           <span>自定义: </span>
-          <el-input v-model="indicatorValue.range[0]" style="flex: 1">
+          <el-input
+            v-model="indicatorValue.range[0]"
+            style="flex: 1"
+          >
             <!-- 单位 -->
-            <template #append v-if="nowIndicator.unitOptions.length">
+            <template
+              #append
+              v-if="nowIndicator.unitOptions.length"
+            >
               <span v-if="nowIndicator.unitOptions.length === 1">{{ indicatorValue.unit[0] }}</span>
               <el-select
                 v-else
                 v-model="indicatorValue.unit[0]"
                 style="width: 72px"
               >
-                <el-option v-for="unit in nowIndicator.unitOptions" :label="unit" :value="unit" />
+                <el-option
+                  v-for="unit in nowIndicator.unitOptions"
+                  :label="unit"
+                  :value="unit"
+                />
               </el-select>
             </template>
           </el-input>
           ~
-          <el-input v-model="indicatorValue.range[1]" style="flex: 1">
+          <el-input
+            v-model="indicatorValue.range[1]"
+            style="flex: 1"
+          >
             <!-- 单位 -->
-            <template #append v-if="nowIndicator.unitOptions.length">
+            <template
+              #append
+              v-if="nowIndicator.unitOptions.length"
+            >
               <span v-if="nowIndicator.unitOptions.length === 1">{{ indicatorValue.unit[1] }}</span>
               <el-select
                 v-else
                 v-model="indicatorValue.unit[1]"
                 style="width: 72px"
               >
-                <el-option v-for="unit in nowIndicator.unitOptions" :label="unit" :value="unit" />
+                <el-option
+                  v-for="unit in nowIndicator.unitOptions"
+                  :label="unit"
+                  :value="unit"
+                />
               </el-select>
             </template>
           </el-input>
@@ -287,9 +391,7 @@ const editTag = (item) => {
           <div class="tFeaturelncomes-option-box">
             <el-button @click="clicktFeaturelncomesOption('≤0')">≤0</el-button>
             <el-button @click="clicktFeaturelncomesOption('≥0')">≥0</el-button>
-            <el-button @click="clicktFeaturelncomesOption('五年内有四年以上盈利超过5千万')"
-              >五年内有四年以上盈利超过5千万</el-button
-            >
+            <el-button @click="clicktFeaturelncomesOption('五年内有四年以上盈利超过5千万')">五年内有四年以上盈利超过5千万</el-button>
             <el-button @click="clicktFeaturelncomesOption('≥10亿')">≥10亿</el-button>
             <el-button @click="clicktFeaturelncomesOption('≥20亿')">≥20亿</el-button>
           </div>
@@ -297,15 +399,40 @@ const editTag = (item) => {
           <div class="tFeaturelncomes-out-box">
             <span>自定义: </span>
             <div>
-              <el-input-number v-model="indicatorValue.withFewYears" controls-position="right" />
+              <el-input-number
+                v-model="indicatorValue.withFewYears"
+                controls-position="right"
+              />
               年内
-              <el-input-number v-model="indicatorValue.yearsCount" controls-position="right" />
+              <el-input-number
+                v-model="indicatorValue.yearsCount"
+                controls-position="right"
+              />
               年以上盈利{{ indicatorValue.rule === 1 ? "超" : "跌" }}过
-              <el-input-number v-model="indicatorValue.netProfit" controls-position="right" />
+              <el-input-number
+                v-model="indicatorValue.netProfit"
+                controls-position="right"
+              />
               亿
             </div>
           </div>
         </div>
+        <!-- 股价分位 -->
+        <div v-if="nowIndicator.key === 'priceLevels'">
+          <el-select
+            v-model="indicatorValue.priceLevels"
+            multiple
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in [1, 2, 3, 4, 5]"
+              :key="item"
+              :label="`${item}分位`"
+              :value="item"
+            />
+          </el-select>
+        </div>
         <!-- 认沽认购 -->
         <div v-if="nowIndicator.key === 'optionsCpType'">
           <el-radio-group v-model="indicatorValue.optionsCpType">
@@ -316,7 +443,11 @@ const editTag = (item) => {
       </template>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitDialog">确定</el-button>
+          <el-button
+            type="primary"
+            @click="submitDialog"
+            >确定</el-button
+          >
         </div>
       </template>
     </el-dialog>
@@ -351,8 +482,8 @@ const editTag = (item) => {
         padding: 4px 0;
         margin-right: 20px;
         cursor: pointer;
-        &:hover{
-          color: var(--el-color-primary)
+        &:hover {
+          color: var(--el-color-primary);
         }
       }
     }

package/packages/VarietySearch/config.js

@@ -1,6 +1,7 @@
-// 默认配置项
+// 品种池搜索组件的默认配置项
+
 export default {
-  // 品种市场
+  // 品种市场 [选项: 前端默认]
   varietyMarket: {
     show: true,
     options: [
@@ -13,7 +14,7 @@ export default {
       { label: "期权", value: 8, memo: [11] },
     ],
   },
-  // 常用选项
+  // 常用选项 [选项: 前端默认]
   commonOption: {
     show: true,
     options: [
@@ -33,12 +34,26 @@ export default {
       { label: "概念板块指数", value: 15 },
     ],
   },
-  // 自定义标签
+  // 上市板块 [选项: 接口获取**!]
+  marketIds: {
+    show: true,
+    options: [
+      // { label: "沪深主板", value: 1, varietyMarketIds: [3] },
+      // { label: "创业板", value: 2, varietyMarketIds: [3] },
+      // { label: "科创板", value: 4, varietyMarketIds: [3] },
+      // { label: "新三板", value: 8, varietyMarketIds: [3] },
+      // { label: "沪股通", value: 1024, varietyMarketIds: [3] },
+      // { label: "深股通", value: 2048, varietyMarketIds: [3] },
+      // { label: "沪港通", value: 4096, varietyMarketIds: [5] },
+      // { label: "深港通", value: 8192, varietyMarketIds: [5] },
+    ],
+  },
+  // 自定标签 [选项: 接口获取**!]
   customTag: {
     show: true,
     options: [],
   },
-  // 因子筛选
+  // 因子筛选 [选项: 接口获取**!]
   factorScreen: {
     show: true,
     // SQL功能是否展示
@@ -51,7 +66,7 @@ export default {
     factorOptions: [], // 因子下拉框数据源
     factorDescriptions: [], // 因子使用说明数据源
   },
-  // 常用指标
+  // 常用指标 [选项: 前端默认]
   commonIndicator: {
     show: true,
     options: [
@@ -315,6 +330,16 @@ export default {
         // 单位下拉框选项
         unitOptions: ["%"],
       },
+      // 股价分位
+      {
+        key: "priceLevels",
+        label: "股价分位",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15],
+        },
+        type: "custom",
+      },
       // ----------期权-----------
       // 过期天数
       {
@@ -446,7 +471,7 @@ export default {
         },
         type: "custom",
       },
-      // 持仓量
+      // 期权档位
       {
         key: "optionGear",
         label: "期权档位",

package/packages/VarietySearch/index.vue

@@ -4,16 +4,15 @@ import defaultConfig from "./config.js";
 import FactorScreen from "./components/FactorScreen/index.vue";
 import CommonIndicator from "./components/CommonIndicator/index.vue";
 
-const props = defineProps({
-  // 配置项
-  config: { type: Object, default: {} },
-});
+const props = defineProps({ config: { type: Object, default: {} } });
 const searchData = defineModel("searchData", {
   default: {
     // 品种市场
     varietyMarket: null,
     // 常用选项
     commonOption: [],
+    // 上市板块
+    marketIds: [],
     // 自定标签
     customTag: [],
     // 因子筛选
@@ -45,16 +44,30 @@ const varietyMarketDict = computed(() => {
 // 选项数据源: 常用选项
 const commonOptionDict = computed(() => {
   const { varietyMarket } = searchData.value;
-  // 如果已选品种市场,仅展示对应子级下的
+  // 已选品种市场,仅展示匹配的
   if (varietyMarket) {
     const memo = varietyMarketDict.value.find(({ value }) => value === varietyMarket).memo;
     return config.value.commonOption.options.filter(({ value }) => memo.includes(value));
   }
-  // 如果未选品种市场,则展示全部
+  // 未选品种市场,展示全部
   else {
     return config.value.commonOption.options;
   }
 });
+// 选项数据源: 上市市场
+const marketIdsOptionDict = computed(() => {
+  const { varietyMarket } = searchData.value;
+  // 已选品种市场, 仅展示匹配的
+  if (varietyMarket) {
+    return config.value.marketIds.options.filter((item) => {
+      return item.varietyMarketIds.includes(varietyMarket);
+    });
+  }
+  // 未选品种市场,展示全部
+  else {
+    return config.value.marketIds.options;
+  }
+});
 // 选项数据源: 自定标签
 const customTagDict = computed(() => {
   return config.value.customTag.options;
@@ -62,7 +75,7 @@ const customTagDict = computed(() => {
 
 // 不限
 const clearRow = (key) => {
-  if (["commonOption", "customTag", "factorScreen", "commonIndicator"].includes(key)) searchData.value[key] = [];
+  if (["commonOption", "marketIds", "customTag", "factorScreen", "commonIndicator"].includes(key)) searchData.value[key] = [];
   else searchData.value[key] = null;
 };
 
@@ -78,6 +91,18 @@ watch(
     }
   }
 );
+// 监视: 上市市场数据源
+watch(
+  () => marketIdsOptionDict.value,
+  (newValue) => {
+    // 如果常用选项已经进行了勾选, 则只保留常用选项中存在的值
+    if (searchData.value.marketIds.length) {
+      searchData.value.marketIds = searchData.value.marketIds.filter((id) => {
+        return newValue.find(({ value }) => value === id);
+      });
+    }
+  }
+);
 
 defineExpose({
   // 生成接口传参结构的数据
@@ -92,11 +117,15 @@ defineExpose({
     if (data.commonOption?.length) {
       params.optionId = data.commonOption.join(",");
     }
-    // 3.自定标签
+    // 3.上市板块
+    if (data.marketIds?.length) {
+      params.marketIds = data.marketIds;
+    }
+    // 4.自定标签
     if (data.customTag?.length) {
       params.tagIds = data.customTag;
     }
-    // 4.因子筛选
+    // 5.因子筛选
     if (config.value.factorScreen?.show) {
       const { factorScreen } = data;
       if (factorScreen?.list?.length) {
@@ -114,10 +143,10 @@ defineExpose({
         params.sql = factorScreen.sqlValue;
       }
     }
-    // 5.常用指标
+    // 6.常用指标
     {
       const QIQUANKYES = ["expireDays", "virtualRealDegree", "yearProfitRate", "impliedVolatility", "levelMultiplier", "turnover", "volume", "openInterest", "optionsCpType", "optionGear"];
-      // 1.常用指标-基本面( 表中 type: undefined 的指标, [期权]的常用指标不计入基本面)
+      // 1.常用指标-基本面(type:undefined的指标, 且[期权]的常用指标不计入基本面)
       const query = data.commonIndicator.reduce((result, item) => {
         const { key, type, range, unit } = item;
         // 股息率
@@ -181,7 +210,12 @@ defineExpose({
       if (netProfitQueryDto) {
         params.netProfitQueryDto = { ...netProfitQueryDto, netProfit: netProfitQueryDto.netProfit * 100000000.0 };
       }
-      // 4.常用指标-期权相关参数
+      // 4.常用指标-股价分位
+      const priceLevelIndicator = data.commonIndicator.find(({ key }) => key === "priceLevels");
+      if (priceLevelIndicator) {
+        params.priceLevels = priceLevelIndicator.priceLevels;
+      }
+      // 5.常用指标-期权相关参数
       const searchOptionDto = {};
       data.commonIndicator.forEach((item) => {
         const { key } = item;
@@ -291,6 +325,27 @@ defineExpose({
         >
       </el-checkbox-group>
     </div>
+    <!-- 上市板块 -->
+    <div
+      v-if="config.marketIds?.show && marketIdsOptionDict.length"
+      class="variety-search-row"
+    >
+      <div class="title">
+        <span>上市板块: </span>
+        <span @click="clearRow('marketIds')">不限</span>
+      </div>
+      <el-checkbox-group
+        v-model="searchData.marketIds"
+        size="small"
+      >
+        <el-checkbox
+          v-for="{ label, value } in marketIdsOptionDict"
+          :label="value"
+          :key="value"
+          >{{ label }}</el-checkbox
+        >
+      </el-checkbox-group>
+    </div>
     <!-- 自定标签 -->
     <div
       v-if="config.customTag?.show && customTagDict.length"