st-comp 0.0.63 → 0.0.65

package/package.json

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

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

@@ -116,7 +116,7 @@ defineExpose({
               if (item.seriesColor === 'kline') {
                 return {
                   value: val,
-                  itemStyle: getSubBarStyle(props.data.kline, index),
+                  itemStyle: getSubBarStyle(props.data.data, index),
                 }
               } else if (item.seriesColor === 'value') {
                 return {

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

@@ -25,8 +25,8 @@ const props = defineProps({
 
 const mainTips = computed(() => {
   const { data, activeIndex } = props;
-  if (data.kline && data.kline[activeIndex]) {
-    const itemData = data.kline[activeIndex];
+  if (data.data && data.data[activeIndex]) {
+    const itemData = data.data[activeIndex];
     const result = [
       { label: "开", value: round(itemData[0]) },
       { label: "高", value: round(itemData[3]) },
@@ -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/Kline/componentsNew/KlineUtils/index.vue

@@ -43,7 +43,7 @@ defineExpose({
   mergeData: (leftData, rightData) => {
     return {
       time: [ ...leftData.time, ...rightData.time.slice(1)],
-      kline: [ ...leftData.kline, ...rightData.kline.slice(1)],
+      data: [ ...leftData.data, ...rightData.data.slice(1)],
       mainIndicator: leftData.mainIndicator.map((item, index) => ({
         ...item,
         data: [ ...item.data, ...rightData.mainIndicator[index].data.slice(1) ]

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,
@@ -192,7 +191,7 @@ const draw = (type, params = {}) => {
   const { startValue, endValue, maxValueSpan } = params
   const callBackMap = new Map([
     [ "main", () => {
-      const { kline, time } = klineData.value
+      const { data, time } = klineData.value
       const indicatorSeries = klineData.value.mainIndicator.map((item) => {
         return {
           name: item.key,
@@ -270,7 +269,7 @@ const draw = (type, params = {}) => {
         series: [
           {
             type: 'candlestick',
-            data: kline,
+            data,
             itemStyle: {
               color: "transparent",
               color0: "#00FFFF",

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: '3a9677a2bee56b14179b88d7c62d9db8',
+      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,11 +115,11 @@ 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,
   })
-  slideData.value = res.time.map((item, index) => [item, res.kline[index][2]])
+  slideData.value = res.time.map((item, index) => [item, res.data[index][2]])
   await getMainData(
     `${slideData.value[slideData.value.length - 1 - defaultShowDays][0].split(' ')[0]} 00:00:00`,
     `${slideData.value[slideData.value.length - 1][0].split(' ')[0]} 24:00:00`
@@ -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,
@@ -383,7 +383,7 @@ const draw = (type, params = {}) => {
         series: [
           {
             type: 'candlestick',
-            data: klineData.value.kline,
+            data: klineData.value.data,
             itemStyle: {
               color: "transparent",
               color0: "#00FFFF",

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: '3a9677a2bee56b14179b88d7c62d9db8',
+      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"
@@ -54,17 +54,17 @@ const chartMode = ref("价差分布图");
 const chartModeList = ["二腿价格走势图", "二腿价格走势百分比图", "二腿相关度", "价差周期性", "价差分布图"];
 
 const tabsList = [
-  // {
-  //   label: "新版K线",
-  //   name: "KlineNew",
-  //   component: KlineNew,
-  // },
   {
-    label: "新版拖动K线",
-    name: "KlineSlideNew",
-    component: KlineSlideNew,
+    label: "新版K线",
+    name: "KlineNew",
+    component: KlineNew,
   },
   // {
+  //   label: "新版拖动K线",
+  //   name: "KlineSlideNew",
+  //   component: KlineSlideNew,
+  // },
+  // {
   //   label: "基础K线组件(条数限制)",
   //   name: "KlineBasic",
   //   component: KlineBasic,
@@ -80,7 +80,7 @@ const tabsList = [
   //   component: KlineAction,
   // },
 ];
-const activeName = ref("KlineSlideNew");
+const activeName = ref("KlineNew");
 </script>
 
 <style lang="scss">