haiwei-ui 1.3.7 → 1.4.0

package/package.json

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

package/packages/components/form/index.vue

@@ -68,11 +68,8 @@ export default {
     /** 提交 */
     submit() {
       this.validate(() => {
-        this.openLoading()
-        console.log('this.model======>', this.model);
-        // 使用深拷贝确保获取最新数据
-        const formData = JSON.parse(JSON.stringify(this.model))
-        console.log('this.model======>formData', formData);
+        this.openLoading()        
+       
         this.action(this.model)
           .then(data => {
             if (this.successMsg === true) {

package/packages/components/form-dialog/index.vue

@@ -150,35 +150,12 @@ export default {
     }
   },
   methods: {
-    /** 提交 */
     async submit() {
       // 设置loading状态
-      this.loading_ = true
-
-      // 触发 before-submit 钩子
-      if (this.$listeners['before-submit']) {
-        try {
-          // 执行 before-submit 钩子并等待结果
-          // 注意：这里不传递model参数，父组件应该直接修改this.model
-          const result = await this.$emit('before-submit')
-          
-          // 如果返回false，停止提交
-          if (result === false) {
-            this.loading_ = false
-            return
-          }
-          // 返回true或undefined则继续提交
-        } catch (error) {
-          this.loading_ = false
-          this.$emit('error', error)
-          return
-        }
-      }
-
-      console.log('test',this.model)
-      // 继续原有提交逻辑
+      this.loading_ = true       
       this.$refs.form.submit()
     },
+
     /** 重置 */
     reset() {
       this.$nextTick(() => {

package/packages/components/toolbar/components/userInfo/index.vue

@@ -12,6 +12,9 @@
         <el-dropdown-item>
           <nm-button type="text" text="修改密码" icon="password" @click="updatePassword.visiable = true" />
         </el-dropdown-item>
+        <el-dropdown-item divided>
+          <nm-button type="text" text="清理缓存" icon="delete" @click="clearCache" />
+        </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 
@@ -38,6 +41,29 @@
     methods: {
       openUserInfo() {
         this.$router.push({ name: this.userPage, query: { tn_: '账户信息' } })
+      },
+      clearCache() {
+        this.$confirm('确定要清理所有枚举缓存吗？清理后所有枚举数据将重新从服务器获取。', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 调用全局的缓存清理方法
+          if (this.$clearAllEnumCache) {
+            this.$clearAllEnumCache()
+            this.$message.success('缓存清理成功')
+            
+            // 可以添加统计信息显示
+            const stats = this.$getCacheStats ? this.$getCacheStats() : null
+            if (stats) {
+              console.log('缓存统计:', stats)
+            }
+          } else {
+            this.$message.warning('缓存清理功能未启用')
+          }
+        }).catch(() => {
+          // 用户取消操作
+        })
       }
     }
   }

package/packages/mixins/components/checkbox.vue

@@ -56,14 +56,27 @@
     methods: {
       refresh() {
         this.loading = true
-        this.action()
-          .then(options => {
-            this.options = options
-            this.loading = false
-          })
-          .catch(() => {
-            this.loading = false
-          })
+        // 如果是枚举组件，使用缓存方法
+        if (this.moduleCode && this.enumName) {
+          this.getEnumData(this.moduleCode, this.enumName, this.libName)
+            .then(options => {
+              this.options = options
+              this.loading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        } else {
+          // 非枚举组件，使用原来的action方法
+          this.action()
+            .then(options => {
+              this.options = options
+              this.loading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        }
       },
       // 清楚已选项
       clear() {

package/packages/mixins/components/loading.js

@@ -1,4 +1,124 @@
+/* eslint-disable no-undef */
 import { mapState } from 'vuex'
+
+// 枚举数据缓存
+const enumCache = new Map()
+const pendingRequests = new Map()
+
+// 缓存统计
+let cacheStats = {
+  hits: 0,
+  misses: 0,
+  size: 0
+}
+
+// 更新缓存统计
+function updateCacheStats() {
+  cacheStats.size = enumCache.size
+}
+
+// 全局缓存管理方法
+const cacheManager = {
+  /**
+   * 获取枚举数据（带缓存）
+   * @param {string} moduleCode 模块编码
+   * @param {string} enumName 枚举名称
+   * @param {string} libName 库名称
+   * @returns {Promise<Array>} 枚举数据
+   */
+  async getEnumData(moduleCode, enumName, libName = '') {
+    const cacheKey = `${moduleCode}_${enumName}_${libName}`
+    
+    // 检查缓存
+    if (enumCache.has(cacheKey)) {
+      cacheStats.hits++
+      updateCacheStats()
+      return Promise.resolve(enumCache.get(cacheKey))
+    }
+    
+    cacheStats.misses++
+    
+    // 检查正在进行的请求
+    if (pendingRequests.has(cacheKey)) {
+      return pendingRequests.get(cacheKey)
+    }
+    
+    // 发起新请求
+    const requestPromise = cacheManager._getEnumApiRequest(moduleCode, enumName, libName)
+      .then(result => {
+        if (result && Array.isArray(result)) {
+          enumCache.set(cacheKey, result)
+          updateCacheStats()
+        }
+        return result || []
+      }).finally(() => {
+        pendingRequests.delete(cacheKey)
+      })
+    
+    pendingRequests.set(cacheKey, requestPromise)
+    return requestPromise
+  },
+  
+  /**
+   * 获取枚举API请求（可被子类重写）
+   * @param {string} moduleCode 模块编码
+   * @param {string} enumName 枚举名称
+   * @param {string} libName 库名称
+   * @returns {Promise<Array>} 枚举数据
+   */
+  _getEnumApiRequest(moduleCode, enumName, libName = '') {
+    // 默认使用全局$api，如果不存在则返回空数组
+    if (typeof $api !== 'undefined' && $api.admin && $api.admin.tool && $api.admin.tool.enumSelect) {
+      return $api.admin.tool.enumSelect({ moduleCode, enumName, libName })
+    }
+    return Promise.resolve([])
+  },
+  
+  /**
+   * 清除枚举缓存
+   * @param {string} moduleCode 模块编码
+   * @param {string} enumName 枚举名称
+   * @param {string} libName 库名称
+   */
+  clearEnumCache(moduleCode, enumName, libName = '') {
+    const cacheKey = `${moduleCode}_${enumName}_${libName}`
+    enumCache.delete(cacheKey)
+    updateCacheStats()
+  },
+  
+  /**
+   * 清除所有枚举缓存
+   */
+  clearAllEnumCache() {
+    enumCache.clear()
+    pendingRequests.clear()
+    cacheStats.hits = 0
+    cacheStats.misses = 0
+    cacheStats.size = 0
+  },
+  
+  /**
+   * 获取缓存统计信息
+   * @returns {Object} 缓存统计
+   */
+  getCacheStats() {
+    return {
+      ...cacheStats,
+      hitRate: cacheStats.hits + cacheStats.misses > 0 
+        ? (cacheStats.hits / (cacheStats.hits + cacheStats.misses) * 100).toFixed(2) + '%'
+        : '0%'
+    }
+  },
+  
+  /**
+   * 获取所有缓存键
+   * @returns {Array} 缓存键列表
+   */
+  getCacheKeys() {
+    return Array.from(enumCache.keys())
+  }
+}
+
 export default {
   computed: {
     ...mapState('app/loading', {
@@ -15,6 +135,54 @@ export default {
         spinner: this.loadingSpinner,
         background: this.loadingBackground
       })
+    },
+    
+    /**
+     * 获取枚举数据（带缓存）
+     * @param {string} moduleCode 模块编码
+     * @param {string} enumName 枚举名称
+     * @param {string} libName 库名称
+     * @returns {Promise<Array>} 枚举数据
+     */
+    async getEnumData(moduleCode, enumName, libName = '') {
+      return cacheManager.getEnumData(moduleCode, enumName, libName)
+    },
+    
+    /**
+     * 清除枚举缓存
+     * @param {string} moduleCode 模块编码
+     * @param {string} enumName 枚举名称
+     * @param {string} libName 库名称
+     */
+    clearEnumCache(moduleCode, enumName, libName = '') {
+      cacheManager.clearEnumCache(moduleCode, enumName, libName)
+    },
+    
+    /**
+     * 清除所有枚举缓存
+     */
+    clearAllEnumCache() {
+      cacheManager.clearAllEnumCache()
+    },
+    
+    /**
+     * 获取缓存统计信息
+     * @returns {Object} 缓存统计
+     */
+    getCacheStats() {
+      return cacheManager.getCacheStats()
     }
   }
 }
+
+// 安装全局缓存管理方法
+export function installCacheManager(Vue) {
+  // 将缓存管理方法添加到Vue原型
+  Vue.prototype.$clearAllEnumCache = cacheManager.clearAllEnumCache
+  Vue.prototype.$clearEnumCache = cacheManager.clearEnumCache
+  Vue.prototype.$getCacheStats = cacheManager.getCacheStats
+  Vue.prototype.$getCacheKeys = cacheManager.getCacheKeys
+  
+  // 将缓存管理器暴露给全局
+  window.$enumCacheManager = cacheManager
+}

package/packages/mixins/components/radio.vue

@@ -44,17 +44,33 @@
     methods: {
       refresh() {
         this.loading = true
-        this.action()
-          .then(data => {
-            this.options = data
-            if (data.length > 0 && this.checkedFirst) {
-              this.onChange(data[0].value)
-            }
-            this.loading = false
-          })
-          .catch(() => {
-            this.loading = false
-          })
+        // 如果是枚举组件，使用缓存方法
+        if (this.moduleCode && this.enumName) {
+          this.getEnumData(this.moduleCode, this.enumName, this.libName)
+            .then(data => {
+              this.options = data
+              if (data.length > 0 && this.checkedFirst) {
+                this.onChange(data[0].value)
+              }
+              this.loading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        } else {
+          // 非枚举组件，使用原来的action方法
+          this.action()
+            .then(data => {
+              this.options = data
+              if (data.length > 0 && this.checkedFirst) {
+                this.onChange(data[0].value)
+              }
+              this.loading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        }
       },
       onChange(val) {
         this.value_ = val

package/packages/mixins/components/select.js

@@ -100,25 +100,54 @@ export default {
       if (this.filterable && this.remote) return
 
       this.loading = true
-      this.action().then(options => {
-        this.options = options
-        this.loading = false
+      
+      // 如果是枚举组件，使用缓存方法
+      if (this.moduleCode && this.enumName) {
+        this.getEnumData(this.moduleCode, this.enumName, this.libName)
+          .then(options => {
+            this.options = options
+            this.loading = false
 
-        // 检查当前值是否在新加载的选项中
-        if (this.value_ && options.length > 0) {
-          const found = this.findOptionByValue(this.value_)
-          if (found) {
-            console.log('【nm-select】refresh后找到匹配选项:', found.label, '->', found.value)
-          } else {
-            console.warn('【nm-select】refresh后未找到匹配选项，当前值:', this.value_)
+            // 检查当前值是否在新加载的选项中
+            if (this.value_ && options.length > 0) {
+              const found = this.findOptionByValue(this.value_)
+              if (found) {
+                console.log('【nm-select】refresh后找到匹配选项:', found.label, '->', found.value)
+              } else {
+                console.warn('【nm-select】refresh后未找到匹配选项，当前值:', this.value_)
+              }
+            }
+
+            if (this.checkedFirst && !this.hasInit && options.length > 0) {
+              this.onChange(options[0].value)
+              this.hasInit = true
+            }
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      } else {
+        // 非枚举组件，使用原来的action方法
+        this.action().then(options => {
+          this.options = options
+          this.loading = false
+
+          // 检查当前值是否在新加载的选项中
+          if (this.value_ && options.length > 0) {
+            const found = this.findOptionByValue(this.value_)
+            if (found) {
+              console.log('【nm-select】refresh后找到匹配选项:', found.label, '->', found.value)
+            } else {
+              console.warn('【nm-select】refresh后未找到匹配选项，当前值:', this.value_)
+            }
           }
-        }
 
-        if (this.checkedFirst && !this.hasInit && options.length > 0) {
-          this.onChange(options[0].value)
-          this.hasInit = true
-        }
-      })
+          if (this.checkedFirst && !this.hasInit && options.length > 0) {
+            this.onChange(options[0].value)
+            this.hasInit = true
+          }
+        })
+      }
     },
     // 根据值查找选项
     findOptionByValue(value) {

package/packages/mixins/components/text.js

@@ -0,0 +1,82 @@
+import loading from './loading'
+
+export default {
+  mixins: [loading],
+  data() {
+    return {
+      value_: this.value,
+      options: [],
+      action: null,
+      loading: false
+    }
+  },
+  props: {
+    value: {
+      type: [String, Number],
+      default: ''
+    },
+    // 是否显示为标签形式
+    tag: Boolean,
+    // 标签类型
+    type: {
+      type: String,
+      default: ''
+    },
+    // 标签大小
+    size: String,
+    // 是否禁用
+    disabled: Boolean,
+    // 是否可点击
+    clickable: Boolean,
+    // 点击事件
+    onClick: Function
+  },
+  methods: {
+    refresh() {
+      this.loading = true
+      // 如果是枚举组件，使用缓存方法
+      if (this.moduleCode && this.enumName) {
+        this.getEnumData(this.moduleCode, this.enumName, this.libName)
+          .then(options => {
+            this.options = options
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      } else {
+        // 非枚举组件，使用原来的action方法
+        this.action()
+          .then(options => {
+            this.options = options
+            this.loading = false
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      }
+    },
+    getLabelByValue(value) {
+      if (!value || !this.options.length) return value
+      
+      for (let i = 0; i < this.options.length; i++) {
+        const opt = this.options[i]
+        if (opt.value === value) return opt.label
+      }
+      return value
+    },
+    handleClick(value) {
+      if (this.clickable && this.onClick) {
+        this.onClick(value)
+      }
+    }
+  },
+  created() {
+    this.refresh()
+  },
+  watch: {
+    value(val) {
+      if (val !== this.value_) this.value_ = val
+    }
+  }
+}

package/packages/mixins/index.js

@@ -8,7 +8,7 @@ import setTabName from './global/setTabName'
 import dialog from './components/dialog'
 import select from './components/select'
 import drawer from './components/drawer'
-import loading from './components/loading'
+import loading, { installCacheManager } from './components/loading'
 import formDialogEdit from './components/form-dialog-edit'
 import formSave from './components/form-save'
 import formReadonly from './components/form-readonly'
@@ -18,6 +18,7 @@ import treeSelect from '../../packages/components/tree-select/mixins.vue'
 import button from './components/button'
 import radio from './components/radio.vue'
 import checkbox from './components/checkbox.vue'
+import text from './components/text'
 
 export default {
   global(Vue) {
@@ -32,6 +33,9 @@ export default {
 
     //设置标签导航名称
     Vue.mixin(setTabName)
+    
+    // 安装缓存管理器
+    installCacheManager(Vue)
   },
   components: {
     dialog,
@@ -46,6 +50,7 @@ export default {
     treeSelect,
     button,
     radio,
-    checkbox
+    checkbox,
+    text
   }
 }

package/packages/page/default/index.vue

@@ -2,8 +2,8 @@
   <nm-container>
     <nm-box page>
       <div class="nm-default">
-        <nm-icon name="work" class="nm-size-100" />        
-        <h1 class="nm-m-20 nm-size-20">欢迎使用{{ title }}管理平台</h1>
+        <nm-icon name="group" class="nm-size-100" />        
+        <h1 class="nm-m-20 nm-size-20">欢迎使用{{ title }}平台</h1>
         <p class="nm-description">
           本系统采用前后端分离架构：<br>
           前端基于 Vue.js + Element UI 构建<br>

package/src/api/config.js

@@ -3,7 +3,7 @@ const getUI = () => {
     resolve({
       system: {
         /** 标题 */
-        title: 'UI',
+        title: '模块化框架件UI组件',
         /** logo */
         logo: '',
         /** 用户信息页(路由名称) */

package/vue.config.js

@@ -9,7 +9,8 @@ module.exports = {
   devServer: {
     port: 6220
   },
-  publicPath: '/ui',
+  // publicPath: '/ui',
+  publicPath: '',
   transpileDependencies: ['haiwei-ui.*', 'element-ui'],
   configureWebpack() {
     let config = {