haiwei-ui 1.0.94 → 1.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haiwei-ui",
-  "version": "1.0.94",
+  "version": "1.0.96",
   "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() {
@@ -201,8 +202,11 @@
         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() {
@@ -270,9 +274,24 @@
       
       /**上传成功 */
       onUploadSuccess(response, file, fileList) {
-        if (response.successful) {
+        // 检查响应格式
+        if (response && response.code === 1) {
           this.fileInfo = response.data.basicInfo
-          this.parseResult = response.data
+          this.parseResult = {
+            basicInfo: response.data.basicInfo,
+            columns: response.data.headers.map((header, index) => ({
+              name: `col${index}`,
+              label: header.name,
+              width: 120
+            })),
+            previewData: response.data.data.map(row => {
+              const obj = {}
+              response.data.headers.forEach((header, colIndex) => {
+                obj[`col${colIndex}`] = row[colIndex]
+              })
+              return obj
+            })
+          }
           this.initColumnMapping()
           this._success('文件上传成功')
         } else {
@@ -347,10 +366,13 @@
         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}`
           }
         }
         
@@ -364,9 +386,24 @@
         const path = 'admin/excel/parseexcel'.replace(/^\//, '')
         this.$http.post(baseURL + path, formData, config)
         .then(response => {
-          if (response.data.successful) {
+          // 检查响应格式
+          if (response.data && response.data.code === 1) {
             this.fileInfo = response.data.data.basicInfo
-            this.parseResult = response.data.data
+            this.parseResult = {
+              basicInfo: response.data.data.basicInfo,
+              columns: response.data.data.headers.map((header, index) => ({
+                name: `col${index}`,
+                label: header.name,
+                width: 120
+              })),
+              previewData: response.data.data.data.map(row => {
+                const obj = {}
+                response.data.data.headers.forEach((header, colIndex) => {
+                  obj[`col${colIndex}`] = row[colIndex]
+                })
+                return obj
+              })
+            }
             this.initColumnMapping()
             this._success('文件解析成功')
           } else {