Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoxian521 committed Apr 29, 2024
1 parent 504aeae commit cf748e6
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/layout/components/lay-frame/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const keep = computed(() => {
!!props.currRoute.meta?.frameSrc
);
});
// 避免重新渲染 frameView
// 避免重新渲染 LayFrame
const normalComp = computed(() => !keep.value && props.currComp);
watch(useMultiTagsStoreHook().multiTags, (tags: any) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { ListItem } from "./data";
import { ListItem } from "../data";
import { ref, PropType, nextTick } from "vue";
import { useNav } from "@/layout/hooks/useNav";
import { deviceDetection } from "@pureadmin/utils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { PropType } from "vue";
import { ListItem } from "./data";
import { ListItem } from "../data";
import { useI18n } from "vue-i18n";
import NoticeItem from "./NoticeItem.vue";
Expand Down
6 changes: 3 additions & 3 deletions src/layout/components/lay-notice/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import { ref } from "vue";
import { useI18n } from "vue-i18n";
import { noticesData } from "./data";
import NoticeList from "./NoticeList.vue";
import Bell from "@iconify-icons/ep/bell";
import NoticeList from "./components/NoticeList.vue";
import BellIcon from "@iconify-icons/ep/bell";
const { t } = useI18n();
const noticesNum = ref(0);
Expand All @@ -18,7 +18,7 @@ notices.value.map(v => (noticesNum.value += v.list.length));
<span class="dropdown-badge navbar-bg-hover select-none">
<el-badge :value="noticesNum" :max="99">
<span class="header-notice-icon">
<IconifyIconOffline :icon="Bell" />
<IconifyIconOffline :icon="BellIcon" />
</span>
</el-badge>
</span>
Expand Down
4 changes: 2 additions & 2 deletions src/layout/components/lay-panel/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { emitter } from "@/utils/mitt";
import { onClickOutside } from "@vueuse/core";
import { ref, computed, onMounted, onBeforeUnmount } from "vue";
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
import Close from "@iconify-icons/ep/close";
import CloseIcon from "@iconify-icons/ep/close";
const target = ref(null);
const show = ref<Boolean>(false);
Expand Down Expand Up @@ -68,7 +68,7 @@ onBeforeUnmount(() => {
class="dark:text-white"
width="18px"
height="18px"
:icon="Close"
:icon="CloseIcon"
@click="show = !show"
/>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import type { optionsItem } from "../types";
import { transformI18n } from "@/plugins/i18n";
import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import Star from "@iconify-icons/ep/star";
import Close from "@iconify-icons/ep/close";
import StarIcon from "@iconify-icons/ep/star";
import CloseIcon from "@iconify-icons/ep/close";
interface Props {
item: optionsItem;
Expand Down Expand Up @@ -33,12 +33,12 @@ function handleDelete(item) {
</span>
<IconifyIconOffline
v-show="item.type === 'history'"
:icon="Star"
:icon="StarIcon"
class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
@click.stop="handleCollect(item)"
/>
<IconifyIconOffline
:icon="Close"
:icon="CloseIcon"
class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
@click.stop="handleDelete(item)"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/layout/components/lay-sidebar/NavHorizontal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ const { t, route, locale, translationCh, translationEn } =
const {
title,
logout,
backTopMenu,
onPanel,
getLogo,
username,
userAvatar,
backTopMenu,
avatarsStyle,
toAccountSettings,
getDropdownItemStyle,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useRoute } from "vue-router";
import { ref, unref, watch, onMounted, nextTick } from "vue";
defineOptions({
name: "FrameView"
name: "LayFrame"
});
const props = defineProps<{
Expand Down
4 changes: 2 additions & 2 deletions src/layout/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import LayContent from "./components/lay-content/index.vue";
import LaySetting from "./components/lay-setting/index.vue";
import NavVertical from "./components/lay-sidebar/NavVertical.vue";
import NavHorizontal from "./components/lay-sidebar/NavHorizontal.vue";
import BackTop from "@/assets/svg/back_top.svg?component";
import BackTopIcon from "@/assets/svg/back_top.svg?component";
const { t } = useI18n();
const appWrapperRef = ref();
Expand Down Expand Up @@ -191,7 +191,7 @@ const LayHeader = defineComponent({
:title="t('buttons.pureBackTop')"
target=".main-container .el-scrollbar__wrap"
>
<BackTop />
<BackTopIcon />
</el-backtop>
<LayHeader />
<!-- 主体内容 -->
Expand Down
2 changes: 1 addition & 1 deletion src/router/modules/board.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { $t } from "@/plugins/i18n";
import { board } from "@/router/enums";
const IFrame = () => import("@/layout/frameView.vue");
const IFrame = () => import("@/layout/frame.vue");

export default {
path: "/board",
Expand Down
2 changes: 1 addition & 1 deletion src/router/modules/formdesign.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { $t } from "@/plugins/i18n";
import { formdesign } from "@/router/enums";
const IFrame = () => import("@/layout/frameView.vue");
const IFrame = () => import("@/layout/frame.vue");

export default {
path: "/form-design",
Expand Down
2 changes: 1 addition & 1 deletion src/router/modules/mind.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { $t } from "@/plugins/i18n";
import { mind } from "@/router/enums";
const IFrame = () => import("@/layout/frameView.vue");
const IFrame = () => import("@/layout/frame.vue");

export default {
path: "/mind-map",
Expand Down
2 changes: 1 addition & 1 deletion src/router/modules/ppt.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ppt } from "@/router/enums";
const IFrame = () => import("@/layout/frameView.vue");
const IFrame = () => import("@/layout/frame.vue");

export default {
path: "/ppt",
Expand Down
2 changes: 1 addition & 1 deletion src/router/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { userKey, type DataInfo } from "@/utils/auth";
import { type menuType, routerArrays } from "@/layout/types";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import { usePermissionStoreHook } from "@/store/modules/permission";
const IFrame = () => import("@/layout/frameView.vue");
const IFrame = () => import("@/layout/frame.vue");
// https://cn.vitejs.dev/guide/features.html#glob-import
const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");

Expand Down

0 comments on commit cf748e6

Please sign in to comment.