From 1d7c7511a7dc69a3824fca94e131fb5e94d535f3 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 Dec 2021 07:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/System/SysDictData.cs           |  4 +--
 ZR.Vue/src/assets/styles/index.scss      |  3 ++
 ZR.Vue/src/views/components/dictData.vue | 39 ++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/ZR.Model/System/SysDictData.cs b/ZR.Model/System/SysDictData.cs
index bb674fb..3451084 100644
--- a/ZR.Model/System/SysDictData.cs
+++ b/ZR.Model/System/SysDictData.cs
@@ -23,8 +23,8 @@ namespace ZR.Model.System
         public string DictLabel { get; set; }
         public string DictValue { get; set; }
         public string DictType { get; set; }
-        public string CssClass { get; set; }
-        public string ListClass { get; set; }
+        public string CssClass { get; set; } = string.Empty;
+        public string ListClass { get; set; } = string.Empty;
         public string IsDefault { get; set; }
         public string Status { get; set; }
     }
diff --git a/ZR.Vue/src/assets/styles/index.scss b/ZR.Vue/src/assets/styles/index.scss
index 576b01c..bfcf783 100644
--- a/ZR.Vue/src/assets/styles/index.scss
+++ b/ZR.Vue/src/assets/styles/index.scss
@@ -319,6 +319,9 @@ aside {
 .text-muted {
   color: #888888;
 }
+.text-orange {
+  color: orangered;
+}
 
 /* image */
 .img-circle {
diff --git a/ZR.Vue/src/views/components/dictData.vue b/ZR.Vue/src/views/components/dictData.vue
index 1286a23..29d4813 100644
--- a/ZR.Vue/src/views/components/dictData.vue
+++ b/ZR.Vue/src/views/components/dictData.vue
@@ -27,8 +27,8 @@
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
         <template slot-scope="scope">
-          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
+          <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>
         </template>
       </el-table-column>
       <el-table-column label="字典键值" align="center" prop="dictValue" />
@@ -61,7 +61,10 @@
           <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
         </el-form-item>
         <el-form-item label="样式属性" prop="cssClass">
-          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+          <!-- <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-select>
         </el-form-item>
         <el-form-item label="显示排序" prop="dictSort">
           <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
@@ -161,6 +164,36 @@ export default {
           label: "危险",
         },
       ],
+      cssClassOptions: [
+        {
+          value: "text-primary",
+          label: "primary",
+        },
+        {
+          value: "text-navy",
+          label: "text-navy",
+        },
+        {
+          value: "text-success",
+          label: "成功",
+        },
+        {
+          value: "text-info",
+          label: "信息",
+        },
+        {
+          value: "text-warning",
+          label: "警告",
+        },
+        {
+          value: "text-danger",
+          label: "危险",
+        },
+        {
+          value: "text-orange",
+          label: "橘红色",
+        },
+      ],
       // 状态数据字典
       statusOptions: [],
       // 类型数据字典