feat(dict-component): 字典相关组件的props：data 属性支持传入函数

mineadmin · Nov 16, 2024 · 321e507 · 321e507
1 parent a50284c
commit 321e507
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/web/src/components/ma-dict-picker/ma-dict-checkbox.vue b/web/src/components/ma-dict-picker/ma-dict-checkbox.vue
@@ -10,6 +10,7 @@
 <script setup lang="ts">
 import type { Dictionary } from '#/global'
 import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import { isFunction } from 'radash'
 
 defineOptions({ name: 'MaDictCheckbox' })
 
@@ -22,15 +23,15 @@ const {
   // 字典名称
   dictName?: string
   // 字典数据
-  data?: Dictionary[]
+  data?: Dictionary[] | (() => Dictionary[])
   // 渲染模式：`normal: el-checkbox` | `button: el-checkbox-button`
   renderMode?: 'normal' | 'button'
   // 翻译范围
   transScope?: 'global' | 'local'
 }>()
 const dictStore = useDictStore()
 const dictionaryData = computed<Dictionary[] | null>(() => {
-  return dictName === '' ? data : dictStore.find(dictName)
+  return dictName === '' ? (isFunction(data) ? data() : data) : dictStore.find(dictName)
 })
 
 const i18n = useTrans() as TransType

diff --git a/web/src/components/ma-dict-picker/ma-dict-radio.vue b/web/src/components/ma-dict-picker/ma-dict-radio.vue
@@ -10,6 +10,7 @@
 <script setup lang="ts">
 import type { Dictionary } from '#/global'
 import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import { isFunction } from 'radash'
 
 defineOptions({ name: 'MaDictRadio' })
 
@@ -22,15 +23,15 @@ const {
   // 字典名称
   dictName?: string
   // 字典数据
-  data?: Dictionary[]
+  data?: Dictionary[] | (() => Dictionary[])
   // 渲染模式：`normal: el-radio` | `button: el-radio-button`
   renderMode?: 'normal' | 'button'
   // 翻译范围
   transScope?: 'global' | 'local'
 }>()
 const dictStore = useDictStore()
 const dictionaryData = computed<Dictionary[] | null>(() => {
-  return dictName === '' ? data : dictStore.find(dictName)
+  return dictName === '' ? (isFunction(data) ? data() : data) : dictStore.find(dictName)
 })
 
 const i18n = useTrans() as TransType

diff --git a/web/src/components/ma-dict-picker/ma-dict-select.vue b/web/src/components/ma-dict-picker/ma-dict-select.vue
@@ -10,6 +10,7 @@
 <script setup lang="ts">
 import type { Dictionary } from '#/global'
 import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import { isFunction } from 'radash'
 
 defineOptions({ name: 'MaDictSelect' })
 
@@ -21,14 +22,14 @@ const {
   // 字典名称
   dictName?: string
   // 字典数据
-  data?: Dictionary[]
+  data?: Dictionary[] | (() => Dictionary[])
   // 翻译范围
   transScope?: 'global' | 'local'
 }>()
 
 const dictStore = useDictStore()
 const dictionaryData = computed<Dictionary[] | null>(() => {
-  return dictName === '' ? data : dictStore.find(dictName)
+  return dictName === '' ? (isFunction(data) ? data() : data) : dictStore.find(dictName)
 })
 
 const i18n = useTrans() as TransType