haiwei-module-admin 1.1.7 → 1.1.9

package/package.json

@@ -2,7 +2,7 @@
   "id": 0,
   "name": "haiwei-module-admin",
   "code": "admin",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "haiwei前端Admin模块组件",
   "author": "Eric",
   "license": "ISC",  
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "haiwei-skins-classics": "^1.0.7",
-    "haiwei-ui": "^1.2.7"
+    "haiwei-ui": "^1.4.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.4.4",

package/src/api/components/file.js

@@ -68,8 +68,7 @@ export default name => {
     // 如果提供了账户ID参数，则添加到请求中（仅在授权模式下需要）
     if (accounts) {
       formData.append('accounts', accounts)
-    }
-
+    } 
     // 发送POST请求到文件上传接口
     // 使用multipart/form-data内容类型，适合文件上传
     return $http.post(urls.upload, formData, {

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

@@ -24,7 +24,8 @@ export default {
   methods: {
     query() {
       const { moduleCode, enumName, libName } = this
-      return $api.admin.tool.enumSelect({ moduleCode, enumName, libName })
+      // 使用缓存方法获取枚举数据
+      return this.getEnumData(moduleCode, enumName, libName)
     }
   }
 }

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

@@ -24,7 +24,8 @@ export default {
   methods: {
     query() {
       const { moduleCode, enumName, libName } = this
-      return $api.admin.tool.enumSelect({ moduleCode, enumName, libName })
+      // 使用缓存方法获取枚举数据
+      return this.getEnumData(moduleCode, enumName, libName)
     }
   }
 }

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

@@ -24,7 +24,8 @@ export default {
   methods: {
     query() {
       const { moduleCode, enumName, libName } = this
-      return $api.admin.tool.enumSelect({ moduleCode, enumName, libName })
+      // 使用缓存方法获取枚举数据
+      return this.getEnumData(moduleCode, enumName, libName)
     }
   }
 }

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

@@ -6,10 +6,15 @@
 </template>
 
 <script>
-// 全局缓存，避免重复请求相同的枚举
-const enumCache = new Map()
+import { mixins } from 'haiwei-ui'
 
 export default {
+  mixins: [mixins.text],
+  data() {
+    return {
+      action: this.query
+    }
+  },
   props: {
     /** 枚举值 */
     value: {
@@ -54,24 +59,25 @@ export default {
       default: 'small'
     }
   },
-  data() {
-    return {
-      enumList: [],
-      loading: false
+  methods: {
+    query() {
+      const { moduleCode, enumName, libName } = this
+      // 使用缓存方法获取枚举数据
+      return this.getEnumData(moduleCode, enumName, libName)
     }
   },
   computed: {
     displayText() {
-      if (this.value === null || this.value === undefined || this.value === '') {
+      if (this.value_ === null || this.value_ === undefined || this.value_ === '') {
         return this.emptyText
       }
 
-      const enumItem = this.enumList.find(item => item.value == this.value)
-      return enumItem ? enumItem.label : this.value
+      const enumItem = this.options.find(item => item.value == this.value_)
+      return enumItem ? enumItem.label : this.value_
     },
 
     showTag() {
-      return this.useTag && this.value !== null && this.value !== undefined && this.value !== ''
+      return this.useTag && this.value_ !== null && this.value_ !== undefined && this.value_ !== ''
     },
 
     // 计算tag颜色类型
@@ -86,12 +92,12 @@ export default {
         // 如果是对象，根据枚举值查找对应的颜色
         if (typeof this.tagType === 'object' && this.tagType !== null) {
           // 首先尝试精确匹配
-          if (this.tagType[this.value] !== undefined) {
-            return this.tagType[this.value]
+          if (this.tagType[this.value_] !== undefined) {
+            return this.tagType[this.value_]
           }
 
           // 尝试数字匹配
-          const numValue = Number(this.value)
+          const numValue = Number(this.value_)
           if (this.tagType[numValue] !== undefined) {
             return this.tagType[numValue]
           }
@@ -99,12 +105,12 @@ export default {
       }
 
       // 如果没有指定或未找到匹配，根据枚举值自动计算
-      if (this.value === null || this.value === undefined || this.value === '') {
+      if (this.value_ === null || this.value_ === undefined || this.value_ === '') {
         return 'info'
       }
 
       // 将值转换为数字
-      const numValue = Number(this.value)
+      const numValue = Number(this.value_)
 
       // 简单的颜色映射
       if (numValue === 0) return 'primary' // 默认/初始状态
@@ -120,62 +126,19 @@ export default {
   watch: {
     moduleCode: {
       immediate: true,
-      handler: 'loadEnumList'
+      handler: 'refresh'
     },
     enumName: {
       immediate: true,
-      handler: 'loadEnumList'
+      handler: 'refresh'
     },
     libName: {
       immediate: true,
-      handler: 'loadEnumList'
-    }
-  },
-  methods: {
-    async loadEnumList() {
-      if (!this.moduleCode || !this.enumName) {
-        this.enumList = []
-        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 })
-
-        // 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
-      }
+      handler: 'refresh'
+    },
+    value(val) {
+      if (val !== this.value_) this.value_ = val
     }
-  },
-  mounted() {
-    // 移除mounted中的调用，由watch的immediate处理
   }
 }
 </script>