st-comp 0.0.103 → 0.0.104

package/package.json

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

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

@@ -63,12 +63,14 @@ const handleSubmit = () => {
   dialogFormRef.value.validate((valid) => {
     const { list, sqlEnable, sqlValue } = dialogForm.value;
     if (!valid) return;
-    // 针对于开启了SQL功能后的字段校验
+    // 针对开启了SQL功能后的字段校验
     if (sqlEnable) {
       if (!sqlValue) return ElMessage.error("SQL语句不能为空");
-      // 校验语句里是否存在因子中不存在的条件
+      // 提取SQL语句中的条件1, 条件2, ...
       const sqlConditions = extractConditionDetails(sqlValue);
+      // 生成因子表格中的条件1, 条件2, ...
       const factorConditions = list.map((item, index) => `条件${index + 1}`);
+      // 校验SQL中是否全部都能在因子表格中找到
       const noSaveConditions = sqlConditions.filter((item) => !factorConditions.includes(item));
       if (noSaveConditions.length) return ElMessage.error(`请检查SQL语句, 不存在[${noSaveConditions}]`);
     }
@@ -86,12 +88,30 @@ const handleDeleteFactor = (index) => {
   dialogForm.value.list.splice(index, 1);
 };
 // 表单: 添加因子
-const handleAppendFactor = () => {
-  dialogForm.value.list.push({
-    cycle: props.config.cycleDefault ?? null,
-    factor: null,
-    score: [null, null],
-  });
+const handleAppendFactor = (type) => {
+  switch (type) {
+    // 对比
+    case "compare": {
+      dialogForm.value.list.push({
+        key: "compare",
+        cycle: props.config.cycleDefault ?? null,
+        factor: null,
+        compareType: ">",
+        cycle2: props.config.cycleDefault ?? null,
+        factor2: null,
+      });
+      break;
+    }
+    // 常规
+    default: {
+      dialogForm.value.list.push({
+        cycle: props.config.cycleDefault ?? null,
+        factor: null,
+        score: [null, null],
+      });
+      break;
+    }
+  }
 };
 // 表单: 生成SQL
 const handleGenerateSql = () => {
@@ -125,14 +145,30 @@ const handleGenerateSql = () => {
 
 // Tag: 文案
 const handleFormatTag = (tag) => {
-  const { cycle, factor, score } = tag;
-  let str = "";
-  str += ` ${props.config.cycleOptions.find(({ value }) => value === cycle).label}`;
-  str += ` ${props.config.factorOptions.find(({ value }) => value === factor).label}`;
-  str += ` ${score[0] || score[0] === 0 ? `${score[0]}分` : "∞"}`;
-  str += " ~";
-  str += ` ${score[1] || score[1] === 0 ? `${score[1]}分` : "∞"}`;
-  return str;
+  switch (tag.key) {
+    // 对比
+    case "compare": {
+      const { cycle, factor, compareType, cycle2, factor2 } = tag;
+      let str = "";
+      str += ` ${props.config.cycleOptions.find(({ value }) => value === cycle).label}`;
+      str += ` ${props.config.factorOptions.find(({ value }) => value === factor).label}`;
+      str += ` ${compareType}`;
+      str += ` ${props.config.cycleOptions.find(({ value }) => value === cycle2).label}`;
+      str += ` ${props.config.factorOptions.find(({ value }) => value === factor2).label}`;
+      return str;
+    }
+    // 常规
+    default: {
+      const { cycle, factor, score } = tag;
+      let str = "";
+      str += ` ${props.config.cycleOptions.find(({ value }) => value === cycle).label}`;
+      str += ` ${props.config.factorOptions.find(({ value }) => value === factor).label}`;
+      str += ` ${score[0] || score[0] === 0 ? `${score[0]}分` : "∞"}`;
+      str += " ~";
+      str += ` ${score[1] || score[1] === 0 ? `${score[1]}分` : "∞"}`;
+      return str;
+    }
+  }
 };
 // Tag: 删除
 const handleDeleteTag = (aciton, index) => {
@@ -200,7 +236,7 @@ const handleDeleteTag = (aciton, index) => {
     <!-- 因子筛选弹窗 -->
     <el-dialog
       v-model="visible"
-      width="530"
+      width="602"
       align-center
       destroy-on-close
     >
@@ -230,69 +266,171 @@ const handleDeleteTag = (aciton, index) => {
           v-for="(item, index) in dialogForm.list"
           class="form-row"
         >
-          <!-- 序列标记 -->
+          <!-- 序列号 -->
           <span class="index">{{ `条件${index + 1}` }}</span>
-          <!-- 周期 -->
-          <el-form-item
-            v-if="config.cycleShow"
-            :prop="'list.' + index + '.cycle'"
-            :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
-            style="width: 100px; margin-right: 10px"
-          >
-            <el-select
-              v-model="item.cycle"
-              placeholder="选择周期"
-              size="small"
+          <!-- 对比因子 -->
+          <template v-if="item.key === 'compare'">
+            <!-- 周期 -->
+            <el-form-item
+              v-if="config.cycleShow"
+              :prop="'list.' + index + '.cycle'"
+              :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
+              style="width: 100px; margin-right: 10px"
             >
-              <el-option
-                v-for="{ label, value } in config.cycleOptions"
-                :label="label"
-                :value="value"
-                :key="value"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- 因子 -->
-          <el-form-item
-            :prop="'list.' + index + '.factor'"
-            :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
-            style="width: 100px; margin-right: 10px"
-          >
-            <el-select
-              v-model="item.factor"
-              placeholder="选择因子"
-              filterable
-              size="small"
-              no-match-text="无匹配数据"
+              <el-select
+                v-model="item.cycle"
+                placeholder="选择周期"
+                size="small"
+              >
+                <el-option
+                  v-for="{ label, value } in config.cycleOptions"
+                  :label="label"
+                  :value="value"
+                  :key="value"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- 因子 -->
+            <el-form-item
+              :prop="'list.' + index + '.factor'"
+              :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
+              style="width: 100px; margin-right: 10px"
             >
-              <el-option
-                v-for="{ label, value } in config.factorOptions"
-                :label="label"
-                :value="value"
-                :key="value"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- 分数 -->
-          <el-form-item
-            :prop="'list.' + index + '.score'"
-            :rules="{ validator: handleVerifyScore, trigger: 'blur' }"
-            style="width: 200px; margin-right: 10px"
-          >
-            <div style="display: flex; align-items: center; width: 100%; height: 24px">
-              <el-input-number
-                v-model="item.score[0]"
+              <el-select
+                v-model="item.factor"
+                placeholder="选择因子"
+                filterable
                 size="small"
-                controls-position="right"
-              />
-              <span>~</span>
-              <el-input-number
-                v-model="item.score[1]"
+                no-match-text="无匹配数据"
+              >
+                <el-option
+                  v-for="{ label, value } in config.factorOptions"
+                  :label="label"
+                  :value="value"
+                  :key="value"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- 对比符 -->
+            <el-form-item style="width: 52px; margin-right: 10px">
+              <el-select
+                v-model="item.compareType"
                 size="small"
-                controls-position="right"
-              />
-            </div>
-          </el-form-item>
+              >
+                <el-option
+                  v-for="item in ['>', '>=', '<', '<=']"
+                  :label="item"
+                  :value="item"
+                  :key="item"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- 周期2 -->
+            <el-form-item
+              v-if="config.cycleShow"
+              :prop="'list.' + index + '.cycle2'"
+              :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
+              style="width: 100px; margin-right: 10px"
+            >
+              <el-select
+                v-model="item.cycle2"
+                placeholder="选择周期"
+                size="small"
+              >
+                <el-option
+                  v-for="{ label, value } in config.cycleOptions"
+                  :label="label"
+                  :value="value"
+                  :key="value"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- 因子2 -->
+            <el-form-item
+              :prop="'list.' + index + '.factor2'"
+              :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
+              style="width: 100px; margin-right: 10px"
+            >
+              <el-select
+                v-model="item.factor2"
+                placeholder="选择因子"
+                filterable
+                size="small"
+                no-match-text="无匹配数据"
+              >
+                <el-option
+                  v-for="{ label, value } in config.factorOptions"
+                  :label="label"
+                  :value="value"
+                  :key="value"
+                />
+              </el-select>
+            </el-form-item>
+          </template>
+          <!-- 常规因子 -->
+          <template v-else>
+            <!-- 周期 -->
+            <el-form-item
+              v-if="config.cycleShow"
+              :prop="'list.' + index + '.cycle'"
+              :rules="{ required: true, message: '周期不能为空', trigger: 'blur' }"
+              style="width: 100px; margin-right: 10px"
+            >
+              <el-select
+                v-model="item.cycle"
+                placeholder="选择周期"
+                size="small"
+              >
+                <el-option
+                  v-for="{ label, value } in config.cycleOptions"
+                  :label="label"
+                  :value="value"
+                  :key="value"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- 因子 -->
+            <el-form-item
+              :prop="'list.' + index + '.factor'"
+              :rules="{ required: true, message: '因子不能为空', trigger: 'blur' }"
+              style="width: 100px; margin-right: 10px"
+            >
+              <el-select
+                v-model="item.factor"
+                placeholder="选择因子"
+                filterable
+                size="small"
+                no-match-text="无匹配数据"
+              >
+                <el-option
+                  v-for="{ label, value } in config.factorOptions"
+                  :label="label"
+                  :value="value"
+                  :key="value"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- 分数 -->
+            <el-form-item
+              :prop="'list.' + index + '.score'"
+              :rules="{ validator: handleVerifyScore, trigger: 'blur' }"
+              style="width: 200px; margin-right: 10px"
+            >
+              <div style="display: flex; align-items: center; width: 100%; height: 24px">
+                <el-input-number
+                  v-model="item.score[0]"
+                  size="small"
+                  controls-position="right"
+                />
+                <span>~</span>
+                <el-input-number
+                  v-model="item.score[1]"
+                  size="small"
+                  controls-position="right"
+                />
+              </div>
+            </el-form-item>
+          </template>
           <!-- 删除 -->
           <el-icon @click="handleDeleteFactor(index)"><CircleCloseFilled /></el-icon>
         </div>
@@ -305,6 +443,15 @@ const handleDeleteTag = (aciton, index) => {
           style="margin-bottom: 10px"
           >添加因子</el-button
         >
+        <el-button
+          type="primary"
+          plain
+          size="small"
+          :icon="Plus"
+          @click="handleAppendFactor('compare')"
+          style="margin-bottom: 10px"
+          >添加因子对比</el-button
+        >
         <!-- SQL功能 -->
         <template v-if="config.sqlShow">
           <el-form-item label="SQL功能: ">

package/packages/VarietySearch/index.vue

@@ -128,37 +128,64 @@ defineExpose({
     // 5.因子筛选
     if (config.value.factorScreen?.show) {
       const { factorScreen } = data;
-      // 因子列表参数
+      // tbFeatureFactorScores参数整理
       if (factorScreen?.list?.length) {
         params.tbFeatureFactorScores = factorScreen.list.map((item) => {
-          return {
-            freqId: item.cycle,
-            factorId: item.factor,
-            startScore: item.score[0],
-            endScore: item.score[1],
-          };
+          switch (item.key) {
+            // 对比
+            case "compare": {
+              return {
+                freqId: item.cycle,
+                factorId: item.factor,
+                compareType: item.compareType,
+                freqId2: item.cycle2,
+                factorId2: item.factor2,
+              };
+            }
+            // 常规
+            default: {
+              return {
+                freqId: item.cycle,
+                factorId: item.factor,
+                startScore: item.score[0],
+                endScore: item.score[1],
+              };
+            }
+          }
         });
       }
-      // SQL语句参数
-      params.enableSql = factorScreen.sqlEnable === 1 ? 2 : 1;
+      // sql参数整理
       if (factorScreen.sqlEnable) {
         const conditions = factorScreen.list.reduce((result, item, index) => {
           const key = `条件${index + 1}`;
-          let sql = `factor_id = ${item.factor} and `;
-          if (config.value.factorScreen?.cycleShow) sql = `freq_id = ${item.cycle} and factor_id = ${item.factor} and `;
-          // 分数语句的判断
-          if ((item.score[0] || item.score[0] === 0) && (item.score[1] || item.score[1] === 0)) {
-            sql += `score >= ${item.score[0]} and score <= ${item.score[1]}`;
-          } else if (item.score[0] || item.score[0] === 0) {
-            sql += `score >= ${item.score[0]}`;
-          } else if (item.score[1] || item.score[1] === 0) {
-            sql += `score <= ${item.score[1]}`;
+          switch (item.key) {
+            case "compare": {
+              let sql = "";
+              if (config.value.factorScreen?.cycleShow) {
+                sql = `freq_id = ${item.cycle} and factor_id = ${item.factor} ${item.compareType} freq_id = ${item.cycle2} and factor_id = ${item.factor2}`;
+              } else {
+                sql = `factor_id = ${item.factor} ${item.compareType} factor_id = ${item.factor2}`;
+              }
+              result.set(key, `(${sql})`);
+              break;
+            }
+            default: {
+              let sql = `factor_id = ${item.factor} and `;
+              if (config.value.factorScreen?.cycleShow) sql = `freq_id = ${item.cycle} and factor_id = ${item.factor} and `;
+              // 分数语句
+              if ((item.score[0] || item.score[0] === 0) && (item.score[1] || item.score[1] === 0)) {
+                sql += `score >= ${item.score[0]} and score <= ${item.score[1]}`;
+              } else if (item.score[0] || item.score[0] === 0) {
+                sql += `score >= ${item.score[0]}`;
+              } else if (item.score[1] || item.score[1] === 0) {
+                sql += `score <= ${item.score[1]}`;
+              }
+              result.set(key, `(${sql})`);
+            }
           }
-          // 格式化因子sql语句
-          sql = `(${sql})`;
-          result.set(key, sql);
           return result;
         }, new Map([]));
+        // 将(SQL语句)与(字符串条件N)进行替换
         let sqlStr = factorScreen.sqlValue;
         for (const [key, value] of conditions) {
           const regex = new RegExp(key, "g");
@@ -166,6 +193,8 @@ defineExpose({
         }
         params.sql = sqlStr;
       }
+      // enableSql参数整理
+      params.enableSql = factorScreen.sqlEnable === 1 ? 2 : 1;
     }
     // 6.常用指标
     {

package/src/pages/VarietySearch/index.vue

@@ -57,13 +57,13 @@ const varietySearchConfig = ref({
     sqlShow: true,
     // 周期下拉框数据源
     cycleOptions: [
-      { label: "Mock周期一", value: 1 },
-      { label: "Mock周期二", value: 2 },
+      { label: "周期一", value: 1 },
+      { label: "周期二", value: 2 },
     ],
     // 因子下拉框数据源
     factorOptions: [
-      { label: "Mock因子一", value: 1 },
-      { label: "Mock因子二", value: 2 },
+      { label: "因子一", value: 1 },
+      { label: "因子二", value: 2 },
     ],
     // 因子使用说明数据源
     factorDescriptions: [],