fix: Tencent#1086 fix(cascader): 修复变更选项触发两次onchange事件和v-model绑定ref()没…

…有响应式问题 Tencent#1086 fix(cascader): 修复变更选项触发两次onchange事件和v-model绑定ref()没有响应式问题
bitjian · Sep 15, 2023 · 1bc31a2 · 1bc31a2
1 parent fa5ec94
commit 1bc31a2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/_common b/src/_common
diff --git a/src/cascader/cascader.vue b/src/cascader/cascader.vue
@@ -207,9 +207,7 @@ export default defineComponent({
         steps[level + 1] = '选择选项';
         steps.length = level + 2;
       } else {
-        setCascaderValue(item[keys.value?.value ?? 'value']);
-        emitEvent(
-          'change',
+        setCascaderValue(
           item[keys.value?.value ?? 'value'],
           items.map((item, index) => toRaw(item?.[selectedIndexes[index]])),
         );

diff --git a/src/shared/useVModel/index.ts b/src/shared/useVModel/index.ts
@@ -1,4 +1,5 @@
 import { ref, Ref, getCurrentInstance, ComponentInternalInstance } from 'vue';
+import kebabCase from 'lodash/kebabCase';
 
 export type ChangeHandler<T> = (value: T, ...args: any[]) => void;
 
@@ -10,12 +11,20 @@ export function useVModel<T>(
   propName = 'value',
   // emit 和 eventName 用于支持 v-model 和 xxx.sync 语法糖
 ): [Ref<T>, ChangeHandler<T>] {
-  const { emit } = getCurrentInstance() as ComponentInternalInstance;
+  const { emit, vnode } = getCurrentInstance() as ComponentInternalInstance;
   const internalValue = ref<T>() as Ref<T>;
   internalValue.value = defaultValue;
 
+  const vProps = vnode.props || {};
+  const isVM =
+    Object.prototype.hasOwnProperty.call(vProps, 'modelValue') ||
+    Object.prototype.hasOwnProperty.call(vProps, 'model-value');
+  const isVMP =
+    Object.prototype.hasOwnProperty.call(vProps, propName) ||
+    Object.prototype.hasOwnProperty.call(vProps, kebabCase(propName));
+
   // 受控模式 v-model:propName
-  if (typeof value.value !== 'undefined') {
+  if (isVMP) {
     return [
       value,
       (newValue, ...args) => {
@@ -26,7 +35,7 @@ export function useVModel<T>(
   }
 
   // 受控模式:modelValue v-model
-  if (typeof modelValue.value !== 'undefined') {
+  if (isVM) {
     return [
       modelValue,
       (newValue, ...args) => {