bk-magic-vue 2.3.7-beta.5 → 2.3.7

package/dist/bk-magic-vue.css

@@ -3558,12 +3558,10 @@ optgroup{
     transition:border .2s, box-shadow .2s, -webkit-box-shadow .2s;
     color:#63656e;
     cursor:pointer;
-    outline:none;
-    background-color:#fff
+    outline:none
 }
 .bk-color-picker.bk-color-picker-show-value{
         width:150px;
-        background-color:#fff;
     }
 .bk-color-picker.bk-color-picker-large{
         height:36px
@@ -4378,22 +4376,22 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
             }
 .bk-dialog-wrapper .bk-dialog-header{
         padding:3px 24px 24px 24px;
-        line-height:1.1;
+        line-height:1.2;
         text-align:center;
     }
 .bk-dialog-wrapper .bk-dialog-header p,
         .bk-dialog-wrapper .bk-dialog-header .bk-dialog-header-inner{
             display:inline-block;
             width:100%;
-            font-size:24px;
-            color:#313238;
+            font-size:20px;
+            color:#63656e;
             overflow:hidden;
             text-overflow:ellipsis;
             white-space:nowrap;
             margin:0;
         }
-.bk-dialog-wrapper .bk-dialog-header .header-aside{
-            font-size:20px;
+.bk-dialog-wrapper .bk-dialog-header .header-center{
+            font-size:24px;
         }
 .bk-dialog-wrapper .bk-dialog-header p i,
             .bk-dialog-wrapper .bk-dialog-header p span{
@@ -4453,11 +4451,14 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                 margin-bottom:0;
             }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-header{
-            padding:20px 30px 10px 30px;
+            padding:15px 30px 10px 30px;
         }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-sub-header{
-            padding:5px 50px 21px 50px;
+            padding:5px 50px 6px 50px
         }
+.bk-dialog-wrapper .bk-info-box .bk-dialog-sub-header.has-sub{
+                padding-bottom:21px;
+            }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-sub-header .bk-dialog-header-inner{
                 font-size:14px;
                 color:#63656e;
@@ -4470,7 +4471,7 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
         }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-footer{
             text-align:center;
-            padding:0 65px 40px;
+            padding:0 65px 33px;
             background-color:#fff;
             border:none;
             border-radius:0;
@@ -4498,7 +4499,7 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                 padding:3px 24px 15px;
             }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-type-header{
-            padding:3px 24px 32px 24px;
+            padding:3px 24px 22px 24px;
             line-height:1;
             text-align:center
         }
@@ -4509,7 +4510,7 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
 .bk-dialog-wrapper .bk-info-box .bk-dialog-type-header .header{
                 display:inline-block;
                 width:100%;
-                font-size:24px;
+                font-size:20px;
                 color:#313238;
                 overflow:hidden;
                 text-overflow:ellipsis;
@@ -4533,12 +4534,11 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                 display:inline-block;
                 width:100%;
                 font-size:14px;
-                color:#313238;
-                overflow:hidden;
-                text-overflow:ellipsis;
-                white-space:nowrap;
+                color:#63656e;
                 line-height:1.5;
                 margin:0;
+                text-align:center;
+                word-break:break-all;
             }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-mark{
             display:block;
@@ -4547,21 +4547,25 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
 .bk-dialog-wrapper .bk-info-box .bk-dialog-mark.bk-dialog-warning,
             .bk-dialog-wrapper .bk-info-box .bk-dialog-mark.bk-dialog-error,
             .bk-dialog-wrapper .bk-info-box .bk-dialog-mark.bk-dialog-success{
-                width:58px;
-                height:58px;
-                line-height:58px;
-                font-size:30px;
+                width:42px;
+                height:42px;
+                line-height:42px;
+                font-size:36px;
                 color:#fff;
                 border-radius:50%;
             }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-mark.bk-dialog-warning{
-                background-color:#ffb848;
+                background-color:#ffe8c3;
+                color:#ff9c01;
+                font-size:26px;
             }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-mark.bk-dialog-error{
-                background-color:#ff5656;
+                background-color:#ffdddd;
+                color:#ea3636;
             }
 .bk-dialog-wrapper .bk-info-box .bk-dialog-mark.bk-dialog-success{
-                background-color:#2dcb56;
+                background-color:#e5f6ea;
+                color:#3fc06d;
             }
 @keyframes loading{
     from{
@@ -5986,7 +5990,6 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
 .bk-textarea-wrapper{
     border:1px solid #c4c6cc;
     border-radius:2px;
-    background-color:#fff;
 }
 .bk-textarea-wrapper .bk-form-textarea{
         border:none;
@@ -8512,8 +8515,7 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
         white-space:nowrap;
     }
 .bk-select .bk-tooltip.bk-select-dropdown{
-        display:block;
-        background-color:#fff
+        display:block
     }
 .bk-select .bk-tooltip.bk-select-dropdown > .bk-tooltip-ref{
             display:block;
@@ -12046,7 +12048,6 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
 .bk-upload .file-wrapper{
         position:relative;
         font-size:14px;
-        background-color:#fff;
     }
 .bk-upload .file-wrapper input[type=file]{
             width:100%;
@@ -12923,7 +12924,6 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
     overflow:inherit;
     z-index:9;
     height:32px;
-    background-color:#fff;
 }
 .search-select-wrap .bk-search-select{
         display:-webkit-box;
@@ -14222,8 +14222,7 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
         white-space:nowrap;
     }
 .bk-cascade .bk-tooltip.bk-cascade-dropdown{
-        display:block;
-        background-color:#fff
+        display:block
     }
 .bk-cascade .bk-tooltip.bk-cascade-dropdown > .bk-tooltip-ref{
             display:block;

package/dist/bk-magic-vue.js

@@ -12918,7 +12918,8 @@
     }, [_vm._t("header", [_c('div', {
       staticClass: "bk-dialog-header-inner"
     }, [_vm._v(_vm._s(_vm.title))])])], 2) : _vm._e(), _c('div', {
-      staticClass: "bk-dialog-sub-header"
+      staticClass: "bk-dialog-sub-header",
+      class: _vm.subTitle || _vm.$slots['sub-header'] ? 'has-sub' : ''
     }, [_vm._t("sub-header", [_c('div', {
       staticClass: "bk-dialog-header-inner"
     }, [_vm._v(_vm._s(_vm.subTitle))])])], 2), _vm.showFooter ? _c('div', {
@@ -12998,7 +12999,7 @@
     }, [_vm._t("header", [_c('div', {
       class: {
         'bk-dialog-header-inner': true,
-        'header-aside': _vm.headerPosition !== 'center'
+        'header-center': _vm.headerPosition === 'center'
       }
     }, [_vm._v(_vm._s(_vm.title))])])], 2) : _vm._e(), _c('div', {
       staticClass: "bk-dialog-body"
@@ -38255,9 +38256,19 @@
         var bodyWidth = this.table.$el.clientWidth;
         var bodyMinWidth = 0;
         var flattenColumns = this.getFlattenColumns();
+        if (flattenColumns.length < 1) {
+          return;
+        }
         var flexColumns = flattenColumns.filter(function (column) {
           return typeof column.width !== 'number';
         });
+        if (!this.store.isDraging) {
+          flattenColumns.forEach(function (column) {
+            if (typeof column.width === 'number') {
+              column.realWidth = column.width;
+            }
+          });
+        }
         if (!this.store.isDraging && flexColumns.length > 0 && fit) {
           flattenColumns.forEach(function (column) {
             bodyMinWidth += column.width || column.minWidth;
@@ -38270,14 +38281,16 @@
             if (flexColumns.length === 1) {
               flexColumns[0].realWidth = flexColumns[0].minWidth + totalFlexWidth;
             } else {
-              var flexWidthPerPixel = totalFlexWidth / flexColumns.length;
-              var firstWidth = flexWidthPerPixel;
+              var flexWidthPerPixel = Math.floor(totalFlexWidth / flexColumns.length);
+              var firstWidth = totalFlexWidth;
               flexColumns.forEach(function (column, index) {
                 if (index === 0) return;
-                var flexWidth = Math.floor(column.minWidth + flexWidthPerPixel);
+                var flexWidth = column.minWidth + flexWidthPerPixel;
                 if (column.maxWidth && column.maxWidth < flexWidth) {
-                  firstWidth += flexWidth - column.maxWidth;
                   flexWidth = column.maxWidth;
+                  firstWidth -= column.maxWidth - column.minWidth;
+                } else {
+                  firstWidth -= flexWidthPerPixel;
                 }
                 column.realWidth = flexWidth;
               });
@@ -38307,19 +38320,21 @@
           };
           if (!this.scrollX && flattenColumns.length) {
             var deltaWidth = bodyWidth - bodyMinWidth;
-            var lastColumn = findLastColumnWithNotSetting(flattenColumns);
+            var lastColumn = flattenColumns[flattenColumns.length - 1];
             lastColumn.realWidth = lastColumn.realWidth + deltaWidth;
             this.bodyWidth = bodyWidth;
           } else {
             var _lastColumn = findLastColumnWithNotSetting(flattenColumns);
-            var lastRealWidth = typeof _lastColumn.width !== 'number' ? _lastColumn.minWidth : _lastColumn.width;
-            var preLastColumnBodyMinWidth = bodyMinWidth - _lastColumn.realWidth;
-            if (preLastColumnBodyMinWidth + lastRealWidth > bodyWidth) {
-              _lastColumn.realWidth = lastRealWidth;
-              bodyMinWidth = preLastColumnBodyMinWidth + lastRealWidth;
-            } else {
-              _lastColumn.realWidth = bodyWidth - preLastColumnBodyMinWidth;
-              bodyMinWidth = preLastColumnBodyMinWidth + _lastColumn.realWidth;
+            if (_lastColumn) {
+              var lastRealWidth = typeof _lastColumn.width !== 'number' ? _lastColumn.minWidth : _lastColumn.width;
+              var preLastColumnBodyMinWidth = bodyMinWidth - _lastColumn.realWidth;
+              if (preLastColumnBodyMinWidth + lastRealWidth > bodyWidth) {
+                _lastColumn.realWidth = lastRealWidth;
+                bodyMinWidth = preLastColumnBodyMinWidth + lastRealWidth;
+              } else {
+                _lastColumn.realWidth = bodyWidth - preLastColumnBodyMinWidth;
+                bodyMinWidth = preLastColumnBodyMinWidth + _lastColumn.realWidth;
+              }
             }
             this.scrollX = bodyMinWidth > bodyWidth;
             this.bodyWidth = bodyMinWidth;
@@ -42281,6 +42296,10 @@
     },
     mixins: [locale.mixin, emitter],
     props: {
+      showClearOnlyHover: {
+        type: Boolean,
+        default: false
+      },
       placeholder: {
         type: String,
         default: ''
@@ -42432,12 +42451,13 @@
         popoverInstance: null,
         isSingleSelect: false,
         INPUT_MIN_WIDTH: 12,
-        popoverWidth: 190
+        popoverWidth: 190,
+        hover: false
       };
     },
     computed: {
       isShowClear: function isShowClear() {
-        return this.clearable && !this.disabled && this.localTagList.length !== 0;
+        return this.clearable && !this.disabled && this.localTagList.length !== 0 && (this.showClearOnlyHover ? this.hover : true);
       },
       resultList: function resultList() {
         if (this.useGroup) {
@@ -42509,6 +42529,9 @@
       clearTimeout(this.timer);
     },
     methods: {
+      mouseEnterHandler: function mouseEnterHandler() {
+        this.hover = true;
+      },
       handlerClear: function handlerClear() {
         this.tagList = [];
         this.localTagList = [];
@@ -43178,6 +43201,10 @@
       on: {
         "click": function click($event) {
           _vm.focusInputer($event);
+        },
+        "mouseenter": _vm.mouseEnterHandler,
+        "mouseleave": function mouseleave($event) {
+          _vm.hover = false;
         }
       }
     }, [_c('div', {