Merge branch 'element-plus:dev' into select-v2-doc

element-plus · Jan 4, 2024 · cc7f426 · cc7f426
2 parents 7ea92bb + 49ca14f
commit cc7f426
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 17 deletions.
diff --git a/.github/workflows/pr-docs-deploy.yml b/.github/workflows/pr-docs-deploy.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Comment preview link
         if: ${{ success() }}
-        uses: actions-cool/maintain-one-comment@v3.0.0
+        uses: actions-cool/maintain-one-comment@v3.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
@@ -53,7 +53,7 @@ jobs:
 
       - name: Comment playground link
         if: ${{ success() }}
-        uses: actions-cool/maintain-one-comment@v3.0.0
+        uses: actions-cool/maintain-one-comment@v3.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
@@ -65,7 +65,7 @@ jobs:
 
       - name: Deploy has failed
         if: ${{ failure() }}
-        uses: actions-cool/maintain-one-comment@v3.0.0
+        uses: actions-cool/maintain-one-comment@v3.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |
@@ -92,7 +92,7 @@ jobs:
         run: echo "id=$(<pr.txt)" >> $GITHUB_OUTPUT
 
       - name: Deploy has failed
-        uses: actions-cool/maintain-one-comment@v3.0.0
+        uses: actions-cool/maintain-one-comment@v3.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |

diff --git a/.github/workflows/pr-docs-start.yml b/.github/workflows/pr-docs-start.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: create
-        uses: actions-cool/maintain-one-comment@v3.0.0
+        uses: actions-cool/maintain-one-comment@v3.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: |

diff --git a/.github/workflows/publish-build-product.yml b/.github/workflows/publish-build-product.yml
@@ -63,7 +63,7 @@ jobs:
           path: ./tmp/diff.md
 
       - name: Set comment
-        uses: actions-cool/maintain-one-comment@v3.0.0
+        uses: actions-cool/maintain-one-comment@v3.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body: ${{ steps.diff.outputs.content }}

diff --git a/packages/components/input/src/input.vue b/packages/components/input/src/input.vue
@@ -41,8 +41,8 @@
           :aria-label="label"
           :placeholder="placeholder"
           :style="inputStyle"
-          :form="props.form"
-          :autofocus="props.autofocus"
+          :form="form"
+          :autofocus="autofocus"
           @compositionstart="handleCompositionStart"
           @compositionupdate="handleCompositionUpdate"
           @compositionend="handleCompositionEnd"
@@ -118,8 +118,8 @@
         :style="textareaStyle"
         :aria-label="label"
         :placeholder="placeholder"
-        :form="props.form"
-        :autofocus="props.autofocus"
+        :form="form"
+        :autofocus="autofocus"
         @compositionstart="handleCompositionStart"
         @compositionupdate="handleCompositionUpdate"
         @compositionend="handleCompositionEnd"
@@ -235,9 +235,9 @@ const attrs = useAttrs({
     return Object.keys(containerAttrs.value)
   }),
 })
-const { form, formItem } = useFormItem()
+const { form: elForm, formItem: elFormItem } = useFormItem()
 const { inputId } = useFormItemInputId(props, {
-  formItemContext: formItem,
+  formItemContext: elFormItem,
 })
 const inputSize = useFormSize()
 const inputDisabled = useFormDisabled()
@@ -260,14 +260,14 @@ const { wrapperRef, isFocused, handleFocus, handleBlur } = useFocusController(
   {
     afterBlur() {
       if (props.validateEvent) {
-        formItem?.validate?.('blur').catch((err) => debugWarn(err))
+        elFormItem?.validate?.('blur').catch((err) => debugWarn(err))
       }
     },
   }
 )
 
-const needStatusIcon = computed(() => form?.statusIcon ?? false)
-const validateState = computed(() => formItem?.validateState || '')
+const needStatusIcon = computed(() => elForm?.statusIcon ?? false)
+const validateState = computed(() => elFormItem?.validateState || '')
 const validateIcon = computed(
   () => validateState.value && ValidateComponentsMap[validateState.value]
 )
@@ -490,7 +490,7 @@ watch(
   () => {
     nextTick(() => resizeTextarea())
     if (props.validateEvent) {
-      formItem?.validate?.('change').catch((err) => debugWarn(err))
+      elFormItem?.validate?.('change').catch((err) => debugWarn(err))
     }
   }
 )

diff --git a/packages/components/tour/src/content.vue b/packages/components/tour/src/content.vue
@@ -24,7 +24,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, inject, ref, toRef } from 'vue'
+import { computed, inject, ref, toRef, watch } from 'vue'
 import ElFocusTrap from '@element-plus/components/focus-trap'
 import { tourContentEmits, tourContentProps } from './content'
 import { tourKey, useFloating } from './helper'
@@ -41,6 +41,13 @@ const strategy = ref(props.strategy)
 const contentRef = ref<HTMLElement | null>(null)
 const arrowRef = ref<HTMLElement | null>(null)
 
+watch(
+  () => props.placement,
+  () => {
+    placement.value = props.placement
+  }
+)
+
 const { contentStyle, arrowStyle } = useFloating(
   toRef(props, 'reference'),
   contentRef,

diff --git a/packages/theme-chalk/src/tour.scss b/packages/theme-chalk/src/tour.scss
@@ -145,6 +145,15 @@
     @include set-css-var-value('tour-text-color', #fff);
     @include set-css-var-value('tour-bg-color', getCssVar('color', 'primary'));
 
+    .#{$namespace}-tour__closebtn {
+      &:focus,
+      &:hover {
+        .#{$namespace}-tour__close {
+          color: getCssVar('tour-title-text-color');
+        }
+      }
+    }
+
     .#{$namespace}-button--default {
       color: getCssVar('color', 'primary');
       border-color: getCssVar('color', 'primary');