st-comp 0.0.276 → 0.0.278

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.276",
+  "version": "0.0.278",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -9,7 +9,10 @@
     "build:all": "vite build --mode build:all",
     "build:split": "vite build --mode build:split",
     "build:test": "vite build --mode test",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
   },
   "main": "lib/bundle.umd.cjs",
   "module": "lib/bundle.umd.cjs",
@@ -30,7 +33,10 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "@vitest/coverage-v8": "^0.34.6",
+    "@vue/test-utils": "^2.4.11",
     "adm-zip": "^0.5.16",
+    "jsdom": "^22.1.0",
     "sass": "^1.69.3",
     "ssh2": "^1.14.0",
     "ssh2-sftp-client": "^9.1.0",
@@ -38,6 +44,7 @@
     "unplugin-auto-import": "^0.17.1",
     "unplugin-vue-components": "^0.25.2",
     "vite": "^4.4.5",
+    "vitest": "^0.34.6",
     "vue": "^3.3.4",
     "vue-tsc": "^1.8.5"
   }

package/packages/CustomFunction/components/ManageDialog.vue

@@ -1,9 +1,11 @@
 <script setup>
 import { ref, h, inject, watch, reactive, nextTick, computed } from "vue";
-import { Close, DocumentCopy, Delete, Document } from "@element-plus/icons-vue";
-import { debounce } from "st-func";
+import { Close, DocumentCopy, Delete, Document, MagicStick, CircleCheckFilled, Loading } from "@element-plus/icons-vue";
+import { debounce, getToken } from "st-func";
+import { sendToNodeVarietyAiHelper } from "../../../public/aiTools";
 
-const { request } = inject("stConfig"); // 组件库全局配置
+const stConfig = inject("stConfig"); // 组件库全局配置
+const { request } = stConfig;
 const stMonacoEditorRef = ref(null);
 const stVarSelectDialogRef = ref(null);
 
@@ -244,6 +246,114 @@ const handleTest = async (action) => {
   }
 };
 
+
+// AI 生成脚本相关参数
+const aiDialogVisible = ref(false);
+const aiInput = ref("");
+const aiLoading = ref(false);
+const aiError = ref("");
+const aiFullResponse = ref("");
+const aiSessionId = ref(null);
+const aiNodeProgressList = ref([]);
+const aiResult = reactive({
+  parsedConditions: [],
+  factorSelectExpr: "",
+});
+// AI 生成: 打开窗口
+const handleOpenAiDialog = () => {
+  aiDialogVisible.value = true;
+  aiError.value = "";
+};
+// AI 生成: 重置结果
+const resetAiResult = () => {
+  aiFullResponse.value = "";
+  aiError.value = "";
+  aiNodeProgressList.value = [];
+  Object.assign(aiResult, {
+    parsedConditions: [],
+    factorSelectExpr: "",
+  });
+};
+// AI 生成: 发送(复用品种池AI助手流式接口, 取最后一步结果中的 factorScreen.factorSelectExpr)
+const handleAiSend = async () => {
+  const value = aiInput.value?.trim();
+  if (!value) return ElMessage.error("请输入脚本描述");
+  if (aiLoading.value) return;
+  resetAiResult();
+  aiLoading.value = true;
+  await sendToNodeVarietyAiHelper({
+    baseUrl: stConfig?.env?.VITE_BASE_URL,
+    token: getToken(),
+    value,
+    sessionId: aiSessionId.value,
+    callback: (type, data) => {
+      switch (type) {
+        case "session": {
+          aiSessionId.value = data;
+          break;
+        }
+        case "node": {
+          const index = aiNodeProgressList.value.findIndex((item) => item.name === data.name);
+          if (index === -1) {
+            aiNodeProgressList.value.push(data);
+          } else {
+            aiNodeProgressList.value[index] = data;
+          }
+          break;
+        }
+        case "message": {
+          // 流式输出为全量覆盖, 最后一次 message 即为最终结果
+          aiFullResponse.value = data;
+          break;
+        }
+        case "finish": {
+          aiLoading.value = false;
+          try {
+            const parsed = JSON.parse(aiFullResponse.value);
+            const factorSelectExpr = parsed?.factorScreen?.factorSelectExpr;
+            if (factorSelectExpr) {
+              Object.assign(aiResult, {
+                parsedConditions: parsed.parsedConditions ?? [],
+                factorSelectExpr,
+              });
+            } else {
+              aiError.value = "AI 未能生成有效的因子脚本, 请调整描述后重试";
+            }
+          } catch (e) {
+            aiError.value = "AI 返回结果解析失败, 请重试";
+          }
+          break;
+        }
+        case "error": {
+          aiLoading.value = false;
+          aiError.value = typeof data === "string" ? data : "AI 生成失败, 请重试";
+          break;
+        }
+      }
+    },
+  });
+};
+// AI 生成: 插入到编辑器(setValue 整段覆盖, 有内容时二次确认)
+const handleAiInsert = async () => {
+  if (!aiResult.factorSelectExpr) return;
+  const currentValue = stMonacoEditorRef.value?.getValue();
+  if (currentValue) {
+    try {
+      await ElMessageBox.confirm("当前编辑器已有内容, 将被 AI 生成结果覆盖, 是否继续?", "提示", {
+        confirmButtonText: "覆盖",
+        cancelButtonText: "取消",
+        type: "warning",
+      });
+    } catch (e) {
+      return;
+    }
+  }
+  stMonacoEditorRef.value?.setValue(aiResult.factorSelectExpr);
+  ruleForm.funcExpression = aiResult.factorSelectExpr;
+  aiDialogVisible.value = false;
+  ElMessage.success("已插入到编辑器");
+};
+
 // 变量选择器
 const handleOpenVarSelectDialog = () => {
   stVarSelectDialogRef.value.open(stMonacoEditorRef.value);
@@ -256,6 +366,7 @@ watch(
       // 确保内嵌窗口全部关闭
       stVarSelectDialogRef.value.close();
       testLogVisible.value = false;
+      aiDialogVisible.value = false;
     }
   },
 );
@@ -392,6 +503,13 @@ defineExpose({
             >
               日志明细
             </el-button>
+            <el-button
+              type="primary"
+              :icon="MagicStick"
+              @click="handleOpenAiDialog"
+            >
+              AI 生成
+            </el-button>
             <el-button
               type="primary"
               @click="handleOpenVarSelectDialog"
@@ -411,6 +529,118 @@ defineExpose({
       </div>
     </div>
 
+    <!-- 窗口: AI 生成脚本 -->
+    <el-dialog
+      modal-class="ai-dialog"
+      v-model="aiDialogVisible"
+      width="600"
+      align-center
+      append-to-body
+      draggable
+      overflow
+      :modal="false"
+      :modal-penetrable="true"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <template #header="{ titleId, titleClass }">
+        <div class="custom-header">
+          <div class="left">
+            <span
+              :id="titleId"
+              :class="titleClass"
+            >
+              AI 生成脚本
+            </span>
+          </div>
+          <div class="right">
+            <el-icon @click="aiDialogVisible = false"><Close /></el-icon>
+          </div>
+        </div>
+      </template>
+      <div class="ai-dialog-body">
+        <!-- 描述输入 -->
+        <el-input
+          v-model="aiInput"
+          type="textarea"
+          :rows="3"
+          placeholder="用自然语言描述脚本逻辑, 例: 收盘价大于10"
+          :disabled="aiLoading"
+        />
+        <!-- 节点进度 -->
+        <div
+          v-if="aiNodeProgressList.length"
+          class="node-progress"
+        >
+          <div
+            v-for="node in aiNodeProgressList"
+            :key="node.name"
+            class="node-item"
+          >
+            <el-icon
+              v-if="node.status === 'success'"
+              class="success"
+              ><CircleCheckFilled
+            /></el-icon>
+            <el-icon
+              v-else
+              class="is-loading executing"
+              ><Loading
+            /></el-icon>
+            <span>{{ node.name }}</span>
+          </div>
+        </div>
+        <!-- 错误提示 -->
+        <div
+          v-if="aiError"
+          class="ai-error"
+        >
+          ❌ {{ aiError }}
+        </div>
+        <!-- 生成结果 -->
+        <div
+          v-if="aiResult.factorSelectExpr"
+          class="ai-result"
+        >
+          <div
+            v-for="(condition, index) in aiResult.parsedConditions"
+            :key="index"
+            class="parsed-condition"
+          >
+            {{ condition }}
+          </div>
+          <pre class="factor-expr">{{ aiResult.factorSelectExpr }}</pre>
+        </div>
+      </div>
+      <!-- 底部 -->
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button
+            v-if="aiResult.factorSelectExpr"
+            @click="handleAiSend"
+            :disabled="aiLoading"
+          >
+            重新生成
+          </el-button>
+          <el-button
+            v-if="aiResult.factorSelectExpr"
+            type="primary"
+            @click="handleAiInsert"
+          >
+            插入到编辑器
+          </el-button>
+          <el-button
+            v-else
+            type="primary"
+            :loading="aiLoading"
+            @click="handleAiSend"
+          >
+            生成
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
     <!-- 变量选择器 -->
     <st-varSelectDialog ref="stVarSelectDialogRef" />
 
@@ -658,6 +888,73 @@ defineExpose({
     }
   }
 }
+.ai-dialog {
+  .custom-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .left,
+    .right {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+    .el-icon {
+      cursor: pointer;
+    }
+  }
+  .ai-dialog-body {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    .node-progress {
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      .node-item {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        font-size: 13px;
+        color: var(--el-color-info);
+        .success {
+          color: var(--el-color-success);
+        }
+        .executing {
+          color: var(--el-color-primary);
+        }
+      }
+    }
+    .ai-error {
+      color: var(--el-color-danger);
+      font-size: 13px;
+    }
+    .ai-result {
+      border: var(--el-border);
+      border-radius: 4px;
+      padding: 10px;
+      .parsed-condition {
+        font-size: 13px;
+        color: var(--el-color-info);
+        margin-bottom: 6px;
+      }
+      .factor-expr {
+        margin: 0;
+        padding: 8px;
+        border-radius: 4px;
+        background-color: var(--el-color-success-light-9);
+        color: var(--el-color-success);
+        white-space: pre-wrap;
+        word-break: break-all;
+      }
+    }
+  }
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 10px;
+  }
+}
 .log-dialog {
   .custom-header {
     display: flex;

package/packages/VarietyAiHelper/index.vue

@@ -27,6 +27,7 @@ const messageList = ref([
     role: "defaultMessage", // defaultMessage-组件内置, assistant-智能体, user-用户
     content: props.defaultMessage,
     fullQuery: "",
+    historyList: [],
     userContent: null,
     showFeedback: false,
     createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
@@ -73,6 +74,7 @@ const sendMessage = async () => {
     role: "assistant",
     content: "",
     fullQuery: "",
+    historyList: [],
     userContent: content,
     showFeedback: false,
     createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
@@ -98,10 +100,13 @@ const sendMessage = async () => {
         if (type === "session") {
           sessionId.value = data;
         }
+        if (type === "historyList") {
+          const lastMessage = messageList.value[messageList.value.length - 1];
+          lastMessage.historyList = data;
+        }
         if (type === "fullQuery") {
           const lastMessage = messageList.value[messageList.value.length - 1];
           lastMessage.fullQuery = data;
-          console.log(data);
         }
         if (type === "node") {
           if (!firstNodeReceived) {
@@ -178,7 +183,7 @@ const sendMessage = async () => {
     isThinking.value = false;
   }
 };
-// 查看结果
+// 确认查询
 const lookResult = (content) => {
   const { parsedConditions, ...webParams } = JSON.parse(content);
   console.log({ parsedConditions, webParams });
@@ -187,11 +192,15 @@ const lookResult = (content) => {
 // 用户反馈
 const handleFeedbackAction = async (action, messageIndex) => {
   switch (action) {
+    // 满意
     case "satisfied": {
       const message = messageList.value[messageIndex];
       await stConfig.request.post("/alarm/deliversign/addVarietyAiHelperLog", {
         userName: userData.username,
         userContent: message.userContent,
+        sessionId: sessionId.value,
+        fullQuery: message.fullQuery,
+        historyList: JSON.stringify(message.historyList ?? []),
         aiContent: message.content,
         type: 1,
         createTime: message.createTime,
@@ -204,16 +213,21 @@ const handleFeedbackAction = async (action, messageIndex) => {
       messageList.value[messageIndex].showFeedback = false;
       break;
     }
+    // 不满意-打开窗口
     case "open": {
       feedbackMessageIndex.value = messageIndex;
       feedbackDialogVisible.value = true;
       break;
     }
+    // 不满意-确认提交
     case "unsatisfied": {
       const message = messageList.value[messageIndex];
       await stConfig.request.post("/alarm/deliversign/addVarietyAiHelperLog", {
         userName: userData.username,
         userContent: message.userContent,
+        sessionId: sessionId.value,
+        fullQuery: message.fullQuery,
+        historyList: JSON.stringify(message.historyList ?? []),
         userSuggestion: feedbackContent.value,
         aiContent: message.content,
         type: 2,
@@ -228,12 +242,29 @@ const handleFeedbackAction = async (action, messageIndex) => {
       messageList.value[messageIndex].showFeedback = false;
       break;
     }
+    // 默认记录
     case "default": {
       const message = messageList.value[messageIndex];
+      console.log({
+        userName: userData.username,
+        userContent: message.userContent,
+        sessionId: sessionId.value,
+        fullQuery: message.fullQuery,
+        historyList: JSON.stringify(message.historyList ?? []),
+        aiContent: message.content,
+        type: null,
+        resTime: message.resTime,
+        createTime: message.createTime,
+        firstPackageTime: message.firstPackageTime,
+        isSolved: 1,
+        logOrigin: 1,
+      });
       await stConfig.request.post("/alarm/deliversign/addVarietyAiHelperLog", {
         userName: userData.username,
         userContent: message.userContent,
-        userSuggestion: feedbackContent.value,
+        sessionId: sessionId.value,
+        fullQuery: message.fullQuery,
+        historyList: JSON.stringify(message.historyList ?? []),
         aiContent: message.content,
         type: null,
         resTime: message.resTime,
@@ -353,7 +384,12 @@ defineExpose({
             </div>
             <!-- 响应 -->
             <div class="message-content">
-              <div v-if="message.fullQuery" style="font-weight: bold; margin-bottom: 10px;">筛选结果: {{ message.fullQuery }}</div>
+              <div
+                v-if="message.fullQuery"
+                style="font-weight: bold; margin-bottom: 10px"
+              >
+                筛选结果: {{ message.fullQuery }}
+              </div>
               <!-- 节点展示 -->
               <div
                 v-if="index === messageList.length - 1 && message.role === 'assistant' && nodeProgressList.length > 0 && !showFinalResult"
@@ -436,13 +472,13 @@ defineExpose({
                     />
                   </el-tooltip>
                 </div>
-                <!-- 查看结果 -->
+                <!-- 确认查询 -->
                 <el-button
                   v-if="isJSONSerializable(message.content)"
                   class="confirm-btn"
                   @click="lookResult(message.content)"
                 >
-                  查看结果
+                  确认查询
                 </el-button>
               </div>
             </div>

package/public/aiTools.js

@@ -89,6 +89,10 @@ export const sendToNodeVarietyAiHelper = async ({ baseUrl, token, value, session
             if (data.type === "session") {
               callback("session", data.sessionId);
             }
+            // 历史消息
+            if (data.type === "historyList") {
+              callback("historyList", data.historyList);
+            }
             // 一句话概括用户查询内容
             if (data.type === "fullQuery") {
               callback("fullQuery", data.fullQuery);

package/src/App.vue

@@ -46,31 +46,31 @@ const route = useRoute();
 /**
  * @description: 组件库Demo本地
  */
-const VITE_RUN_ENV = {
-  VITE_PROJECT_NAME: "迈幻量化",
-  VITE_PROJECT_CLIENTID: "7",
-  VITE_BASE_URL: "http://127.0.0.1:7001",
-  BASE_URL: "/",
-  MODE: "localhost",
-  DEV: true,
-  PROD: false,
-  SSR: false,
-};
-
-/**
- * @description: 组件库Demo测试
- */
 // const VITE_RUN_ENV = {
 //   VITE_PROJECT_NAME: "迈幻量化",
 //   VITE_PROJECT_CLIENTID: "7",
-//   VITE_BASE_URL: "http://192.168.12.38:5173",
+//   VITE_BASE_URL: "http://127.0.0.1:7001",
 //   BASE_URL: "/",
-//   MODE: "test49",
+//   MODE: "localhost",
 //   DEV: true,
 //   PROD: false,
 //   SSR: false,
 // };
 
+/**
+ * @description: 组件库Demo测试
+ */
+const VITE_RUN_ENV = {
+  VITE_PROJECT_NAME: "迈幻量化",
+  VITE_PROJECT_CLIENTID: "7",
+  VITE_BASE_URL: "http://192.168.12.38:5173",
+  BASE_URL: "/",
+  MODE: "test49",
+  DEV: true,
+  PROD: false,
+  SSR: false,
+};
+
 /**
  * @description: 组件库Demo线上
  */

package/tests/components/ChartLayout.spec.ts

@@ -0,0 +1,67 @@
+import { mountWithPlugins } from '@test/helpers/mountWithPlugins.ts'
+import ChartLayout from '@package/ChartLayout/index.vue'
+
+const data = [
+  { key: 'a', name: '图表A' },
+  { key: 'b', name: '图表B' },
+  { key: 'c', name: '图表C' },
+  { key: 'd', name: '图表D' },
+]
+
+describe('ChartLayout', () => {
+  it('默认渲染：data 非空时渲染网格容器与 item', () => {
+    const wrapper = mountWithPlugins(ChartLayout, {
+      props: { data },
+      slots: { default: `<div class="chart-slot">chart</div>` },
+    })
+    expect(wrapper.find('.chartLayout').exists()).toBe(true)
+    expect(wrapper.findAll('.chartLayout-item').length).toBe(4)
+    expect(wrapper.findComponent({ name: 'ElEmpty' }).exists()).toBe(false)
+  })
+
+  it('插槽内容接收 data 与 index', () => {
+    const wrapper = mountWithPlugins(ChartLayout, {
+      props: { data: [{ key: 'x', name: '甲' }] },
+      slots: {
+        default: `<template #default="{ data, index }"><span class="slot-name">{{ data.name }}-{{ index }}</span></template>`,
+      },
+    })
+    expect(wrapper.find('.slot-name').text()).toBe('甲-0')
+  })
+
+  it('渲染数量受 col*row 截断', () => {
+    const many = Array.from({ length: 10 }, (_, i) => ({ key: `k${i}`, name: `n${i}` }))
+    const wrapper = mountWithPlugins(ChartLayout, {
+      props: { data: many, row: 2, col: 2 },
+      slots: { default: `<div>x</div>` },
+    })
+    expect(wrapper.findAll('.chartLayout-item').length).toBe(4)
+  })
+
+  it('空数据显示 ElEmpty 与自定义 emptyText', () => {
+    const wrapper = mountWithPlugins(ChartLayout, {
+      props: { data: [], emptyText: '空空如也' },
+    })
+    const empty = wrapper.findComponent({ name: 'ElEmpty' })
+    expect(empty.exists()).toBe(true)
+    expect(wrapper.text()).toContain('空空如也')
+    expect(wrapper.find('.chartLayout').exists()).toBe(false)
+  })
+
+  it('data 为 null 时显示空状态', () => {
+    const wrapper = mountWithPlugins(ChartLayout, {
+      props: { data: null },
+    })
+    expect(wrapper.findComponent({ name: 'ElEmpty' }).exists()).toBe(true)
+  })
+
+  it('item 样式按 row/col/spacing 计算', () => {
+    const wrapper = mountWithPlugins(ChartLayout, {
+      props: { data, row: 2, col: 4, spacing: 10 },
+      slots: { default: `<div>x</div>` },
+    })
+    const item = wrapper.find('.chartLayout-item')
+    expect(item.attributes('style')).toContain('calc(100% / 2  - 10px)')
+    expect(item.attributes('style')).toContain('calc(100% / 4 - 10px)')
+  })
+})