st-comp 0.0.204 → 0.0.205

package/package.json

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

package/packages/FactorWarning/index.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { nextTick, ref, watch } from "vue";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import { InfoFilled } from "@element-plus/icons-vue";
+import { ref, watch } from "vue";
 import { defaultShowConfig } from "./tools";
 import { debounce } from "st-func";
 
@@ -82,9 +82,20 @@ const handleThreeAdd = async (factorName) => {
   });
   const fsParams = {
     factorSelectedList: ruleForm.value.factorSelectedList.map((factorName) => {
+      let totalCount = 3;
+      // 判断表格里面有没有同因子的数据, 如果有的话需要确保增加以后的有效次数 <= 12
+      const repeatData = props.tableData.find(({ factorExtendName }) => factorExtendName === factorName);
+      if (repeatData) {
+        const diff = repeatData.totalCount - repeatData.currentCount;
+        // 如果: 已触发次数 === 触发次数上限, 直接全额添加, 此时后端会另起一行数据的
+        if (diff === 0) totalCount = 3;
+        // 如果: 已触发次数 !== 触发次数上限 确保添加后的diff要小于等于12, 出于兼容老数据1/20类似的情况考虑, 加个容错
+        else totalCount = Math.min(3, 12 - diff >= 0 ? 12 - diff : 0);
+      }
       return {
         factorName,
         ...ruleForm.value,
+        totalCount,
       };
     }),
   };
@@ -111,9 +122,9 @@ const handleFastControls = async (item) => {
       const repeatData = props.tableData.find(({ factorExtendName }) => factorExtendName === factorName);
       if (repeatData) {
         const diff = repeatData.totalCount - repeatData.currentCount;
-        // 如果: 已触发次数 === 触发次数上限, 直接+3, 此时后端会另起一行数据的
+        // 如果: 已触发次数 === 触发次数上限, 直接全额添加, 此时后端会另起一行数据的
         if (diff === 0) totalCount = data.totalCount;
-        // 确保添加后的diff要小于等于10, 出于兼容老数据1/20类似的情况考虑, 加个容错
+        // 如果: 已触发次数 !== 触发次数上限 确保添加后的diff要小于等于10, 出于兼容老数据1/20类似的情况考虑, 加个容错
         else totalCount = Math.min(data.totalCount, 10 - diff >= 0 ? 10 - diff : 0);
       }
       return {

package/src/pages/FactorWarning/index.vue

@@ -1,27 +1,8 @@
-<template>
-  <div style="width: 100%; height: 100%">
-    <el-button @click="openDialog">因子预警</el-button>
-    <st-factorWarning
-      v-model:visible="visible"
-      :title="title"
-      :moreFactorOptions="moreFactorOptions"
-      :emptyFactorOptions="emptyFactorOptions"
-      :tableData="tableData"
-      :shortcutData="shortcutData"
-      :showConfig="showConfig"
-      @add="handleAddFactor"
-      @delete="handleDeleteFactor"
-      @enabled="handleEnabledFactor"
-      @closed="handleClosed"
-      @shortcutAdd="handleShortcutAdd"
-      @shortcutDelete="handleShortcutDelete"
-    />
-  </div>
-</template>
-
 <script setup>
-import axios from "axios";
-import { ref, onMounted } from "vue";
+import { getUserData } from "st-func";
+import { ref, onMounted, inject } from "vue";
+
+const { request } = inject("stConfig"); // 组件库全局配置
 
 const visible = ref(false);
 const title = ref("品种-code(周期)");
@@ -41,77 +22,64 @@ const showConfig = {
 // 打开弹窗
 const openDialog = async () => {
   // 获取预警因子[多, 空]选项
-  {
-    const { data } = await axios({
-      method: "post",
-      headers: {
-        token: "a4c883f7f2efb1fe42505961ce97b954",
-      },
-      url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/getFactorConfigByPage",
-      data: {
-        pageNum: 1,
-        pageSize: 9999,
-        factorType: 2,
-      },
+  const params = {
+    pageNum: 1,
+    pageSize: 9999,
+    factorType: 2,
+  };
+  const { body } = await request.post("/middleLayer/post/alarm/deliversign/getFactorConfigByPage", params);
+  moreFactorOptions.value = body.list.reduce((result, item) => {
+    result.push({
+      alarmFactor: item.id,
+      ...item.tbFactorConfigExtendList.find((citem) => citem.factorType === 1),
+    });
+    return result;
+  }, []);
+  emptyFactorOptions.value = body.list.reduce((result, item) => {
+    result.push({
+      alarmFactor: item.id,
+      ...item.tbFactorConfigExtendList.find((citem) => citem.factorType === -1),
     });
-    const { body } = data;
-    moreFactorOptions.value = body.list.reduce((result, item) => {
-      result.push({
-        alarmFactor: item.id,
-        ...item.tbFactorConfigExtendList.find((citem) => citem.factorType === 1),
-      });
-      return result;
-    }, []);
-    emptyFactorOptions.value = body.list.reduce((result, item) => {
-      result.push({
-        alarmFactor: item.id,
-        ...item.tbFactorConfigExtendList.find((citem) => citem.factorType === -1),
-      });
-      return result;
-    }, []);
-  }
-  // 获取自定义快捷配置数据
+    return result;
+  }, []);
+  // 获取快捷配置
   queryShortcutData();
   visible.value = true;
 };
-const handleAddFactor = (ruleForm) => console.log(ruleForm);
-const handleDeleteFactor = (row) => console.log("删除", row);
-const handleEnabledFactor = (row) => console.log("启用", row);
-const handleClosed = () => console.log("弹窗关闭");
+// 关闭弹窗
+const handleClosed = () => {
+  console.log("弹窗关闭");
+};
+
+// 添加因子预警
+const handleAddFactor = (ruleForm) => {
+  console.log(ruleForm);
+};
+// 删除因子预警
+const handleDeleteFactor = (row) => {
+  console.log("删除", row);
+};
+// 启用因子预警
+const handleEnabledFactor = (row) => {
+  console.log("启用", row);
+};
 
+// 查询快捷配置
 const queryShortcutData = async () => {
-  const { data } = await axios({
-    method: "post",
-    headers: {
-      token: "a4c883f7f2efb1fe42505961ce97b954",
-    },
-    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/queryFactorAlarmConfig",
-    data: {
-      userId: 103,
-    },
-  });
-  shortcutData.value = data.body;
+  const params = {
+    userId: getUserData("id"),
+  };
+  const { body } = await request.post("/middleLayer/post/alarm/deliversign/queryFactorAlarmConfig", params);
+  shortcutData.value = body;
 };
+// 更新快捷配置
 const handleShortcutAdd = async (params) => {
-  const { data } = await axios({
-    method: "post",
-    headers: {
-      token: "a4c883f7f2efb1fe42505961ce97b954",
-    },
-    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/addOrUpdateFactorAlarmConfig",
-    data: params,
-  });
+  await request.post("/middleLayer/post/alarm/deliversign/addOrUpdateFactorAlarmConfig", params);
   queryShortcutData();
 };
+// 删除快捷配置
 const handleShortcutDelete = async (params) => {
-  const { data } = await axios({
-    method: "post",
-    headers: {
-      token: "a4c883f7f2efb1fe42505961ce97b954",
-    },
-    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/delFactorAlarmConfig",
-    data: { id: params.id },
-  });
+  await request.post("/middleLayer/post/alarm/deliversign/delFactorAlarmConfig", { id: params.id });
   queryShortcutData();
 };
 
@@ -129,7 +97,7 @@ onMounted(() => {
       factorExtendValue: "1",
       factorExtendName: "30均线上+向上+单箱",
       userId: 103,
-      totalCount: 10,
+      totalCount: 12,
       currentCount: 1,
       enable: 1,
       mark: null,
@@ -212,3 +180,24 @@ onMounted(() => {
   ];
 });
 </script>
+
+<template>
+  <div style="width: 100%; height: 100%">
+    <el-button @click="openDialog">因子预警</el-button>
+    <st-factorWarning
+      v-model:visible="visible"
+      :title="title"
+      :moreFactorOptions="moreFactorOptions"
+      :emptyFactorOptions="emptyFactorOptions"
+      :tableData="tableData"
+      :shortcutData="shortcutData"
+      :showConfig="showConfig"
+      @add="handleAddFactor"
+      @delete="handleDeleteFactor"
+      @enabled="handleEnabledFactor"
+      @closed="handleClosed"
+      @shortcutAdd="handleShortcutAdd"
+      @shortcutDelete="handleShortcutDelete"
+    />
+  </div>
+</template>

package/es/raf-8e05a7f4.js

@@ -1,6 +0,0 @@
-import { a as o } from "./base-ff0e366f.js";
-const e = (i) => o ? window.requestAnimationFrame(i) : setTimeout(i, 16), a = (i) => o ? window.cancelAnimationFrame(i) : clearTimeout(i);
-export {
-  a as c,
-  e as r
-};