haiwei-ui 1.0.93 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haiwei-ui",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "description": "HaiWei前端组件库",
   "author": "Eric",
   "license": "ISC",

package/packages/components/list/components/import/index.vue

@@ -149,6 +149,7 @@
 <script>
   import dialog from '../../../../mixins/components/dialog'
   import { mapState } from 'vuex'
+  import token from '../../../../utils/token'
   export default {
     mixins: [dialog],
     data() {
@@ -191,12 +192,21 @@
       ...mapState('app/user', { token: 'token' }),
       uploadUrl() {
         // 从axios默认配置中获取baseURL，如果不存在则使用全局变量或默认值
-        const baseURL = this.$http?.axios?.defaults?.baseURL || window.__HAIWEI_API_BASE_URL__ || '/api'
-        return `${baseURL}/admin/excel/parseexcel`
+        let baseURL = this.$http?.axios?.defaults?.baseURL || window.__HAIWEI_API_BASE_URL__ || '/api'
+        // 确保baseURL以斜杠结尾，但不要有双斜杠
+        if (!baseURL.endsWith('/')) {
+          baseURL += '/'
+        }
+        // 移除路径开头的斜杠，避免双斜杠
+        const path = 'admin/excel/parseexcel'.replace(/^\//, '')
+        return baseURL + path
       },
       headers() {
+        // 从token模块获取token
+        const t = token.get()
+        const accessToken = t && t.accessToken ? t.accessToken : ''
         return {
-          'Authorization': `Bearer ${this.token}`
+          'Authorization': `Bearer ${accessToken}`
         }
       },
       uploadData() {
@@ -341,16 +351,25 @@
         formData.append('skipEmptyRows', this.model.skipEmptyRows)
         
         // 使用axios直接发送请求，避免$api可能为undefined的问题
+        // 从token模块获取token
+        const t = token.get()
+        const accessToken = t && t.accessToken ? t.accessToken : ''
         const config = {
           headers: { 
             'Content-Type': 'multipart/form-data',
-            'Authorization': `Bearer ${this.token}`
+            'Authorization': `Bearer ${accessToken}`
           }
         }
         
         // 使用与uploadUrl相同的逻辑获取API基础URL
-        const baseURL = this.$http?.axios?.defaults?.baseURL || window.__HAIWEI_API_BASE_URL__ || '/api'
-        this.$http.post(`${baseURL}/admin/excel/parseexcel`, formData, config)
+        let baseURL = this.$http?.axios?.defaults?.baseURL || window.__HAIWEI_API_BASE_URL__ || '/api'
+        // 确保baseURL以斜杠结尾，但不要有双斜杠
+        if (!baseURL.endsWith('/')) {
+          baseURL += '/'
+        }
+        // 移除路径开头的斜杠，避免双斜杠
+        const path = 'admin/excel/parseexcel'.replace(/^\//, '')
+        this.$http.post(baseURL + path, formData, config)
         .then(response => {
           if (response.data.successful) {
             this.fileInfo = response.data.data.basicInfo