st-comp 0.0.244 → 0.0.245

package/package.json

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

package/packages/CustomFunction/index.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { actionStat } from "st-func";
 import { ref, inject, onMounted } from "vue";
 import { Edit, DocumentCopy, Delete } from "@element-plus/icons-vue";
 import ManageDialog from "./components/ManageDialog.vue";
@@ -7,11 +6,10 @@ 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" },
-  pageName: { type: String, default: "" },
 });
 
 const customFunctionId = ref(null);
@@ -51,7 +49,7 @@ const handleCustomFuncManage = async (action, item) => {
   switch (action) {
     case "open": {
       ManageDialogRef.value.open();
-      props.pageName && actionStat(props.pageName, "因子筛选", "函数管理");
+      emit("actionState", "因子筛选", "函数管理");
       break;
     }
     case "copy": {

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

@@ -1,16 +1,15 @@
 <script setup>
-import { actionStat } from "st-func";
 import { Close, Plus } from "@element-plus/icons-vue";
 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 }, // 已选品种市场
   commonOption: { type: Array, default: () => [] }, // 已选常用选项
-  pageName: { type: String, default: "" },
 });
 const visible = ref(false);
 const compositeOrderForm = ref({
@@ -60,8 +59,7 @@ const handleAction = (action, index) => {
     }
     // 窗口确认
     case "submit": {
-      props.pageName && actionStat(props.pageName, "组合排序");
-
+      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

@@ -1,6 +1,5 @@
 <!-- 因子筛选组件 -->
 <script setup name="FactorScreen">
-import { actionStat } from "st-func";
 import { nextTick, ref, watch, inject, reactive } from "vue";
 import { Close, Plus, CircleCloseFilled, InfoFilled, Document } from "@element-plus/icons-vue";
 import { handleVerifyScore, extractConditionDetails, extractVariables, sendToAi } from "./tools.js";
@@ -9,6 +8,7 @@ import MonacoEditor from "../../../MonacoEditor/index.vue";
 
 const { request } = inject("stConfig"); // 组件库全局配置
 
+const emit = defineEmits(["actionState"]);
 const props = defineProps({
   config: {
     type: Object,
@@ -21,7 +21,6 @@ const props = defineProps({
       factorDescriptions: [], // 因子使用说明数据源
     },
   },
-  pageName: { type: String, default: "" },
 });
 const data = defineModel("data", {
   default: {
@@ -324,7 +323,7 @@ const handleScriptCopy = async () => {
     ElMessage.success("脚本内容已经成功复制到粘贴板");
   } finally {
     scriptCopyLoading.value = false;
-    props.pageName && actionStat(props.pageName, "因子筛选", "复制");
+    emit("actionState", "因子筛选", "复制");
   }
 };
 
@@ -376,7 +375,7 @@ const handleScriptTest = async (action) => {
         }
       } finally {
         scriptTestLoading.value = false;
-        props.pageName && actionStat(props.pageName, "因子筛选", "测试");
+        emit("actionState", "因子筛选", "测试");
       }
       break;
     }
@@ -391,7 +390,7 @@ const handleScriptTest = async (action) => {
 };
 // 测试: AI分析
 const handleTestAi = () => {
-  props.pageName && actionStat(props.pageName, "因子筛选", "AI分析");
+  emit("actionState", "因子筛选", "AI分析");
   const appId = "87be17ecc84d4d2ea3108d7155bec2ac";
   const apiKey = "sk-d995eb26a4334bdeb2ccb4cbfaf51de8";
   scriptAILoading.value = true;
@@ -402,7 +401,6 @@ const handleTestAi = () => {
       return;
     }
     scriptTestResult.ai = scriptTestResult.ai + res;
-    console.log(scriptTestResult.ai);
   });
 };
 
@@ -574,7 +572,7 @@ watch(
                 v-show="factorType === '脚本'"
                 size="small"
                 @insert="handleInsertCustomFunction"
-                :pageName="pageName"
+                @actionState="(...args) => emit('actionState', ...args)"
               />
               <el-button
                 type="primary"

package/packages/VarietySearch/index.vue

@@ -6,10 +6,8 @@ import CommonIndicator from "./components/CommonIndicator/index.vue";
 import CompositeOrder from "./components/CompositeOrder/index.vue";
 import AddTag from "./components/AddTag/index.vue";
 
-const props = defineProps({
-  config: { type: Object, default: {} },
-  pageName: { type: String, default: "" },
-});
+const emit = defineEmits(["actionState"]);
+const props = defineProps({ config: { type: Object, default: {} } });
 const searchData = defineModel("searchData");
 searchData.value = Object.assign(searchData.value, {
   // 品种市场
@@ -600,7 +598,7 @@ defineExpose({
         <FactorScreen
           v-model:data="searchData.factorScreen"
           :config="config.factorScreen"
-          :pageName="pageName"
+          @actionState="(...args) => emit('actionState', ...args)"
         />
       </div>
     </template>
@@ -617,7 +615,7 @@ defineExpose({
       :varietyMarket="searchData.varietyMarket"
       :commonOption="searchData.commonOption"
       :config="config.compositeOrder"
-      :pageName="pageName"
+      @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