st-comp 0.0.159 → 0.0.161

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

@@ -1,9 +1,11 @@
 <!-- 因子筛选组件 -->
 <script setup name="FactorScreen">
-import { ref } from "vue";
+import { nextTick, ref, watch } from "vue";
 import { Plus, CircleCloseFilled, InfoFilled } from "@element-plus/icons-vue";
 import { handleVerifyScore, extractConditionDetails } from "./tools.js";
 import FactorDescription from "./FactorDescription.vue";
+import ScriptSelect from "./ScriptSelect.vue";
+import MonacoEditor from "../../../MonacoEditor/index.vue"
 
 const props = defineProps({
   config: {
@@ -26,9 +28,12 @@ const data = defineModel("data", {
   },
 });
 
+const monacoEditorRef = ref();
+const scriptSelectRef = ref();
 // 弹窗开关
 const visible = ref(false);
 const visibleDescriptions = ref(false);
+const factorType = ref("模版");
 // 弹窗表单
 const dialogFormRef = ref(null);
 const dialogForm = ref({
@@ -44,43 +49,73 @@ const dialogForm = ref({
   sqlEnable: 0,
   // SQL语句
   sqlValue: null,
+  // 脚本语句
+  factorSelectExpr: '',
 });
 
+watch(() => [factorType.value, visible.value], () => {
+  if (factorType.value === '模版' || visible.value === false) {
+    scriptSelectRef.value.close();
+  }
+}, { deep: true })
+
 // 打开
 const handleOpenDialog = () => {
-  const { list, sqlEnable, sqlValue } = data.value;
+  const { list, sqlEnable, sqlValue, factorSelectExpr } = data.value;
   dialogForm.value = {
     list: JSON.parse(JSON.stringify(list)),
     sqlEnable,
     sqlValue,
+    factorSelectExpr,
   };
   // 保证因子筛选最少一条
   if (!dialogForm.value.list.length) handleAppendFactor();
   visible.value = true;
+  // 解决初次访问样式错乱问题
+  nextTick(() => {
+    if (factorSelectExpr) {
+      factorType.value = '脚本'
+      monacoEditorRef.value.setValue(factorSelectExpr);
+    } else factorType.value = '模版';
+    monacoEditorRef.value.resize();
+  })
 };
 // 确定
 const handleSubmit = () => {
-  dialogFormRef.value.validate((valid) => {
-    const { list, sqlEnable, sqlValue } = dialogForm.value;
-    if (!valid) return;
-    // 针对开启了SQL功能后的字段校验
-    if (sqlEnable) {
-      if (!sqlValue) return ElMessage.error("SQL语句不能为空");
-      // 提取SQL语句中的条件1, 条件2, ...
-      const sqlConditions = extractConditionDetails(sqlValue);
-      // 生成因子表格中的条件1, 条件2, ...
-      const factorConditions = list.map((item, index) => `条件${index + 1}`);
-      // 校验SQL中是否全部都能在因子表格中找到
-      const noSaveConditions = sqlConditions.filter((item) => !factorConditions.includes(item));
-      if (noSaveConditions.length) return ElMessage.error(`请检查SQL语句, 不存在[${noSaveConditions}]`);
-    }
+  if (factorType.value === '模版') {
+    dialogFormRef.value.validate((valid) => {
+      const { list, sqlEnable, sqlValue } = dialogForm.value;
+      if (!valid) return;
+      // 针对开启了SQL功能后的字段校验
+      if (sqlEnable) {
+        if (!sqlValue) return ElMessage.error("SQL语句不能为空");
+        // 提取SQL语句中的条件1, 条件2, ...
+        const sqlConditions = extractConditionDetails(sqlValue);
+        // 生成因子表格中的条件1, 条件2, ...
+        const factorConditions = list.map((item, index) => `条件${index + 1}`);
+        // 校验SQL中是否全部都能在因子表格中找到
+        const noSaveConditions = sqlConditions.filter((item) => !factorConditions.includes(item));
+        if (noSaveConditions.length) return ElMessage.error(`请检查SQL语句, 不存在[${noSaveConditions}]`);
+      }
+      data.value = {
+        list: JSON.parse(JSON.stringify(list)),
+        sqlEnable,
+        sqlValue,
+        factorSelectExpr: '',
+      };
+      visible.value = false;
+    });
+  } else {
+    const script = monacoEditorRef.value.getValue();
+    if (!script) return ElMessage.error("请输入脚本语句");
     data.value = {
-      list: JSON.parse(JSON.stringify(list)),
-      sqlEnable,
-      sqlValue,
+      list: [],
+      sqlEnable: 0,
+      sqlValue: null,
+      factorSelectExpr: script,
     };
     visible.value = false;
-  });
+  }
 };
 
 // 表单: 删除因子
@@ -185,8 +220,22 @@ const handleDeleteTag = (aciton, index) => {
       data.value.list.splice(index, 1);
       break;
     }
+    case "scriptTag": {
+      data.value = {
+        list: [],
+        sqlEnable: 0,
+        sqlValue: null,
+        factorSelectExpr: '',
+      };
+      break;
+    }
   }
 };
+
+// 打开变量选择器
+const open = () => {
+  scriptSelectRef.value.open(monacoEditorRef.value);
+}
 </script>
 
 <template>
@@ -221,6 +270,25 @@ const handleDeleteTag = (aciton, index) => {
           {{ handleFormatTag(tag) }}
         </el-tag>
       </template>
+      <!-- 脚本模式 -->
+      <el-popover
+        v-if="data.factorSelectExpr"
+        width="500"
+        placement="bottom-start"
+      >
+        <div style="white-space: pre-line;">
+          {{ data.factorSelectExpr }}
+        </div>
+        <template #reference>
+          <el-tag
+            closable
+            type="info"
+            @close="handleDeleteTag('scriptTag')"
+          >
+            脚本模式
+          </el-tag>
+        </template>
+      </el-popover>
       <!-- 添加按钮 -->
       <el-button
         class="screen-btn"
@@ -236,7 +304,7 @@ const handleDeleteTag = (aciton, index) => {
     <!-- 因子筛选弹窗 -->
     <el-dialog
       v-model="visible"
-      width="680"
+      width="1000"
       align-center
       destroy-on-close
     >
@@ -255,9 +323,27 @@ const handleDeleteTag = (aciton, index) => {
           >
             <el-icon @click="visibleDescriptions = true"><InfoFilled /></el-icon>
           </el-tooltip>
+          <el-radio-group
+            v-model="factorType"
+            size="small"
+            style="margin-left: 12px;"
+          >
+            <el-radio-button label="模版" value="模版" />
+            <el-radio-button label="脚本" value="脚本" />
+          </el-radio-group>
+          <!-- 变量选择器 -->
+           <div style="flex: 1; text-align: right;" v-if="factorType === '脚本'">
+            <el-button
+              size="small"
+              type="primary"
+              @click="open"
+            >变量选择器</el-button>
+           </div>
         </div>
       </template>
+      <!-- 模版模式 -->
       <el-form
+        v-if="factorType === '模版'"
         ref="dialogFormRef"
         :model="dialogForm"
       >
@@ -485,6 +571,20 @@ const handleDeleteTag = (aciton, index) => {
           </template>
         </template>
       </el-form>
+      <!-- 脚本模式 -->
+      <div
+        style="width: 968px; height: 400px"
+        :style="
+          factorType === '脚本' ?
+            null :
+            { position: 'fixed', top: '-400px', zIndex: -1 }
+          "
+      >
+        <MonacoEditor
+          ref="monacoEditorRef"
+          :language="'lua'"
+        />
+      </div>
       <template #footer>
         <div class="dialog-footer">
           <el-button
@@ -501,6 +601,8 @@ const handleDeleteTag = (aciton, index) => {
     v-model:visible="visibleDescriptions"
     :data="config.factorDescriptions?.filter((item) => [1, 3].includes(item.type))"
   />
+  <!-- 变量选择器 -->
+  <ScriptSelect ref="scriptSelectRef" />
 </template>
 
 <style lang="scss" scoped>

package/packages/VarietySearch/config.js

@@ -387,6 +387,55 @@ export default {
           commonOptionIds: [4, 6, 12, 14, 15, 16],
         },
       },
+      // 营业收入增长率
+      {
+        key: "incrementRevenueLyr",
+        label: "营业收入增长率",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15, 16],
+        },
+        // 默认选中单位
+        defaultUnit: ["%", "%"],
+        // 单位下拉框选项
+        unitOptions: ["%"],
+      },
+      // 净利润增长率
+      {
+        key: "netProfitGrowthRatioLyr",
+        label: "净利润增长率",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15, 16],
+        },
+        // 默认选中单位
+        defaultUnit: ["%", "%"],
+        // 单位下拉框选项
+        unitOptions: ["%"],
+      },
+      // 5年净资产收益率
+      {
+        key: "fiveYearRoe",
+        label: "5年净资产收益率",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15, 16],
+        },
+        // 默认选中单位
+        defaultUnit: ["%", "%"],
+        // 单位下拉框选项
+        unitOptions: ["%"],
+      },
+      // 年报审计意见
+      {
+        key: "auditOpinionType",
+        label: "年报审计意见",
+        parent: {
+          varietyMarketIds: [3, 5, 7],
+          commonOptionIds: [4, 6, 12, 14, 15, 16],
+        },
+        type: "custom",
+      },
 
       // ----------期权-----------
 

package/packages/VarietySearch/index.vue

@@ -26,6 +26,7 @@ searchData.value = Object.assign(searchData.value, {
     list: [],
     sqlEnable: 0,
     sqlValue: null,
+    factorSelectExpr: '',
   },
   // 常用指标
   commonIndicator: [],
@@ -114,6 +115,7 @@ const clearRow = (key) => {
         list: [],
         sqlEnable: 0,
         sqlValue: null,
+        factorSelectExpr: '',
       };
       break;
     }
@@ -156,7 +158,7 @@ watch(
 defineExpose({
   // 生成接口传参结构的数据
   formatData: (data) => {
-    console.log("%c[品种池搜索聚合组件]: 正在生成接口传参...", "color: tomato");
+    console.log("%c[st-varietySearch]: 正在生成接口传参...", "color: tomato");
     const params = {};
     // 1.品种市场
     if (data.varietyMarket) {
@@ -260,19 +262,27 @@ defineExpose({
       }
       // enableSql参数整理
       params.enableSql = factorScreen.sqlEnable === 1 ? 2 : 1;
+      // 2.因子筛选表达式
+      if (factorScreen.factorSelectExpr) {
+        params.factorSelectExpr = factorScreen.factorSelectExpr;
+      }
     }
     // 7.常用指标
     {
       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, radioType, radio, rankRange } = item;
         // 主力净流入资金
-        if (key === 'mainFlow') {
+        if (key === "mainFlow") {
           let [start, end] = rankRange;
-          let column = radioType === '0' ? `netInfow${radio}d` : `last${radio}DayMainFlowRank`
+          let column = radioType === "0" ? `netInfow${radio}d` : `last${radio}DayMainFlowRank`;
           result.push({ column, start, end });
         }
+        // 年报审计意见
+        if (key === "auditOpinionType") {
+          result.push({ column: item.key, enumType: item.enumType });
+        }
         // 排名模式
         else if (radioType === "1") {
           params.sortBy = {
@@ -281,8 +291,8 @@ defineExpose({
             end: rankRange[1] || null,
           };
         }
-        // 股息率
-        else if (key === "dividendYield") {
+        // 需要传递原始值的, 即除100
+        else if (["dividendYield", "incrementRevenueLyr", "netProfitGrowthRatioLyr", "fiveYearRoe"].includes(key)) {
           let [start, end] = range;
           if (!["", null].includes(start)) start = start / 100;
           if (!["", null].includes(end)) end = end / 100;
@@ -332,27 +342,27 @@ defineExpose({
       if (query.length) {
         params.query = query;
       }
-      // 2.常用指标-是否ST
+      // 2.是否ST
       const stIndicator = data.commonIndicator.find(({ key }) => key === "st");
       if (stIndicator) {
         params.st = stIndicator.st;
       }
-      // 3.常用指标-净利润
+      // 3.净利润
       const netProfitQueryDto = data.commonIndicator.find(({ key }) => key === "tFeaturelncomes");
       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.常用指标-市盈率分位
+      // 5.市盈率分位
       const peTtmLevelIndicator = data.commonIndicator.find(({ key }) => key === "peTtmLevels");
       if (peTtmLevelIndicator) {
         params.peTtmLevels = peTtmLevelIndicator.peTtmLevels;
       }
-      // 6.常用指标-期权相关参数
+      // 6.期权相关参数
       const searchOptionDto = {};
       data.commonIndicator.forEach((item) => {
         const { key } = item;
@@ -408,7 +418,7 @@ defineExpose({
             break;
         }
       });
-      // 7.常用指标-成交量
+      // 7.成交量
       const perVolumnIndicator = data.commonIndicator.find(({ key }) => key === "perVolumn");
       if (perVolumnIndicator) {
         params.perVolumn = {
@@ -423,7 +433,7 @@ defineExpose({
         };
       }
     }
-    console.log("%c[品种池搜索聚合组件]: 接口传参数据生成完毕", "color: green", params);
+    console.log("%c[st-varietySearch]: 接口传参数据生成完毕", "color: green", params);
     return params;
   },
   // 重置函数
@@ -447,6 +457,7 @@ defineExpose({
         list: [],
         sqlEnable: 0,
         sqlValue: null,
+        factorSelectExpr: '',
       },
       // 常用指标
       commonIndicator: [],

package/src/pages/VarietySearch/api.js

@@ -0,0 +1,70 @@
+import axios from "axios";
+import { getToken, getUserData } from "st-func";
+
+const token = getToken();
+const host = "http://192.168.12.38:5173";
+
+// 预警系统: 字典汇总
+export const getAlarDict = async () => {
+  const params = {
+    method: "post",
+    headers: { token },
+    data: {
+      userId: getUserData("id"),
+      dictIds: [1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1012, 1013, 1017, 1020, 1021, 1025, 1024, 1027, 1030],
+    },
+    url: `${host}/middleLayer/post/alarm/deliversign/getDicConfig`,
+  };
+  const { data } = await axios(params);
+  const obj = {};
+  for (const key in data.body) {
+    if (Object.hasOwnProperty.call(data.body, key)) {
+      const element = data.body[key];
+      obj[key] = element.map((item) => ({
+        ...item,
+        label: item.dictName,
+        value: item.dictCode,
+      }));
+    }
+  }
+  return obj;
+};
+
+// 预警系统: 周期
+export const getAlarFreq = async () => {
+  const params = {
+    method: "post",
+    headers: { token },
+    url: `${host}/middleLayer/post/alarm/deliversign/getAllFreq`,
+  };
+  const { data } = await axios(params);
+  return data.body
+    .sort((a, b) => a.orderInfo - b.orderInfo)
+    .map((item) => ({
+      ...item,
+      label: item.freqName,
+      value: item.freqCode,
+    }));
+};
+
+// 预警系统: 因子
+export const getAlarFactor = async () => {
+  const params = {
+    method: "post",
+    headers: { token },
+    data: { pageNum: 1, pageSize: 9999 },
+    url: `${host}/middleLayer/post/alarm/deliversign/getFactorConfigByPage`,
+  };
+  const { data } = await axios(params);
+  const { body } = data;
+  return body.list.reduce((result, item) => {
+    if ([1, 3, 4].includes(item.type)) {
+      result.push({
+        ...item,
+        label: item.factorName,
+        value: item.id,
+      });
+    }
+    return result;
+  }, []);
+};