bri-components 1.2.67 → 1.2.68

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.67",
+    "version": "1.2.68",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/control.less

@@ -182,7 +182,7 @@
                             
                             & + span {
                                 color: @value;
-                                opacity: 0.5;
+                                opacity: 0.6;
                             }
                         }
 

package/src/components/small/DshTabs.vue

@@ -6,13 +6,13 @@
     >
         <TabPane
             v-for="tabItem in list"
-            :key="tabItem._key"
+            :key="tabItem[keyField]"
             class="DshTabs-item"
-            :name="tabItem._key"
+            :name="tabItem[keyField]"
             :label="getLabel(tabItem)"
         >
             <slot
-                v-if="renderStatusMap[tabItem._key]"
+                v-if="renderStatusMap[tabItem[keyField]]"
                 :tabItem="tabItem"
             >
                 <span></span>
@@ -20,17 +20,18 @@
         </TabPane>
 
         <div
+            v-if="rightTabList.length"
             slot="extra"
             class="extra"
         >
             <span
                 v-for="tabItem in rightTabList"
-                :key="tabItem._key"
+                :key="tabItem[keyField]"
                 :class="{
                     'extra-item': true,
-                    'extra-item-active': tabItem._key === curTabKey
+                    'extra-item-active': tabItem[keyField] === curTabKey
                 }"
-                @click="curTabKey = tabItem._key"
+                @click="curTabKey = tabItem[keyField]"
             >
                 {{ tabItem.name }}
             </span>
@@ -49,9 +50,13 @@
                 type: String,
                 default: "creative",
                 validator (val) {
-                    return ["creative", "tradition", "page"].includes(val);
+                    return ["creative", "tradition", "page", "line"].includes(val);
                 }
             },
+            keyField: {
+                type: String,
+                default: "_key"
+            },
             list: {
                 type: Array,
                 default () {
@@ -75,7 +80,7 @@
                         this.init(tabKey);
 
                         this.$emit("input", tabKey);
-                        this.$emit("change", tabKey, this.list.find(item => item._key === tabKey));
+                        this.$emit("change", tabKey, this.list.find(item => item[this.keyField] === tabKey));
                     }
                 }
             },
@@ -84,7 +89,7 @@
             }
         },
         created () {
-            this.init(this.curTabKey != undefined ? this.curTabKey : (this.list[0] && this.list[0]._key));
+            this.init(this.curTabKey != undefined ? this.curTabKey : (this.list[0] && this.list[0][this.keyField]));
         },
         mounted () {},
         methods: {
@@ -133,17 +138,6 @@
                 &-active {
                     color: @themeColor;
                     position: relative;
-
-                    // &::after {
-                    //     content: "";
-                    //     width: 100%;
-                    //     height: 2px;
-                    //     position: absolute;
-                    //     bottom: 0px;
-                    //     left: 0;
-                    //     z-index: 1;
-                    //     background-color: @themeColor;
-                    // }
                 }
             }
         }
@@ -325,6 +319,7 @@
                                         // tab切换下方下划线
                                         .ivu-tabs-ink-bar {
                                             display: none;
+
                                             &-animated {
                                                 display: none;
                                             }
@@ -370,5 +365,53 @@
                 }
             }
         }
+
+        // 下划线
+        &-line {
+            .ivu-tabs {
+                // color: @titleColor;
+
+                &-bar {
+                    height: 100%;
+                    border-bottom: 0px!important;
+                    margin-bottom: 0px!important;
+
+                    .ivu-tabs-nav-container {
+
+                        .ivu-tabs-nav-wrap {
+
+                            .ivu-tabs-nav {
+                                &-prev,
+                                &-next {
+
+                                }
+
+                                &-scroll {
+                                    &-disabled {
+
+                                    }
+
+                                    .ivu-tabs-nav {
+
+                                        .ivu-tabs-ink-bar {
+
+                                        }
+
+                                        .ivu-tabs-tab {
+                                            // margin-right: 0px;
+
+                                            &-active,
+                                            &-focused {
+
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 </style>