From e02f6923593bd49f87caccd87e063baf312aaa3f Mon Sep 17 00:00:00 2001
From: 稚屿 <1491182878@qq.com>
Date: 星期一, 22 八月 2022 14:19:08 +0800
Subject: [PATCH] 修复菜单管理已知问题 问题描述：在菜单管理下，类型为菜单或者按钮的条目下点击修改按钮。 情况1，如果是类型为菜单，第一次点击修改按钮正常，则第二次点击另一个条目后面的修改按钮时报错！ 情况2，如果是类型为按钮，第一次点击修改时正常，当点击取消按钮关闭弹窗时，浏览器报错！
---
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.2