Merge remote-tracking branch 'origin/detached' into dev

continew-org · Jun 2, 2024 · e2b2f06 · e2b2f06
2 parents 6780282 + 4186201
commit e2b2f06
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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: '' }
   }
-}
-)
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git 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' })
 </script>
 
 <style lang="scss" scoped>
@@ -31,6 +31,7 @@ defineOptions({ name: 'Header' })
 .header {
   display: flex;
   align-items: center;
+
   .header-right {
     flex: 1;
     overflow: hidden;

diff --git a/src/layout/components/Main.vue b/src/layout/components/Main.vue
@@ -13,7 +13,7 @@
 <script setup lang="ts">
 import { useAppStore, useTabsStore } from '@/stores'
 
-defineOptions({ name: 'Main' })
+defineOptions({ name: 'LayoutMain' })
 const appStore = useAppStore()
 const tabsStore = useTabsStore()
 </script>