haiwei-module-admin 1.0.7 → 1.0.9

package/package.json

@@ -2,13 +2,13 @@
   "id": 0,
   "name": "haiwei-module-admin",
   "code": "admin",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "haiwei前端Admin模块组件",
   "author": "Eric",
-  "license": "ISC",
+  "license": "ISC",  
   "main": "src/index.js",
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service lint && vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "cm": "rimraf node_modules",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "haiwei-skins-classics": "^1.0.2",
-    "haiwei-ui": "^1.0.7"
+    "haiwei-ui": "^1.0.8"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.4.4",

package/src/components/enum-text/index.vue

@@ -6,6 +6,9 @@
 </template>
 
 <script>
+// 全局缓存，避免重复请求相同的枚举
+const enumCache = new Map()
+
 export default {
   props: {
     /** 枚举值 */
@@ -24,10 +27,7 @@ export default {
       required: true
     },
     /** 所在库 */
-    libName: {
-      type: String,
-      default: ''
-    },
+    libName: String,
     /** 空值显示文本 */
     emptyText: {
       type: String,
@@ -56,7 +56,8 @@ export default {
   },
   data() {
     return {
-      enumList: []
+      enumList: [],
+      loading: false
     }
   },
   computed: {
@@ -68,11 +69,11 @@ export default {
       const enumItem = this.enumList.find(item => item.value == this.value)
       return enumItem ? enumItem.label : this.value
     },
-    
+
     showTag() {
       return this.useTag && this.value !== null && this.value !== undefined && this.value !== ''
     },
-    
+
     // 计算tag颜色类型
     computedTagType() {
       // 如果用户指定了tagType
@@ -81,14 +82,14 @@ export default {
         if (typeof this.tagType === 'string') {
           return this.tagType
         }
-        
+
         // 如果是对象，根据枚举值查找对应的颜色
         if (typeof this.tagType === 'object' && this.tagType !== null) {
           // 首先尝试精确匹配
           if (this.tagType[this.value] !== undefined) {
             return this.tagType[this.value]
           }
-          
+
           // 尝试数字匹配
           const numValue = Number(this.value)
           if (this.tagType[numValue] !== undefined) {
@@ -96,21 +97,21 @@ export default {
           }
         }
       }
-      
+
       // 如果没有指定或未找到匹配，根据枚举值自动计算
       if (this.value === null || this.value === undefined || this.value === '') {
         return 'info'
       }
-      
+
       // 将值转换为数字
       const numValue = Number(this.value)
-      
+
       // 简单的颜色映射
-      if (numValue === 0) return 'primary'   // 默认/初始状态
-      if (numValue === 1) return 'success'   // 成功/确认状态
-      if (numValue === 2) return 'warning'   // 警告状态
-      if (numValue === 3) return 'danger'    // 失败/错误状态
-      
+      if (numValue === 0) return 'primary' // 默认/初始状态
+      if (numValue === 1) return 'success' // 成功/确认状态
+      if (numValue === 2) return 'warning' // 警告状态
+      if (numValue === 3) return 'danger' // 失败/错误状态
+
       // 其他值使用循环颜色
       const colors = ['primary', 'success', 'warning', 'danger', 'info']
       return colors[numValue % colors.length] || 'info'
@@ -137,23 +138,44 @@ export default {
         return
       }
 
+      // 生成缓存键
+      const cacheKey = `${this.moduleCode}_${this.enumName}_${this.libName || ''}`
+
+      // 检查缓存
+      if (enumCache.has(cacheKey)) {
+        this.enumList = enumCache.get(cacheKey)
+        return
+      }
+
+      // 防止重复请求
+      if (this.loading) {
+        return
+      }
+
+      this.loading = true
+
       try {
         const { moduleCode, enumName, libName } = this
         const result = await $api.admin.tool.enumSelect({ moduleCode, enumName, libName })
-        
-        if (result && result.data) {
-          this.enumList = result.data
+
+        // API返回的是数组格式：[{label: '出仓', value: 0}, {label: '入仓', value: 1}]
+        if (result && Array.isArray(result)) {
+          this.enumList = result
+          // 缓存结果
+          enumCache.set(cacheKey, result)
         } else {
           this.enumList = []
         }
       } catch (error) {
         console.error('加载枚举列表失败:', error)
         this.enumList = []
+      } finally {
+        this.loading = false
       }
     }
   },
   mounted() {
-    this.loadEnumList()
+    // 移除mounted中的调用，由watch的immediate处理
   }
 }
 </script>

package/src/components/file-download/index.vue

@@ -59,6 +59,7 @@ export default {
         if (this.private) {
           $api.admin.file.download(this.url)
         } else {
+          console.log('=====>')
           //通过模拟a标签点击事件下载文件
           const link = document.createElement('a')
           link.href = this.url

package/src/components/file-preview/index copy.vue

@@ -1,12 +1,15 @@
 <template>
   <div class="file-preview">
-    <!-- 图片预览链接 -->
-    <a v-if="isImage" class="preview-link" @click="showPreviewDialog">
-      查看
-    </a>
+    <!-- 当fullPath有效时显示内容 -->
+    <template v-if="hasValidFullPath">
+      <!-- 图片预览链接 -->
+      <a v-if="isImage" class="preview-link" @click="showPreviewDialog">
+        查看
+      </a>
 
-    <!-- 非图片文件下载 -->
-    <nm-file-download v-else :url="downloadUrl" :private="isPrivate" :fileName="fileName" :text="downloadText" :icon="downloadIcon" :size="downloadSize" :type="downloadType" @click="onDownload" />
+      <!-- 非图片文件下载 -->
+      <nm-file-download v-else :url="downloadUrl" :private="isPrivate" :fileName="fileName" :text="downloadText" :icon="downloadIcon" :size="downloadSize" :type="downloadType" @click="onDownload" />
+    </template>
 
     <!-- 图片预览对话框 -->
     <nm-dialog
@@ -52,6 +55,18 @@
             <span class="icon">⟳</span>
             <span class="text">重置</span>
           </button>
+          <!-- 非图片文件下载 -->
+          <nm-file-download
+            v-if="hasValidFullPath"
+            :url="downloadUrl"
+            :private="isPrivate"
+            :fileName="fileName"
+            :text="downloadText"
+            :icon="downloadIcon"
+            :size="downloadSize"
+            :type="downloadType"
+            @click="onDownload"
+          />
         </div>
       </div>
     </nm-dialog>
@@ -63,9 +78,7 @@ export default {
   name: 'FilePreview',
   props: {
     fullPath: { type: String, required: true },
-    fileName: String,
     isPrivate: { type: Boolean, default: false },
-    ext: String,
     downloadText: { type: String, default: '下载' },
     downloadIcon: { type: String, default: 'download' },
     downloadSize: String,
@@ -101,10 +114,46 @@ export default {
   },
 
   computed: {
+    hasValidFullPath() {
+      // 检查fullPath是否有效：不为空且不是空字符串
+      if (!this.fullPath || this.fullPath.trim() === '') {
+        return false
+      }
+
+      // 检查是否是目录路径（以斜杠结尾）
+      if (this.fullPath.endsWith('/') || this.fullPath.endsWith('\\')) {
+        return false
+      }
+
+      // 检查是否有文件名（路径的最后一部分）
+      const path = this.fullPath.replace(/\\/g, '/')
+      const filename = path.split('/').pop()
+
+      // 文件名不能为空
+      if (!filename || filename.trim() === '') {
+        return false
+      }
+
+      return true
+    },
+
+    fileName() {
+      // 从fullPath中提取文件名
+      if (!this.fullPath) return ''
+      const path = this.fullPath.replace(/\\/g, '/')
+      const filename = path.split('/').pop()
+      return filename || ''
+    },
+
+    fileExt() {
+      // 从fullPath中提取文件扩展名
+      const filename = this.fileName
+      const dotIndex = filename.lastIndexOf('.')
+      return dotIndex > -1 ? filename.slice(dotIndex + 1).toLowerCase() : ''
+    },
+
     isImage() {
-      // return false;
-      const ext = this.ext || (this.fileName || '').split('.').pop() || ''
-      return this.imageExtensions.includes(ext.toLowerCase())
+      return this.imageExtensions.includes(this.fileExt)
     },
 
     downloadUrl() {
@@ -153,13 +202,6 @@ export default {
   },
 
   methods: {
-    getFileExtension() {
-      if (this.ext) return this.ext.toLowerCase()
-      const name = this.fileName || this.fullPath || ''
-      const dotIndex = name.lastIndexOf('.')
-      return dotIndex > -1 ? name.slice(dotIndex + 1).toLowerCase() : ''
-    },
-
     async getFileInfo() {
       if (!this.fullPath) return null
 

package/src/components/file-preview/index.vue

@@ -1,12 +1,15 @@
 <template>
   <div class="file-preview">
-    <!-- 图片预览链接 -->
-    <a v-if="isImage" class="preview-link" @click="showPreviewDialog">
-      查看
-    </a>
+    <!-- 当fullPath有效时显示内容 -->
+    <template v-if="hasValidFullPath">
+      <!-- 图片预览链接 -->
+      <a v-if="isImage" class="preview-link" @click="showPreviewDialog">
+        查看
+      </a>
 
-    <!-- 非图片文件下载 -->
-    <nm-file-download v-else :url="downloadUrl" :private="isPrivate" :fileName="fileName" :text="downloadText" :icon="downloadIcon" :size="downloadSize" :type="downloadType" @click="onDownload" />
+      <!-- 非图片文件下载 -->
+      <nm-file-download v-else :url="downloadUrl" :private="isPrivate" :fileName="fileName" :text="downloadText" :icon="downloadIcon" :size="downloadSize" :type="downloadType" @click="onDownload" />
+    </template>
 
     <!-- 图片预览对话框 -->
     <nm-dialog
@@ -53,8 +56,17 @@
             <span class="text">重置</span>
           </button>
           <!-- 非图片文件下载 -->
-         <nm-file-download  :url="downloadUrl" :private="isPrivate" :fileName="fileName" :text="downloadText" :icon="downloadIcon" :size="downloadSize" :type="downloadType" @click="onDownload" />
-
+          <nm-file-download
+            v-if="hasValidFullPath"
+            :url="downloadUrl"
+            :private="isPrivate"
+            :fileName="fileName"
+            :text="downloadText"
+            :icon="downloadIcon"
+            :size="downloadSize"
+            :type="downloadType"
+            @click="onDownload"
+          />
         </div>
       </div>
     </nm-dialog>
@@ -66,9 +78,7 @@ export default {
   name: 'FilePreview',
   props: {
     fullPath: { type: String, required: true },
-    fileName: String,
     isPrivate: { type: Boolean, default: false },
-    ext: String,
     downloadText: { type: String, default: '下载' },
     downloadIcon: { type: String, default: 'download' },
     downloadSize: String,
@@ -104,10 +114,46 @@ export default {
   },
 
   computed: {
+    hasValidFullPath() {
+      // 检查fullPath是否有效：不为空且不是空字符串
+      if (!this.fullPath || this.fullPath.trim() === '') {
+        return false
+      }
+
+      // 检查是否是目录路径（以斜杠结尾）
+      if (this.fullPath.endsWith('/') || this.fullPath.endsWith('\\')) {
+        return false
+      }
+
+      // 检查是否有文件名（路径的最后一部分）
+      const path = this.fullPath.replace(/\\/g, '/')
+      const filename = path.split('/').pop()
+
+      // 文件名不能为空
+      if (!filename || filename.trim() === '') {
+        return false
+      }
+
+      return true
+    },
+
+    fileName() {
+      // 从fullPath中提取文件名
+      if (!this.fullPath) return ''
+      const path = this.fullPath.replace(/\\/g, '/')
+      const filename = path.split('/').pop()
+      return filename || ''
+    },
+
+    fileExt() {
+      // 从fullPath中提取文件扩展名
+      const filename = this.fileName
+      const dotIndex = filename.lastIndexOf('.')
+      return dotIndex > -1 ? filename.slice(dotIndex + 1).toLowerCase() : ''
+    },
+
     isImage() {
-      // return false;
-      const ext = this.ext || (this.fileName || '').split('.').pop() || ''
-      return this.imageExtensions.includes(ext.toLowerCase())
+      return this.imageExtensions.includes(this.fileExt)
     },
 
     downloadUrl() {
@@ -156,13 +202,6 @@ export default {
   },
 
   methods: {
-    getFileExtension() {
-      if (this.ext) return this.ext.toLowerCase()
-      const name = this.fileName || this.fullPath || ''
-      const dotIndex = name.lastIndexOf('.')
-      return dotIndex > -1 ? name.slice(dotIndex + 1).toLowerCase() : ''
-    },
-
     async getFileInfo() {
       if (!this.fullPath) return null
 

package/src/views/file/index/index.vue

@@ -36,7 +36,7 @@
 
       <!-- 文件预览列 -->
       <template v-slot:col-fullPath="{ row }">
-        <nm-file-preview :fullPath="row.fullPath" :fileName="row.fileName" :ext="row.ext" :isPrivate="row.accessMode !== 1" />
+        <nm-file-preview :fullPath="row.fullPath" :isPrivate="row.accessMode !== 1" />
         <!-- <nm-file-preview :fullPath="row.fullPath"/> -->
       </template>