From 9d2c702944492ca3ede22b6a03f86b622b4bfef9 Mon Sep 17 00:00:00 2001
From: 2betop <2betop.cn@gmail.com>
Date: Mon, 11 May 2020 14:16:54 +0800
Subject: [PATCH] =?UTF-8?q?combo=20=E7=9A=84tabs=20=E6=A8=A1=E5=BC=8F,?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scss/components/_tabs.scss       | 7 ++++---
 scss/components/form/_combo.scss | 8 ++++++++
 src/renderers/Form/Combo.tsx     | 5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scss/components/_tabs.scss b/scss/components/_tabs.scss
index 6d6e3c33..1924bfc0 100644
--- a/scss/components/_tabs.scss
+++ b/scss/components/_tabs.scss
@@ -4,6 +4,7 @@
     padding-left: 0;
     margin-bottom: 0;
     list-style: none;
+    user-select: none;
 
     &::before {
       display: table;
@@ -264,8 +265,8 @@
   }
 
   &-toolbar {
-      display: inline-block;
-      float: right;
-      padding-top: $gap-xs;
+    display: inline-block;
+    float: right;
+    padding-top: $gap-xs;
   }
 }
diff --git a/scss/components/form/_combo.scss b/scss/components/form/_combo.scss
index ebba7d95..f4447ef3 100644
--- a/scss/components/form/_combo.scss
+++ b/scss/components/form/_combo.scss
@@ -237,6 +237,14 @@
   }
 }
 
+.#{$ns}ComboTabs > .#{$ns}Tabs-links {
+  @include clearfix();
+}
+
+.#{$ns}ComboTabs-addLink {
+  float: right;
+}
+
 .#{$ns}Combo-dragableTip {
   color: $text--muted-color;
   font-size: $fontSizeSm;
diff --git a/src/renderers/Form/Combo.tsx b/src/renderers/Form/Combo.tsx
index d126a10e..080414ec 100644
--- a/src/renderers/Form/Combo.tsx
+++ b/src/renderers/Form/Combo.tsx
@@ -694,12 +694,13 @@ export default class ComboControl extends React.Component<ComboProps> {
 
     return (
       <CTabs
+        className={"ComboTabs"}
         mode={tabsStyle}
         activeKey={store.activeKey}
         onSelect={this.handleTabSelect}
         additionBtns={
           !disabled ? (
-            <li className={cx(`Tabs-link`)}>
+            <li className={cx(`Tabs-link ComboTabs-addLink`)}>
               {store.addable && addable !== false ? (
                 Array.isArray(conditions) && conditions.length ? (
                   render(
@@ -723,7 +724,7 @@ export default class ComboControl extends React.Component<ComboProps> {
                     }
                   )
                 ) : (
-                  <a onClick={this.addItem} data-tooltip="新增一条数据">
+                  <a onClick={this.addItem} data-position="left" data-tooltip="新增一条数据">
                     {addIcon ? <i className={cx('m-r-xs', addIcon)} /> : null}
                     <span>{addButtonText || '新增'}</span>
                   </a>