st-comp 0.0.168 → 0.0.170

package/package.json

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

package/packages/KlineConfig/index.vue

@@ -8,6 +8,9 @@ const { request } = inject("stConfig"); // 组件库全局配置
 const emit = defineEmits("callBack");
 const props = defineProps({
   indicatorStore: { type: Object, default: () => ({}) }, // 指标配置Store
+  origin: { type: String, default: "server" }, // 数据来源: server服务器, local本地
+  // 如果server此项不用管, 如果local则使用此项
+  cycleOptions: { type: Array, default: () => [] },
 });
 
 const visible = ref(false);
@@ -23,25 +26,37 @@ const handleReset = () => {
 // 配置: 保存配置
 const handleSubmit = async () => {
   const json = JSON.stringify(form);
-  await request.post("/common/qt/updateUserConfig", { appId: 1, json });
+  if (props.origin === "server") {
+    await request.post("/common/qt/updateUserConfig", { appId: 1, json });
+  } else {
+    localStorage.setItem("userKlineConfig", json);
+  }
   emit("callBack", json);
   visible.value = false;
 };
-
 // 获取配置数据
 const getKlineConfig = async () => {
-  const { body } = await request.post("/common/qt/getUserConfig", { appId: 1 });
-  Object.assign(form, getDefaultUserKlineConfig(), body ? JSON.parse(body) : {});
+  if (props.origin === "server") {
+    const { body } = await request.post("/common/qt/getUserConfig", { appId: 1 });
+    Object.assign(form, getDefaultUserKlineConfig(), body ? JSON.parse(body) : {});
+  } else {
+    const body = localStorage.getItem("userKlineConfig");
+    Object.assign(form, getDefaultUserKlineConfig(), body ? JSON.parse(body) : {});
+  }
 };
 // 获取周期选项
 const getCycleOptions = async () => {
-  const { body } = await request.post("/common/qt/getDict", { dictIds: [1002] });
-  cycleOptions.value = body[1002].map((item) => {
-    return {
-      label: item.dictName,
-      value: item.dictCode,
-    };
-  });
+  if (props.origin === "server") {
+    const { body } = await request.post("/common/qt/getDict", { dictIds: [1002] });
+    cycleOptions.value = body[1002].map((item) => {
+      return {
+        label: item.dictName,
+        value: item.dictCode,
+      };
+    });
+  } else {
+    cycleOptions.value = props.cycleOptions;
+  }
 };
 
 onMounted(() => {

package/packages/KlinePlus/components/SliderChart.vue

@@ -22,6 +22,10 @@ const props = defineProps({
   rightType: { type: Number, required: true },
   // 常用选项 [期货]
   klineType: { type: Number, required: true },
+
+  // 业务系统相关
+  deleteFirstNumber: { type: Number, default: 1 }, // 绩效标记
+  withoutPermission: { type: Number, default: 0 }, // 三方标记(不需要token授权)
 });
 const klineData = ref({
   data: [], // <[开 收 低 高 成交额 涨跌值 涨跌百分比]>
@@ -37,7 +41,8 @@ const getData = async () => {
     cycle: "6",
     startTime: "1999-01-01 00:00:00",
     endTime: dayjs().format("YYYY-MM-DD 23:59:59"),
-    deleteFirstNumber: 1, // 后端要求标识
+    deleteFirstNumber: props.deleteFirstNumber,
+    withoutPermission: props.withoutPermission,
   };
   // 参数加工
   switch (props.varietyStock) {

package/packages/KlinePlus/index.vue

@@ -28,15 +28,18 @@ const props = defineProps({
   initTimeRange: { type: Array, required: true },
   mainIndicator: { type: String, required: true },
 
-  // 绘制数据: 成交
+  // 绘制数据
   tradeLog: { type: Array, default: () => [] }, // 成交数据
-  // 绘制数据: 净值
   netPositionData: { type: Array, default: () => [] }, // 净值数据
 
-  // 功能: 强制定位高亮(非必填)
+  // 强制定位高亮(非必填)
   positionTime: { type: [String, null], default: null },
-  // 功能: 同步刷选范围(非必填)
+  // 同步刷选范围(非必填)
   syncBrushRange: { type: Object, default: () => ({ cycleList: [], startTime: null, endTime: null }) },
+
+  // 业务系统相关
+  deleteFirstNumber: { type: Number, default: 1 }, // 绩效标记
+  withoutPermission: { type: Number, default: 0 }, // 三方标记(不需要token授权)
 });
 
 // 加载标记
@@ -174,7 +177,8 @@ const getMainData = async ({ startTime, endTime }) => {
       contractType: props.varietyStock ? null : props.klineType, // 合约类型
       mainIndicatorList: props.indicatorStore.getIndicatorParams(props.mainIndicator),
       subIndicator: subIndicator.value,
-      deleteFirstNumber: 1, // >> 重要: 绩效后端特殊要求传参 <<
+      deleteFirstNumber: props.deleteFirstNumber,
+      withoutPermission: props.withoutPermission,
     };
     // Echarts如果一屏如果正好展示了所有数据, 是无法缩放触发加载更多的
     // 所以在请求中需要对开始和结束时间进行延伸, 但是首屏的展示时间定位还是会以传入的开始结束时间为准
@@ -197,9 +201,24 @@ const getMainData = async ({ startTime, endTime }) => {
     const { body } = await request.post("/middleLayer/kline/getKline", params);
     klineData.value = body ?? { data: [], mainIndicator: [], subIndicator: [], time: [] };
 
-    // 绘制图表
-    const startValue = klineData.value.time.findIndex((item) => new Date(item) >= new Date(startTime));
-    const endValue = klineData.value.time.findIndex((item) => new Date(item) >= new Date(endTime));
+    // 找到匹配对应传入的开始, 结束时间的数据索引, 绘制图表
+    let startValue = -1;
+    let endValue = -1;
+    for (let index = 0; index < klineData.value.time.length; index++) {
+      const day = dayjs(klineData.value.time[index]).format("YYYY-MM-DD");
+      if (startValue !== -1 && endValue !== -1) break;
+      if (startValue === -1) {
+        if (new Date(day) === new Date(startTime)) startValue = index;
+        else if (new Date(day) > new Date(startTime)) startValue = index - 1;
+      }
+      if (endValue === -1) {
+        if (new Date(day) === new Date(endTime)) endValue = index;
+        else if (new Date(day) > new Date(endTime)) endValue = index - 1;
+      }
+    }
+    if (endValue === -1) endValue = klineData.value.time.length - 1;
+    // const startValue = klineData.value.time.findIndex((item) => new Date(item) >= new Date(startTime));
+    // const endValue = klineData.value.time.findIndex((item) => new Date(item) >= new Date(endTime));
     draw({
       startValue: startValue === -1 ? 0 : startValue,
       endValue: endValue === -1 ? klineData.value.time.length - 1 : endValue,
@@ -223,7 +242,8 @@ const getMoreData = async (type) => {
         limit: loadAddCount,
         mainIndicatorList: props.indicatorStore.getIndicatorParams(props.mainIndicator),
         subIndicator: subIndicator.value,
-        deleteFirstNumber: 1,
+        deleteFirstNumber: props.deleteFirstNumber,
+        withoutPermission: props.withoutPermission,
       };
       const { body } = await request.post("/middleLayer/kline/getKline", params);
       // 合并数据
@@ -245,9 +265,10 @@ const getMoreData = async (type) => {
         contractType: props.varietyStock ? null : props.klineType, // 合约类型
         startTime: klineData.value.time[klineData.value.time.length - 1], // 开始时间
         limit: loadAddCount, // 查询K线数量
-        deleteFirstNumber: 1, // >> 重要: 绩效后端特殊要求传参 <<
         mainIndicatorList: props.indicatorStore.getIndicatorParams(props.mainIndicator),
         subIndicator: subIndicator.value,
+        deleteFirstNumber: props.deleteFirstNumber,
+        withoutPermission: props.withoutPermission,
       };
       const { body } = await request.post("/middleLayer/kline/getKline", params);
       // 合并数据
@@ -688,6 +709,7 @@ watch(
       startTime: klineData.value.time[startValue],
       endTime: klineData.value.time[endValue],
       cycle: props.cycle,
+      type: "middle",
     });
     getMainData({ startTime, endTime });
   },
@@ -796,6 +818,8 @@ defineExpose({
           :varietyStock="varietyStock"
           :rightType="rightType"
           :klineType="klineType"
+          :deleteFirstNumber="props.deleteFirstNumber"
+          :withoutPermission="props.withoutPermission"
           @change="handleSliderChange"
         />
       </div>

package/packages/KlinePlus/utils.js

@@ -26,15 +26,32 @@ export const dayBarsNumByCycle = {
   8: 0.033, // 每月1根（按21个交易日算）
 };
 
-// 校验时间间隔, 避免开始和结束时间过大, 超过一屏根数上限
-export const checkTimeInterval = ({ startTime, endTime, cycle }) => {
+/**
+ * @description: 校验时间间隔, 避免开始和结束时间过大, 超过一屏根数上限
+ */
+export const checkTimeInterval = ({ startTime, endTime, cycle, type = "end" }) => {
   // 大切小时可能会出现请求超过一屏上限的数据量, 进行时间间隔校验, 由于是估算, 所以计算时可以比一屏上限根数多一些
   const { maxValueSpan } = loadKlineConfig;
   const N = Math.ceil((maxValueSpan + 1000) / dayBarsNumByCycle[cycle]);
   const d1 = dayjs(startTime);
   const d2 = dayjs(endTime);
   const diff = d2.diff(d1, "day");
-  return [diff <= N ? startTime : dayjs(endTime).subtract(N, "day").format("YYYY-MM-DD HH:mm:ss"), endTime];
+  // 未超出间隔, 返回原本的开始, 结束时间
+  if (diff <= N) return [startTime, endTime];
+  // 超出间隔, 按照期望以结束时间, 还是中间时间去计算
+  if (type === "end") return [dayjs(endTime).subtract(N, "day").format("YYYY-MM-DD HH:mm:ss"), endTime];
+  if (type === "middle") {
+    const middleTime = dayjs((dayjs(startTime).valueOf() + dayjs(endTime).valueOf()) / 2).format("YYYY-MM-DD HH:mm:ss");
+    console.log("超过一屏数量上限, 进行中间时间计算", middleTime, N / 2);
+    return [
+      dayjs(middleTime)
+        .subtract(N / 2, "day")
+        .format("YYYY-MM-DD HH:mm:ss"),
+      dayjs(middleTime)
+        .add(N / 2, "day")
+        .format("YYYY-MM-DD HH:mm:ss"),
+    ];
+  }
 };
 
 // 获取副图配置