st-comp 0.0.121 → 0.0.123

package/package.json

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

package/packages/KlineNew/components/KlineTips/index.vue

@@ -17,6 +17,18 @@ const props = defineProps({
     type: Object,
     require: true,
   },
+  // K线数据
+  // candlestickData: [开, 收, 低, 高, 成交额, 涨跌值, 涨跌百分比]
+  candlestickData: {
+    type: Array,
+    default: () => null,
+  },
+  // 主图指标数据
+  // mainIndicatorData: [key, data, color]
+  mainIndicatorData: {
+    type: Array,
+    default: () => null,
+  },
   activeIndex: {
     type: Number,
     require: true,
@@ -24,9 +36,25 @@ const props = defineProps({
 });
 
 const mainTips = computed(() => {
-  const { drawData, activeIndex } = props as any;
-  // candlestickData: [开, 收, 低, 高, 昨收, 交易总额]
-  if (drawData.candlestickData && drawData.candlestickData[activeIndex]) {
+  const { drawData, activeIndex, candlestickData } = props as any;
+  if (candlestickData?.length && candlestickData[activeIndex]) {
+    // 新版传参 [开, 收, 低, 高, 成交额, 涨跌值, 涨跌百分比]
+    let diffColor;
+    if (candlestickData[activeIndex][6] > 0) {
+      diffColor = "red";
+    } else if (candlestickData[activeIndex][6] < 0) {
+      diffColor = "green";
+    }
+    return [
+      { label: "开", value: round(candlestickData[activeIndex][0]) },
+      { label: "高", value: round(candlestickData[activeIndex][3]) },
+      { label: "低", value: round(candlestickData[activeIndex][2]) },
+      { label: "收", value: round(candlestickData[activeIndex][1]) },
+      { label: "额", value: formatValue(candlestickData[activeIndex][4]) },
+      { label: "涨跌", value: `${round(candlestickData[activeIndex][6])}%`, color: diffColor }
+    ]
+  } else if (drawData.candlestickData && drawData.candlestickData[activeIndex]) {
+    // candlestickData: [开, 收, 低, 高, 昨收, 交易总额]
     const itemData = drawData.candlestickData[activeIndex];
     const result = [
       { label: "开", value: round(itemData[0]) },

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

@@ -268,7 +268,7 @@ const handleDeleteTag = (aciton, index) => {
         >
           <!-- 序列号 -->
           <span class="index">{{ `条件${index + 1}` }}</span>
-          <!-- 对比因子 -->
+          <!-- 对比因子: 分值因子 -->
           <template v-if="item.key === 'compare'">
             <!-- 周期 -->
             <el-form-item
@@ -304,7 +304,7 @@ const handleDeleteTag = (aciton, index) => {
                 no-match-text="无匹配数据"
               >
                 <el-option
-                  v-for="{ label, value } in config.factorOptions"
+                  v-for="{ label, value } in config.factorOptions?.filter((item) => [4].includes(item.type))"
                   :label="label"
                   :value="value"
                   :key="value"
@@ -359,7 +359,7 @@ const handleDeleteTag = (aciton, index) => {
                 no-match-text="无匹配数据"
               >
                 <el-option
-                  v-for="{ label, value } in config.factorOptions"
+                  v-for="{ label, value } in config.factorOptions?.filter((item) => [4].includes(item.type))"
                   :label="label"
                   :value="value"
                   :key="value"
@@ -367,7 +367,7 @@ const handleDeleteTag = (aciton, index) => {
               </el-select>
             </el-form-item>
           </template>
-          <!-- 常规因子 -->
+          <!-- 常规因子: 机器打分, 人工打分因子 -->
           <template v-else>
             <!-- 周期 -->
             <el-form-item
@@ -403,7 +403,7 @@ const handleDeleteTag = (aciton, index) => {
                 no-match-text="无匹配数据"
               >
                 <el-option
-                  v-for="{ label, value } in config.factorOptions"
+                  v-for="{ label, value } in config.factorOptions?.filter((item) => [1, 3].includes(item.type))"
                   :label="label"
                   :value="value"
                   :key="value"
@@ -496,10 +496,10 @@ const handleDeleteTag = (aciton, index) => {
       </template>
     </el-dialog>
   </div>
-  <!-- 因子说明 -->
+  <!-- 因子说明: 机器打分, 人工打分因子 -->
   <FactorDescription
     v-model:visible="visibleDescriptions"
-    :data="config.factorDescriptions"
+    :data="config.factorDescriptions?.filter((item) => [1, 3].includes(item.type))"
   />
 </template>
 

package/src/pages/VarietySearch/index.vue

@@ -62,8 +62,9 @@ const varietySearchConfig = ref({
     ],
     // 因子下拉框数据源
     factorOptions: [
-      { label: "因子一", value: 1 },
-      { label: "因子二", value: 2 },
+      { label: "机器打分", value: 1, type: 1 },
+      { label: "人工打分", value: 3, type: 3 },
+      { label: "分值因子", value: 4, type: 4 },
     ],
     // 因子使用说明数据源
     factorDescriptions: [],