st-comp 0.0.171 → 0.0.172

package/package.json

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

package/packages/KlinePlus/components/SliderChart.vue

@@ -19,9 +19,9 @@ const props = defineProps({
   // 品种市场类型: 0-期货, 1-股票, 2-期权
   varietyStock: { type: Number, required: true },
   // 复权选项 [股票]
-  rightType: { type: Number, required: true },
+  rightType: { type: [Number, null], default: null },
   // 常用选项 [期货]
-  klineType: { type: Number, required: true },
+  klineType: { type: [Number, null], default: null },
 
   // 业务系统相关
   deleteFirstNumber: { type: Number, default: 1 }, // 绩效标记
@@ -39,28 +39,13 @@ const getData = async () => {
   const params = {
     varietyCode: props.varietyCode,
     cycle: "6",
+    right: props.varietyStock === 1 ? props.rightType : 0, // 复权方式
+    contractType: props.varietyStock ? null : props.klineType, // 合约类型
     startTime: "1999-01-01 00:00:00",
     endTime: dayjs().format("YYYY-MM-DD 23:59:59"),
     deleteFirstNumber: props.deleteFirstNumber,
     withoutPermission: props.withoutPermission,
   };
-  // 参数加工
-  switch (props.varietyStock) {
-    // 期货
-    case 0: {
-      Object.assign(params, {
-        contractType: props.klineType,
-      });
-      break;
-    }
-    // 股票
-    case 1: {
-      Object.assign(params, {
-        right: props.rightType,
-      });
-      break;
-    }
-  }
   const { body } = await request.post("/middleLayer/kline/getKline", params);
   if (body) {
     klineData.value = body;

package/packages/KlinePlus/index.vue

@@ -33,8 +33,8 @@ const props = defineProps({
   // 交互选项
   cycle: { type: String, required: true },
   sellBuy: { type: Number, default: 1 },
-  rightType: { type: Number, default: null }, // 复权类型
-  klineType: { type: Number, default: null }, // 合约类型
+  rightType: { type: [Number, null], default: null }, // 复权类型
+  klineType: { type: [Number, null], default: null }, // 合约类型
   incomeType: { type: Number, default: 0 }, // 收益计算类型 0-单利, 1-复利
   initTimeRange: { type: Array, required: true },
   mainIndicator: { type: String, required: true },
@@ -185,7 +185,7 @@ const getMainData = async ({ startTime, endTime }) => {
     const params = {
       varietyCode: props.varietyCode,
       cycle: props.cycle, // 周期
-      right: props.rightType, // 复权方式
+      right: props.varietyStock === 1 ? props.rightType : 0, // 复权方式
       contractType: props.varietyStock ? null : props.klineType, // 合约类型
       mainIndicatorList: props.indicatorStore.getIndicatorParams(props.mainIndicator),
       subIndicator: subIndicator.value,
@@ -248,7 +248,7 @@ const getMoreData = async (type) => {
       const params = {
         varietyCode: props.varietyCode,
         cycle: props.cycle,
-        right: props.rightType,
+        right: props.varietyStock === 1 ? props.rightType : 0, // 复权方式
         contractType: props.varietyStock ? null : props.klineType,
         endTime: klineData.value.time[0],
         limit: loadAddCount,
@@ -273,7 +273,7 @@ const getMoreData = async (type) => {
       const params = {
         varietyCode: props.varietyCode,
         cycle: props.cycle, // 周期
-        right: props.rightType, // 复权方式
+        right: props.varietyStock === 1 ? props.rightType : 0, // 复权方式
         contractType: props.varietyStock ? null : props.klineType, // 合约类型
         startTime: klineData.value.time[klineData.value.time.length - 1], // 开始时间
         limit: loadAddCount, // 查询K线数量