st-comp 0.0.192 → 0.0.193

package/package.json

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

package/packages/MonacoEditor/index.vue

@@ -276,6 +276,28 @@ defineExpose({
   setReadOnly: (readOnly = true) => {
     editorInstance.updateOptions({ readOnly });
   },
+  focusToEnd: () => {
+    if (!editorInstance) return;
+
+    const model = editorInstance.getModel();
+    if (!model) return;
+
+    // 获取最后一行
+    const lineCount = model.getLineCount();
+    const lastLine = model.getLineContent(lineCount);
+
+    // 设置光标位置到最后一行末尾
+    const position = {
+      lineNumber: lineCount,
+      column: lastLine.length + 1,
+    };
+
+    editorInstance.setPosition(position);
+    editorInstance.focus();
+
+    // 滚动到光标位置
+    editorInstance.revealPositionInCenter(position);
+  },
 });
 </script>
 

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

@@ -64,14 +64,6 @@ const handleOpenDialog = () => {
   // 保证因子筛选最少一条
   if (!dialogForm.value.list.length) handleAppendFactor();
   visible.value = true;
-  // 解决刚打开时, 如果是脚本的样式错乱问题
-  nextTick(() => {
-    if (factorSelectExpr) {
-      factorType.value = "脚本";
-      monacoEditorRef.value.setValue(factorSelectExpr);
-    }
-    monacoEditorRef.value.resize();
-  });
 };
 // 确定
 const handleSubmit = () => {
@@ -286,11 +278,40 @@ const handleInsertCustomFunction = (value) => {
   }
 };
 
+// 监控: 窗口开关
+watch(
+  () => visible.value,
+  (newValue) => {
+    switch (newValue) {
+      case true: {
+        nextTick(() => {
+          monacoEditorRef.value.resize();
+          // 如果有脚本内容, 直接切换到脚本模式, 并将值回显
+          if (data.value.factorSelectExpr) {
+            factorType.value = "脚本";
+            monacoEditorRef.value.setValue(data.value.factorSelectExpr);
+            monacoEditorRef.value.focusToEnd();
+          }
+        });
+        break;
+      }
+      case false: {
+        stVarSelectDialogRef.value.close();
+        break;
+      }
+    }
+  }
+);
+
+// 监控: 因子类型
 watch(
-  () => [factorType.value, visible.value],
-  () => {
-    if (factorType.value === "模版" || visible.value === false) {
-      stVarSelectDialogRef.value.close();
+  () => factorType.value,
+  (newValue) => {
+    if (newValue === "模版") stVarSelectDialogRef.value.close();
+    if (newValue === "脚本") {
+      nextTick(() => {
+        monacoEditorRef.value.focusToEnd();
+      });
     }
   },
   { deep: true }

package/packages/VarietySearch/config.js

@@ -57,11 +57,11 @@ export default {
     show: true,
     jcOptions: [
       { label: "恒指", value: "HZCFJC" },
-      { label: "恒生科技", value: "HSKJJC" },
+      { label: "恒生科技", value: "HSKJCFJC" },
       { label: "上证50", value: "SZ50CFJC" },
       { label: "沪深300", value: "HS300CFJC" },
       { label: "中证500", value: "ZZ500CFJC" },
-      { label: "中证1000", value: "ZZ1000JC" },
+      { label: "中证1000", value: "ZZ1000CFJC" },
     ],
   },
   // 因子筛选 [选项: 接口获取]