Skip to content

Commit

Permalink
style: -
Browse files Browse the repository at this point in the history
  • Loading branch information
jsxiaosi committed Jan 8, 2022
1 parent 54bd9e7 commit bc9625a
Show file tree
Hide file tree
Showing 16 changed files with 52 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script setup lang="ts">
import { ElConfigProvider } from 'element-plus';
import { deffElementLocale } from '@/hooks/useI18n';
import { deffElementLocale } from '@/hooks/web/useI18n';
const { tolocale } = deffElementLocale();
Expand Down
2 changes: 1 addition & 1 deletion src/components/Application/AppLocale.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</template>

<script setup lang="ts">
import { useI18n, localesList } from '@/hooks/useI18n';
import { useI18n, localesList } from '@/hooks/web/useI18n';
import SvgIcon from '@/components/SvgIcon/index.vue';
const i18n = useI18n();
Expand Down
2 changes: 1 addition & 1 deletion src/components/Application/AppTheme.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import SvgIcon from '../SvgIcon/index.vue';
import { toggleTheme } from '@zougt/vite-plugin-theme-preprocessor/dist/browser-utils';
import { useAppStore } from '@/store/modules/app';
import { getAppCollapseMenu } from '@/hooks/appWindow';
import { getAppCollapseMenu } from '@/hooks/userAppWindow';
// const toggleTheme = (scopeName = 'theme-default') => {
// document.documentElement.className = scopeName
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/hooks/web/useMessage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ElMessageBox, ElMessageBoxOptions } from 'element-plus';
import { useI18n } from '@/hooks/useI18n';
import { useI18n } from '@/hooks/web/useI18n';

const { t } = useI18n();

Expand Down
4 changes: 2 additions & 2 deletions src/layouts/components/Breadcrumb/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
import SvgIcon from '@/components/SvgIcon/index.vue';
import type { RouteLocationMatched } from 'vue-router';
import { ref, watch } from 'vue';
import { getAppCollapseMenu } from '@/hooks/appWindow';
import { getAppCollapseMenu } from '@/hooks/userAppWindow';
import { useRoute, useRouter } from 'vue-router';
import { useI18n } from '@/hooks/useI18n';
import { useI18n } from '@/hooks/web/useI18n';
import { useAppStore } from '@/store/modules/app';
const { t } = useI18n();
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/components/Navbart/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import SvgIcon from '@/components/SvgIcon/index.vue';
import { ref } from '@vue/reactivity';
import { getAppCollapseMenu } from '@/hooks/appWindow';
import { getAppCollapseMenu } from '@/hooks/userAppWindow';
const drawer = ref(false);
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/components/Seting/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</template>

<script setup lang="ts">
import { getAppCollapseMenu } from '@/hooks/appWindow';
import { getAppCollapseMenu } from '@/hooks/userAppWindow';
import { watch, ref } from 'vue';
import { useAppStore } from '@/store/modules/app';
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/components/Sidebar/Item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<script setup lang="ts">
import SvgIcon from '@/components/SvgIcon/index.vue';
import { useI18n } from '@/hooks/useI18n';
import { useI18n } from '@/hooks/web/useI18n';
defineProps({
icon: {
type: String,
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/components/Sidebar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import { useRoute } from 'vue-router';
import SidebarItem from './SidebarItem.vue';
import routeModuleList from '@/router/modules';
import { getAppCollapseMenu } from '@/hooks/appWindow';
import { getAppCollapseMenu } from '@/hooks/userAppWindow';
defineProps({
mode: {
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import NavBart from './components/Navbart/index.vue';
import Sidebar from './components/Sidebar/index.vue';
import Breadcrumb from './components/Breadcrumb/index.vue';
import { getAppCollapseMenu } from '@/hooks/appWindow';
import { getAppCollapseMenu } from '@/hooks/userAppWindow';
const { appConfigMode } = getAppCollapseMenu();
</script>
Expand Down
20 changes: 18 additions & 2 deletions src/router/modules/otherRoute/otherRoute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// import Layout from '@/layouts/index.vue'
// import AppMain from '@/layouts/components/AppMain/index.vue'
import { AppRouteRecordRaw } from '#/route';
import { t } from '@/hooks/useI18n';
import { t } from '@/hooks/web/useI18n';

const Layout = () => import('@/layouts/index.vue');
const AppMain = () => import('@/layouts/components/AppMain/index.vue');
Expand All @@ -18,12 +18,28 @@ const safeManagerRoutes: Array<AppRouteRecordRaw> = [
children: [
{
path: 'welcome',
name: 'welcome',
name: 'RtWelcome',
component: () => import('@/views/index/index.vue'),
meta: { title: t('route.pathName.index') },
},
],
},
{
path: '/components',
component: Layout,
redirect: '/components/drag',
name: 'components',
alwaysShow: true,
meta: { title: '组件', icon: 'iEL-home-filled' },
children: [
{
path: 'drag',
name: 'RtDrag',
component: () => import('@/views/components/drag/index.vue'),
meta: { title: '拖拽组件' },
},
],
},
{
path: '/useradmin',
component: Layout,
Expand Down
16 changes: 16 additions & 0 deletions src/views/components/drag/index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<template>
<div ref="chartRef" class="chartRef"></div>
</template>
<script lang="ts">
export default {
name: 'RtDrag',
};
</script>
<script lang="ts" setup></script>

<style scoped lang="scss">
.chartRef {
width: 100%;
height: 380px;
}
</style>
6 changes: 6 additions & 0 deletions src/views/index/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
</div>
</template>

<script lang="ts">
export default {
name: 'RtWelcome',
};
</script>

<script setup lang="ts">
import SeamlessScroll from '@/components/SeamlessScroll/index.vue';
import WeDetails from './components/WeDetails.vue';
Expand Down
2 changes: 1 addition & 1 deletion src/views/login/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
import { addClass, removeClass } from '@/utils/operate';
import { deffHttp } from '@/utils/axios';
import { useI18n } from '@/hooks/useI18n';
import { useI18n } from '@/hooks/web/useI18n';
const { t } = useI18n();
Expand Down

0 comments on commit bc9625a

Please sign in to comment.