st-comp 0.0.104 → 0.0.106

package/package.json

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

package/packages/FactorWarning/index.vue

@@ -2,21 +2,22 @@
 import { ref, watch } from "vue";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 
-const visible = defineModel("visible", { default: false });
+const emit = defineEmits(["add", "delete", "enabled", "closed"]);
 const props = defineProps({
   // 弹窗标题
   title: { type: [String, null], default: null },
-  // 因子选项[多, 空]
+  // 表单因子
   moreFactorOptions: { type: Array, default: () => [] },
   emptyFactorOptions: { type: Array, default: () => [] },
-  // 管理表格数据
+  // 表单点击确认提交后是否关闭弹窗
+  closeAfterSubmit: { type: Boolean, default: true },
+  // 表格数据
   tableData: { type: Array, default: () => [] },
-  // 是否允许进行操作(表单, 表格的操作)
+  // 是否可操作
   allowOperation: { type: Boolean, default: true },
-  // 个别字段功能是否展示
+  // 功能点展示配置
   showConfig: { type: Object, default: () => ({}) },
 });
-const emit = defineEmits(["add", "delete", "enabled", "closed"]);
 const showConfig = Object.assign(
   {
     ruleFormPrice: true, // 表单-价格范围
@@ -29,12 +30,12 @@ const showConfig = Object.assign(
   props.showConfig
 );
 
-// 添加-ruleForm, 管理-table
+const visible = defineModel("visible", { default: false });
+
+// 内容类型: [添加-ruleForm, 管理-table]
 const contentType = ref(props.allowOperation ? "ruleForm" : "table");
 
-/**
- * @description: 添加-表单相关参数和方法
- */
+// 表单相关参数
 const ruleFormRef = ref(null);
 const ruleForm = ref({
   factorType: 1,
@@ -49,49 +50,82 @@ const rules = ref({
   factorSelectedList: [{ required: true, message: "请选择预警因子", trigger: "blur" }],
   totalCount: [{ required: true, message: "请填写预警次数", trigger: "blur" }],
 });
+
+// 表单: 三次多/三次空
 const handleFastControls = async (type) => {
   switch (type) {
     case "threeMore":
       Object.assign(ruleForm.value, {
         factorType: 1,
         factorSelectedList: ["dkx金叉", "dkx黄白线上+双箱单次", "dkx金叉后+单箱突破", "30均线上+向上+单箱"],
-        totalCount: 3,
       });
       break;
     case "threeEmpty":
       Object.assign(ruleForm.value, {
         factorType: -1,
         factorSelectedList: ["dkx死叉", "dkx黄白线下+双箱单次", "dkx死叉后+单箱突破", "30均线下+向下+单箱"],
-        totalCount: 3,
       });
       break;
   }
-  handleSubmit(ruleFormRef.value, false);
+  // 特殊需求 [2025-03-10]: 葛总要求通过3次多3次空添加的, 具备上限10的校验
+  const tsParams = {
+    factorSelectedList: ruleForm.value.factorSelectedList.map((factorName) => {
+      let totalCount = 3;
+      // 判断表格里面有没有同因子的数据, 如果有的话需要确保增加以后的有效次数 <= 10
+      const repeatData = props.tableData.find(({ factorExtendName }) => factorExtendName === factorName);
+      if (repeatData) {
+        const diff = repeatData.totalCount - repeatData.currentCount;
+        // 如果: 已触发次数 === 触发次数上限, 直接+3, 此时后端会另起一行数据的
+        if (diff === 0) totalCount = 3;
+        // 确保添加后的diff要小于等于10, 出于兼容老数据1/20类似的情况考虑, 加个容错
+        else totalCount = Math.min(3, 10 - diff >= 0 ? 10 - diff : 0);
+      }
+      return {
+        factorName,
+        ...ruleForm.value,
+        totalCount,
+      };
+    }),
+  };
+  handleSubmit(ruleFormRef.value, false, tsParams);
 };
-const handleSubmit = async (formEl, close = true) => {
+// 表单: 提交
+const handleSubmit = async (formEl, close = props.closeAfterSubmit, tsParams) => {
   if (!formEl) return;
   await formEl.validate((valid) => {
     if (!valid) return false;
-    emit("add", ruleForm.value);
-    if (close) {
-      visible.value = false;
-    } else {
-      ruleForm.value = {
-        factorType: 1,
-        factorSelectedList: [],
-        totalCount: 1,
-        minPrice: null,
-        maxPrice: null,
-        mark: null,
-      };
+    // 将表单值抛出
+    const params = tsParams ?? {
+      factorSelectedList: ruleForm.value.factorSelectedList.map((factorName) => {
+        return {
+          factorName,
+          ...ruleForm.value,
+        };
+      }),
+    };
+    emit("add", params);
+    // 根据是否关闭弹窗, 进行对应的逻辑处理
+    switch (close) {
+      // 关闭弹窗
+      case true: {
+        visible.value = false;
+        break;
+      }
+      // 重置表单值
+      case false: {
+        ruleForm.value = {
+          factorType: 1,
+          factorSelectedList: [],
+          totalCount: 1,
+          minPrice: null,
+          maxPrice: null,
+          mark: null,
+        };
+        break;
+      }
     }
   });
 };
-/**
- * @description: 管理-表格相关参数和方法
- */
-const handleDelete = (row) => emit("delete", row);
-const handleEnabled = (row) => emit("enabled", row);
 
 // 监视组件开关
 watch(
@@ -122,7 +156,7 @@ watch(
         destroy-on-close
         @closed="emit('closed')"
       >
-        <!-- 头部 -->
+        <!-- 头部: 标题 + 切换 -->
         <template #header="{ close, titleId, titleClass }">
           <div class="custom-header">
             <div :class="titleClass">
@@ -331,13 +365,13 @@ watch(
                   v-if="showConfig.tableEnable"
                   :disabled="scope.row.currentCount !== scope.row.totalCount"
                   size="small"
-                  @click="handleEnabled(scope.row)"
+                  @click="emit('enabled', scope.row)"
                 >
                   启用
                 </el-button>
                 <el-popconfirm
                   title="确定删除?"
-                  @confirm="handleDelete(scope.row)"
+                  @confirm="emit('delete', scope.row)"
                 >
                   <template #reference>
                     <el-button size="small">删除</el-button>