st-comp 0.0.61 → 0.0.62

package/package.json

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

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

@@ -185,7 +185,7 @@ const submitDialog = () => {
     // 校验
     if (optionsCpType === null) return ElMessage.warning("格式错误: 请至少选择一个值");
     // 格式化文案
-    indicatorValue.value.tagText = `${label}: ${optionsCpType ? "看涨" : "看跌"}`;
+    indicatorValue.value.tagText = `${label}: ${optionsCpType === 1 ? "看涨" : "看跌"}`;
   }
   // 判断data中是否已存在同样key的数据, 如果存在则替换, 如果不存在就push
   const keyIndex = data.value.findIndex(({ key }) => key === indicatorValue.value.key);
@@ -310,7 +310,7 @@ const editTag = (item) => {
         <div v-if="nowIndicator.key === 'optionsCpType'">
           <el-radio-group v-model="indicatorValue.optionsCpType">
             <el-radio :label="1">看涨</el-radio>
-            <el-radio :label="0">看跌</el-radio>
+            <el-radio :label="2">看跌</el-radio>
           </el-radio-group>
         </div>
       </template>

package/packages/VarietySearch/index.vue

@@ -164,8 +164,8 @@ const formatData = (data) => {
     switch (key) {
       // 过期时间
       case "expireDays":
-        searchOptionDto.minExpireDays = item.range[0];
-        searchOptionDto.maxExpireDays = item.range[1];
+        if (!["", null].includes(item.range[0])) searchOptionDto.minExpireDays = item.range[0];
+        if (!["", null].includes(item.range[1])) searchOptionDto.maxExpireDays = item.range[1];
         break;
       // 虚实度
       case "virtualRealDegree":
@@ -184,8 +184,8 @@ const formatData = (data) => {
         break;
       // 杠杆率
       case "levelMultiplier":
-        searchOptionDto.minLevelMultiplier = item.range[0];
-        searchOptionDto.maxLevelMultiplier = item.range[1];
+        if (!["", null].includes(item.range[0])) searchOptionDto.minLevelMultiplier = item.range[0];
+        if (!["", null].includes(item.range[1])) searchOptionDto.maxLevelMultiplier = item.range[1];
         break;
       // 成交额(期权)
       case "turnover":
@@ -194,13 +194,13 @@ const formatData = (data) => {
         break;
       // 成交量
       case "volume":
-        searchOptionDto.minVolume = item.range[0];
-        searchOptionDto.maxVolume = item.range[1];
+        if (!["", null].includes(item.range[0])) searchOptionDto.minVolume = item.range[0];
+        if (!["", null].includes(item.range[1])) searchOptionDto.maxVolume = item.range[1];
         break;
       // 持仓量
       case "openInterest":
-        searchOptionDto.minOpenInterest = item.range[0];
-        searchOptionDto.maxOpenInterest = item.range[1];
+        if (!["", null].includes(item.range[0])) searchOptionDto.minOpenInterest = item.range[0];
+        if (!["", null].includes(item.range[1])) searchOptionDto.maxOpenInterest = item.range[1];
         break;
       // 认沽认购
       case "optionsCpType":

package/src/pages/VarietySearch/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div style="width: 100%; height: 100%">
     <st-varietySearch ref="varietySearchRef" v-model:searchData="varietySearchData" :config="varietySearchConfig" />
+    <el-button @click="query">查询</el-button>
+    <br/>
+    {{ formatData }}
   </div>
 </template>
 
@@ -51,6 +54,15 @@ const varietySearchConfig = ref({
     show: true,
   },
 });
+
+const formatData = ref(null)
+
+const query = () => {
+  console.log(varietySearchData.value)
+  const res = varietySearchRef.value.formatData(varietySearchData.value)
+  console.log(res)
+  formatData.value = res
+}
 </script>
 
 <style lang="scss" scoped></style>