From 2d75837ec532575c43be404d2ba5e2df07be19bb Mon Sep 17 00:00:00 2001
From: Tyh2001 <1469442737@qq.com>
Date: Fri, 24 May 2024 09:03:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20select=20=E7=BB=84=E4=BB=B6=20on-before?=
 =?UTF-8?q?-change=20=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=A2=9E=E5=AE=B6?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/components/select.md                     |  8 +++--
 .../fighting-design/option/src/option.vue     |  2 +-
 .../fighting-design/select/src/interface.ts   |  5 ++-
 start/src/App.vue                             | 32 ++-----------------
 4 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/docs/components/select.md b/docs/components/select.md
index 38fb7cb030..12dc64f079 100644
--- a/docs/components/select.md
+++ b/docs/components/select.md
@@ -129,10 +129,11 @@
 <script lang="ts" setup>
   import { ref } from 'vue'
   import { FConfirmBox } from 'fighting-design'
+  import type { SelectBeforeChange } from 'fighting-design'
 
   const value4 = ref('')
 
-  const onBeforeChange = (): Promise<boolean> => {
+  const onBeforeChange: SelectBeforeChange = (value, label): Promise<boolean> => {
     return new Promise(resolve => {
       FConfirmBox({
         title: '标题',
@@ -222,7 +223,10 @@ type SelectChange = (
 ### SelectBeforeChange
 
 ```ts
-type SelectBeforeChange = () => Promise<boolean>
+type SelectBeforeChange = (
+  value: SelectModelValue,
+  label: SelectModelValue
+) => Promise<boolean>
 ```
 
 ## Contributors
diff --git a/packages/fighting-design/option/src/option.vue b/packages/fighting-design/option/src/option.vue
index 7e9103c53d..a496717b2e 100644
--- a/packages/fighting-design/option/src/option.vue
+++ b/packages/fighting-design/option/src/option.vue
@@ -140,7 +140,7 @@
      * promise 返回一个布尔类型，为 true 代表值需要改变，为 false 代表取消改变
      */
     if (parentInject.onBeforeChange) {
-      const changeRes = await parentInject.onBeforeChange()
+      const changeRes = await parentInject.onBeforeChange(currentValue, currentLabel)
 
       if (!changeRes) {
         // 点击之后关闭
diff --git a/packages/fighting-design/select/src/interface.ts b/packages/fighting-design/select/src/interface.ts
index a1e5d7a9a7..3ab5e95f82 100644
--- a/packages/fighting-design/select/src/interface.ts
+++ b/packages/fighting-design/select/src/interface.ts
@@ -18,8 +18,11 @@ export type SelectChange = (
 
 /**
  * 值在改变之前的回调类型
+ * 
+ * @param { string | number } value 需要改变的值
+ * @param { string | number } label 需要改变的标签
  */
-export type SelectBeforeChange = () => Promise<boolean>
+export type SelectBeforeChange = (value: SelectModelValue, label: SelectModelValue) => Promise<boolean>
 
 /**
  * 提供给子组件注入的依赖项类型接口
diff --git a/start/src/App.vue b/start/src/App.vue
index afc0fc85ba..1c772edac4 100644
--- a/start/src/App.vue
+++ b/start/src/App.vue
@@ -1,31 +1,3 @@
-<template>
-  <f-select v-model="value3" placeholder="请选择……" :on-before-change="onBeforeChange">
-    <f-option :value="1">香蕉</f-option>
-    <f-option :value="2">苹果</f-option>
-    <f-option :value="3">哈密瓜</f-option>
-    <f-option :value="4">樱桃</f-option>
-  </f-select>
-</template>
+<script lang="ts" setup></script>
 
-<script lang="ts" setup>
-  import { ref } from 'vue'
-  import { FConfirmBox } from 'fighting-design'
-
-  const value3 = ref('')
-
-  const onBeforeChange = (): Promise<boolean> => {
-    return new Promise(resolve => {
-      FConfirmBox({
-        title: '标题',
-        content: '这是内容',
-        zIndex: 2000,
-        onConfirm: () => {
-          resolve(true)
-        },
-        onCancel: () => {
-          resolve(false)
-        }
-      })
-    })
-  }
-</script>
+<template></template>