From cd981cc11393a96d3e175d6bae5726d92511b466 Mon Sep 17 00:00:00 2001
From: winixt <haizekuo@gmail.com>
Date: Sat, 19 Jul 2025 11:49:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20select=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=8F=97=E6=8E=A7=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/_util/use/useModel.ts              | 22 +++----
 components/select/props.ts                    |  4 ++
 components/select/select.vue                  | 17 +++---
 components/select/useCurrentValue.ts          | 57 +++++++++++++++++
 docs/.vitepress/components/select/index.md    |  7 +++
 docs/.vitepress/components/select/passive.vue | 61 +++++++++++++++++++
 6 files changed, 148 insertions(+), 20 deletions(-)
 create mode 100644 components/select/useCurrentValue.ts
 create mode 100644 docs/.vitepress/components/select/passive.vue

diff --git a/components/_util/use/useModel.ts b/components/_util/use/useModel.ts
index 783e657e..43ec1afd 100644
--- a/components/_util/use/useModel.ts
+++ b/components/_util/use/useModel.ts
@@ -21,10 +21,10 @@ export const useNormalModel = <
     > = ModelValuePropKey,
     EventName extends string = string,
 >(
-        props: Props,
-        emit: (eventName: EventName, ...args: any[]) => void,
-        config: UseNormalModelOptions<Props, Key> = {},
-    ): [WritableComputedRef<Props[Key]>, (val: Props[Key]) => void] => {
+    props: Props,
+    emit: (eventName: EventName, ...args: any[]) => void,
+    config: UseNormalModelOptions<Props, Key> = {},
+): [WritableComputedRef<Props[Key]>, (val: Props[Key]) => void] => {
     const {
         prop = 'modelValue',
         deep = false,
@@ -106,13 +106,13 @@ export const useArrayModel = <
     > = Extract<ModelValuePropKey, GetKeysIsArrayType<Props>>,
     EventName extends string = string,
 >(
-        props: Props,
-        emit: (eventName: EventName, ...args: any[]) => void,
-        config: UseNormalModelOptions<Props, Key> = {},
-    ): [
-        WritableComputedRef<Props[Key]>,
-        (val: ArrayOrItem<Props[Key]>) => void,
-    ] => {
+    props: Props,
+    emit: (eventName: EventName, ...args: any[]) => void,
+    config: UseNormalModelOptions<Props, Key> = {},
+): [
+    WritableComputedRef<Props[Key]>,
+    (val: ArrayOrItem<Props[Key]>) => void,
+] => {
     const [computedValue, updateCurrentValue] = useNormalModel(props, emit, {
         ...config,
         defaultValue: [] as Props[Key],
diff --git a/components/select/props.ts b/components/select/props.ts
index 0c1a8a07..1e288e14 100644
--- a/components/select/props.ts
+++ b/components/select/props.ts
@@ -93,6 +93,10 @@ export const selectProps = {
         type: Boolean,
         default: false,
     },
+    passive: {
+        type: Boolean,
+        default: true,
+    },
     popperClass: [String, Array, Object] as PropType<string | [] | object>,
     triggerClass: [String, Array, Object] as PropType<string | [] | object>,
     triggerStyle: [Object, String] as PropType<CSSProperties | string>,
diff --git a/components/select/select.vue b/components/select/select.vue
index fde3b1ec..2e368828 100644
--- a/components/select/select.vue
+++ b/components/select/select.vue
@@ -74,10 +74,10 @@
 </template>
 
 <script lang="ts">
-import { type CSSProperties, computed, defineComponent, provide, ref, unref, watch } from 'vue';
+import { computed, defineComponent, provide, ref, unref, watch } from 'vue';
+import type { CSSProperties } from 'vue';
 import { isNil } from 'lodash-es';
 import { useTheme } from '../_theme/useTheme';
-import { type UseArrayModelReturn, useArrayModel, useNormalModel } from '../_util/use/useModel';
 import { CHANGE_EVENT, UPDATE_MODEL_EVENT } from '../_util/constants';
 import useFormAdaptor from '../_util/use/useFormAdaptor';
 import Popper from '../popper';
@@ -88,6 +88,7 @@ import OptionList from './optionList';
 import { selectProps } from './props';
 import useOptions from './useOptions';
 import type { SelectOption, SelectValue } from './interface';
+import { useCurrentValue } from './useCurrentValue';
 
 export default defineComponent({
     name: 'FSelect',
@@ -106,7 +107,7 @@ export default defineComponent({
         const innerDisabled = computed(() => props.disabled === true || isFormDisabled.value);
         const isOpenedRef = ref(false);
         // 与 props 中 modelValue 类型保持一致
-        const [currentValue, updateCurrentValue] = props.multiple ? (useArrayModel(props, emit) as unknown as UseArrayModelReturn<SelectValue[]>) : useNormalModel(props, emit);
+        const { currentValue, updateCurrentValue } = useCurrentValue(props, emit);
 
         const triggerRef = ref();
         const triggerWidth = ref(0);
@@ -123,16 +124,15 @@ export default defineComponent({
             }
         });
 
-        const handleChange = () => {
-            emit(CHANGE_EVENT, unref(currentValue));
+        const handleChange = (value: SelectValue | SelectValue[]) => {
+            emit(CHANGE_EVENT, value);
             validate(CHANGE_EVENT);
         };
 
         const handleClear = () => {
             const value: null | [] = props.multiple ? [] : null;
             if (props.multiple ? ((currentValue.value as SelectValue[]) || []).length : currentValue.value !== null) {
-                updateCurrentValue(value);
-                handleChange();
+                handleChange(updateCurrentValue(value));
             }
             filterText.value = '';
             cacheOptions.value = [];
@@ -260,8 +260,7 @@ export default defineComponent({
                     }
                 }
             }
-            updateCurrentValue(unref(value));
-            handleChange();
+            handleChange(updateCurrentValue(unref(value)));
         };
 
         // select-trigger 选择项展示，只在 currentValue 改变时才改变
diff --git a/components/select/useCurrentValue.ts b/components/select/useCurrentValue.ts
new file mode 100644
index 00000000..6e898d62
--- /dev/null
+++ b/components/select/useCurrentValue.ts
@@ -0,0 +1,57 @@
+import { useVModel } from '@vueuse/core';
+import type { SelectValue } from './interface';
+import type { SelectProps } from './props';
+
+export function useCurrentValue(props: SelectProps, emit: (event: 'filter' | 'update:modelValue' | 'focus' | 'blur' | 'change' | 'clear' | 'search' | 'scroll' | 'removeTag' | 'visibleChange', ...args: any[]) => void) {
+    const currentValue = useVModel(props, 'modelValue', emit, {
+        passive: props.passive,
+    });
+
+    function updateCurrentValue(value: SelectValue | SelectValue[]): SelectValue | SelectValue[] {
+        if (!props.multiple) {
+            currentValue.value = value;
+            return value;
+        } else {
+            if (Array.isArray(value)) {
+                currentValue.value = value;
+                return value;
+            }
+
+            // 兼容重复赋值为不符合预期数据类型的场景
+            let val: SelectValue[] = [];
+            if (!Array.isArray(currentValue.value)) {
+                console.warn(
+                    '[useArrayModel] 绑定值类型不匹配, 仅支持数组类型, value:',
+                    currentValue.value,
+                );
+                val = [];
+            } else {
+                val = [...currentValue.value];
+            }
+
+            const index = val.indexOf(value);
+            if (index !== -1) {
+                val.splice(index, 1);
+            } else {
+                val.push(value);
+            }
+            currentValue.value = val;
+            return val;
+        }
+    };
+
+    if (props.multiple) {
+        if (!Array.isArray(currentValue.value)) {
+            console.warn(
+                '[useArrayModel] 绑定值类型不匹配, 仅支持数组类型, value:',
+                props.modelValue,
+            );
+            currentValue.value = [];
+        }
+    }
+
+    return {
+        currentValue,
+        updateCurrentValue,
+    };
+}
diff --git a/docs/.vitepress/components/select/index.md b/docs/.vitepress/components/select/index.md
index b1996625..e53916d6 100644
--- a/docs/.vitepress/components/select/index.md
+++ b/docs/.vitepress/components/select/index.md
@@ -134,6 +134,12 @@ addon.vue
 selectGroupOption.vue
 :::
 
+### 受控模式
+
+:::demo
+passive.vue
+:::
+
 ## Select Props
 
 | 属性                 | 说明                                                          | 类型                                         | 默认值                |
@@ -156,6 +162,7 @@ selectGroupOption.vue
 | tag                  | 是否可以创建新的选项，需要和 `filterable` 一起使用            | boolean                                      | `false`               |
 | remote               | 是否远程搜索，当输入内容时触发`search`事件                    | boolean                                      | `false`               |
 | options              | 选项配置                                                      | array\<SelectOption\>                        | `[]`                  |
+| passive              | 是否受控模式，true-非受控，false-受控                                                           | boolean                       | `true`                  |
 | virtualScroll        | 虚拟滚动                                                      | boolean / number                             | `true`                |
 | valueField           | 替代 `SelectOption` 中的 `value` 字段名                       | string                                       | `value`               |
 | labelField           | 替代 `SelectOption` 中的 `label` 字段名                       | string                                       | `label`               |
diff --git a/docs/.vitepress/components/select/passive.vue b/docs/.vitepress/components/select/passive.vue
new file mode 100644
index 00000000..13000eb4
--- /dev/null
+++ b/docs/.vitepress/components/select/passive.vue
@@ -0,0 +1,61 @@
+<template>
+    <FSpace vertical>
+        <!-- <FSelect multiple :multipleLimit="2" :passive="false">
+            <FOption
+                v-for="(item, index) in optionList"
+                :key="index"
+                :value="item.value"
+                :label="item.label"
+            />
+        </FSelect> -->
+
+        <FSelect :modelValue="singleSelect" :passive="false" @change="changeSingle">
+            <FOption
+                v-for="(item, index) in optionList"
+                :key="index"
+                :value="item.value"
+                :label="item.label"
+            />
+        </FSelect>
+    </FSpace>
+</template>
+
+<script setup>
+import { reactive, ref } from 'vue';
+
+const optionList = reactive([
+    {
+        value: 'HuNan',
+        label: '湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南湖南',
+    },
+    {
+        value: 'HuBei',
+        label: '湖北',
+        disabled: true,
+    },
+    {
+        value: 'ZheJiang',
+        label: '浙江',
+    },
+    {
+        value: 'GuangDong',
+        label: '广东',
+    },
+    {
+        value: 'JiangSu',
+        label: '江苏',
+    },
+]);
+
+const singleSelect = ref();
+function changeSingle(value) {
+    console.log(value);
+    singleSelect.value = value;
+}
+</script>
+
+<style scoped>
+.fes-select {
+    width: 200px;
+}
+</style>

From 7f66e634107819558b9bc1d7b98e4171b10ef214 Mon Sep 17 00:00:00 2001
From: winixt <haizekuo@gmail.com>
Date: Tue, 22 Jul 2025 14:30:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20cr=20=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/select/useCurrentValue.ts          | 2 ++
 docs/.vitepress/components/select/passive.vue | 9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/components/select/useCurrentValue.ts b/components/select/useCurrentValue.ts
index 6e898d62..d7604bfe 100644
--- a/components/select/useCurrentValue.ts
+++ b/components/select/useCurrentValue.ts
@@ -5,6 +5,8 @@ import type { SelectProps } from './props';
 export function useCurrentValue(props: SelectProps, emit: (event: 'filter' | 'update:modelValue' | 'focus' | 'blur' | 'change' | 'clear' | 'search' | 'scroll' | 'removeTag' | 'visibleChange', ...args: any[]) => void) {
     const currentValue = useVModel(props, 'modelValue', emit, {
         passive: props.passive,
+        deep: true,
+        defaultValue: props.multiple ? [] : undefined,
     });
 
     function updateCurrentValue(value: SelectValue | SelectValue[]): SelectValue | SelectValue[] {
diff --git a/docs/.vitepress/components/select/passive.vue b/docs/.vitepress/components/select/passive.vue
index 13000eb4..0ca49106 100644
--- a/docs/.vitepress/components/select/passive.vue
+++ b/docs/.vitepress/components/select/passive.vue
@@ -1,14 +1,5 @@
 <template>
     <FSpace vertical>
-        <!-- <FSelect multiple :multipleLimit="2" :passive="false">
-            <FOption
-                v-for="(item, index) in optionList"
-                :key="index"
-                :value="item.value"
-                :label="item.label"
-            />
-        </FSelect> -->
-
         <FSelect :modelValue="singleSelect" :passive="false" @change="changeSingle">
             <FOption
                 v-for="(item, index) in optionList"