From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-ui/src/components/DictTag/index.vue | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/ruoyi-ui/src/components/DictTag/index.vue b/ruoyi-ui/src/components/DictTag/index.vue
index 4779415..4c196c4 100644
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -1,51 +1,52 @@
-<template>
- <div>
- <template v-for="(item, index) in options">
- <template v-if="values.includes(item.dictValue)">
- <span
- v-if="item.listClass == 'default' || item.listClass == ''"
- :key="item.dictValue"
- :index="index"
- :class="item.cssClass"
- >{{ item.dictLabel }}</span
- >
- <el-tag
- v-else
- :key="item.dictValue"
- :index="index"
- :type="item.listClass == 'primary' ? '' : item.listClass"
- :class="item.cssClass"
- >
- {{ item.dictLabel }}
- </el-tag>
- </template>
- </template>
- </div>
-</template>
-
-<script>
-export default {
- name: "DictTag",
- props: {
- options: {
- type: Array,
- default: null,
- },
- value: [String, Array],
- },
- computed: {
- values() {
- if (this.value) {
- return Array.isArray(this.value) ? this.value : [this.value];
- } else {
- return [];
- }
- },
- },
-};
-</script>
-<style scoped>
-.el-tag + .el-tag {
- margin-left: 10px;
-}
+<template>
+ <div>
+ <template v-for="(item, index) in options">
+ <template v-if="values.includes(item.value)">
+ <span
+ v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
+ :key="item.value"
+ :index="index"
+ :class="item.raw.cssClass"
+ >{{ item.label }}</span
+ >
+ <el-tag
+ v-else
+ :disable-transitions="true"
+ :key="item.value"
+ :index="index"
+ :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
+ :class="item.raw.cssClass"
+ >
+ {{ item.label }}
+ </el-tag>
+ </template>
+ </template>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "DictTag",
+ props: {
+ options: {
+ type: Array,
+ default: null,
+ },
+ value: [Number, String, Array],
+ },
+ computed: {
+ values() {
+ if (this.value !== null && typeof this.value !== 'undefined') {
+ return Array.isArray(this.value) ? this.value : [String(this.value)];
+ } else {
+ return [];
+ }
+ },
+ },
+};
+</script>
+<style scoped>
+.el-tag + .el-tag {
+ margin-left: 10px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3