diff --git a/.vscode/settings.json b/.vscode/settings.json index 06f0735..90ee5a0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,7 @@ // Disable the default formatter, use eslint instead "prettier.enable": false, - "editor.formatOnSave": true, + "editor.formatOnSave": false, // Auto fix "editor.codeActionsOnSave": { diff --git a/src/components/GiCell/GiCellTag.vue b/src/components/GiCell/GiCellTag.vue index 1df157c..98d5bfe 100644 --- a/src/components/GiCell/GiCellTag.vue +++ b/src/components/GiCell/GiCellTag.vue @@ -25,14 +25,15 @@ const props = defineProps({ } }) -const dictItem = computed(() => { +const dictItem = computed((): LabelValueState => { try { - return props.dict.find((d) => d.value === String(props.value) || d.value === Number(props.value)) + return props.dict.find( + (d) => d.value === String(props.value) || d.value === Number(props.value) + ) || { label: '', value: '' } } catch (error) { - return [] + return { label: '', value: '' } } -} -) +}) diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index c27f326..f922cc1 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -20,7 +20,7 @@ import HeaderRightBar from '../HeaderRightBar/index.vue' import MenuFoldBtn from '../MenuFoldBtn.vue' -defineOptions({ name: 'Header' }) +defineOptions({ name: 'LayoutHeader' })