st-comp 0.0.115 → 0.0.116

package/package.json

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

package/packages/FactorWarning/index.vue

@@ -1,41 +1,32 @@
 <script setup>
 import { ref, watch } from "vue";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
+import { InfoFilled } from "@element-plus/icons-vue";
+import { defaultShowConfig } from "./tools";
+import { debounce } from "st-func";
 
-const emit = defineEmits(["add", "delete", "enabled", "closed"]);
+const segmentedValue = ref(null);
+const visible = defineModel("visible", { default: false });
+const emit = defineEmits(["add", "delete", "enabled", "closed", "shortcutAdd", "shortcutDelete"]);
 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 },
-  // 功能点展示配置
+  // 快捷配置数据
+  shortcutData: { type: Array, default: () => [] },
+
+  // 字段展示配置
   showConfig: { type: Object, default: () => ({}) },
+  // 是否支持操作
+  allowOperation: { type: Boolean, default: true },
 });
-const showConfig = Object.assign(
-  {
-    ruleFormPrice: true, // 表单-价格范围
-    ruleFormMark: true, // 表单-备注
-    tableStatus: true, // 表格-状态
-    tableCreateTime: true, // 表格-设置时间
-    tableMark: true, // 表格-备注
-    tableEnable: true, // 表格-操作-启用
-  },
-  props.showConfig
-);
+const showConfig = Object.assign(defaultShowConfig, props.showConfig);
 
-const visible = defineModel("visible", { default: false });
-
-// 内容类型: [添加-ruleForm, 管理-table]
-const contentType = ref(props.allowOperation ? "ruleForm" : "table");
-
-// 表单相关参数
+// 添加因子相关参数
 const ruleFormRef = ref(null);
 const ruleForm = ref({
   factorType: 1,
@@ -50,46 +41,41 @@ const rules = ref({
   factorSelectedList: [{ required: true, message: "请选择预警因子", trigger: "blur" }],
   totalCount: [{ required: true, message: "请填写预警次数", trigger: "blur" }],
 });
+// 快捷配置相关参数
+const shortcut_ruleFormRef = ref(null);
+const shortcut_ruleForm = ref({
+  shortcutName: null,
+  factorType: 1,
+  factorSelectedList: [],
+  totalCount: 1,
+});
+const shortcut_rules = ref({
+  factorType: [{ required: true, message: "请选择交易类型", trigger: "blur" }],
+  factorSelectedList: [{ required: true, message: "请选择预警因子", trigger: "blur" }],
+  totalCount: [{ required: true, message: "请填写预警次数", trigger: "blur" }],
+  shortcutName: [{ required: true, message: "请填写配置名称", trigger: "blur" }],
+});
 
-// 表单: 重置
-const handleResetForm = () => {
-  ruleForm.value = {
-    factorType: 1,
-    factorSelectedList: [],
-    totalCount: 1,
-    minPrice: null,
-    maxPrice: null,
-    mark: null,
-  };
-};
-// 表单: 三次多/三次空
-const handleFastControls = async (type) => {
-  switch (type) {
-    case "threeMore":
-      Object.assign(ruleForm.value, {
-        factorType: 1,
-        factorSelectedList: ["dkx金叉", "dkx黄白线上+双箱单次", "dkx金叉后+单箱突破", "30均线上+向上+单箱"],
-      });
-      break;
-    case "threeEmpty":
-      Object.assign(ruleForm.value, {
-        factorType: -1,
-        factorSelectedList: ["dkx死叉", "dkx黄白线下+双箱单次", "dkx死叉后+单箱突破", "30均线下+向下+单箱"],
-      });
-      break;
-  }
-  // 特殊需求 [2025-03-10]: 葛总要求通过3次多3次空添加的, 具备上限10的校验
-  const tsParams = {
+// [添加因子] 快捷提交
+const handleFastControls = async (item) => {
+  const data = JSON.parse(item.data);
+  Object.assign(ruleForm.value, {
+    factorType: data.factorType,
+    factorSelectedList: data.factorSelectedList,
+    totalCount: data.totalCount,
+  });
+  // 通过快捷进行添加的因子, 具备有效次数上限10的校验
+  const fsParams = {
     factorSelectedList: ruleForm.value.factorSelectedList.map((factorName) => {
-      let totalCount = 3;
+      let totalCount = data.totalCount;
       // 判断表格里面有没有同因子的数据, 如果有的话需要确保增加以后的有效次数 <= 10
       const repeatData = props.tableData.find(({ factorExtendName }) => factorExtendName === factorName);
       if (repeatData) {
         const diff = repeatData.totalCount - repeatData.currentCount;
         // 如果: 已触发次数 === 触发次数上限, 直接+3, 此时后端会另起一行数据的
-        if (diff === 0) totalCount = 3;
+        if (diff === 0) totalCount = data.totalCount;
         // 确保添加后的diff要小于等于10, 出于兼容老数据1/20类似的情况考虑, 加个容错
-        else totalCount = Math.min(3, 10 - diff >= 0 ? 10 - diff : 0);
+        else totalCount = Math.min(data.totalCount, 10 - diff >= 0 ? 10 - diff : 0);
       }
       return {
         factorName,
@@ -98,15 +84,15 @@ const handleFastControls = async (type) => {
       };
     }),
   };
-  handleSubmit(ruleFormRef.value, false, tsParams);
+  handleSubmit(ruleFormRef.value, fsParams);
 };
-// 表单: 提交
-const handleSubmit = async (formEl, close = props.closeAfterSubmit, tsParams) => {
+// [添加因子] 普通提交
+const handleSubmit = debounce(async (formEl, fsParams) => {
   if (!formEl) return;
   await formEl.validate((valid) => {
     if (!valid) return false;
     // 将表单值抛出
-    const params = tsParams ?? {
+    const params = fsParams ?? {
       factorSelectedList: ruleForm.value.factorSelectedList.map((factorName) => {
         return {
           factorName,
@@ -115,33 +101,64 @@ const handleSubmit = async (formEl, close = props.closeAfterSubmit, tsParams) =>
       }),
     };
     emit("add", params);
-    // 根据是否关闭弹窗, 进行对应的逻辑处理
-    switch (close) {
-      // 关闭弹窗
-      case true: {
-        visible.value = false;
-        break;
-      }
-      // 重置表单值
-      case false: {
-        handleResetForm();
-        break;
-      }
-    }
+    // 关闭弹窗
+    visible.value = false;
   });
+}, 200);
+
+// [快捷配置] 保存配置
+const handleSaveShortcut = async (formEl) => {
+  if (!formEl) return;
+  await formEl.validate((valid) => {
+    if (!valid) return false;
+    // 将表单值抛出
+    const params = {
+      shortcutName: shortcut_ruleForm.value.shortcutName,
+      data: JSON.stringify(shortcut_ruleForm.value),
+    };
+    emit("shortcutAdd", params);
+    handleResetForm();
+  });
+};
+// [快捷配置] 回显配置
+const handleClickShortcut = (item) => {
+  shortcut_ruleForm.value = JSON.parse(item.data);
+};
+// [快捷配置] 删除配置
+const handleDeleteShortcut = (item) => {
+  ElMessageBox.confirm(`是否确认删除配置: ${item.shortcutName} ?`, "删除提示", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(() => emit("shortcutDelete", item));
 };
 
-// 监视组件开关
+// [添加因子, 快捷配置] 重置
+const handleResetForm = () => {
+  ruleForm.value = {
+    factorType: 1,
+    factorSelectedList: [],
+    totalCount: 1,
+    minPrice: null,
+    maxPrice: null,
+    mark: null,
+  };
+  shortcut_ruleForm.value = {
+    shortcutName: null,
+    factorType: 1,
+    factorSelectedList: [],
+    totalCount: 1,
+  };
+};
 watch(
   () => visible.value,
   (newValue) => {
     if (newValue) {
-      contentType.value = props.allowOperation ? "ruleForm" : "table";
+      segmentedValue.value = props.allowOperation ? "ruleForm" : "table";
       handleResetForm();
     }
   }
 );
-defineExpose({ handleResetForm });
 </script>
 
 <template>
@@ -161,21 +178,18 @@ defineExpose({ handleResetForm });
               <span style="margin-right: 4px">因子预警</span>
               <span>{{ title }}</span>
             </div>
-            <el-radio-group v-model="contentType">
-              <el-radio-button
-                label="添加"
-                value="ruleForm"
-                :disabled="!allowOperation"
-              />
-              <el-radio-button
-                label="管理"
-                value="table"
-              />
-            </el-radio-group>
+            <el-segmented
+              v-model="segmentedValue"
+              :options="[
+                { label: '添加', value: 'ruleForm', disabled: !allowOperation },
+                { label: '管理', value: 'table', disabled: false },
+                { label: '快捷配置', value: 'shortcut', disabled: !allowOperation },
+              ]"
+            />
           </div>
         </template>
         <!-- 内容: 添加 -->
-        <template v-if="contentType === 'ruleForm'">
+        <template v-if="segmentedValue === 'ruleForm'">
           <el-form
             ref="ruleFormRef"
             :model="ruleForm"
@@ -239,8 +253,30 @@ defineExpose({ handleResetForm });
                 controls-position="right"
                 style="margin-right: 20px"
               />
-              <el-button @click="handleFastControls('threeMore')">3次多</el-button>
-              <el-button @click="handleFastControls('threeEmpty')">3次空</el-button>
+              <template v-if="shortcutData.length">
+                <el-button
+                  v-for="item in shortcutData"
+                  :key="item.id"
+                  @click="handleFastControls(item)"
+                >
+                  {{ item.shortcutName }}
+                </el-button>
+                <el-tooltip
+                  effect="dark"
+                  content="通过快捷配置添加的因子有效预警次数上限为10"
+                  placement="right-start"
+                >
+                  <el-icon style="margin-left: 10px"><InfoFilled /></el-icon>
+                </el-tooltip>
+              </template>
+              <el-text
+                v-else
+                type="primary"
+                style="cursor: pointer"
+                @click="() => (segmentedValue = 'shortcut')"
+              >
+                暂无快捷配置, 是否点击前往自定义配置?
+              </el-text>
             </el-form-item>
             <!-- 价格范围 -->
             <el-form-item
@@ -279,7 +315,7 @@ defineExpose({ handleResetForm });
           </el-form>
         </template>
         <!-- 内容: 表格 -->
-        <template v-if="contentType === 'table'">
+        <template v-if="segmentedValue === 'table'">
           <el-table
             :data="tableData"
             size="small"
@@ -379,17 +415,144 @@ defineExpose({ handleResetForm });
             </el-table-column>
           </el-table>
         </template>
+        <!-- 内容: 快捷配置 -->
+        <template v-if="segmentedValue === 'shortcut'">
+          <div class="shortcut-title">
+            <span>我的配置</span>
+            <el-tooltip
+              effect="dark"
+              content="如有配置数据, 可点击查看该配置的具体信息"
+              placement="right-start"
+            >
+              <el-icon><InfoFilled /></el-icon>
+            </el-tooltip>
+          </div>
+          <div class="shortcut-config">
+            <template v-if="shortcutData.length">
+              <el-tag
+                v-for="item in shortcutData"
+                :key="item.id"
+                type="primary"
+                closable
+                @click="handleClickShortcut(item)"
+                @close="handleDeleteShortcut(item)"
+              >
+                {{ item.shortcutName }}
+              </el-tag>
+            </template>
+            <span
+              class="empty"
+              v-else
+              >暂无数据</span
+            >
+          </div>
+          <div class="shortcut-title">
+            <span>新增配置</span>
+            <el-tooltip
+              effect="dark"
+              content="同名配置将会进行覆盖"
+              placement="right-start"
+            >
+              <el-icon><InfoFilled /></el-icon>
+            </el-tooltip>
+          </div>
+          <el-form
+            ref="shortcut_ruleFormRef"
+            :model="shortcut_ruleForm"
+            :rules="shortcut_rules"
+            label-width="90px"
+          >
+            <!-- 配置名称 -->
+            <el-form-item
+              label="配置名称:"
+              prop="shortcutName"
+            >
+              <el-input
+                v-model="shortcut_ruleForm.shortcutName"
+                maxlength="6"
+                show-word-limit
+                style="width: 160px"
+              />
+            </el-form-item>
+            <!-- 交易类型 -->
+            <el-form-item
+              label="交易类型:"
+              prop="factorType"
+            >
+              <el-button
+                type="danger"
+                :plain="shortcut_ruleForm.factorType !== 1"
+                @click="shortcut_ruleForm.factorType = 1"
+              >
+                多
+              </el-button>
+              <el-button
+                type="success"
+                :plain="shortcut_ruleForm.factorType !== -1"
+                @click="shortcut_ruleForm.factorType = -1"
+              >
+                空
+              </el-button>
+            </el-form-item>
+            <!-- 预警因子 -->
+            <el-form-item
+              label="预警因子:"
+              prop="factorSelectedList"
+            >
+              <el-checkbox-group v-model="shortcut_ruleForm.factorSelectedList">
+                <template v-if="shortcut_ruleForm.factorType === 1">
+                  <el-checkbox
+                    v-for="(item, index) in moreFactorOptions"
+                    :key="index"
+                    :label="item.factorTypeName"
+                    :value="item.factorTypeName"
+                    style="width: 200px"
+                  />
+                </template>
+                <template v-if="shortcut_ruleForm.factorType === -1">
+                  <el-checkbox
+                    v-for="(item, index) in emptyFactorOptions"
+                    :key="index"
+                    :label="item.factorTypeName"
+                    :value="item.factorTypeName"
+                    style="width: 200px"
+                  />
+                </template>
+              </el-checkbox-group>
+            </el-form-item>
+            <!-- 预警次数 -->
+            <el-form-item
+              label="预警次数:"
+              prop="totalCount"
+            >
+              <el-input-number
+                v-model="shortcut_ruleForm.totalCount"
+                :min="1"
+                :max="10"
+                controls-position="right"
+                style="margin-right: 20px"
+              />
+            </el-form-item>
+          </el-form>
+        </template>
         <!-- 底部 -->
         <template #footer>
           <div class="custom-footer">
             <el-button @click="visible = false">关闭</el-button>
             <el-button
-              v-if="contentType === 'ruleForm'"
+              v-if="segmentedValue === 'ruleForm'"
               type="primary"
               @click="handleSubmit(ruleFormRef)"
             >
               确认
             </el-button>
+            <el-button
+              v-if="segmentedValue === 'shortcut'"
+              type="primary"
+              @click="handleSaveShortcut(shortcut_ruleFormRef)"
+            >
+              保存配置
+            </el-button>
           </div>
         </template>
       </el-dialog>
@@ -406,7 +569,6 @@ defineExpose({ handleResetForm });
   :deep(.el-dialog__headerbtn) {
     top: 9px;
   }
-
   :deep(.el-dialog__body) {
     padding-top: 0;
     padding-bottom: 0;
@@ -418,7 +580,6 @@ defineExpose({ handleResetForm });
       height: 590px;
     }
   }
-
   .custom-header {
     width: 100%;
     display: flex;
@@ -427,9 +588,47 @@ defineExpose({ handleResetForm });
     padding: 10px;
     margin-top: -15px;
   }
-
   .el-radio {
     margin-right: 20px;
   }
+  .shortcut-title {
+    display: inline-block;
+    color: var(--el-text-color-regular);
+    width: 100%;
+    padding: 2px;
+    padding-left: 6px;
+    font-size: 14px;
+    background: linear-gradient(90deg, rgba(178, 161, 248, 0.15), rgba(123, 104, 238, 0));
+    position: relative;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+    &::before {
+      content: "";
+      left: 0;
+      top: 0;
+      width: 3px;
+      height: 100%;
+      background-color: #7b68ee;
+      position: absolute;
+    }
+    .el-icon {
+      margin-top: 1px;
+      margin-left: 4px;
+    }
+  }
+  .shortcut-config {
+    margin-bottom: 10px;
+    .el-tag {
+      cursor: pointer;
+      margin-right: 4px;
+    }
+    .empty {
+      display: inline-block;
+      width: 100%;
+      color: var(--el-color-info);
+      text-align: center;
+    }
+  }
 }
 </style>

package/packages/FactorWarning/tools.js

@@ -0,0 +1,10 @@
+export const defaultShowConfig = {
+  // 表单字段
+  ruleFormPrice: true, // 价格范围
+  ruleFormMark: true, // 备注
+  // 表格字段
+  tableStatus: true, // 状态
+  tableCreateTime: true, // 设置时间
+  tableMark: true, // 备注
+  tableEnable: true, // 启用按钮
+};

package/src/pages/FactorWarning/index.vue

@@ -7,11 +7,14 @@
       :moreFactorOptions="moreFactorOptions"
       :emptyFactorOptions="emptyFactorOptions"
       :tableData="tableData"
+      :shortcutData="shortcutData"
       :showConfig="showConfig"
       @add="handleAddFactor"
       @delete="handleDeleteFactor"
       @enabled="handleEnabledFactor"
       @closed="handleClosed"
+      @shortcutAdd="handleShortcutAdd"
+      @shortcutDelete="handleShortcutDelete"
     />
   </div>
 </template>
@@ -25,6 +28,7 @@ const title = ref("品种-code(周期)");
 const moreFactorOptions = ref([]);
 const emptyFactorOptions = ref([]);
 const tableData = ref([]);
+const shortcutData = ref([]);
 const showConfig = {
   ruleFormPrice: true, // 表单-价格范围
   ruleFormMark: true, // 表单-备注
@@ -37,39 +41,79 @@ const showConfig = {
 // 打开弹窗
 const openDialog = async () => {
   // 获取预警因子[多, 空]选项
+  {
+    const { data } = await axios({
+      method: "post",
+      headers: {
+        token: "8bc3369819162ef472cd7f2db2990438",
+      },
+      url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/getFactorConfigByPage",
+      data: {
+        pageNum: 1,
+        pageSize: 9999,
+        factorType: 2,
+      },
+    });
+    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;
+    }, []);
+  }
+  // 获取自定义快捷配置数据
+  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 queryShortcutData = async () => {
   const { data } = await axios({
     method: "post",
     headers: {
-      token: "dbe114939fc69924d6a94ff69074e72c",
+      token: "8bc3369819162ef472cd7f2db2990438",
     },
-    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/getFactorConfigByPage",
+    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/queryFactorAlarmConfig",
     data: {
-      pageNum: 1,
-      pageSize: 9999,
-      factorType: 2,
+      userId: 103,
     },
   });
-  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;
-  }, []);
-  visible.value = true;
+  shortcutData.value = data.body;
+};
+const handleShortcutAdd = async (params) => {
+  const { data } = await axios({
+    method: "post",
+    headers: {
+      token: "8bc3369819162ef472cd7f2db2990438",
+    },
+    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/addOrUpdateFactorAlarmConfig",
+    data: params,
+  });
+  queryShortcutData();
+};
+const handleShortcutDelete = async (params) => {
+  const { data } = await axios({
+    method: "post",
+    headers: {
+      token: "8bc3369819162ef472cd7f2db2990438",
+    },
+    url: "http://192.168.12.38:5173/middleLayer/post/alarm/deliversign/delFactorAlarmConfig",
+    data: { id: params.id },
+  });
+  queryShortcutData();
 };
-const handleAddFactor = (ruleForm) => console.log(ruleForm);
-const handleDeleteFactor = (row) => console.log("删除", row);
-const handleEnabledFactor = (row) => console.log("启用", row);
-const handleClosed = () => console.log("弹窗关闭");
 
 onMounted(() => {
   tableData.value = [