From fc1f3599c1613664b191bb9b98c659207985810e Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Thu, 21 Jul 2022 11:58:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=A5=E5=8F=A3=E6=94=BEonMounted?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/.vitepress/src/shared/utils.ts   |  2 +-
 app/.vitepress/src/views/TheDemo.vue | 15 +++++++--------
 opendesign/style/variable.scss       |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/.vitepress/src/shared/utils.ts b/app/.vitepress/src/shared/utils.ts
index baa3effbd..7578b29ff 100644
--- a/app/.vitepress/src/shared/utils.ts
+++ b/app/.vitepress/src/shared/utils.ts
@@ -11,5 +11,5 @@ export function isValidKey(
   key: string | number | symbol,
   object: object
 ): key is keyof typeof object {
-  return key in object;
+  return Object.prototype.hasOwnProperty.call(object, key);
 }
diff --git a/app/.vitepress/src/views/TheDemo.vue b/app/.vitepress/src/views/TheDemo.vue
index a2b9e4bd3..9d53098b7 100644
--- a/app/.vitepress/src/views/TheDemo.vue
+++ b/app/.vitepress/src/views/TheDemo.vue
@@ -1,8 +1,5 @@
 <script setup lang="ts">
-import { ref, computed } from 'vue';
-
-import { getMeetingData } from '@/api/api-calendar';
-import { TableData } from '@/shared/@types/type-calendar';
+import { ref, onMounted, computed } from 'vue';
 
 import { getMeetingData } from '@/api/api-calendar';
 import { TableData } from '@/shared/@types/type-calendar';
@@ -48,9 +45,6 @@ const inputName = ref('zhangsan');
 interface MeetingData {
   tableData: TableData[];
 }
-getMeetingData().then((res: MeetingData) => {
-  calendarData.value = res.tableData;
-});
 
 const calendarData = ref<TableData[]>([
   {
@@ -109,6 +103,11 @@ const tagClick = (i: number) => {
   activeIndex.value = i;
 };
 // tagFiter end
+onMounted(() => {
+  getMeetingData().then((res: MeetingData) => {
+    calendarData.value = res.tableData;
+  });
+});
 </script>
 
 <template>
@@ -165,8 +164,8 @@ const tagClick = (i: number) => {
       <TagFilter label="全部" :show="true" @toggle-click="toggleClick">
         <OTag
           v-for="(item, index) in tagArrLen"
-          :type="activeIndex === index ? 'primary' : 'text'"
           :key="'tag' + index"
+          :type="activeIndex === index ? 'primary' : 'text'"
           @click="tagClick(index)"
         >
           {{ item }}
diff --git a/opendesign/style/variable.scss b/opendesign/style/variable.scss
index a5377df02..e21eb823d 100644
--- a/opendesign/style/variable.scss
+++ b/opendesign/style/variable.scss
@@ -84,4 +84,4 @@
   --o-shadow-overlay: 0px 10px 32px rgba(45, 47, 31, 0.18); // 覆盖投影，应用场景：信息提示（tips，活动进入按钮等）
   --o-shadow-overlay_hover: 0px 10px 32px rgba(0, 47, 167, 0.18); // 覆盖投影hover态
   --o-shadow-pop: 0px 12px 42px rgba(45, 47, 31, 0.24); // 弹出层投影：应用场景：模态框弹窗
-}
\ No newline at end of file
+}
-- 
Gitee