fix(define-model): unifed key

vue-macros · Oct 16, 2022 · 7877ac7 · 7877ac7
1 parent dde7477
commit 7877ac7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/.changeset/soft-avocados-jam.md b/.changeset/soft-avocados-jam.md
@@ -0,0 +1,5 @@
+---
+'@vue-macros/define-model': patch
+---
+
+fix unifed key
diff --git a/packages/define-model/src/core/helper.ts b/packages/define-model/src/core/helper.ts
@@ -12,8 +12,8 @@ import { useVModel } from '@vueuse/core';
 export default (...keys) => {
   const props = getCurrentInstance().proxy.$props
   const ret = {}
-  for (const [key, eventName] of keys)
-    ret[key] = useVModel(props, key, undefined, { eventName })
+  for (const [key, prop, eventName] of keys)
+    ret[key] = useVModel(props, prop, undefined, { eventName })
   return ret
 }
 `
diff --git a/packages/define-model/src/core/index.ts b/packages/define-model/src/core/index.ts
@@ -380,7 +380,7 @@ export const transformDefineModel = (
 
       const names = Object.keys(map)
       const text = `_DM_useVModel(${names
-        .map((n) => `['${getPropKey(n)}', '${getEventKey(n)}']`)
+        .map((n) => `['${n}', '${getPropKey(n)}', '${getEventKey(n)}']`)
         .join(', ')})`
       s.overwriteNode(modelDecl!, text, { offset: setupOffset })
     }

diff --git a/playground/vue2/src/examples/define-model/child.vue b/playground/vue2/src/examples/define-model/child.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
-let { title } = defineModel<{
+let { modelValue, title } = defineModel<{
+  modelValue: number
   title: string
 }>()
 
 const update = () => {
+  modelValue.value++
   title.value += ' Updated!'
   debugger
 }
@@ -16,7 +18,8 @@ const check = () => {
 <template>
   <div>
     <div>defineModel demo.</div>
-    <div>current value: {{ title }}</div>
+    <div>value: {{ modelValue }}</div>
+    <div>title: {{ title }}</div>
     <button @click="update">Update</button>
     <button @click="check">Check source map</button>
   </div>

diff --git a/playground/vue2/src/examples/define-model/parent.vue b/playground/vue2/src/examples/define-model/parent.vue
@@ -2,11 +2,12 @@
 import { ref } from 'vue'
 import Child from './child.vue'
 
+const value = ref(0)
 const title = ref('hello')
 </script>
 
 <template>
   <div>
-    <child :title.sync="title" />
+    <child v-model="value" :title.sync="title" />
   </div>
 </template>
diff --git a/playground/vue2/vite.config.ts b/playground/vue2/vite.config.ts
@@ -10,6 +10,7 @@ export default defineConfig({
   },
   plugins: [
     VueMacros({
+      version: 2,
       plugins: {
         vue: Vue({
           include: [/\.vue$/, /setup\.[cm]?[jt]sx?$/],