st-comp 0.0.127 → 0.0.129

package/package.json

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

package/packages/KlineBasic/api.js

@@ -1,31 +1,31 @@
 import { initRequest, isLogin, getToken, loginout, getUserData } from "st-func";
 
-const env = { VITE_BASE_URL: 'http://127.0.0.1:7001' }
-
-const { get, post } = initRequest(env, {
-  handleReq: (request) => {
-    if (isLogin()) {
-      request.headers["token"] = getToken();
-    }
-  },
-  handleRes: (response) => {
-    const { data } = response;
-    // 登录失效
-    if (data.code === 401) {
-      if (location.origin.includes("localhost")) {
-        location.href = `${location.origin}/#/404`;
-      } else {
-        loginout();
+let get = null;
+let post = null;
+
+export const initRequestByEnv = (env) => {
+  const requestFn = initRequest(env, {
+    handleReq: (request) => {
+      if (isLogin()) {
+        request.headers["token"] = getToken();
       }
-      return true;
-    }
-  },
-  timeout: 20 * 60 * 1000,
-});
-
-
-const token = getToken();
-const host = "http://127.0.0.1:7001";
+    },
+    handleRes: (response) => {
+      const { data } = response;
+      // 登录失效
+      if (data.code === 401) {
+        if (location.origin.includes("localhost")) {
+          location.href = `${location.origin}/#/404`;
+        } else {
+          loginout();
+        }
+        return true;
+      }
+    },
+  });
+  get = requestFn.get;
+  post = requestFn.post;
+}
 
 // 获取K线数据以及基础数据
 export const getKlineBasic = (data) => {

package/packages/KlineBasic/index.vue

@@ -84,7 +84,7 @@
 import { onMounted, onUnmounted, ref, watch, computed } from "vue"
 import * as echarts from "echarts"
 import dayjs from "dayjs"
-import { getKlineBasic, getKline, getWarningLine, addWarningLine, updateWarningLine, deleteWarningLine } from './api'
+import { initRequestByEnv, getKlineBasic, getKline, getWarningLine, addWarningLine, updateWarningLine, deleteWarningLine } from './api'
 import { addResizeListener } from 'st-func'
 import { getMainOptions, getWarningLineOptions } from './utils'
 import KlineTips from './components/KlineTips/index.vue'
@@ -149,6 +149,10 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   }, // 配置
+  env: {
+    type: Object,
+    default: () => ({})
+  }, // 环境变量
 })
 
 const isEmpty = ref(false) // 是否无数据
@@ -196,7 +200,7 @@ watch(
 )
 
 onMounted(() => {
-  console.log(import.meta.env)
+  initRequestByEnv(props.env)
   getMainData()
 })
 
@@ -308,7 +312,7 @@ const getMainData = async () => {
       params.limit = defaultShowCounts + addCounts
     } else {
       // 未传入时间，使用最新时间作为结束时间请求数据
-      params.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      params.endTime = dayjs().add(1, "hour").format('YYYY-MM-DD HH:mm:ss')
       params.limit = defaultShowCounts + addCounts
     }
     const res = await getKlineBasic(params)

package/src/pages/KlineBasic/api.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 
 const token = "490cdb08082fe518cdfa476bd53edc86";
-const host = "http://127.0.0.1:7001";
+const host = "http://192.168.12.38:5173";
 
 // 获取指标线配置
 export const getIndicator = async () => {

package/src/pages/KlineBasic/index.vue

@@ -32,6 +32,7 @@
         :mainIndicator="mainIndicator"
         :indicatorStore="indicatorStore"
         :config="config"
+        :env="{ VITE_BASE_URL: 'http://192.168.12.38:5173' }"
       />
     </div>
   </div>