Skip to content

Commit

Permalink
types: 修复全局组件属性类型无法推导
Browse files Browse the repository at this point in the history
  • Loading branch information
kailong321200875 committed Dec 21, 2023
1 parent c29d1cb commit 94160c0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
1 change: 0 additions & 1 deletion .prettierignore
Expand Up @@ -3,7 +3,6 @@
/dist*
/public/*
/docs/*
/vite.config.ts
/src/types/env.d.ts
/docs/**/*
/plop/**/*
Expand Down
4 changes: 2 additions & 2 deletions src/views/Example/Page/ExampleAdd.vue
Expand Up @@ -43,8 +43,8 @@ const save = async () => {
<BaseButton @click="go(-1)">
{{ t('common.back') }}
</BaseButton>
<BaseButton type="primary" :loading="loading" @click="save">
{{ t('exampleDemo.save') }}
<BaseButton type="primary" :loading="loading" @click="save"
>{{ t('exampleDemo.save') }}
</BaseButton>
</template>
</ContentDetailWrap>
Expand Down
6 changes: 3 additions & 3 deletions types/components.d.ts
@@ -1,8 +1,8 @@
declare module 'vue' {
export interface GlobalComponents {
Icon: (typeof import('../components/Icon/src/Icon.vue'))['default']
Permission: (typeof import('../components/Permission/src/Permission.vue'))['default']
BaseButton: (typeof import('../components/Button/src/Button.vue'))['default']
Icon: (typeof import('../src/components/Icon/index'))['Icon']
Permission: (typeof import('../src/components/Permission/index'))['Permission']
BaseButton: (typeof import('../src/components/Button/index'))['BaseButton']
}
}

Expand Down
29 changes: 15 additions & 14 deletions vite.config.ts
Expand Up @@ -5,10 +5,10 @@ import Vue from '@vitejs/plugin-vue'
import VueJsx from '@vitejs/plugin-vue-jsx'
import progress from 'vite-plugin-progress'
import EslintPlugin from 'vite-plugin-eslint'
import { ViteEjsPlugin } from "vite-plugin-ejs"
import { ViteEjsPlugin } from 'vite-plugin-ejs'
import { viteMockServe } from 'vite-plugin-mock'
import PurgeIcons from 'vite-plugin-purge-icons'
import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite"
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
import { createStyleImportPlugin, ElementPlusResolve } from 'vite-plugin-style-import'
import UnoCSS from 'unocss/vite'
Expand All @@ -24,7 +24,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
let env = {} as any
const isBuild = command === 'build'
if (!isBuild) {
env = loadEnv((process.argv[3] === '--mode' ? process.argv[4] : process.argv[3]), root)
env = loadEnv(process.argv[3] === '--mode' ? process.argv[4] : process.argv[3], root)
} else {
env = loadEnv(mode, root)
}
Expand All @@ -41,16 +41,18 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
progress(),
createStyleImportPlugin({
resolves: [ElementPlusResolve()],
libs: [{
libraryName: 'element-plus',
esModule: true,
resolveStyle: (name) => {
if (name === 'click-outside') {
return ''
libs: [
{
libraryName: 'element-plus',
esModule: true,
resolveStyle: (name) => {
if (name === 'click-outside') {
return ''
}
return `element-plus/es/components/${name.replace(/^el-/, '')}/style/css`
}
return `element-plus/es/components/${name.replace(/^el-/, '')}/style/css`
}
}]
]
}),
EslintPlugin({
cache: false,
Expand Down Expand Up @@ -81,8 +83,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
ViteEjsPlugin({
title: env.VITE_APP_TITLE
}),
UnoCSS(),
// sveltekit(),
UnoCSS()
],

css: {
Expand Down Expand Up @@ -125,7 +126,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
'/api': {
target: 'http://127.0.0.1:8000',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, '')
rewrite: (path) => path.replace(/^\/api/, '')
}
},
hmr: {
Expand Down

0 comments on commit 94160c0

Please sign in to comment.