haiwei-ui 1.0.8 → 1.0.91

package/package.json

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

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

@@ -9,6 +9,8 @@
       <slot name="toolbar" />
       <!--导出按钮-->
       <nm-button v-if="exportEnabled" icon="export" @click="onExportClick" v-nm-has="exportBtnCode" />
+      <!--导入按钮-->
+      <nm-button v-if="importEnabled" icon="import" @click="onImportClick" v-nm-has="importBtnCode" />
       <!--刷新按钮-->
       <nm-button v-if="!noRefresh" icon="refresh" @click="refresh" />
       <!--全屏按钮-->
@@ -33,7 +35,11 @@
       /**显示导出按钮 */
       exportEnabled: Boolean,
       /**导出按钮权限编码 */
-      exportBtnCode: String
+      exportBtnCode: String,
+      /**显示导入按钮 */
+      importEnabled: Boolean,
+      /**导入按钮权限编码 */
+      importBtnCode: String
     },
     methods: {
       query() {
@@ -51,6 +57,9 @@
       },
       onExportClick() {
         this.$parent.triggerExport()
+      },
+      onImportClick() {
+        this.$parent.triggerImport()
       }
     }
   }

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

@@ -190,7 +190,7 @@
     computed: {
       ...mapState('app/user', { token: 'token' }),
       uploadUrl() {
-        return `${this.$api.baseURL}/api/admin/excel/parseexcel`
+        return '/api/admin/excel/parseexcel'
       },
       headers() {
         return {
@@ -338,17 +338,23 @@
         formData.append('maxPreviewRows', this.model.maxPreviewRows)
         formData.append('skipEmptyRows', this.model.skipEmptyRows)
         
-        this.$api.post('/api/admin/excel/parseexcel', formData, {
-          headers: { 'Content-Type': 'multipart/form-data' }
-        })
+        // 使用axios直接发送请求，避免$api可能为undefined的问题
+        const config = {
+          headers: { 
+            'Content-Type': 'multipart/form-data',
+            'Authorization': `Bearer ${this.token}`
+          }
+        }
+        
+        this.$http.post('/api/admin/excel/parseexcel', formData, config)
         .then(response => {
-          if (response.successful) {
-            this.fileInfo = response.data.basicInfo
-            this.parseResult = response.data
+          if (response.data.successful) {
+            this.fileInfo = response.data.data.basicInfo
+            this.parseResult = response.data.data
             this.initColumnMapping()
             this._success('文件解析成功')
           } else {
-            this._error(response.msg || '文件解析失败')
+            this._error(response.data.msg || '文件解析失败')
           }
         })
         .catch(error => {

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

@@ -12,6 +12,9 @@
       <el-form-item v-if="exportEnabled" v-nm-has="exportBtnCode">
         <nm-button type="primary" @click="onExport" icon="export" text="导出" />
       </el-form-item>
+      <el-form-item v-if="importEnabled" v-nm-has="importBtnCode">
+        <nm-button type="primary" @click="onImport" icon="import" text="导入" />
+      </el-form-item>
       <el-form-item v-if="advanced_.enabled">
         <nm-button ref="showAdvnacedBtn" type="warning" @click="onAdvancedClick">
           高级查询
@@ -90,7 +93,11 @@
       /**显示导出按钮 */
       exportEnabled: Boolean,
       /**导出按钮权限编码 */
-      exportBtnCode: String
+      exportBtnCode: String,
+      /**显示导入按钮 */
+      importEnabled: Boolean,
+      /**导入按钮权限编码 */
+      importBtnCode: String
     },
     computed: {
       model_() {
@@ -186,6 +193,9 @@
       },
       onExport() {
         this.$parent.triggerExport()
+      },
+      onImport() {
+        this.$parent.triggerImport()
       }
     },
     mounted() {

package/packages/components/list/index.vue

@@ -1,14 +1,14 @@
 <template>
   <section :class="class_" v-loading="showLoading" :element-loading-text="loadingText || loadingText_" :element-loading-background="loadingBackground" :element-loading-spinner="loadingSpinner">
     <!--header-->
-    <query-header v-if="!noHeader" :title="title" :icon="icon" :no-fullscreen="noFullscreen" :fullscreen="fullscreen" :no-refresh="noRefresh" :export-enabled="exportOptions_.enabled && exportOptions_.btnLocation !== 'querybar'" :exportBtnCode="exportOptions_.btnCode">
+    <query-header v-if="!noHeader" :title="title" :icon="icon" :no-fullscreen="noFullscreen" :fullscreen="fullscreen" :no-refresh="noRefresh" :export-enabled="exportOptions_.enabled && exportOptions_.btnLocation !== 'querybar'" :exportBtnCode="exportOptions_.btnCode" :import-enabled="importOptions_.enabled && importOptions_.btnLocation !== 'querybar'" :importBtnCode="importOptions_.btnCode">
       <template v-slot:toolbar>
         <slot name="header-toolbar" :total="total" :selection="selection" />
       </template>
     </query-header>
 
     <!--查询栏-->
-    <querybar ref="querybar" v-if="!noQuerybar" :model="model" :rules="rules" :input-width="inputWidth" :advanced="advanced" :no-search="noSearch" :no-reset="noReset" :export-enabled="exportOptions_.enabled && exportOptions_.btnLocation === 'querybar'" :export-btn-code="exportOptions_.btnCode" @reset="onQueryBarReset">
+    <querybar ref="querybar" v-if="!noQuerybar" :model="model" :rules="rules" :input-width="inputWidth" :advanced="advanced" :no-search="noSearch" :no-reset="noReset" :export-enabled="exportOptions_.enabled && exportOptions_.btnLocation === 'querybar'" :export-btn-code="exportOptions_.btnCode" :import-enabled="importOptions_.enabled && importOptions_.btnLocation === 'querybar'" :import-btn-code="importOptions_.btnCode" @reset="onQueryBarReset">
       <template v-slot>
         <slot name="querybar" />
       </template>