From 5dbbc608640d93fe68fec6f58fdb30a43e02aada Mon Sep 17 00:00:00 2001 From: jinyang Date: Sat, 16 Apr 2022 09:42:40 +0800 Subject: [PATCH 1/4] fix: fixed spelling 'ElememtPlusSzie' --- src/components/ConfigGlobal/src/ConfigGlobal.vue | 2 +- src/components/SizeDropdown/src/SizeDropdown.vue | 2 +- src/config/app.ts | 4 ++-- src/store/modules/app.ts | 6 +++--- types/componentType/configGlobal.d.ts | 2 +- types/global.d.ts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/ConfigGlobal/src/ConfigGlobal.vue b/src/components/ConfigGlobal/src/ConfigGlobal.vue index 189e6eb..985d5df 100644 --- a/src/components/ConfigGlobal/src/ConfigGlobal.vue +++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue @@ -13,7 +13,7 @@ const { variables } = useDesign() const appStore = useAppStore() const props = defineProps({ - size: propTypes.oneOf(['default', 'small', 'large']).def('default') + size: propTypes.oneOf(['default', 'small', 'large']).def('default') }) provide('configGlobal', props) diff --git a/src/components/SizeDropdown/src/SizeDropdown.vue b/src/components/SizeDropdown/src/SizeDropdown.vue index f7b1e88..773ad62 100644 --- a/src/components/SizeDropdown/src/SizeDropdown.vue +++ b/src/components/SizeDropdown/src/SizeDropdown.vue @@ -20,7 +20,7 @@ const appStore = useAppStore() const sizeMap = computed(() => appStore.sizeMap) -const setCurrentSize = (size: ElememtPlusSzie) => { +const setCurrentSize = (size: ElememtPlusSize) => { appStore.setCurrentSize(size) } diff --git a/src/config/app.ts b/src/config/app.ts index 3b2c6f2..e4d2aad 100644 --- a/src/config/app.ts +++ b/src/config/app.ts @@ -39,8 +39,8 @@ export interface AppState { title: string userInfo: string isDark: boolean - currentSize: ElememtPlusSzie - sizeMap: ElememtPlusSzie[] + currentSize: ElememtPlusSize + sizeMap: ElememtPlusSize[] mobile: boolean footer: boolean theme: ThemeTypes diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index c6fac4e..8f00ed1 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -69,10 +69,10 @@ export const useAppStore = defineStore({ getIsDark(): boolean { return this.isDark }, - getCurrentSize(): ElememtPlusSzie { + getCurrentSize(): ElememtPlusSize { return this.currentSize }, - getSizeMap(): ElememtPlusSzie[] { + getSizeMap(): ElememtPlusSize[] { return this.sizeMap }, getMobile(): boolean { @@ -150,7 +150,7 @@ export const useAppStore = defineStore({ } wsCache.set('isDark', this.isDark) }, - setCurrentSize(currentSize: ElememtPlusSzie) { + setCurrentSize(currentSize: ElememtPlusSize) { this.currentSize = currentSize wsCache.set('currentSize', this.currentSize) }, diff --git a/types/componentType/configGlobal.d.ts b/types/componentType/configGlobal.d.ts index ba13256..6a0bb1a 100644 --- a/types/componentType/configGlobal.d.ts +++ b/types/componentType/configGlobal.d.ts @@ -1,3 +1,3 @@ declare interface ConfigGlobalTypes { - size?: ElememtPlusSzie + size?: ElememtPlusSize } diff --git a/types/global.d.ts b/types/global.d.ts index dfcb44a..28bb924 100644 --- a/types/global.d.ts +++ b/types/global.d.ts @@ -6,7 +6,7 @@ declare type Nullable = T | null declare type ElRef = Nullable -declare type ElememtPlusSzie = 'default' | 'small' | 'large' +declare type ElememtPlusSize = 'default' | 'small' | 'large' declare type ElementPlusInfoType = 'success' | 'info' | 'warning' | 'danger' From dc4bf7f271fe6cf040289ce77b3861d551670388 Mon Sep 17 00:00:00 2001 From: Archer <32283845+kailong321200875@users.noreply.github.com> Date: Sun, 17 Apr 2022 18:38:29 +0800 Subject: [PATCH 2/4] contrib-readme-action has updated readme --- README.zh-CN.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.zh-CN.md b/README.zh-CN.md index 938ddc1..9d921a8 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -200,13 +200,21 @@ pnpm run build:pro Snoword + + + amifed +
+ Yangyu + + WuYihui
WuYihui - + + z6w6j6 From e9a55457b608ec6ecd1ca3f8488b67659de0524a Mon Sep 17 00:00:00 2001 From: Archer <32283845+kailong321200875@users.noreply.github.com> Date: Sun, 17 Apr 2022 18:38:30 +0800 Subject: [PATCH 3/4] contrib-readme-action has updated readme --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f03f1f5..51c7d01 100644 --- a/README.md +++ b/README.md @@ -200,13 +200,21 @@ Support modern browsers, not IE Snoword + + + amifed +
+ Yangyu + + WuYihui
WuYihui - + + z6w6j6 From e5755438e19c4c8a114ca0b820eaefd445687f8e Mon Sep 17 00:00:00 2001 From: Archer <32283845+kailong321200875@users.noreply.github.com> Date: Sun, 17 Apr 2022 18:38:40 +0800 Subject: [PATCH 4/4] chore(master): release 1.2.12 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b693c5..b89569d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.2.12](https://github.com/kailong321200875/vue-element-plus-admin/compare/v1.2.11...v1.2.12) (2022-04-17) + + +### Bug Fixes + +* fixed spelling 'ElememtPlusSzie' ([5dbbc60](https://github.com/kailong321200875/vue-element-plus-admin/commit/5dbbc608640d93fe68fec6f58fdb30a43e02aada)) + ### [1.2.11](https://github.com/kailong321200875/vue-element-plus-admin/compare/v1.2.10...v1.2.11) (2022-04-14) diff --git a/package.json b/package.json index 6707496..969c319 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "1.2.11", + "version": "1.2.12", "description": "一套基于vue3、element-plus、typesScript、vite2的后台集成方案。", "author": "Archer <502431556@qq.com>", "private": false,