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 @@