Merge pull request #8583 from element-plus/dev

D2M
element-plus · Jul 1, 2022 · c5c7f07 · c5c7f07
2 parents b2823ba + d746c46
commit c5c7f07
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,4 +1,13 @@
 ## Changelog
+
+### 2.2.8
+
+_2022-07-01_
+
+#### Bug fixes
+
+- Components [radio] fix typo (#8556 by @holazz)
+- Components [message] fix z-index & offset (#8582 by @sxzz)
 
 ### 2.2.7
 

diff --git a/packages/components/message/src/instance.ts b/packages/components/message/src/instance.ts
@@ -1,13 +1,13 @@
 import { shallowReactive } from 'vue'
-import type { VNode } from 'vue'
+import type { ComponentInternalInstance, VNode } from 'vue'
 import type { Mutable } from '@element-plus/utils'
-import type { MessageHandler, MessageInstance, MessageProps } from './message'
+import type { MessageHandler, MessageProps } from './message'
 
 export type MessageContext = {
   id: string
   vnode: VNode
   handler: MessageHandler
-  vm: MessageInstance
+  vm: ComponentInternalInstance
   props: Mutable<MessageProps>
 }
 
@@ -26,5 +26,5 @@ export const getInstance = (id: string) => {
 export const getLastOffset = (id: string): number => {
   const { prev } = getInstance(id)
   if (!prev) return 0
-  return prev.vm.bottom
+  return prev.vm.exposeProxy!.bottom
 }
diff --git a/packages/components/message/src/method.ts b/packages/components/message/src/method.ts
@@ -20,7 +20,6 @@ import type {
   Message,
   MessageFn,
   MessageHandler,
-  MessageInstance,
   MessageOptions,
   MessageParams,
   MessageParamsNormalized,
@@ -82,7 +81,7 @@ const createMessage = (
 
   const props = {
     ...options,
-    zIndex: options.zIndex ?? nextZIndex(),
+    zIndex: nextZIndex() + options.zIndex,
     id,
     onClose: () => {
       userOnClose?.()
@@ -110,14 +109,13 @@ const createMessage = (
   // instances will remove this item when close function gets called. So we do not need to worry about it.
   appendTo.appendChild(container.firstElementChild!)
 
-  const vm = vnode.component!.proxy as MessageInstance
+  const vm = vnode.component!
+
   const handler: MessageHandler = {
     // instead of calling the onClose function directly, setting this value so that we can have the full lifecycle
     // for out component, so that all closing steps will not be skipped.
     close: () => {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore `visible` from defineExpose
-      vm.visible = false
+      vm.exposeProxy!.visible = false
     },
   }
 

diff --git a/packages/components/radio/src/radio.vue b/packages/components/radio/src/radio.vue
@@ -10,7 +10,7 @@
       rawAttrs.class,
     ]"
     :style="containerStyle"
-    v-bind="labelListieners"
+    v-bind="labelListeners"
   >
     <span
       :class="[
@@ -61,7 +61,7 @@ const containerStyle = computed<StyleValue>(() => rawAttrs.style as StyleValue)
 
 const inputAttrs = useAttrs({ excludeListeners: true })
 
-const labelListieners = useAttrs({
+const labelListeners = useAttrs({
   excludeKeys: computed<string[]>(() => {
     return Object.keys(inputAttrs.value)
   }),