-import { useI18n } from "vue-i18n";
-import { useFullscreen } from "@vueuse/core";
-
-const { t } = useI18n();
-const { isFullscreen, toggle } = useFullscreen();
-
-
-
-
-
-
-
diff --git a/src/layout/components/search/components/SearchModal.vue b/src/layout/components/search/components/SearchModal.vue
index 74f4c92..4251e09 100644
--- a/src/layout/components/search/components/SearchModal.vue
+++ b/src/layout/components/search/components/SearchModal.vue
@@ -3,11 +3,10 @@ import { useRouter } from "vue-router";
import { cloneDeep } from "@pureadmin/utils";
import SearchResult from "./SearchResult.vue";
import SearchFooter from "./SearchFooter.vue";
-import { deleteChildren } from "@/utils/tree";
import { useNav } from "@/layout/hooks/useNav";
import { transformI18n } from "@/plugins/i18n";
+import { ref, computed, shallowRef } from "vue";
import { useDebounceFn, onKeyStroke } from "@vueuse/core";
-import { ref, watch, computed, nextTick, shallowRef } from "vue";
import { usePermissionStoreHook } from "@/store/modules/permission";
import Search from "@iconify-icons/ep/search";
@@ -33,7 +32,7 @@ const handleSearch = useDebounceFn(search, 300);
/** 菜单树形结构 */
const menusData = computed(() => {
- return deleteChildren(cloneDeep(usePermissionStoreHook().wholeMenus));
+ return cloneDeep(usePermissionStoreHook().wholeMenus);
});
const show = computed({
@@ -45,14 +44,6 @@ const show = computed({
}
});
-watch(show, async val => {
- if (val) {
- /** 自动聚焦 */
- await nextTick();
- inputRef.value?.focus();
- }
-});
-
/** 将菜单树形结构扁平化为一维数组,用于菜单查询 */
function flatTree(arr) {
const res = [];
@@ -136,9 +127,11 @@ onKeyStroke("ArrowDown", handleDown);
+import { toRaw } from "vue";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
+
+const props = defineProps({
+ extraIcon: {
+ type: String,
+ default: ""
+ }
+});
+
+
+
+
+
+
+
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index c99d5dd..6d2574f 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -46,8 +46,8 @@ watch(
class="horizontal-header"
>
{
"align-middle",
"text-primary",
"cursor-pointer",
- "duration-[360ms]",
+ "duration-[100ms]",
"hover:text-primary",
"dark:hover:!text-white"
];
diff --git a/src/layout/components/sidebar/logo.vue b/src/layout/components/sidebar/logo.vue
index 6f8b475..f079b3b 100644
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/sidebar/logo.vue
@@ -18,7 +18,7 @@ const { title } = useNav();
class="sidebar-logo-link"
to="/"
>
-
+
@@ -37,37 +37,33 @@ const { title } = useNav();