st-comp 0.0.242 → 0.0.244

package/package.json

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

package/packages/CustomFunction/index.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { ref, inject, onMounted, watch, reactive } from "vue";
+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";
 
@@ -10,6 +11,7 @@ const emit = defineEmits(["insert"]);
 const props = defineProps({
   size: { type: String, default: "small" },
   selectWidth: { type: String, default: "200px" },
+  pageName: { type: String, default: "" },
 });
 
 const customFunctionId = ref(null);
@@ -44,11 +46,12 @@ const handleInsert = () => {
   emit("insert", funcName, funcExpression);
 };
 
-// 窗口: 函数管理(复制, 编辑, 删除)
+// 窗口: 函数管理(打开, 复制, 编辑, 删除)
 const handleCustomFuncManage = async (action, item) => {
   switch (action) {
     case "open": {
       ManageDialogRef.value.open();
+      props.pageName && actionStat(props.pageName, "因子筛选", "函数管理");
       break;
     }
     case "copy": {

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

@@ -197,7 +197,7 @@ const getTagList = async () => {
     // 个人标签
     const res = await request.post('/alarm/deliversign/findTagsByUserId', { tagName: searchValue.value })
     tagList.value = []
-    tagMap.value = [
+    tagMap.value = {
       ...tagMap.value,
       ...res.body.reduce((r, i) => {
         return {
@@ -205,7 +205,7 @@ const getTagList = async () => {
           [i.id]: i.tagName
         }
       }, {})
-    ]
+    }
     nextTick(() => {
       tagList.value = res.body?.map(item => ({
         name: item.tagName,
@@ -216,7 +216,7 @@ const getTagList = async () => {
     // 系统标签
     const res = await request.post('/alarm/deliversign/findSystemTagsByTagName', { tagName: searchValue.value })
     tagList.value = []
-    tagMap.value = [
+    tagMap.value = {
       ...tagMap.value,
       ...res.body.reduce((r, i) => {
         return {
@@ -224,7 +224,7 @@ const getTagList = async () => {
           [i.id]: i.tagName
         }
       }, {})
-    ]
+    }
     nextTick(() => {
       tagList.value = res.body?.map(item => ({
         name: item.tagName,

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

@@ -1,4 +1,5 @@
 <script setup>
+import { actionStat } from "st-func";
 import { Close, Plus } from "@element-plus/icons-vue";
 import { ref, watch, computed, inject } from "vue";
 
@@ -9,6 +10,7 @@ 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({
@@ -58,6 +60,8 @@ const handleAction = (action, index) => {
     }
     // 窗口确认
     case "submit": {
+      props.pageName && actionStat(props.pageName, "组合排序");
+
       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,5 +1,6 @@
 <!-- 因子筛选组件 -->
 <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";
@@ -20,6 +21,7 @@ const props = defineProps({
       factorDescriptions: [], // 因子使用说明数据源
     },
   },
+  pageName: { type: String, default: "" },
 });
 const data = defineModel("data", {
   default: {
@@ -322,8 +324,10 @@ const handleScriptCopy = async () => {
     ElMessage.success("脚本内容已经成功复制到粘贴板");
   } finally {
     scriptCopyLoading.value = false;
+    props.pageName && actionStat(props.pageName, "因子筛选", "复制");
   }
 };
+
 // 测试: 复制
 const handleTestCodeCopy = () => {
   let txa = document.createElement("textarea");
@@ -372,6 +376,7 @@ const handleScriptTest = async (action) => {
         }
       } finally {
         scriptTestLoading.value = false;
+        props.pageName && actionStat(props.pageName, "因子筛选", "测试");
       }
       break;
     }
@@ -386,6 +391,7 @@ const handleScriptTest = async (action) => {
 };
 // 测试: AI分析
 const handleTestAi = () => {
+  props.pageName && actionStat(props.pageName, "因子筛选", "AI分析");
   const appId = "87be17ecc84d4d2ea3108d7155bec2ac";
   const apiKey = "sk-d995eb26a4334bdeb2ccb4cbfaf51de8";
   scriptAILoading.value = true;
@@ -568,6 +574,7 @@ watch(
                 v-show="factorType === '脚本'"
                 size="small"
                 @insert="handleInsertCustomFunction"
+                :pageName="pageName"
               />
               <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,12 +1,15 @@
 <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 props = defineProps({ config: { type: Object, default: {} } });
+const props = defineProps({
+  config: { type: Object, default: {} },
+  pageName: { type: String, default: "" },
+});
 const searchData = defineModel("searchData");
 searchData.value = Object.assign(searchData.value, {
   // 品种市场
@@ -83,10 +86,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 +147,7 @@ watch(
         return newValue.find(({ value }) => value === id);
       });
     }
-  }
+  },
 );
 // 监视: 上市市场数据源
 watch(
@@ -160,7 +159,7 @@ watch(
         return newValue.find(({ value }) => value === id);
       });
     }
-  }
+  },
 );
 
 provide("clearRow", clearRow);
@@ -555,9 +554,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 +600,7 @@ defineExpose({
         <FactorScreen
           v-model:data="searchData.factorScreen"
           :config="config.factorScreen"
+          :pageName="pageName"
         />
       </div>
     </template>
@@ -619,6 +617,7 @@ defineExpose({
       :varietyMarket="searchData.varietyMarket"
       :commonOption="searchData.commonOption"
       :config="config.compositeOrder"
+      :pageName="pageName"
     />
   </div>
 </template>