st-comp 0.0.224 → 0.0.225

package/package.json

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

package/packages/CustomFunction/components/ManageDialog.vue

@@ -37,13 +37,11 @@ const ruleForm = reactive({
 });
 
 // 测试日志相关参数
-const testVariety = ref("");
 const testResult = reactive({
   result: null,
   detail: "",
   code: "",
 });
-const testVarietyVisible = ref(false);
 const testLogVisible = ref(false);
 
 // 函数: 新建
@@ -53,7 +51,6 @@ const handleAdd = () => {
     funcName: "",
     funcExpression: "",
   });
-  testVariety.value = "";
   stMonacoEditorRef.value?.setValue(ruleForm.funcExpression);
 };
 // 函数: 编辑
@@ -63,7 +60,6 @@ const handleEdit = (item) => {
     funcName: item.funcName,
     funcExpression: item.funcExpression,
   });
-  testVariety.value = "";
   stMonacoEditorRef.value?.setValue(ruleForm.funcExpression);
 };
 // 函数: 复制
@@ -73,7 +69,6 @@ const handleCopy = (item) => {
     funcName: `${item.funcName}-复制`,
     funcExpression: item.funcExpression,
   });
-  testVariety.value = "";
   stMonacoEditorRef.value?.setValue(ruleForm.funcExpression);
 };
 
@@ -210,23 +205,9 @@ const replaceVariables = (expression, variableValues) => {
     return variableValues[variableName] !== undefined ? variableValues[variableName] : match;
   });
 };
-const extractCodesFromString = (str) => {
-  if (!str) return [];
-  return str.split("\n").reduce((result, next) => {
-    const code = next.trim().replace(/\s+/gi, " ").split(" ")[0];
-    code && result.push(code);
-    return result;
-  }, []);
-};
-// 测试: 打开/确认/日志
+// 测试: 提交/日志
 const handleTest = async (action) => {
   switch (action) {
-    case "open": {
-      // 基础校验
-      if (!stMonacoEditorRef.value.getValue()) return ElMessage.error("函数内容不可为空");
-      testVarietyVisible.value = true;
-      break;
-    }
     case "submit": {
       let testContent = stMonacoEditorRef.value.getValue();
       if (!testContent) return ElMessage.error("函数内容不可为空");
@@ -237,16 +218,11 @@ const handleTest = async (action) => {
         if (!variableValues) return;
         testContent = replaceVariables(testContent, variableValues);
       }
-      testVarietyVisible.value = false;
       try {
         loading.test = true;
-        const params = {
-          codes: extractCodesFromString(testVariety.value),
-          factorSelectExpr: testContent,
-        };
-        const { body } = await request.post("/common/qt/testFactorSelect", params);
+        const { body } = await request.post("/common/qt/testFactorSelect", { factorSelectExpr: testContent });
         const { result, detail } = body;
-        Object.assign(testResult, { result, detail, code: params.factorSelectExpr });
+        Object.assign(testResult, { result, detail, code: testContent });
         if (result === 1) {
           ElMessage.success("测试通过");
         } else {
@@ -279,7 +255,6 @@ watch(
     if (!newValue) {
       // 确保内嵌窗口全部关闭
       stVarSelectDialogRef.value.close();
-      testVarietyVisible.value = false;
       testLogVisible.value = false;
     }
   },
@@ -407,7 +382,7 @@ defineExpose({
             </el-button>
             <el-button
               :loading="loading.test"
-              @click="handleTest('open')"
+              @click="handleTest('submit')"
             >
               测试
             </el-button>
@@ -439,55 +414,6 @@ defineExpose({
     <!-- 变量选择器 -->
     <st-varSelectDialog ref="stVarSelectDialogRef" />
 
-    <!-- 窗口: 选择测试所用的品种 -->
-    <el-dialog
-      modal-class="test-variety-dialog"
-      v-model="testVarietyVisible"
-      width="500"
-      align-center
-      append-to-body
-      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">
-            <st-varietyAutoComplete
-              label=""
-              @select="({ name, code }) => (testVariety += `${code} ${name} \n`)"
-            />
-            <el-icon @click="testVarietyVisible = false"><Close /></el-icon>
-          </div>
-        </div>
-      </template>
-      <el-input
-        class="full-height-textarea"
-        v-model="testVariety"
-        resize="none"
-        type="textarea"
-        :placeholder="`不填写时, 默认为000001 平安银行\n格式示例:\nhc8888\xa0\xa0\xa0\xa0热轧卷板期货指数\nsp8888\xa0\xa0\xa0\xa0纸浆期货指数\nbu8888\xa0\xa0\xa0\xa0石油沥青期货指数`"
-      />
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button
-            type="primary"
-            @click="handleTest('submit')"
-          >
-            确认
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
     <!-- 窗口: 日志明细 -->
     <el-dialog
       modal-class="log-dialog"

package/packages/KlineBasic/components/Tips/index.vue

@@ -29,9 +29,11 @@
           if (props.data?.[index]?.label === '涨跌') {
             widthList.value[index] = '85px'
           } else if(props.data?.[index]?.label === '至今涨跌') {
-            widthList.value[index] = '100px'
+            widthList.value[index] = '105px'
           } else if(props.data?.[index]?.label === '额') {
             widthList.value[index] = '75px'
+          } else if(['开', '高', '低', '收'].includes(props.data?.[index]?.label)) {
+            widthList.value[index] = `${item.offsetWidth + 20}px`
           } else {
             widthList.value[index] = `${item.offsetWidth + 30}px`
           }