diff --git a/src/App.vue b/src/App.vue index f83735f5b5a9ed727ccad77bb8ca75f33037a1f3..e4a4558f3930c2d2a40f9cece1ef5aa7c371ca86 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,7 @@ - + @@ -22,13 +22,13 @@ import setIntroduction from '/@/utils/setIconfont'; // 引入组件 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue')); -const Setings = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/setings.vue')); +const Settings = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/settings.vue')); const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/closeFull.vue')); const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue')); // 定义变量内容 const { messages, locale } = useI18n(); -const setingsRef = ref(); +const settingsRef = ref(); const route = useRoute(); const stores = useTagsViewRoutes(); const storesThemeConfig = useThemeConfig(); @@ -62,8 +62,8 @@ onBeforeMount(() => { onMounted(() => { nextTick(() => { // 监听布局配'置弹窗点击打开 - mittBus.on('openSetingsDrawer', () => { - setingsRef.value.openDrawer(); + mittBus.on('openSettingsDrawer', () => { + settingsRef.value.openDrawer(); }); // 获取缓存中的布局配置 if (Local.get('themeConfig')) { @@ -78,7 +78,7 @@ onMounted(() => { }); // 页面销毁时，关闭监听布局配置/i18n监听 onUnmounted(() => { - mittBus.off('openSetingsDrawer', () => {}); + mittBus.off('openSettingsDrawer', () => {}); }); // 监听路由的变化，设置网站标题 watch( diff --git a/src/components/auth/authAll.vue b/src/components/auth/authAll.vue index 54c8d5859283e36572db17d7c3689616b6e60f60..911a797590a79fb6cbeca789fab955ea40a14227 100644 --- a/src/components/auth/authAll.vue +++ b/src/components/auth/authAll.vue @@ -6,7 +6,7 @@ import { computed } from 'vue'; import { storeToRefs } from 'pinia'; import { useUserInfo } from '/@/stores/userInfo'; -import { judementSameArr } from '/@/utils/arrayOperation'; +import { judgementSameArr } from '/@/utils/arrayOperation'; // 定义父组件传过来的值 const props = defineProps({ @@ -22,6 +22,6 @@ const { userInfos } = storeToRefs(stores); // 获取 pinia 中的用户权限 const getUserAuthBtnList = computed(() => { - return judementSameArr(props.value, userInfos.value.authBtnList); + return judgementSameArr(props.value, userInfos.value.authBtnList); }); diff --git a/src/directive/authDirective.ts b/src/directive/authDirective.ts index 5971e64fa6d8475154cc881d9f55596c64b8512f..844965007666e31ecb592bf5499e550041805ed7 100644 --- a/src/directive/authDirective.ts +++ b/src/directive/authDirective.ts @@ -1,6 +1,6 @@ import type { App } from 'vue'; import { useUserInfo } from '/@/stores/userInfo'; -import { judementSameArr } from '/@/utils/arrayOperation'; +import { judgementSameArr } from '/@/utils/arrayOperation'; /** * 用户权限指令 @@ -33,7 +33,7 @@ export function authDirective(app: App) { app.directive('auth-all', { mounted(el, binding) { const stores = useUserInfo(); - const flag = judementSameArr(binding.value, stores.userInfos.authBtnList); + const flag = judgementSameArr(binding.value, stores.userInfos.authBtnList); if (!flag) el.parentNode.removeChild(el); }, }); diff --git a/src/directive/customDirective.ts b/src/directive/customDirective.ts index c67350f555ecb3609b0ceb452df80e8a2db44dfc..720061b0a6729b9137dac1e2f2602c415e2a73da 100644 --- a/src/directive/customDirective.ts +++ b/src/directive/customDirective.ts @@ -83,13 +83,13 @@ export function dragDirective(app: App) { // 对话框宽度 const dragDomWidth = dragDom.offsetWidth; // 对话框高度 - const dragDomheight = dragDom.offsetHeight; + const dragDomHeight = dragDom.offsetHeight; const minDragDomLeft = dragDom.offsetLeft; const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth; const minDragDomTop = dragDom.offsetTop; - const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomheight; + const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomHeight; // 获取到的值带px 正则匹配替换 let styL: any = getComputedStyle(dragDom).left; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 83d1129d1b1c9e94a3b635a7cd694c4febe27375..bdf105fdd424e8ba93ae76d8866a905c23777d37 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -24,7 +24,7 @@ export default { menu2: 'menu2', funIndex: 'function', funTagsView: 'funTagsView', - funCountup: 'countup', + funCountUp: 'countup', funWangEditor: 'wangEditor', funCropper: 'cropper', funQrcode: 'qrcode', @@ -154,19 +154,19 @@ export default { fourIsShowLogo: 'Sidebar logo', fourIsBreadcrumb: 'Open breadcrumb', fourIsBreadcrumbIcon: 'Open breadcrumb icon', - fourIsTagsview: 'Open tagsview', - fourIsTagsviewIcon: 'Open tagsview Icon', - fourIsCacheTagsView: 'Enable tagsview cache', - fourIsSortableTagsView: 'Enable tagsview drag', - fourIsShareTagsView: 'Enable tagsview sharing', + fourIsTagsView: 'Open tagsView', + fourIsTagsViewIcon: 'Open tagsView Icon', + fourIsCacheTagsView: 'Enable tagsView cache', + fourIsSortableTagsView: 'Enable tagsView drag', + fourIsShareTagsView: 'Enable tagsView sharing', fourIsFooter: 'Open footer', fourIsGrayscale: 'Grey model', fourIsInvert: 'Color weak mode', fourIsDark: 'Dark Mode', - fourIsWartermark: 'Turn on watermark', - fourWartermarkText: 'Watermark copy', + fourIsWatermark: 'Turn on watermark', + fourWatermarkText: 'Watermark copy', fiveTitle: 'Other settings', - fiveTagsStyle: 'Tagsview style', + fiveTagsStyle: 'TagsView style', fiveAnimation: 'page animation', fiveColumnsAsideStyle: 'Column style', fiveColumnsAsideLayout: 'Column layout', diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts index e0713b94c5419d6af8d5f6a4c556d70105ecd0aa..48627023f9533b507fa4cafedbfb700e6c95c9c1 100644 --- a/src/i18n/lang/zh-cn.ts +++ b/src/i18n/lang/zh-cn.ts @@ -24,7 +24,7 @@ export default { menu2: '菜单2', funIndex: '功能', funTagsView: 'tagsView 操作', - funCountup: '数字滚动', + funCountUp: '数字滚动', funWangEditor: 'Editor 编辑器', funCropper: '图片裁剪', funQrcode: '二维码生成', @@ -154,8 +154,8 @@ export default { fourIsShowLogo: '侧边栏 Logo', fourIsBreadcrumb: '开启 Breadcrumb', fourIsBreadcrumbIcon: '开启 Breadcrumb 图标', - fourIsTagsview: '开启 Tagsview', - fourIsTagsviewIcon: '开启 Tagsview 图标', + fourIsTagsView: '开启 TagsView', + fourIsTagsViewIcon: '开启 TagsView 图标', fourIsCacheTagsView: '开启 TagsView 缓存', fourIsSortableTagsView: '开启 TagsView 拖拽', fourIsShareTagsView: '开启 TagsView 共用', @@ -163,10 +163,10 @@ export default { fourIsGrayscale: '灰色模式', fourIsInvert: '色弱模式', fourIsDark: '深色模式', - fourIsWartermark: '开启水印', - fourWartermarkText: '水印文案', + fourIsWatermark: '开启水印', + fourWatermarkText: '水印文案', fiveTitle: '其它设置', - fiveTagsStyle: 'Tagsview 风格', + fiveTagsStyle: 'TagsView 风格', fiveAnimation: '主页面切换动画', fiveColumnsAsideStyle: '分栏高亮风格', fiveColumnsAsideLayout: '分栏布局风格', diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts index 35e406fe76783f17bee56c662aec6b3f5efbb338..59756d0b2851652b06335a37868f228875a79806 100644 --- a/src/i18n/lang/zh-tw.ts +++ b/src/i18n/lang/zh-tw.ts @@ -24,7 +24,7 @@ export default { menu2: '選單2', funIndex: '功能', funTagsView: 'tagsView 操作', - funCountup: '數位滾動', + funCountUp: '數位滾動', funWangEditor: 'Editor 編輯器', funCropper: '圖片裁剪', funQrcode: '二維碼生成', @@ -154,8 +154,8 @@ export default { fourIsShowLogo: '側邊欄 Logo', fourIsBreadcrumb: '開啟 Breadcrumb', fourIsBreadcrumbIcon: '開啟 Breadcrumb 圖標', - fourIsTagsview: '開啟 Tagsview', - fourIsTagsviewIcon: '開啟 Tagsview 圖標', + fourIsTagsView: '開啟 TagsView', + fourIsTagsViewIcon: '開啟 TagsView 圖標', fourIsCacheTagsView: '開啟 TagsView 緩存', fourIsSortableTagsView: '開啟 TagsView 拖拽', fourIsShareTagsView: '開啟 TagsView 共用', @@ -163,10 +163,10 @@ export default { fourIsGrayscale: '灰色模式', fourIsInvert: '色弱模式', fourIsDark: '深色模式', - fourIsWartermark: '開啟浮水印', - fourWartermarkText: '浮水印文案', + fourIsWatermark: '開啟浮水印', + fourWatermarkText: '浮水印文案', fiveTitle: '其它設定', - fiveTagsStyle: 'Tagsview 風格', + fiveTagsStyle: 'TagsView 風格', fiveAnimation: '主頁面切換動畫', fiveColumnsAsideStyle: '分欄高亮風格', fiveColumnsAsideLayout: '分欄佈局風格', diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue index 36cec94398fc845cbd4c0ab972dfc80fde60ada8..b1e0fa904b1320c9fdb7ee0afdc86e4f4fe34574 100644 --- a/src/layout/component/main.vue +++ b/src/layout/component/main.vue @@ -49,8 +49,8 @@ const setBacktopClass = computed(() => { // 设置主内容区的高度 const setMainHeight = computed(() => { if (isTagsViewCurrenFull.value) return '0px'; - const { isTagsview, layout } = themeConfig.value; - if (isTagsview && layout !== 'classic') return '85px'; + const { isTagsView, layout } = themeConfig.value; + if (isTagsView && layout !== 'classic') return '85px'; else return '51px'; }); // 页面加载前 diff --git a/src/layout/main/classic.vue b/src/layout/main/classic.vue index 56d3b8e15a9bea0145af90a06436b4dd748e1d3c..bf5aec343b99540f148cd1ffb7f2290aec8f7d82 100644 --- a/src/layout/main/classic.vue +++ b/src/layout/main/classic.vue @@ -4,7 +4,7 @@
- +
@@ -29,9 +29,9 @@ const route = useRoute(); const storesThemeConfig = useThemeConfig(); const { themeConfig } = storeToRefs(storesThemeConfig); -// 判断是否显示 tasgview -const isTagsview = computed(() => { - return themeConfig.value.isTagsview; +// 判断是否显示 tagsView +const isTagsView = computed(() => { + return themeConfig.value.isTagsView; }); // 重置滚动条高度，更新子级 scrollbar const updateScrollbar = () => { diff --git a/src/layout/navBars/breadcrumb/setings.vue b/src/layout/navBars/breadcrumb/settings.vue similarity index 69% rename from src/layout/navBars/breadcrumb/setings.vue rename to src/layout/navBars/breadcrumb/settings.vue index db644af71a5fe6f9fe0ed56c2d4cfd0a05235395..f1e08f906ad4299479372e35a2f0a77f172bd5ef 100644 --- a/src/layout/navBars/breadcrumb/setings.vue +++ b/src/layout/navBars/breadcrumb/settings.vue @@ -1,5 +1,5 @@ -