st-comp 0.0.64 → 0.0.66

package/package.json

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

package/packages/Kline/componentsNew/KlineTips/index.vue

@@ -34,7 +34,7 @@ const mainTips = computed(() => {
       { label: "收", value: round(itemData[1]) },
     ];
     // 特殊: 交易总额
-    itemData[4] !== undefined && result.push({ label: "额", value: formatValue(itemData[4]) });
+    itemData[4] !== null && result.push({ label: "额", value: formatValue(itemData[4]) });
     // 特殊: 涨跌幅 公式:收盘价 - 昨收 / (昨收绝对值)
     let diffColor;
     if (itemData[6] > 0) {

package/packages/VarietySearch/config.js

@@ -416,7 +416,22 @@ export default {
           commonOptionIds: [11],
         },
         type: "custom",
-      }
+      },
+      // 持仓量
+      {
+        key: "optionGear",
+        label: "期权档位",
+        parent: {
+          varietyMarketIds: [8],
+          commonOptionIds: [11],
+        },
+        // 便捷选项
+        convenientOptions: [],
+        // 默认选中单位
+        defaultUnit: [],
+        // 单位下拉框选项
+        unitOptions: [],
+      },
     ],
   },
 };

package/packages/VarietySearch/index.vue

@@ -104,6 +104,7 @@ const formatData = (data) => {
     "volume",
     "openInterest",
     "optionsCpType",
+    "optionGear"
   ];
   // 1.常用指标-基本面( 表中 type: undefined 的指标, [期权]的常用指标不计入基本面)
   const query = data.commonIndicator.reduce((result, item) => {
@@ -206,6 +207,11 @@ const formatData = (data) => {
       case "optionsCpType":
         searchOptionDto.optionsCpType = item.optionsCpType;
         break;
+      // 期权档位
+      case "optionGear":
+        if (!["", null].includes(item.range[0])) searchOptionDto.minOptionGear = item.range[0];
+        if (!["", null].includes(item.range[1])) searchOptionDto.maxOptionGear = item.range[1];
+        break;
     }
   });
   if (Object.keys(searchOptionDto).length) {

package/src/pages/KlineNew/components/KlineNew/index.vue

@@ -97,8 +97,7 @@ onUnmounted(() => {
 const initChart = async () => {
   const { addCount } = config.value
   const res = await getKlineDataApi({
-    variety: props.code,
-    contractType: 0, // 合约类型 0-主连 1-加权
+    varietyCode: props.code,
     right: 1,
     cycle: 5,
     mainIndicator: props.mainIndicator,
@@ -162,7 +161,7 @@ const keyDownEvent = e => {
 const getMoreData = async(params) => {
   const { addCount, maxLoadCount } = config.value
   const res = await getKlineDataApi({
-    variety: props.code,
+    varietyCode: props.code,
     contractType: 0, // 合约类型 0-主连 1-加权
     right: 1,
     cycle: 5,

package/src/pages/KlineNew/components/KlineNew/utils.js

@@ -22,9 +22,9 @@ export const getKlineDataApi = async(params) => {
   const res = await axios({
     method: 'post',
     headers: {
-      token: '524164e2c6b6ae23bd25c690a7c6bf96',
+      token: 'c05386d92e7d18a59c5e74713d3e3a2d',
     },
-    url: 'http://127.0.0.1:7001/middleLayer/kline/getKline',
+    url: 'http://192.168.12.38:5173/middleLayer/kline/getKline',
     data: params,
   })
   return res.data.body

package/src/pages/KlineNew/components/KlineSlideNew/index.vue

@@ -75,7 +75,7 @@ watch(
       startTime: `${dayjs().subtract(defaultShowYears, 'year').format("YYYY-MM-DD")} 00:00:00`,
       endTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       cycle: '6',
-      variety: props.code,
+      varietyCode: props.code,
       contractType: 0, // 合约类型 0-主连 1-加权
       right: 1,
     })
@@ -115,7 +115,7 @@ onMounted(async () => {
       startTime: `${dayjs().subtract(defaultShowYears, 'year').format("YYYY-MM-DD")} 00:00:00`,
       endTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       cycle: '6',
-      variety: props.code,
+      varietyCode: props.code,
       contractType: 0, // 合约类型 0-主连 1-加权
       right: 1,
   })
@@ -240,7 +240,7 @@ const getMainData = async(startTime, endTime, isResetSlide = true) => {
     startTime: loadStartTime,
     endTime: loadEndTime,
     cycle: props.freqId,
-    variety: props.code,
+    varietyCode: props.code,
     contractType: 0, // 合约类型 0-主连 1-加权
     right: 1,
     mainIndicator: props.mainIndicator,
@@ -265,7 +265,7 @@ const getMainData = async(startTime, endTime, isResetSlide = true) => {
 const getMoreData = async(params) => {
   const { maxShowDays } = config.value
   const res = await getKlineDataApi({
-    variety: props.code,
+    varietyCode: props.code,
     contractType: 0, // 合约类型 0-主连 1-加权
     right: 1,
     mainIndicator: props.mainIndicator,

package/src/pages/KlineNew/components/KlineSlideNew/utils.js

@@ -69,7 +69,7 @@ export const getKlineDataApi = async(params) => {
   const res = await axios({
     method: 'post',
     headers: {
-      token: '524164e2c6b6ae23bd25c690a7c6bf96',
+      token: '52b84e74121cbc1dca6808d2a2ea73d8',
     },
     url: 'http://127.0.0.1:7001/middleLayer/kline/getKline',
     data: params,

package/src/pages/KlineNew/index.vue

@@ -15,7 +15,7 @@
       <div style="height: calc(100vh - 64px - 40px - 40px - 40px - 16px - 32px)">
         <component
           :is="item.component"
-          :code="'RU'"
+          :code="'000002'"
           :freqId="freqId"
           :freqDict="freqOption"
           :mainIndicator="mainIndicator"
@@ -59,11 +59,11 @@ const tabsList = [
     name: "KlineNew",
     component: KlineNew,
   },
-  {
-    label: "新版拖动K线",
-    name: "KlineSlideNew",
-    component: KlineSlideNew,
-  },
+  // {
+  //   label: "新版拖动K线",
+  //   name: "KlineSlideNew",
+  //   component: KlineSlideNew,
+  // },
   // {
   //   label: "基础K线组件(条数限制)",
   //   name: "KlineBasic",
@@ -80,7 +80,7 @@ const tabsList = [
   //   component: KlineAction,
   // },
 ];
-const activeName = ref("KlineSlideNew");
+const activeName = ref("KlineNew");
 </script>
 
 <style lang="scss">

package/src/pages/VarietySearch/index.vue

@@ -3,7 +3,8 @@
     <st-varietySearch ref="varietySearchRef" v-model:searchData="varietySearchData" :config="varietySearchConfig" />
     <el-button @click="query">查询</el-button>
     <br/>
-    {{ formatData }}
+    <p>格式化后的查询参数:</p>
+    <p>{{ formatData }}</p>
   </div>
 </template>