From 442cf7adb38a492933ffad6f9a9ebb3b7276a61d Mon Sep 17 00:00:00 2001
From: zhuoda <zhuoluodadada@qq.com>
Date: Mon, 2 Mar 2026 11:50:53 +0800
Subject: [PATCH] =?UTF-8?q?v3.30.0=20=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B9=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F;=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6S3=E5=8D=8F=E8=AE=AE=E5=AF=B9=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0minio=E7=9A=84=E6=94=AF=E6=8C=81;=E3=80=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=9B?=
 =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=89=8D=E7=AB=AFvite?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/constants/support/dict-const.js       |  4 ++--
 .../dict/components/dict-data-modal.vue       | 20 +++++++++++++++----
 .../src/constants/support/dict-const.ts       |  4 ++--
 .../dict/components/dict-data-modal.vue       | 20 +++++++++++++++----
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/smart-admin-web-javascript/src/constants/support/dict-const.js b/smart-admin-web-javascript/src/constants/support/dict-const.js
index 97892c8c..a3afe6e7 100644
--- a/smart-admin-web-javascript/src/constants/support/dict-const.js
+++ b/smart-admin-web-javascript/src/constants/support/dict-const.js
@@ -37,8 +37,8 @@ export const DICT_DATA_STYLE_ENUM = {
     desc: '信息',
     color: 'colorInfo',
   },
-  WARN: {
-    value: 'warn',
+  WARNING: {
+    value: 'warning',
     desc: '警告',
     color: 'colorWarning',
   },
diff --git a/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue b/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue
index 12fd8d76..bba19005 100644
--- a/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue
+++ b/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue
@@ -66,6 +66,10 @@
       bordered
     >
       <template #bodyCell="{ record, column }">
+        <template v-if="column.dataIndex === 'dataLabel'">
+          <span v-if="record.color" :style="{ color: token[record.color] }">{{ record.dataLabel }}</span>
+          <span v-else> {{ record.dataLabel }} </span>
+        </template>
         <template v-if="column.dataIndex === 'disabledFlag'">
           <a-switch
             @change="(checked) => handleChangeDisabled(checked, record)"
@@ -89,11 +93,14 @@
   import DictDataFormModal from './dict-data-form-modal.vue';
   import { dictApi } from '/@/api/support/dict-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { Modal } from 'ant-design-vue';
-  import { message } from 'ant-design-vue';
+  import { message, Modal, theme } from 'ant-design-vue';
   import { smartSentry } from '/@/lib/smart-sentry';
   import BooleanSelect from '/@/components/framework/boolean-select/index.vue';
   import _ from 'lodash';
+  import { DICT_DATA_STYLE_ENUM } from '/@/constants/support/dict-const';
+
+  const { useToken } = theme;
+  const { token } = useToken();
 
   // 是否展示抽屉
   const visible = ref(false);
@@ -168,7 +175,7 @@
       let keywordsFilterFlag = true;
       if (keywords.value) {
         keywordsFilterFlag =
-          (item.dataValue &&_.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
+          (item.dataValue && _.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.dataLabel && _.includes(item.dataLabel.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.remark && _.includes(item.remark.toLowerCase(), keywords.value.toLowerCase()));
       }
@@ -187,7 +194,12 @@
     try {
       tableLoading.value = true;
       let responseData = await dictApi.queryDictData(dictId.value);
-      responseData.data.map((e) => (e.enabled = !e.disabledFlag));
+      responseData.data.map((e) => {
+        e.enabled = !e.disabledFlag;
+        if (e.dataStyle) {
+          e.color = DICT_DATA_STYLE_ENUM[e.dataStyle.toUpperCase()].color;
+        }
+      });
       dictDataList.value = responseData.data;
       search();
     } catch (e) {
diff --git a/smart-admin-web-typescript/src/constants/support/dict-const.ts b/smart-admin-web-typescript/src/constants/support/dict-const.ts
index 97892c8c..a3afe6e7 100644
--- a/smart-admin-web-typescript/src/constants/support/dict-const.ts
+++ b/smart-admin-web-typescript/src/constants/support/dict-const.ts
@@ -37,8 +37,8 @@ export const DICT_DATA_STYLE_ENUM = {
     desc: '信息',
     color: 'colorInfo',
   },
-  WARN: {
-    value: 'warn',
+  WARNING: {
+    value: 'warning',
     desc: '警告',
     color: 'colorWarning',
   },
diff --git a/smart-admin-web-typescript/src/views/support/dict/components/dict-data-modal.vue b/smart-admin-web-typescript/src/views/support/dict/components/dict-data-modal.vue
index 91e9b956..18226de8 100644
--- a/smart-admin-web-typescript/src/views/support/dict/components/dict-data-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/dict/components/dict-data-modal.vue
@@ -66,6 +66,10 @@
       bordered
     >
       <template #bodyCell="{ record, column }">
+        <template v-if="column.dataIndex === 'dataLabel'">
+          <span v-if="record.color" :style="{ color: token[record.color] }">{{ record.dataLabel }}</span>
+          <span v-else> {{ record.dataLabel }} </span>
+        </template>
         <template v-if="column.dataIndex === 'disabledFlag'">
           <a-switch
             @change="(checked) => handleChangeDisabled(checked, record)"
@@ -89,11 +93,14 @@
   import DictDataFormModal from './dict-data-form-modal.vue';
   import { dictApi } from '/@/api/support/dict-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { Modal } from 'ant-design-vue';
-  import { message } from 'ant-design-vue';
+  import { message, Modal, theme } from 'ant-design-vue';
   import { smartSentry } from '/@/lib/smart-sentry';
   import BooleanSelect from '/@/components/framework/boolean-select/index.vue';
   import _ from 'lodash';
+  import { DICT_DATA_STYLE_ENUM } from '/@/constants/support/dict-const';
+
+  const { useToken } = theme;
+  const { token } = useToken();
 
   // 是否展示抽屉
   const visible = ref(false);
@@ -168,7 +175,7 @@
       let keywordsFilterFlag = true;
       if (keywords.value) {
         keywordsFilterFlag =
-          (item.dataValue &&_.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
+          (item.dataValue && _.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.dataLabel && _.includes(item.dataLabel.toLowerCase(), keywords.value.toLowerCase())) ||
           (item.remark && _.includes(item.remark.toLowerCase(), keywords.value.toLowerCase()));
       }
@@ -187,7 +194,12 @@
     try {
       tableLoading.value = true;
       let responseData = await dictApi.queryDictData(dictId.value);
-      responseData.data.map((e) => (e.enabled = !e.disabledFlag));
+      responseData.data.map((e) => {
+        e.enabled = !e.disabledFlag;
+        if (e.dataStyle) {
+          e.color = DICT_DATA_STYLE_ENUM[e.dataStyle.toUpperCase()].color;
+        }
+      });
       dictDataList.value = responseData.data;
       search();
     } catch (e) {