st-comp 0.0.210 → 0.0.212

package/package.json

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

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

@@ -11,7 +11,11 @@ const props = defineProps({
   commonOption: { type: Array, default: () => [] }, // 已选常用选项
 });
 const visible = ref(false);
-const compositeOrderForm = ref({ name: null, value: "desc" });
+const compositeOrderForm = ref({
+  id: null,
+  name: null, // 字段名
+  value: "desc", // 排序
+});
 
 // 组合排序数据源 [受到: 品种市场, 常用选项影响]
 const compositeOrderOptions = computed(() => {
@@ -41,7 +45,7 @@ const handleAction = (action, index) => {
   switch (action) {
     // 新增
     case "add": {
-      compositeOrderForm.value = { name: null, value: "desc" };
+      compositeOrderForm.value = { id: null, name: null, value: "desc" };
       visible.value = true;
       break;
     }
@@ -54,22 +58,37 @@ const handleAction = (action, index) => {
     }
     // 窗口确认
     case "submit": {
-      if (!compositeOrderForm.value.name) return ElMessage.warning("请选择需要排序的条件");
-      const { label } = compositeOrderOptions.value.find((item) => item.key === compositeOrderForm.value.name);
-      const tagText = `${label}-${compositeOrderForm.value.value === "asc" ? "正序↑" : "降序↓"}`;
-      // 判断data中是否已存在同字段条件, 是则替换, 否则push
-      const keyIndex = data.value.findIndex(({ name }) => name === compositeOrderForm.value.name);
-      if (keyIndex === -1) {
-        data.value.push({ ...compositeOrderForm.value, tagText });
-      } else {
-        data.value.splice(keyIndex, 1, { ...compositeOrderForm.value, tagText });
+      const { id, name, value } = compositeOrderForm.value;
+      if (!name) return ElMessage.warning("请选择需要排序的条件");
+      const { label } = compositeOrderOptions.value.find((item) => item.key === name);
+      const tagText = `${label}-${value === "asc" ? "正序↑" : "降序↓"}`;
+
+      // 新增确认逻辑
+      if (id === null) {
+        // 判断data中是否已存在同字段条件, 是则替换, 否则push
+        const index = data.value.findIndex((item) => item.name === name);
+        if (index === -1) {
+          data.value.push({ ...compositeOrderForm.value, id: name, tagText });
+        } else {
+          data.value.splice(index, 1, { ...compositeOrderForm.value, id: name, tagText });
+        }
+      }
+      // 编辑确认逻辑
+      else if (compositeOrderForm.value.id) {
+        // 修改当前位置的内容, 并将其他相同name的删除掉
+        const index = data.value.findIndex((item) => item.name === id);
+        const index2 = data.value.findIndex((item) => item.name === name);
+        data.value[index] = { ...compositeOrderForm.value, id: name, tagText };
+        if (index2 !== -1 && index !== index2) data.value.splice(index2, 1);
       }
+
       visible.value = false;
       break;
     }
     // 删除
     case "delete": {
       data.value.splice(index, 1);
+      visible.value = false;
       break;
     }
   }
@@ -84,7 +103,7 @@ watch(
         return compositeOrderOptions.value.find((item) => item.key === name);
       });
     }
-  }
+  },
 );
 </script>
 

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

@@ -1,11 +1,13 @@
 <!-- 因子筛选组件 -->
 <script setup name="FactorScreen">
-import { nextTick, ref, watch } from "vue";
-import { Close, Plus, CircleCloseFilled, InfoFilled } from "@element-plus/icons-vue";
+import { nextTick, ref, watch, inject, reactive } from "vue";
+import { Close, Plus, CircleCloseFilled, InfoFilled, Document } from "@element-plus/icons-vue";
 import { handleVerifyScore, extractConditionDetails, extractVariables } from "./tools.js";
 import FactorDescription from "./FactorDescription.vue";
 import MonacoEditor from "../../../MonacoEditor/index.vue";
 
+const { request } = inject("stConfig"); // 组件库全局配置
+
 const props = defineProps({
   config: {
     type: Object,
@@ -29,10 +31,20 @@ const data = defineModel("data", {
 
 const monacoEditorRef = ref();
 const stVarSelectDialogRef = ref();
+
 // 弹窗开关
 const visible = ref(false);
 const visibleDescriptions = ref(false);
 const factorType = ref("脚本");
+const scriptTestLoading = ref(false);
+const scriptCopyLoading = ref(false);
+const scriptTestLogVisible = ref(false);
+const scriptTestResult = reactive({
+  result: null,
+  detail: "",
+  code: "",
+});
+
 // 弹窗表单
 const dialogFormRef = ref(null);
 const dialogForm = ref({
@@ -227,7 +239,7 @@ const handleDeleteTag = (aciton, index) => {
 const open = () => {
   stVarSelectDialogRef.value.open(monacoEditorRef.value);
 };
-// 插入自定义函数
+// 脚本: 插入自定义函数
 const handleInsertCustomFunction = (funcName, funcExpression) => {
   if (!monacoEditorRef.value) return ElMessage.error("未检测到编辑器实例");
   // 生成基础插入内容 (如果内含${}, 需提取出来, 作为变量)
@@ -288,6 +300,54 @@ const handleInsertCustomFunction = (funcName, funcExpression) => {
     editorIns.focus();
   }
 };
+// 脚本: 复制
+const handleScriptCopy = async () => {
+  try {
+    scriptCopyLoading.value = true;
+    const script = monacoEditorRef.value.getValue();
+    if (!script) return ElMessage.error("请输入脚本语句");
+    const { body } = await request.post("/common/qt/getFuncExpr", { factorSelectExpr: script });
+    if (!body) return ElMessage.error("脚本解析失败, 请检查脚本内容是否填写完整或者联系管理员");
+    // 复制内容到粘贴板
+    let txa = document.createElement("textarea");
+    txa.value = body;
+    document.body.appendChild(txa);
+    txa.select();
+    document.execCommand("copy");
+    document.body.removeChild(txa);
+    ElMessage.success("脚本内容已经成功复制到粘贴板");
+  } finally {
+    scriptCopyLoading.value = false;
+  }
+};
+// 脚本: 测试
+const handleScriptTest = async () => {
+  try {
+    scriptTestLoading.value = true;
+    const script = monacoEditorRef.value.getValue();
+    if (!script) return ElMessage.error("请输入脚本语句");
+    const { body } = await request.post("/common/qt/getFuncExpr", { factorSelectExpr: script });
+    if (!body) return ElMessage.error("脚本解析失败, 请检查脚本内容是否填写完整或者联系管理员");
+    const testRes = await request.post("/common/qt/testFactorSelect", { factorSelectExpr: body });
+    const { result, detail } = testRes.body;
+    Object.assign(scriptTestResult, { result, detail, code: body });
+    if (result === 1) {
+      ElMessage.success("测试通过");
+    } else {
+      ElMessage.error("测试未能通过");
+      scriptTestLogVisible.value = true;
+    }
+  } finally {
+    scriptTestLoading.value = false;
+  }
+};
+// 脚本: 日志明细
+const handleScriptLog = () => {
+  if (scriptTestResult.result === null) {
+    return ElMessage.warning("请先进行测试, 等待测试完成后可查看日志");
+  }
+  scriptTestLogVisible.value = true;
+};
 
 // 监控: 窗口开关
 watch(
@@ -308,16 +368,21 @@ watch(
             factorType.value = "模版";
           }
         });
+        // 重置测试结果
+        Object.assign(scriptTestResult, {
+          result: null,
+          detail: "",
+        });
         break;
       }
       case false: {
         stVarSelectDialogRef.value.close();
+        scriptTestLogVisible.value = false;
         break;
       }
     }
-  }
+  },
 );
-
 // 监控: 因子类型
 watch(
   () => factorType.value,
@@ -329,7 +394,7 @@ watch(
       });
     }
   },
-  { deep: true }
+  { deep: true },
 );
 </script>
 
@@ -418,6 +483,7 @@ watch(
             >
               因子筛选
             </span>
+            <!-- 因子使用说明 -->
             <el-tooltip
               effect="dark"
               content="点击查看: 因子使用说明"
@@ -425,6 +491,7 @@ watch(
             >
               <el-icon @click="visibleDescriptions = true"><InfoFilled /></el-icon>
             </el-tooltip>
+            <!-- 因子模式 -->
             <el-radio-group
               v-model="factorType"
               size="small"
@@ -438,11 +505,37 @@ watch(
                 value="脚本"
               />
             </el-radio-group>
-            <st-customFunction
+            <!-- 脚本模式: 自定义函数插入新建, 脚本测试, 脚本复制 -->
+            <div
+              class="editor-tools"
               v-show="factorType === '脚本'"
-              size="small"
-              @insert="handleInsertCustomFunction"
-            />
+            >
+              <st-customFunction
+                v-show="factorType === '脚本'"
+                size="small"
+                @insert="handleInsertCustomFunction"
+              />
+              <el-button
+                type="primary"
+                size="small"
+                :loading="scriptCopyLoading"
+                @click="handleScriptCopy"
+                >复制</el-button
+              >
+              <el-button
+                type="primary"
+                size="small"
+                :loading="scriptTestLoading"
+                @click="handleScriptTest"
+                >测试</el-button
+              >
+              <el-button
+                size="small"
+                :icon="Document"
+                @click="handleScriptLog"
+                >日志明细</el-button
+              >
+            </div>
           </div>
           <!-- 变量选择器 + 关闭 -->
           <div class="right">
@@ -719,6 +812,57 @@ watch(
     :factorType="factorType"
     :data="config.factorDescriptions?.filter((item) => [1, 3].includes(item.type))"
   />
+  <!-- 窗口: 日志明细 -->
+  <el-dialog
+    modal-class="log-dialog"
+    v-model="scriptTestLogVisible"
+    width="830"
+    align-center
+    append-to-body
+    draggable
+    overflow
+    :modal="false"
+    :modal-penetrable="true"
+    :show-close="false"
+  >
+    <template #header="{ titleId, titleClass }">
+      <div class="custom-header">
+        <div class="left">
+          <span
+            :id="titleId"
+            :class="titleClass"
+          >
+            日志明细
+          </span>
+        </div>
+        <!-- 关闭 -->
+        <div class="right">
+          <el-icon @click="scriptTestLogVisible = false"><Close /></el-icon>
+        </div>
+      </div>
+    </template>
+    <div class="content">
+      <!-- 代码 -->
+      <el-scrollbar
+        class="code"
+        height="600px"
+      >
+        <pre>{{ scriptTestResult.code }}</pre>
+      </el-scrollbar>
+      <!-- 分割线 -->
+      <el-divider direction="vertical" />
+      <!-- 日志 -->
+      <el-scrollbar height="600px">
+        <pre :class="scriptTestResult.result === 1 ? 'success-log' : 'error-log'">{{ scriptTestResult.result === 1 ? "测试通过 √" : scriptTestResult.detail }}</pre>
+      </el-scrollbar>
+    </div>
+    <!-- 底部 -->
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="scriptTestLogVisible = false"> 关闭 </el-button>
+      </div>
+    </template>
+  </el-dialog>
   <!-- 变量选择器 -->
   <st-varSelectDialog ref="stVarSelectDialogRef" />
 </template>
@@ -738,6 +882,14 @@ watch(
       align-items: center;
       gap: 10px;
     }
+    .editor-tools {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      .el-button {
+        margin: 0;
+      }
+    }
     .el-icon {
       cursor: pointer;
     }
@@ -760,4 +912,49 @@ watch(
     }
   }
 }
+.log-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;
+    }
+  }
+  .content {
+    display: flex;
+    background-color: var(--el-color-black);
+    .el-scrollbar {
+      flex: 1;
+      box-sizing: border-box;
+      padding: 8px;
+    }
+    .el-divider {
+      margin: 0;
+      height: 616px;
+    }
+    .code {
+      color: var(--el-color-info);
+    }
+    .success-log {
+      color: var(--el-color-success);
+    }
+    .error-log {
+      color: var(--el-color-danger);
+    }
+    pre {
+      margin: 0;
+      line-height: 1.5;
+      white-space: pre-wrap;
+      word-break: break-all;
+      word-wrap: break-word;
+    }
+  }
+}
 </style>