From e142c892b418b924d821c616c3e04a06810ee336 Mon Sep 17 00:00:00 2001
From: Bang <15622356989@163.com>
Date: Wed, 22 Mar 2023 18:06:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendesign/src/components/cascader/OCascader.vue     | 8 +++-----
 .../src/components/cascader/__demo__/CascaderBasic.vue   | 9 +++++----
 packages/opendesign/src/components/index.scss            | 3 +++
 packages/opendesign/src/components/index.ts              | 2 +-
 .../opendesign/src/components/message/style/index.scss   | 2 +-
 .../opendesign/src/components/message/style/var.scss     | 6 ++++--
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/opendesign/src/components/cascader/OCascader.vue b/packages/opendesign/src/components/cascader/OCascader.vue
index d911bb953..40977a66d 100644
--- a/packages/opendesign/src/components/cascader/OCascader.vue
+++ b/packages/opendesign/src/components/cascader/OCascader.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
-import { inject, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 
 import { IconChevronRight } from '../_shared/icons';
 import { OSelect } from '../select';
-import { selectOptionInjectKey } from '../select/provide';
 
 import { cascaderProps } from './types';
 import type { CascaderValueT, CascaderNodePathT } from './types';
@@ -20,8 +19,6 @@ interface ColumnInfoT {
 
 const props = defineProps(cascaderProps);
 
-const selectInject = inject(selectOptionInjectKey, null);
-
 const emits = defineEmits<{
   (e: 'change', val: CascaderValueT): void;
 }>();
@@ -69,6 +66,7 @@ watch(
 );
 
 const onClick = (option: ColumnInfoT, columnInfo: Array<ColumnInfoT>) => {
+  console.log(panelInfo.value);
   if (!isArray(panelInfo.value)) {
     return;
   }
@@ -113,7 +111,7 @@ const onClick = (option: ColumnInfoT, columnInfo: Array<ColumnInfoT>) => {
     :transition="props.transition"
   >
     <div class="o-cascader-panel">
-      <ul v-for="(columnInfo, index) in panelInfo" :key="columnInfo[0].depth" class="o-cascader-options" :style="{ zIndex: 100 - index }">
+      <ul v-for="(columnInfo, index) in panelInfo" :key="index" class="o-cascader-options">
         <li
           v-for="option in columnInfo"
           :key="option.value"
diff --git a/packages/opendesign/src/components/cascader/__demo__/CascaderBasic.vue b/packages/opendesign/src/components/cascader/__demo__/CascaderBasic.vue
index 21a544951..b301008d8 100644
--- a/packages/opendesign/src/components/cascader/__demo__/CascaderBasic.vue
+++ b/packages/opendesign/src/components/cascader/__demo__/CascaderBasic.vue
@@ -3,7 +3,8 @@ import { ref } from 'vue';
 import { OCascader } from '../index';
 
 const cascaderVal1 = ref('1-1-1');
-const options1 = [
+
+const option1 = [
   {
     label: '选项一',
     value: '1',
@@ -57,7 +58,7 @@ const handleChange1 = (val: string | number | Array<string | number>) => {
 };
 
 const cascaderVal2 = ref('1-1-1');
-const options2 = [
+const option2 = [
   {
     label: '选项一',
     value: '1',
@@ -113,7 +114,7 @@ const handleChange2 = (val: string | number | Array<string | number>) => {
 <template>
   <h4>基础用法</h4>
   <section>
-    <OCascader v-model="cascaderVal1" :options="options1" @change="handleChange1" />
-    <OCascader v-model="cascaderVal2" :options="options2" path-mode @change="handleChange2" />
+    <OCascader v-model="cascaderVal1" :options="option1" @change="handleChange1" />
+    <OCascader v-model="cascaderVal2" :options="option2" path-mode @change="handleChange2" />
   </section>
 </template>
diff --git a/packages/opendesign/src/components/index.scss b/packages/opendesign/src/components/index.scss
index 3d2a8ae15..fc648f4a7 100644
--- a/packages/opendesign/src/components/index.scss
+++ b/packages/opendesign/src/components/index.scss
@@ -30,3 +30,6 @@
 @use './figure/style/index.scss' as *;
 @use './card/style/index.scss' as *;
 @use './slides/style/index.scss' as *;
+@use './message/style/index.scss' as *;
+@use './cascader/style/index.scss' as *;
+
diff --git a/packages/opendesign/src/components/index.ts b/packages/opendesign/src/components/index.ts
index 52a3c2b51..3e1819f70 100644
--- a/packages/opendesign/src/components/index.ts
+++ b/packages/opendesign/src/components/index.ts
@@ -34,9 +34,9 @@ export * from './figure';
 export * from './card';
 export * from './message';
 export * from './slides';
+export * from './cascader';
 
 // export * from './scrollbar';
-
 export * from './intersection-observer';
 export * from './resize-observer';
 export * from './child-only';
diff --git a/packages/opendesign/src/components/message/style/index.scss b/packages/opendesign/src/components/message/style/index.scss
index 370d27546..1acb757f2 100644
--- a/packages/opendesign/src/components/message/style/index.scss
+++ b/packages/opendesign/src/components/message/style/index.scss
@@ -15,7 +15,7 @@
 }
 
 .o-message + .o-message {
-  margin-top: 16px;
+  margin-top: var(--message-gap);
 }
 
 .o-message-list {
diff --git a/packages/opendesign/src/components/message/style/var.scss b/packages/opendesign/src/components/message/style/var.scss
index 70cb1eeb8..5dfb21997 100644
--- a/packages/opendesign/src/components/message/style/var.scss
+++ b/packages/opendesign/src/components/message/style/var.scss
@@ -1,11 +1,13 @@
 .o-message {
+  --message-color: var(--o-color-info1);
+
   --message-padding: 8px 16px;
   --message-text-size: var(--o-font_size-text1);
   --message-text-height: var(--o-line_height-text1);
 
-  --message-color: var(--o-color-info1);
-
   --message-radius: var(--o-radius-control-m);
+
+  --message-gap: 16px;
 }
 
 .o-message-normal {
-- 
Gitee