From ad87248ab3f34f019d4f288832c8baeef428d0e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 23 Nov 2023 07:39:15 +0800
Subject: [PATCH] =?UTF-8?q?:sparks:DictTag=E7=BB=84=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictTag/index.vue | 21 ++++++++++++++++++++-
 src/utils/ruoyi.js               | 23 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 407a1d7..556dd84 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <template v-for="(item, index) in props.options">
+  <template v-for="(item, index) in dataList">
     <template v-if="values.includes(item.dictValue)">
       <span v-if="item.listClass == 'default' || item.listClass == ''" :key="item.dictValue" :index="index" :class="item.cssClass">
         <template v-if="item.langKey">
@@ -42,9 +42,28 @@ const props = defineProps({
   split: {
     type: String,
     default: null
+  },
+  //自定义属性值 例如：{ label: 'name', value: 'id'}
+  config: {
+    type: Object,
+    default: null
   }
 })
+const dataList = computed(() => {
+  if (props.config) {
+    let config = props.config
+    var newList = []
 
+    for (let d of props.options) {
+      let label = d[config.label]
+      let value = d[config.value]
+
+      newList.push({ dictLabel: label, dictValue: value, ...d })
+    }
+    return newList
+  }
+  return props.options
+})
 const values = computed(() => {
   if (props.value !== null && typeof props.value !== 'undefined') {
     if (props.split != null && props.split != '') {
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index decde9c..3ce6e73 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -180,6 +180,29 @@ export function handleTree(data, id, parentId, children) {
   }
   return tree
 }
+/**
+ * 将自定义数据转换成字典
+ * @param {*} data 数据源
+ * @param {*} dictLabel dictLabel
+ * @param {*} dictValue dictValue
+ */
+export function toDict(data, dictLabel, dictValue) {
+  let config = {
+    label: dictLabel || 'dictLabel',
+    value: dictValue || 'dictValue'
+  }
+
+  var tree = []
+
+  for (let d of data) {
+    let label = d[config.label]
+    let value = d[config.value]
+
+    tree.push({ dictLabel: label, dictValue: value })
+  }
+
+  return tree
+}
 
 /**
  * 参数处理