Merge branch 'master' into develop

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)
 
 

README.md

@@ -200,13 +200,21 @@ Support modern browsers, not IE
             <sub><b>Snoword</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/amifed">
+            <img src="https://avatars.githubusercontent.com/u/36906371?v=4" width="100;" alt="amifed"/>
+            <br />
+            <sub><b>Yangyu</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/WuYihui">
             <img src="https://avatars.githubusercontent.com/u/29938095?v=4" width="100;" alt="WuYihui"/>
             <br />
             <sub><b>WuYihui</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/z6w6j6">
             <img src="https://avatars.githubusercontent.com/u/23661303?v=4" width="100;" alt="z6w6j6"/>

README.zh-CN.md

@@ -200,13 +200,21 @@ pnpm run build:pro
             <sub><b>Snoword</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/amifed">
+            <img src="https://avatars.githubusercontent.com/u/36906371?v=4" width="100;" alt="amifed"/>
+            <br />
+            <sub><b>Yangyu</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/WuYihui">
             <img src="https://avatars.githubusercontent.com/u/29938095?v=4" width="100;" alt="WuYihui"/>
             <br />
             <sub><b>WuYihui</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/z6w6j6">
             <img src="https://avatars.githubusercontent.com/u/23661303?v=4" width="100;" alt="z6w6j6"/>

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,

src/components/ConfigGlobal/src/ConfigGlobal.vue

@@ -13,7 +13,7 @@ const { variables } = useDesign()
 const appStore = useAppStore()
 
 const props = defineProps({
-  size: propTypes.oneOf<ElememtPlusSzie[]>(['default', 'small', 'large']).def('default')
+  size: propTypes.oneOf<ElememtPlusSize[]>(['default', 'small', 'large']).def('default')
 })
 
 provide('configGlobal', props)

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)
 }
 </script>

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

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)
     },

types/componentType/configGlobal.d.ts

@@ -1,3 +1,3 @@
 declare interface ConfigGlobalTypes {
-  size?: ElememtPlusSzie
+  size?: ElememtPlusSize
 }

types/global.d.ts

@@ -6,7 +6,7 @@ declare type Nullable<T> = T | null
 
 declare type ElRef<T extends HTMLElement = HTMLDivElement> = Nullable<T>
 
-declare type ElememtPlusSzie = 'default' | 'small' | 'large'
+declare type ElememtPlusSize = 'default' | 'small' | 'large'
 
 declare type ElementPlusInfoType = 'success' | 'info' | 'warning' | 'danger'