diff --git a/src/App.vue b/src/App.vue
index 9edaef5..b267072 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,16 +2,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/components/AppProvider/index.vue b/src/components/AppProvider/index.vue
deleted file mode 100644
index 66fbf8e..0000000
--- a/src/components/AppProvider/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/DataTable/tools/Tags.vue b/src/components/DataTable/tools/Tags.vue
index 81c01f5..6a65fa1 100644
--- a/src/components/DataTable/tools/Tags.vue
+++ b/src/components/DataTable/tools/Tags.vue
@@ -4,7 +4,7 @@
v-for="(item,index) in getData.data"
:key="`tag_${index}`"
v-bind="getProps"
- :color="getFilter(item[getData.rowKey]).color || getProps.color"
+ :color="getFilter(item[getData.rowKey])?.color || getProps?.color"
>
{{ getFilter(item[getData.rowKey]).label }}
@@ -60,9 +60,11 @@ export default defineComponent({
const data = filters.find(item => {
return item.key === value
})
- return data
+ return data || {
+ key: value,
+ label: value
+ }
}
-
/* 获取传递的数据 */
const getData = computed(() => {
return {
diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
index 2d527fe..9ffe265 100644
--- a/src/components/Dialog/index.vue
+++ b/src/components/Dialog/index.vue
@@ -1,6 +1,52 @@
+
diff --git a/src/components/Message/index.vue b/src/components/Message/index.vue
index f288a73..90940c2 100644
--- a/src/components/Message/index.vue
+++ b/src/components/Message/index.vue
@@ -8,12 +8,6 @@ const NMessage = useMessage()
let loadingMessage = null
class Message {
- /**
- * 规则:
- * * loading message只显示一个,新的message会替换正在显示的loading message
- * * loading message不会自动清除,除非被替换成非loading message,非loading message默认2秒后自动清除
- */
-
removeMessage(message, duration = 2000) {
setTimeout(() => {
if (message) {
@@ -25,16 +19,13 @@ class Message {
showMessage(type, content, option = {}) {
if (loadingMessage && loadingMessage.type === 'loading') {
- // 如果存在则替换正在显示的loading message
loadingMessage.type = type
loadingMessage.content = content
if (type !== 'loading') {
- // 非loading message需设置自动清除
this.removeMessage(loadingMessage, option.duration)
}
} else {
- // 不存在正在显示的loading则新建一个message,如果新建的message是loading message则将message赋值存储下来
const message = NMessage[type](content, option)
if (type === 'loading') {
loadingMessage = message
diff --git a/src/views/system/menu/components/MenuModal.vue b/src/views/system/menu/components/MenuModal.vue
index d5c5eb6..bf4296e 100644
--- a/src/views/system/menu/components/MenuModal.vue
+++ b/src/views/system/menu/components/MenuModal.vue
@@ -196,11 +196,10 @@ export default defineComponent({
}
addMenu(params)
.then(res => {
- console.log(res)
handleClose()
})
} else {
- // console.log('error')
+ $message.error('清先完成校验')
}
})
return false