From d0ad54b4d7e90b53ec6f04bc34027f4f36ace0ac Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 17 Jan 2023 14:23:43 +0800
Subject: [PATCH] feat: add dict color

---
 yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue | 3 ++-
 yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue   | 2 +-
 yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue b/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
index fb166019d..d4a13a09e 100644
--- a/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
+++ b/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onMounted, onUpdated, PropType, ref } from 'vue'
 import { getDictOptions, DictDataType } from '@/utils/dict'
+import { isHexColor } from '@/utils/color'
 import { ElTag } from 'element-plus'
 const props = defineProps({
   type: {
@@ -38,7 +39,7 @@ onUpdated(() => {
     :disable-transitions="true"
     :key="dictData?.value + ''"
     :type="dictData?.colorType"
-    :color="dictData?.cssClass"
+    :color="dictData?.cssClass && isHexColor(dictData?.cssClass) ? dictData?.cssClass : ''"
   >
     {{ dictData?.label }}
   </ElTag>
diff --git a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
index 7bd12c3d0..3abbe9102 100644
--- a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
+++ b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
@@ -205,7 +205,7 @@ const getPageConfig = (options: XTableProps) => {
     if (isBoolean(pagination)) {
       options.pagerConfig = {
         border: false, // 带边框
-        background: true, // 带背景颜色
+        background: false, // 带背景颜色
         perfect: false, // 配套的样式
         pageSize: 10, // 每页大小
         pagerCount: 7, // 显示页码按钮的数量
diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
index 0293ebfd8..bfaea8604 100644
--- a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
+++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
@@ -95,7 +95,7 @@ VXETable.setup({
     }
   },
   pager: {
-    background: true,
+    background: false,
     autoHidden: false,
     perfect: true,
     pageSize: 10,