From 4aa42f5c20d56661a3d7dbaad8a9d0a21bbb5f73 Mon Sep 17 00:00:00 2001
From: bleachtred <bleachtred@163.com>
Date: 星期四, 18 四月 2024 11:29:57 +0800
Subject: [PATCH] fix 角色必填*号
---
src/views/system/dict/data.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 33df638..902a942 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -49,8 +49,16 @@
<el-table-column v-if="false" label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template #default="scope">
- <span v-if="(scope.row.listClass === '' || scope.row.listClass === 'default') && (scope.row.cssClass === '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
- <el-tag v-else :type="(scope.row.listClass === 'primary' || scope.row.listClass === 'default') ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
+ <span
+ v-if="(scope.row.listClass === '' || scope.row.listClass === 'default') && (scope.row.cssClass === '' || scope.row.cssClass == null)"
+ >{{ scope.row.dictLabel }}</span
+ >
+ <el-tag
+ v-else
+ :type="scope.row.listClass === 'primary' || scope.row.listClass === 'default' ? '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" />
@@ -123,6 +131,7 @@
import { listData, getData, delData, addData, updateData } from '@/api/system/dict/data';
import { DictTypeVO } from '@/api/system/dict/type/types';
import { DictDataForm, DictDataQuery, DictDataVO } from '@/api/system/dict/data/types';
+import { RouteLocationNormalized } from 'vue-router';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
@@ -160,7 +169,7 @@
dictLabel: '',
dictValue: '',
cssClass: '',
- listClass: 'default',
+ listClass: 'primary',
dictSort: 0,
remark: ''
};
@@ -220,7 +229,17 @@
};
/** 杩斿洖鎸夐挳鎿嶄綔 */
const handleClose = () => {
- const obj = { path: '/system/dict' };
+ const obj: RouteLocationNormalized = {
+ fullPath: '',
+ hash: '',
+ matched: [],
+ meta: undefined,
+ name: undefined,
+ params: undefined,
+ query: undefined,
+ redirectedFrom: undefined,
+ path: '/system/dict'
+ };
proxy?.$tab.closeOpenPage(obj);
};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3