st-comp 0.0.216 → 0.0.218

package/package.json

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

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

@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <el-tag
+      v-for="(item, index) in showCheckTagList"
+      closable
+      style="margin-right: 10px;"
+      type="info"
+      @close="handleAction('delete', index)"
+    >
+      <span>{{ item.name }}</span>
+    </el-tag>
+    <el-button
+      class="screen-btn"
+      type="primary"
+      plain
+      size="small"
+      :icon="Plus"
+      @click="handleAction('add')"
+    >
+      添加标签
+    </el-button>
+  </div>
+  <!-- 添加标签弹窗 -->
+  <el-dialog
+    v-model="visible"
+    title="Tips"
+    width="1000"
+  >
+    <template #header>
+      <div>
+        添加标签
+        <el-radio-group v-model="tagType" size="small" style="margin-left: 8px; vertical-align: 5px;" v-if="0">
+          <el-radio-button label="个人" value="person" />
+          <el-radio-button label="系统" value="system" />
+        </el-radio-group>
+        <el-input v-model="searchValue" size="small" style="width: 120px; margin-left: 8px;" placeholder="请输入标签名称" />
+      </div>
+    </template>
+    <div class="tag-list">
+      <div class="tab-list-item" v-for="item in tagList">
+        <el-checkbox :checked="isCheck(item)" @change="changeCheckBox(item)">
+          <div style="display: flex; width: 280px;">
+            <div style="flex: 1;line-height: 24px;">{{ item.name }}</div>
+            <el-button size="small" :icon="Edit" v-if="0"></el-button>
+            <el-button size="small" :icon="Delete" @click="deleteTag(item)"></el-button>
+          </div>
+        </el-checkbox>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="handleAction('submit')">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+  <!-- 编辑标签弹窗 -->
+</template>
+
+<script setup>
+import { inject, ref, watch, computed, nextTick } from "vue";
+import { Plus, Edit, Delete } from "@element-plus/icons-vue";
+
+let searchTimer = null
+
+const { request } = inject("stConfig"); // 组件库全局配置
+
+const data = defineModel("data", { default: [] });
+const visible = ref(false);
+const tagType = ref('person'); // 标签类型
+const searchValue = ref(''); // 搜索值
+const totalTagList = ref([]); // 全部标签列表
+const tagList = ref([]); // 标签列表
+const checkList = ref([]); // 勾选列表
+
+const showCheckTagList = computed(() => {
+  return data.value.map(id => {
+    return {
+      name: totalTagList.value?.find(i => i.id === id)?.tagName,
+      id,
+    }
+  })
+})
+
+watch(() => tagType.value, () => {
+  searchValue.value = ''
+})
+
+watch(() => searchValue.value, () => {
+  clearTimeout(searchTimer)
+  searchTimer = setTimeout(() => {
+    getTagList()
+  }, 300)
+})
+
+const isCheck = (item) => {
+  return Boolean(checkList.value.includes(item.id))
+}
+
+const changeCheckBox = (item) => {
+  if (isCheck(item)) {
+    // 已经勾选
+    checkList.value = checkList.value.filter(i => i !== item.id)
+  } else {
+    checkList.value.push(item.id)
+  }
+}
+
+const handleAction = (action, index) => {
+  switch (action) {
+    // 新增
+    case "add": {
+      tagList.value = []
+      visible.value = true;
+      searchValue.value = '';
+      checkList.value = [...data.value]
+      getTagList()
+      break;
+    }
+    // 编辑
+    case "edit": {
+      const item = data.value[index];
+      compositeOrderForm.value = { ...item };
+      visible.value = true;
+      break;
+    }
+    // 窗口确认
+    case "submit": {
+      visible.value = false;
+      data.value = [...checkList.value]
+      break;
+    }
+    // 删除
+    case "delete": {
+      data.value.splice(index, 1);
+      break;
+    }
+  }
+};
+
+const deleteTag = (item) => {
+  ElMessageBox.alert(`确认删除标签“${item.name}”吗？`, '删除标签', {
+    confirmButtonText: 'OK',
+    callback: async (action) => {
+      if (action === 'confirm') {
+        await request.post('/alarm/deliversign/deleteTag', { tagId: item.id })
+        getTagList()
+        Elmessage.success('删除成功!')
+      }
+    },
+  })
+}
+
+const getTagList = async (isTotal = false) => {
+  if (tagType.value === 'person') {
+    // 个人标签
+    const res = await request.post('/alarm/deliversign/findTagsByUserId', { tagName: searchValue.value })
+    tagList.value = []
+    nextTick(() => {
+      tagList.value = res.body?.map(item => ({
+        name: item.tagName,
+        id: item.id
+      }))
+    })
+    if (isTotal) {
+      totalTagList.value = res.body
+    }
+  } else {
+    // 系统标签
+  }
+}
+
+getTagList(true)
+
+defineExpose({
+  updateTag: () => {
+    getTagList(true)
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.tag-list {
+  .tab-list-item {
+    display: inline-block;
+    width: 33%;
+  }
+}
+</style>

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

@@ -38,6 +38,8 @@ const visibleDescriptions = ref(false);
 const factorType = ref("脚本");
 const scriptTestLoading = ref(false);
 const scriptCopyLoading = ref(false);
+const testVariety = ref("");
+const testVarietyVisible = ref(false);
 const scriptTestLogVisible = ref(false);
 const scriptTestResult = reactive({
   result: null,
@@ -320,33 +322,55 @@ const handleScriptCopy = async () => {
     scriptCopyLoading.value = false;
   }
 };
-// 脚本: 测试
-const handleScriptTest = async () => {
-  try {
-    scriptTestLoading.value = true;
-    const script = monacoEditorRef.value.getValue();
-    if (!script) return ElMessage.error("请输入脚本语句");
-    const { body } = await request.post("/common/qt/getFuncExpr", { factorSelectExpr: script });
-    if (!body) return ElMessage.error("脚本解析失败, 请检查脚本内容是否填写完整或者联系管理员");
-    const testRes = await request.post("/common/qt/testFactorSelect", { factorSelectExpr: body });
-    const { result, detail } = testRes.body;
-    Object.assign(scriptTestResult, { result, detail, code: body });
-    if (result === 1) {
-      ElMessage.success("测试通过");
-    } else {
-      ElMessage.error("测试未能通过");
+// 测试: 打开/确认/日志
+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 handleScriptTest = async (action) => {
+  switch (action) {
+    case "open": {
+      // 基础校验
+      if (!monacoEditorRef.value.getValue()) return ElMessage.error("脚本语句不可为空");
+      testVarietyVisible.value = true;
+      break;
+    }
+    case "submit": {
+      testVarietyVisible.value = false;
+      try {
+        scriptTestLoading.value = true;
+        const { body } = await request.post("/common/qt/getFuncExpr", { factorSelectExpr: monacoEditorRef.value.getValue() });
+        if (!body) return ElMessage.error("脚本解析失败, 请检查脚本内容是否填写完整或者联系管理员");
+        const params = {
+          codes: extractCodesFromString(testVariety.value),
+          factorSelectExpr: body,
+        };
+        const testRes = await request.post("/common/qt/testFactorSelect", params);
+        const { result, detail } = testRes.body;
+        Object.assign(scriptTestResult, { result, detail, code: body });
+        if (result === 1) {
+          ElMessage.success("测试通过");
+        } else {
+          ElMessage.error("测试未能通过");
+          scriptTestLogVisible.value = true;
+        }
+      } finally {
+        scriptTestLoading.value = false;
+      }
+      break;
+    }
+    case "log": {
+      if (scriptTestResult.result === null) {
+        return ElMessage.warning("请先进行测试, 等待测试完成后可查看日志");
+      }
       scriptTestLogVisible.value = true;
+      break;
     }
-  } finally {
-    scriptTestLoading.value = false;
-  }
-};
-// 脚本: 日志明细
-const handleScriptLog = () => {
-  if (scriptTestResult.result === null) {
-    return ElMessage.warning("请先进行测试, 等待测试完成后可查看日志");
   }
-  scriptTestLogVisible.value = true;
 };
 
 // 监控: 窗口开关
@@ -378,6 +402,7 @@ watch(
       case false: {
         stVarSelectDialogRef.value.close();
         scriptTestLogVisible.value = false;
+        testVariety.value = "";
         break;
       }
     }
@@ -526,13 +551,13 @@ watch(
                 type="primary"
                 size="small"
                 :loading="scriptTestLoading"
-                @click="handleScriptTest"
+                @click="handleScriptTest('open')"
                 >测试</el-button
               >
               <el-button
                 size="small"
                 :icon="Document"
-                @click="handleScriptLog"
+                @click="handleScriptTest('log')"
                 >日志明细</el-button
               >
             </div>
@@ -812,6 +837,55 @@ watch(
     :factorType="factorType"
     :data="config.factorDescriptions?.filter((item) => [1, 3].includes(item.type))"
   />
+  <!-- 窗口: 选择测试所用的品种 -->
+  <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="handleScriptTest('submit')"
+        >
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
   <!-- 窗口: 日志明细 -->
   <el-dialog
     modal-class="log-dialog"
@@ -853,7 +927,7 @@ watch(
       <el-divider direction="vertical" />
       <!-- 日志 -->
       <el-scrollbar height="600px">
-        <pre :class="scriptTestResult.result === 1 ? 'success-log' : 'error-log'">{{ scriptTestResult.result === 1 ? "测试通过 √" : scriptTestResult.detail }}</pre>
+        <pre :class="scriptTestResult.result === 1 ? 'success-log' : 'error-log'">{{ scriptTestResult.result === 1 ? `✅️ 测试通过\n${scriptTestResult.detail}` : scriptTestResult.detail }}</pre>
       </el-scrollbar>
     </div>
     <!-- 底部 -->
@@ -912,6 +986,31 @@ watch(
     }
   }
 }
+.test-variety-dialog {
+  .custom-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .left,
+    .right {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+    .el-icon {
+      cursor: pointer;
+    }
+  }
+  .full-height-textarea {
+    width: 100%;
+    height: 200px;
+    margin-top: 10px;
+    :deep(.el-textarea__inner) {
+      box-sizing: border-box;
+      height: 100%;
+    }
+  }
+}
 .log-dialog {
   .custom-header {
     display: flex;

package/packages/VarietySearch/index.vue

@@ -1,9 +1,10 @@
 <script setup name="VarietySearch">
-import { watch, computed, provide } from "vue";
+import { watch, computed, provide, ref } 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 searchData = defineModel("searchData");
@@ -34,6 +35,9 @@ searchData.value = Object.assign(searchData.value, {
   compositeOrder: [],
 });
 
+// 添加标签
+const addTagRef = ref();
+
 // 合并配置项
 const config = computed(() => {
   const result = {};
@@ -482,6 +486,10 @@ defineExpose({
       compositeOrder: [],
     };
   },
+  // 更新标签
+  updateTag: () => {
+    addTagRef.value.updateTag();
+  },
 });
 </script>
 
@@ -548,23 +556,16 @@ defineExpose({
       </div>
     </template>
     <!-- 自定标签 -->
-    <template v-if="config.customTag?.show && customTagDict.length">
+    <template v-if="config.customTag?.show">
       <div class="variety-search-row">
         <div class="title">
           <span>自定标签: </span>
           <span @click="clearRow('customTag')">不限</span>
         </div>
-        <el-checkbox-group
-          v-model="searchData.customTag"
-          size="small"
-        >
-          <el-checkbox
-            v-for="{ label, value } in customTagDict"
-            :label="label"
-            :value="value"
-            :key="value"
-          />
-        </el-checkbox-group>
+        <AddTag
+          ref="addTagRef"
+          v-model:data="searchData.customTag"
+        />
       </div>
     </template>
     <!-- 价差转换 -->