feat: 迁移 v3-admin v3.1.3 版本代码

This commit is contained in:
pany 2022-04-21 18:37:52 +08:00
parent 83979683b1
commit 8d7953db99
11 changed files with 30 additions and 29 deletions

View File

@ -25,7 +25,7 @@ module.exports = {
'vue/multi-word-component-names': 'off',
'vue/comment-directive': 'off',
'no-console': 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': import.meta.env.MODE === 'production' ? 'warn' : 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/member-delimiter-style': [

View File

@ -19,6 +19,7 @@
"lodash-es": "^4.17.21",
"normalize.css": "^8.0.1",
"nprogress": "^0.2.0",
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.0",
"pinia": "^2.0.13",
"screenfull": "^6.0.1",
@ -30,6 +31,7 @@
"@types/lodash-es": "^4.17.6",
"@types/node": "^17.0.25",
"@types/nprogress": "^0.2.0",
"@types/path-browserify": "^1.0.0",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"@vitejs/plugin-vue": "^2.3.1",

12
pnpm-lock.yaml generated
View File

@ -6,6 +6,7 @@ specifiers:
'@types/lodash-es': ^4.17.6
'@types/node': ^17.0.25
'@types/nprogress': ^0.2.0
'@types/path-browserify': ^1.0.0
'@typescript-eslint/eslint-plugin': ^5.20.0
'@typescript-eslint/parser': ^5.20.0
'@vitejs/plugin-vue': ^2.3.1
@ -24,6 +25,7 @@ specifiers:
lodash-es: ^4.17.21
normalize.css: ^8.0.1
nprogress: ^0.2.0
path-browserify: ^1.0.1
path-to-regexp: ^6.2.0
pinia: ^2.0.13
sass: ^1.50.1
@ -46,6 +48,7 @@ dependencies:
lodash-es: 4.17.21
normalize.css: 8.0.1
nprogress: 0.2.0
path-browserify: 1.0.1
path-to-regexp: 6.2.0
pinia: 2.0.13_typescript@4.6.3+vue@3.2.33
screenfull: 6.0.1
@ -57,6 +60,7 @@ devDependencies:
'@types/lodash-es': 4.17.6
'@types/node': 17.0.25
'@types/nprogress': 0.2.0
'@types/path-browserify': 1.0.0
'@typescript-eslint/eslint-plugin': 5.20.0_b9ac9b5656ce5dffade639fcf5e491bf
'@typescript-eslint/parser': 5.20.0_eslint@8.13.0+typescript@4.6.3
'@vitejs/plugin-vue': 2.3.1_vite@2.9.5+vue@3.2.33
@ -208,6 +212,10 @@ packages:
resolution: {integrity: sha512-1cYJrqq9GezNFPsWTZpFut/d4CjpZqA0vhqDUPFWYKF1oIyBz5qnoYMzR+0C/T96t3ebLAC1SSnwrVOm5/j74A==}
dev: true
/@types/path-browserify/1.0.0:
resolution: {integrity: sha512-XMCcyhSvxcch8b7rZAtFAaierBYdeHXVvg2iYnxOV0MCQHmPuRRmGZPFDRzPayxcGiiSL1Te9UIO+f3cuj0tfw==}
dev: true
/@types/svgo/2.6.3:
resolution: {integrity: sha512-5sP0Xgo0dXppY0tbYF6TevB/1+tzFLuu71XXxC/zGvQAn9PW7y+DwtDO81g0ZUPye00K6tPwtsLDOpARa0mFcA==}
dependencies:
@ -2813,6 +2821,10 @@ packages:
engines: {node: '>=0.10.0'}
dev: true
/path-browserify/1.0.1:
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
dev: false
/path-exists/3.0.0:
resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
engines: {node: '>=4'}

View File

@ -1,6 +1,6 @@
<template>
<svg class="svg-icon" aria-hidden="true">
<use :href="symbolId" :fill="color" />
<use :href="symbolId" />
</svg>
</template>
@ -15,10 +15,6 @@ const props = defineProps({
name: {
type: String,
required: true
},
color: {
type: String,
default: '#333'
}
})

View File

@ -39,8 +39,8 @@ import { useRouter } from 'vue-router'
import { useAppStore } from '@/store/modules/app'
import { useSettingsStore } from '@/store/modules/settings'
import { useUserStore } from '@/store/modules/user'
import BreadCrumb from '../bread-crumb/index.vue'
import Hamburger from '../hamburger/index.vue'
import BreadCrumb from '../BreadCrumb/index.vue'
import Hamburger from '../Hamburger/index.vue'
import ThemeSwitch from '@/components/ThemeSwitch/index.vue'
import Screenfull from '@/components/Screenfull/index.vue'

View File

@ -31,11 +31,11 @@
</template>
<script lang="ts" setup>
import path from 'path'
import path from 'path-browserify'
import { computed, PropType } from 'vue'
import { RouteRecordRaw } from 'vue-router'
import { isExternal } from '@/utils/validate'
import SidebarItemLink from './sidebar-item-link.vue'
import SidebarItemLink from './SidebarItemLink.vue'
const props = defineProps({
item: {

View File

@ -29,8 +29,8 @@ import { useRoute } from 'vue-router'
import { useAppStore } from '@/store/modules/app'
import { usePermissionStore } from '@/store/modules/permission'
import { useSettingsStore } from '@/store/modules/settings'
import SidebarItem from './sidebar-item.vue'
import SidebarLogo from './sidebar-logo.vue'
import SidebarItem from './SidebarItem.vue'
import SidebarLogo from './SidebarLogo.vue'
const route = useRoute()
const sidebar = computed(() => {

View File

@ -35,12 +35,12 @@
</template>
<script lang="ts" setup>
import path from 'path'
import path from 'path-browserify'
import { useTagsViewStore, ITagView } from '@/store/modules/tags-view'
import { usePermissionStore } from '@/store/modules/permission'
import { computed, getCurrentInstance, nextTick, onBeforeMount, reactive, watch } from 'vue'
import { RouteRecordRaw, useRoute, useRouter } from 'vue-router'
import ScrollPane from './scroll-pane.vue'
import ScrollPane from './ScrollPane.vue'
import { Close } from '@element-plus/icons-vue'
const tagsViewStore = useTagsViewStore()

View File

@ -1,6 +1,6 @@
export { default as AppMain } from './AppMain.vue'
export { default as NavigationBar } from './navigation-bar/index.vue'
export { default as Settings } from './settings/index.vue'
export { default as Sidebar } from './sidebar/index.vue'
export { default as TagsView } from './tags-view/index.vue'
export { default as RightPanel } from './right-panel/index.vue'
export { default as NavigationBar } from './NavigationBar/index.vue'
export { default as Settings } from './Settings/index.vue'
export { default as Sidebar } from './Sidebar/index.vue'
export { default as TagsView } from './TagsView/index.vue'
export { default as RightPanel } from './RightPanel/index.vue'

View File

@ -5,15 +5,6 @@ import '@vue/runtime-core'
declare module '@vue/runtime-core' {
export interface GlobalComponents {
ElButton: typeof import('element-plus/es')['ElButton']
ElDropdown: typeof import('element-plus/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
Screenfull: typeof import('./../components/Screenfull/index.vue')['default']

View File

@ -99,7 +99,7 @@ function createRequestFunction(service: AxiosInstance) {
'Content-Type': get(config, 'headers.Content-Type', 'application/json')
},
timeout: 5000,
baseURL: process.env.VUE_APP_BASE_API,
baseURL: import.meta.env.VITE_BASE_API,
data: {}
}
return service(Object.assign(configDefault, config))