From 9059eb6e756fe30eea403541e3960790a60aefc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com>
Date: Mon, 18 Oct 2021 16:43:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(props):=20=E4=BF=AE=E5=A4=8D=20tab=20?=
 =?UTF-8?q?=E5=92=8C=20menu=20=E7=9A=84=E5=8F=8C=E7=BB=91=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/docs/zh-CN/components/menu.md |  6 +++-
 docs/docs/zh-CN/guide/changelog.md |  4 +++
 docs/docs/zh-CN/guide/sandbox.md   | 54 ++++++++++++++++++++++++++++++
 docs/src/layouts/Layout.vue        |  6 ++++
 docs/src/router/zh-CN.ts           |  5 +++
 src/module/carouselItem/index.ts   |  2 +-
 src/module/carouselItem/index.vue  |  1 -
 src/module/menu/index.vue          | 52 +++++++++++++++++++---------
 src/module/tab/index.vue           | 24 +++++++++----
 9 files changed, 128 insertions(+), 26 deletions(-)
 create mode 100644 docs/docs/zh-CN/guide/sandbox.md

diff --git a/docs/docs/zh-CN/components/menu.md b/docs/docs/zh-CN/components/menu.md
index 59b26f49..aeed02dd 100644
--- a/docs/docs/zh-CN/components/menu.md
+++ b/docs/docs/zh-CN/components/menu.md
@@ -1,7 +1,7 @@
 ::: demo
 
 <template>
-  <lay-menu selectedKey="5">
+  <lay-menu v-model:selectedKey="selectedKey" v-model:openKeys="openKeys">
     <lay-menu-item title="首页" id="1"></lay-menu-item>
     <lay-menu-item title="用户" id="2"></lay-menu-item>
     <lay-menu-item title="角色" id="3"></lay-menu-item> 
@@ -19,7 +19,11 @@ import { ref } from 'vue'
 export default {
   setup() {
 
+    const selectedKey = ref("5")
+    const openKeys = ref(["7"])   
     return {
+      selectedKey,
+      openKeys
     }
   }
 }
diff --git a/docs/docs/zh-CN/guide/changelog.md b/docs/docs/zh-CN/guide/changelog.md
index cd2c8f3a..608f8aca 100644
--- a/docs/docs/zh-CN/guide/changelog.md
+++ b/docs/docs/zh-CN/guide/changelog.md
@@ -4,6 +4,10 @@
 ::: demo
 <template>
     <lay-timeline>
+        <lay-timeline-item title="0.1.5">
+          [修复] menu 菜单 selectedKey 选中项 openKeys 打开项 props 双绑。<br>
+          [修复] tab 选项卡 v-model 激活项 双绑。<br>
+        </lay-timeline-item>
         <lay-timeline-item title="0.1.4">
           [新增] button 按钮 loading 属性, 提供 加载 状态。<br>
           [新增] tab 选项卡 allow-close 属性，支持 关闭。<br>
diff --git a/docs/docs/zh-CN/guide/sandbox.md b/docs/docs/zh-CN/guide/sandbox.md
new file mode 100644
index 00000000..f9c0ee85
--- /dev/null
+++ b/docs/docs/zh-CN/guide/sandbox.md
@@ -0,0 +1,54 @@
+::: field 测试
+:::
+
+::: demo
+
+<template>
+<lay-menu v-model:selectedKey="selectedKey" v-model:openKeys="openKeys" :tree="isTree">
+    <lay-menu-item title="工作空间" id="0">
+        <lay-menu-child-item id="1" title="控制台">
+        </lay-menu-child-item>
+        <lay-menu-child-item id="2" title="分析页">
+        </lay-menu-child-item>
+    </lay-menu-item>
+    <lay-menu-item title="错误页面" id="3">
+        <lay-menu-child-item id="4" title="403">
+        </lay-menu-child-item>
+        <lay-menu-child-item id="5" title="404">
+        </lay-menu-child-item>
+        <lay-menu-child-item id="6" title="500">
+        </lay-menu-child-item>
+    </lay-menu-item>
+</lay-menu>
+  <lay-tab type="brief" v-model="selectedKey">
+    <lay-tab-item title="选项一" id="1"><div style="padding:20px">选项一</div></lay-tab-item>
+    <lay-tab-item title="选项二" id="2"><div style="padding:20px">选项二</div></lay-tab-item>
+  </lay-tab>
+</template>
+
+<script>
+import { ref, watch } from "vue";
+import { useRoute, useRouter } from "vue-router";
+export default {
+  setup() {
+    const router = useRouter();
+    const route = useRoute();
+
+    const isTree = ref(true);
+    const selectedKey = ref("1");
+    const openKeys = ref(["0"]);
+    const change = function (id) {
+        selectedKey.value = id
+    };
+
+    return {
+      isTree,
+      selectedKey,
+      openKeys,
+      change,
+    };
+  },
+};
+</script>
+
+:::
\ No newline at end of file
diff --git a/docs/src/layouts/Layout.vue b/docs/src/layouts/Layout.vue
index dcca07d1..f8874030 100644
--- a/docs/src/layouts/Layout.vue
+++ b/docs/src/layouts/Layout.vue
@@ -105,6 +105,12 @@ export default {
         subTitle: 'change log',
         path: '/zh-CN/guide/changelog',
       },
+      {
+        id: 39,
+        title: '沙盒',
+        subTitle: 'sandbox',
+        path: '/zh-CN/guide/sandbox'
+      },
       {
         id: 4,
         title: '布局',
diff --git a/docs/src/router/zh-CN.ts b/docs/src/router/zh-CN.ts
index 53bf9ff6..3e60e14e 100644
--- a/docs/src/router/zh-CN.ts
+++ b/docs/src/router/zh-CN.ts
@@ -22,6 +22,11 @@ const zhCN = [
         component: () => import('../../docs/zh-CN/guide/changelog.md'),
         meta: { title: '更新' },
       },
+      {
+        path: '/zh-CN/guide/sandbox',
+        component: () => import('../../docs/zh-CN/guide/sandbox.md'),
+        meta: { title: '沙盒' },
+      },
     ],
   },
   {
diff --git a/src/module/carouselItem/index.ts b/src/module/carouselItem/index.ts
index 1acce590..51404620 100644
--- a/src/module/carouselItem/index.ts
+++ b/src/module/carouselItem/index.ts
@@ -6,4 +6,4 @@ Component.install = (app: App) => {
   app.component(Component.name || 'LayCarouselItem', Component)
 }
 
-export default Component as IDefineComponent
+export default Component as IDefineComponent
\ No newline at end of file
diff --git a/src/module/carouselItem/index.vue b/src/module/carouselItem/index.vue
index 83ebe3ae..f21b9d47 100644
--- a/src/module/carouselItem/index.vue
+++ b/src/module/carouselItem/index.vue
@@ -12,5 +12,4 @@ const props =
   }>()
 
 const active = inject('active')
-
 </script>
\ No newline at end of file
diff --git a/src/module/menu/index.vue b/src/module/menu/index.vue
index 5f693219..75612067 100644
--- a/src/module/menu/index.vue
+++ b/src/module/menu/index.vue
@@ -5,7 +5,9 @@
 </template>
 
 <script setup name="LayMenu" lang="ts">
-import { defineProps, provide, ref, watch } from 'vue'
+import { computed, defineProps, provide, ref, watch } from 'vue'
+
+const emit = defineEmits(['update:selectedKey', 'update:openKeys'])
 
 const props = withDefaults(
   defineProps<{
@@ -15,28 +17,46 @@ const props = withDefaults(
   }>(),
   {
     selectedKey: '',
-    openKeys: function() {
+    openKeys: function () {
       return []
     },
     tree: false,
   }
 )
 
-const isTree = ref(props.tree)
-const selectedKey = ref(props.selectedKey)
-const openKeys = ref([...props.openKeys])
+const isTree = computed(() => props.tree)
+
+const openKeys = computed({
+  get() {
+    return props.openKeys
+  },
+  set(val) {
+    emit('update:selectedKey', val)
+  },
+})
+
+const selectedKey = computed({
+  get() {
+    return props.selectedKey
+  },
+  set(val) {
+    emit('update:selectedKey', val)
+  },
+})
+
+watch(selectedKey, function (val) {
+  emit('update:selectedKey', val)
+})
+
+watch(
+  openKeys,
+  function (val) {
+    emit('update:openKeys', val)
+  },
+  { deep: true }
+)
 
 provide('isTree', isTree)
 provide('selectedKey', selectedKey)
-provide('openKeys',openKeys)
-
-const emit = defineEmits(['update:selectedKey','update:openKeys'])
-
-watch(selectedKey, function(val) {
-  emit('update:selectedKey',val)
-})
-
-watch(openKeys, function(val) {
-  emit('update:openKeys',val)
-},{deep : true})
+provide('openKeys', openKeys)
 </script>
diff --git a/src/module/tab/index.vue b/src/module/tab/index.vue
index 6aaf9863..50479429 100644
--- a/src/module/tab/index.vue
+++ b/src/module/tab/index.vue
@@ -4,11 +4,15 @@
       <li
         v-for="ss in slots"
         :key="ss"
-        :class="[ss.props.id === modelValue ? 'layui-this' : '']"
+        :class="[ss.props.id === active ? 'layui-this' : '']"
         @click.stop="change(ss.props.id)"
       >
         {{ ss.props.title }}
-        <i @click.stop="close(ss.props.id)"  v-if="allowClose" class="layui-icon layui-icon-close layui-unselect layui-tab-close"></i>
+        <i
+          @click.stop="close(ss.props.id)"
+          v-if="allowClose"
+          class="layui-icon layui-icon-close layui-unselect layui-tab-close"
+        ></i>
       </li>
     </ul>
     <div class="layui-tab-content">
@@ -18,7 +22,7 @@
 </template>
 
 <script setup name="LayTab" lang="ts">
-import { defineProps, provide, ref, useSlots } from 'vue'
+import { computed, defineProps, provide, ref, useSlots } from 'vue'
 
 const slot = useSlots() as any
 const slots = slot.default && slot.default()
@@ -30,17 +34,23 @@ const props = defineProps<{
 }>()
 
 // select update 时, 通知 change 事件
-const emit = defineEmits(['update:modelValue','change','close'])
+const emit = defineEmits(['update:modelValue', 'change', 'close'])
 
-const active = ref(props.modelValue)
+const active = computed({
+  get() {
+    return props.modelValue
+  },
+  set(val) {
+    emit('update:modelValue', val)
+  }
+})
 
 const change = function (id: any) {
   emit('update:modelValue', id)
   emit('change', id)
-  active.value = id
 }
 
-const close = function(id: any) {
+const close = function (id: any) {
   emit('close', id)
 }