From 80e58e7f76ca9e4fa96bb96f3bffd9f8eeca3a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=A4=9A=E7=9B=8A?= <wuduoyi@baidu.com>
Date: Tue, 22 Dec 2020 10:47:54 +0800
Subject: [PATCH] Fix wizard (#1222)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* options 支持配置 selectFirst 自动选择第一个

* 文档优化；修复 cxd 下 toast 展现不一致问题 (#1219)

* Panel 支持更多的 className 配置

* 修复 cxd 下向导多出的边框

Co-authored-by: 2betop <2betop.cn@gmail.com>
---
 scss/_properties.scss           | 2 +-
 scss/_variables.scss            | 1 +
 scss/components/_wizard.scss    | 2 +-
 scss/themes/_cxd-variables.scss | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scss/_properties.scss b/scss/_properties.scss
index f32ceed2a..ffcae518e 100644
--- a/scss/_properties.scss
+++ b/scss/_properties.scss
@@ -1286,7 +1286,7 @@
   --Wizard-steps-li-onActive-arrow-bg: #fff;
   --Wizard-steps-li-onActive-bg: #fff;
   --Wizard-steps-li-onActive-color: var(--info);
-  --Wizard-steps-liAfterBorder: #{px2rem(20px)} solid transparent;
+
   --Wizard-steps-liAfterContent: '';
   --Wizard-steps-liVender: '';
   --Wizard-steps-padding: 0;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2e449f80e..c0a00065c 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -413,3 +413,4 @@ $Form--horizontal-columns: 12;
 $Table-strip-bg: lighten(#f6f8f8, 1%) !default;
 $Toast-icon-fillHeight: true !default;
 $Number-handler-mode: 'vertical';
+$Wizard-steps-liAfterBorder: px2rem(20px) solid transparent !default;
diff --git a/scss/components/_wizard.scss b/scss/components/_wizard.scss
index 8d7529e78..61f66a5cb 100644
--- a/scss/components/_wizard.scss
+++ b/scss/components/_wizard.scss
@@ -173,7 +173,7 @@
           position: absolute;
           bottom: 0;
           right: px2rem(-10px);
-          border: var(--Wizard-steps-liAfterBorder);
+          border: $Wizard-steps-liAfterBorder;
           border-right: 0;
           border-left: px2rem(10px) solid var(--borderColor);
           border-left-color: rgba(0, 0, 0, 0.05);
diff --git a/scss/themes/_cxd-variables.scss b/scss/themes/_cxd-variables.scss
index 3fff997f8..fe63320ad 100644
--- a/scss/themes/_cxd-variables.scss
+++ b/scss/themes/_cxd-variables.scss
@@ -19,12 +19,13 @@ $danger-bg: #fff5f5;
 
 $body-bg: #ffffff;
 $text-color: #666;
-
 $Toast-icon-fillHeight: false;
 $Button-onDisabled-bg: #f5f5f5;
 $Button-onDisabled-borderColor: #ebebeb;
 $Button-onDisabled-color: #aaa;
 $Number-handler-mode: 'horizontal';
+// css 变量似乎没法用 !important，所以这里用 sass 变量
+$Wizard-steps-liAfterBorder: none !important;
 
 @import '../variables';
 @import '../properties';
@@ -343,7 +344,7 @@ $Number-handler-mode: 'horizontal';
   --Wizard-steps-padding: #{px2rem(10)} 0;
   --Wizard-steps-liVender: 'iconfont';
   --Wizard-steps-liAfterContent: '\e6ee';
-  --Wizard-steps-liAfterBorder: 0 !important;
+
   --Wizard-steps-li-onActive-color: #333333;
   --Wizard-steps-bg--isComplete: #fff;
   --Wizard-badge-size: #{px2rem(26px)};