fix: router bug

src/components/ModalPro/index.vue

@@ -32,7 +32,8 @@ import { ref, watch, watchEffect, computed, CSSProperties, reactive, onMounted }
 export interface ModalProPorps extends ModalProps {
   label: string,
   okRequest: () =>void,
-  openConfirmLoading: boolean
+  openConfirmLoading: boolean,
+  cancel?: () => void
 }
 
 export interface ModalOkProps {

src/layout/components/Sidebar/index.vue

@@ -28,11 +28,13 @@
 
 <script lang="ts" setup >
 
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 import { useAppRouter } from '@/store/router'
 import SidebarItem from './SidebarItem.vue'
+import { useRouter } from 'vue-router'
 
 const appRouter = useAppRouter()
+const router = useRouter()
 
 console.log('appRouter.router.sider.route:', appRouter.router.sider.route)
 
@@ -41,7 +43,8 @@ const collapsed = ref<boolean>(false)
 // const selectedKeys2 = ref<string[]>([appRouter.router.sider!.selectPath])
 // const openKeys = ref<string[]>(appRouter.router.sider!.openKeys)
 
-const selectedKeys2 = ref<string[]>([appRouter.router.sider!.selectPath])
+// const selectedKeys2 = ref<string[]>([appRouter.router.sider!.selectPath])
+const selectedKeys2 = ref<string[]>([router.currentRoute.value.path])
 const openKeys = ref<string[]>(appRouter.router.sider!.openKeys)
 
 console.log(selectedKeys2, openKeys)

src/pages/Iot/device/components/overview.vue

@@ -8,6 +8,7 @@
   <modal-pro
     label="hellp"
     :visible="state.visible"
+    @cancel="state.visible = false"
   >
 
   </modal-pro>