From 68ecc3a752b58d61d6464ea59673273fac42e5de 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: Sat, 1 Jan 2022 16:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=96=87=E5=AD=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/assets/styles/index.scss      |  9 +++++++++
 ZR.Vue/src/views/components/dictData.vue | 17 +++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ZR.Vue/src/assets/styles/index.scss b/ZR.Vue/src/assets/styles/index.scss
index 01a8951..93654fc 100644
--- a/ZR.Vue/src/assets/styles/index.scss
+++ b/ZR.Vue/src/assets/styles/index.scss
@@ -323,6 +323,15 @@ aside {
   color: orangered;
 }
 
+.text-hotpink {
+	color: hotpink;
+}
+.text-green {
+	color: green;
+}
+.text-greenyellow {
+	color: greenyellow;
+}
 /* image */
 .img-circle {
   border-radius: 50%;
diff --git a/ZR.Vue/src/views/components/dictData.vue b/ZR.Vue/src/views/components/dictData.vue
index 29d4813..6fbd970 100644
--- a/ZR.Vue/src/views/components/dictData.vue
+++ b/ZR.Vue/src/views/components/dictData.vue
@@ -28,7 +28,8 @@
       <el-table-column label="字典标签" align="center" prop="dictLabel">
         <template slot-scope="scope">
           <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'" :class="scope.row.cssClass">{{scope.row.dictLabel}}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{scope.row.dictLabel}}</el-tag>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{scope.row.dictLabel}}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="字典键值" align="center" prop="dictValue" />
@@ -63,7 +64,7 @@
         <el-form-item label="样式属性" prop="cssClass">
           <!-- <el-input v-model="form.cssClass" placeholder="请输入样式属性" /> -->
           <el-select v-model="form.cssClass" clearable="">
-            <el-option v-for="dict in cssClassOptions" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+            <el-option v-for="dict in cssClassOptions" :class="dict.value" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="显示排序" prop="dictSort">
@@ -193,6 +194,18 @@ export default {
           value: "text-orange",
           label: "橘红色",
         },
+        {
+          value: "text-hotpink",
+          label: "粉红色",
+        },
+        {
+          value: "text-green",
+          label: "绿色",
+        },
+        {
+          value: "text-greenyellow",
+          label: "黄绿色",
+        },
       ],
       // 状态数据字典
       statusOptions: [],