Merge branch 'dev' into next

Author: hunterliu1003

dist/VueFinalModal.esm.js

@@ -12,7 +12,7 @@
       :overlay-transition="overlayTransition ? 'vfm' : ''"
       :z-index-auto="zIndexAuto"
       :z-index-base="zIndexBase"
-      :z-index="allowZIndex ? zIndexBase : false"
+      :z-index="allowZIndex ? zIndex : false"
       :attach="attach ? '#attach' : false"
       :focus-retain="focusRetain"
       :focus-trap="focusTrap"

dist/VueFinalModal.esm.js.map

@@ -134,7 +134,7 @@ const isComponentReadyToBeDestroyed = computed(() => {
 export const calculateZIndex = computed(() => {
   if (props.zIndex === false) {
     if (props.zIndexAuto) {
-      return props.zIndexBase + 2 * (modalStackIndex.value || 0)
+      return +props.zIndexBase + 2 * (modalStackIndex.value || 0)
     } else {
       return false
     }