st-comp 0.0.243 → 0.0.245

package/package.json

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

package/packages/CustomFunction/index.vue

@@ -1,12 +1,12 @@
 <script setup>
-import { ref, inject, onMounted, watch, reactive } from "vue";
+import { ref, inject, onMounted } from "vue";
 import { Edit, DocumentCopy, Delete } from "@element-plus/icons-vue";
 import ManageDialog from "./components/ManageDialog.vue";
 
 const { request } = inject("stConfig"); // 组件库全局配置
 const ManageDialogRef = ref(null);
 
-const emit = defineEmits(["insert"]);
+const emit = defineEmits(["insert", "actionState"]);
 const props = defineProps({
   size: { type: String, default: "small" },
   selectWidth: { type: String, default: "200px" },
@@ -44,11 +44,12 @@ const handleInsert = () => {
   emit("insert", funcName, funcExpression);
 };
 
-// 窗口: 函数管理(复制, 编辑, 删除)
+// 窗口: 函数管理(打开, 复制, 编辑, 删除)
 const handleCustomFuncManage = async (action, item) => {
   switch (action) {
     case "open": {
       ManageDialogRef.value.open();
+      emit("actionState", "因子筛选", "函数管理");
       break;
     }
     case "copy": {

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

@@ -5,6 +5,7 @@ import { ref, watch, computed, inject } from "vue";
 const clearRow = inject("clearRow");
 
 const data = defineModel("data", { default: [] });
+const emit = defineEmits(["actionState"]);
 const props = defineProps({
   config: { type: Object, default: () => {} },
   varietyMarket: { type: null || Number, default: () => null }, // 已选品种市场
@@ -58,6 +59,7 @@ const handleAction = (action, index) => {
     }
     // 窗口确认
     case "submit": {
+      emit("actionState", "组合排序");
       const { id, name, value } = compositeOrderForm.value;
       if (!name) return ElMessage.warning("请选择需要排序的条件");
       const { label } = compositeOrderOptions.value.find((item) => item.key === name);

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

@@ -8,6 +8,7 @@ import MonacoEditor from "../../../MonacoEditor/index.vue";
 
 const { request } = inject("stConfig"); // 组件库全局配置
 
+const emit = defineEmits(["actionState"]);
 const props = defineProps({
   config: {
     type: Object,
@@ -322,8 +323,10 @@ const handleScriptCopy = async () => {
     ElMessage.success("脚本内容已经成功复制到粘贴板");
   } finally {
     scriptCopyLoading.value = false;
+    emit("actionState", "因子筛选", "复制");
   }
 };
+
 // 测试: 复制
 const handleTestCodeCopy = () => {
   let txa = document.createElement("textarea");
@@ -372,6 +375,7 @@ const handleScriptTest = async (action) => {
         }
       } finally {
         scriptTestLoading.value = false;
+        emit("actionState", "因子筛选", "测试");
       }
       break;
     }
@@ -386,6 +390,7 @@ const handleScriptTest = async (action) => {
 };
 // 测试: AI分析
 const handleTestAi = () => {
+  emit("actionState", "因子筛选", "AI分析");
   const appId = "87be17ecc84d4d2ea3108d7155bec2ac";
   const apiKey = "sk-d995eb26a4334bdeb2ccb4cbfaf51de8";
   scriptAILoading.value = true;
@@ -396,7 +401,6 @@ const handleTestAi = () => {
       return;
     }
     scriptTestResult.ai = scriptTestResult.ai + res;
-    console.log(scriptTestResult.ai);
   });
 };
 
@@ -568,6 +572,7 @@ watch(
                 v-show="factorType === '脚本'"
                 size="small"
                 @insert="handleInsertCustomFunction"
+                @actionState="(...args) => emit('actionState', ...args)"
               />
               <el-button
                 type="primary"

package/packages/VarietySearch/config.js

@@ -47,12 +47,11 @@ const config = {
       // { label: "深港通", value: 8192, varietyMarketIds: "5" },
     ],
   },
-  // 自定标签 [选项: 接口]
+  // 自定标签 [选项: 组件内部请求]
   customTag: {
     show: true,
-    options: [],
   },
-  // 价差转换 [选项: 前端默认]
+  // 价差转换 [选项: 组件默认]
   jcTranslate: {
     show: true,
     jcOptions: [
@@ -77,7 +76,7 @@ const config = {
     factorOptions: [], // 因子下拉框数据源
     factorDescriptions: [], // 因子使用说明数据源
   },
-  // 常用指标 [选项: 前端默认]
+  // 常用指标 [选项: 组件默认]
   commonIndicator: {
     show: true,
     options: [
@@ -618,7 +617,7 @@ const config = {
 
 export default {
   ...config,
-  // 组合排序 [选项: 前端默认] 本质就是给常用指标排序用的, 用的就是常用指标的数据源
+  // 组合排序 [选项: 组件默认] 本质就是给常用指标排序用的, 用的就是常用指标的数据源
   compositeOrder: {
     show: true,
     options: config.commonIndicator.options,

package/packages/VarietySearch/index.vue

@@ -1,11 +1,12 @@
 <script setup name="VarietySearch">
-import { watch, computed, provide, ref } from "vue";
+import { watch, computed, provide } from "vue";
 import defaultConfig from "./config.js";
 import FactorScreen from "./components/FactorScreen/index.vue";
 import CommonIndicator from "./components/CommonIndicator/index.vue";
 import CompositeOrder from "./components/CompositeOrder/index.vue";
 import AddTag from "./components/AddTag/index.vue";
 
+const emit = defineEmits(["actionState"]);
 const props = defineProps({ config: { type: Object, default: {} } });
 const searchData = defineModel("searchData");
 searchData.value = Object.assign(searchData.value, {
@@ -83,10 +84,6 @@ const marketIdsOptionDict = computed(() => {
     return config.value.marketIds.options;
   }
 });
-// 选项数据源: 自定标签
-const customTagDict = computed(() => {
-  return config.value.customTag.options;
-});
 // 选项数据源: 价差转换
 const jcOptions = computed(() => {
   return config.value.jcTranslate.jcOptions;
@@ -148,7 +145,7 @@ watch(
         return newValue.find(({ value }) => value === id);
       });
     }
-  }
+  },
 );
 // 监视: 上市市场数据源
 watch(
@@ -160,7 +157,7 @@ watch(
         return newValue.find(({ value }) => value === id);
       });
     }
-  }
+  },
 );
 
 provide("clearRow", clearRow);
@@ -555,9 +552,7 @@ defineExpose({
           <span>自定标签: </span>
           <span @click="clearRow('customTag')">不限</span>
         </div>
-        <AddTag
-          v-model:data="searchData.customTag"
-        />
+        <AddTag v-model:data="searchData.customTag" />
       </div>
     </template>
     <!-- 价差转换 -->
@@ -603,6 +598,7 @@ defineExpose({
         <FactorScreen
           v-model:data="searchData.factorScreen"
           :config="config.factorScreen"
+          @actionState="(...args) => emit('actionState', ...args)"
         />
       </div>
     </template>
@@ -619,6 +615,7 @@ defineExpose({
       :varietyMarket="searchData.varietyMarket"
       :commonOption="searchData.commonOption"
       :config="config.compositeOrder"
+      @actionState="(...args) => emit('actionState', ...args)"
     />
   </div>
 </template>

package/src/pages/VarietySearch/index.vue

@@ -48,7 +48,7 @@ const getTableData = async () => {
    * @description: 根据用户最后一次操作交互的时机, 决定排序使用哪个维度
    * 常规排序字段: orderByInfo
    * 表头的orderByInfo和预警组的orderByInfo为顺序互斥, 谁最后操作就用谁
-   * 
+   *
    * 组合排序字段: compositeOrder
    * 表头的orderByInfo与compositeOrder为顺序互斥, 谁最后操作就用谁
    * 预警组的orderByInfo与compositeOrder为强制互斥, compositeOrder有值就一定优先使用compositeOrder
@@ -105,6 +105,10 @@ const sortChange = ({ column, prop, order }) => {
   getTableData();
 };
 
+const actionState = (...args) => {
+  console.log(...args);
+};
+
 onMounted(async () => {
   const dicAlar = await getAlarDict();
   const dicCycle = await getAlarFreq();
@@ -181,7 +185,7 @@ watch(
   },
   {
     deep: true,
-  }
+  },
 );
 </script>
 
@@ -191,6 +195,7 @@ watch(
       ref="varietySearchRef"
       v-model:searchData="varietySearchData"
       :config="varietySearchConfig"
+      @actionState="actionState"
     />
     <div>品种池组件接口参数: {{ apiParams }}</div>
     <el-button