bk-magic-vue 2.4.9-beta.2 → 2.4.9

package/bkui-vue2-helper/attributes.json

@@ -431,6 +431,7 @@
   "bk-info-box/confirmLoading": { "description": "异步 confirmFn 确定按钮自动开启 loading", "default": "false" },
   "bk-info-box/confirmFn": { "description": "确认按钮点击回调函数，支持异步函数，函数返回false可阻止弹窗关闭" },
   "bk-info-box/cancelFn": { "description": "取消按钮点击回调函数" },
+  "bk-info-box/closeFn": { "description": "右上角的关闭 icon 点击回调函数，默认与取消按钮的回调函数一致" },
   "bk-info-box/stateChangeFn": { "description": "弹框显示状态变化的回调函数" },
   "bk-info-box/afterLeaveFn": { "description": "弹框消失的动画结束后触发的回调函数" },
   "bk-link/href": { "description": "文字链接地址" },

package/bkui-vue2-helper/tags.json

@@ -253,6 +253,7 @@
       "confirmLoading",
       "confirmFn",
       "cancelFn",
+      "closeFn",
       "stateChangeFn",
       "afterLeaveFn"
     ],

package/dist/bk-magic-vue.css

@@ -7243,6 +7243,14 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
             padding:0 2px;
             font-weight:bold;
         }
+.bk-page .bk-page-jumper{
+        margin-left:18px;
+        display:inline-block;
+    }
+.bk-page .bk-page-jumper > span{
+            font-size:14px;
+            color:#63656e;
+        }
 .bk-page.bk-page-align-left{
             text-align:left;
         }
@@ -7260,6 +7268,9 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                 height:32px;
                 line-height:30px;
             }
+.bk-page.bk-page-small .bk-page-jumper{
+            font-size:14px;
+        }
 .bk-page.bk-page-small .bk-page-total-count,
         .bk-page.bk-page-small .bk-page-selection-count{
             line-height:32px;
@@ -8568,6 +8579,9 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
         cursor:not-allowed;
         border-color:#dcdee5;
     }
+.bk-select.is-disabled .bk-select-angle{
+            color:#c4c6cc;
+        }
 .bk-select.is-readonly,
     .bk-select.is-loading{
         background-color:#fafafa;
@@ -9873,7 +9887,7 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
 .bk-tab.bk-tab-card .bk-tab-scroll-controller.prev.disabled{
                 border-right:none;
             }
-.bk-tab.bk-tab-card .bk-tab-add-controller{
+.bk-tab.bk-tab-card .bk-tab-extension-controller, .bk-tab.bk-tab-card .bk-tab-add-controller{
         border-top:1px solid #dcdee5;
         background-color:#fff;
     }
@@ -9902,7 +9916,11 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
 .bk-tab.bk-tab-unborder-card .bk-tab-label-wrapper.has-scroller.has-add .bk-tab-add-controller{
                 border-left:none;
             }
-.bk-tab.bk-tab-unborder-card .bk-tab-label-wrapper .bk-tab-add-controller,
+.bk-tab.bk-tab-unborder-card .bk-tab-label-wrapper.has-scroller.has-add .bk-tab-extension-controller{
+                border-left:none;
+            }
+.bk-tab.bk-tab-unborder-card .bk-tab-label-wrapper .bk-tab-extension-controller,
+        .bk-tab.bk-tab-unborder-card .bk-tab-label-wrapper .bk-tab-add-controller,
         .bk-tab.bk-tab-unborder-card .bk-tab-label-wrapper .bk-tab-scroll-controller{
             border:none;
             border-bottom:1px solid #dcdee5;
@@ -9985,6 +10003,9 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
 .position-left .bk-tab-label-wrapper.has-scroller.has-add .bk-tab-add-controller, .position-right .bk-tab-label-wrapper.has-scroller.has-add .bk-tab-add-controller{
                 border-left:none;
             }
+.position-left .bk-tab-label-wrapper.has-scroller.has-add ..bk-tab-extension-controller, .position-right .bk-tab-label-wrapper.has-scroller.has-add ..bk-tab-extension-controller{
+                border-left:none;
+            }
 .position-left .bk-tab-label-wrapper .bk-tab-label-list, .position-right .bk-tab-label-wrapper .bk-tab-label-list{
             display:-webkit-box;
             display:-ms-flexbox;
@@ -10057,6 +10078,18 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                         box-shadow:-10px 0 10px rgba(0, 0, 0, .05);
                 border-right:0;
             }
+.bk-tab-label-wrapper.has-scroller.has-add.has-extension .bk-tab-extension-controller{
+                position:absolute;
+                top:0;
+                right:42px;
+                border-left:1px solid #dcdee5;
+            }
+.bk-tab-label-wrapper.has-scroller.has-add.has-extension .bk-tab-add-controller{
+                border-left-width:0;
+            }
+.bk-tab-label-wrapper.has-scroller.has-add.has-extension .bk-tab-scroll-controller.next{
+                right:84px !important;
+            }
 .bk-tab-label-wrapper.has-scroller.has-add .bk-tab-scroll-controller.next{
             right:42px;
         }
@@ -10072,7 +10105,17 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
                 -webkit-box-shadow:-10px 0 10px rgba(0, 0, 0, .05);
                         box-shadow:-10px 0 10px rgba(0, 0, 0, .05);
             }
-.bk-tab-label-wrapper .bk-tab-add-controller{
+.bk-tab-label-wrapper.has-scroller.has-extension:not(.has-add) .bk-tab-extension-controller{
+            position:absolute;
+            top:0;
+            right:0;
+            border-bottom:1px solid #dcdee5;
+            border-left:1px solid #dcdee5;
+        }
+.bk-tab-label-wrapper.has-scroller.has-extension:not(.has-add) .bk-tab-scroll-controller.next{
+            right:42px;
+        }
+.bk-tab-label-wrapper .bk-tab-extension-controller, .bk-tab-label-wrapper .bk-tab-add-controller{
         display:inline-block;
         vertical-align:middle;
         width:42px;
@@ -10086,10 +10129,10 @@ span.bk-date-picker-cells-cell-disabled.bk-date-picker-cells-cell-selected em{
         cursor:pointer;
         z-index:2
     }
-.bk-tab-label-wrapper .bk-tab-add-controller:hover{
+.bk-tab-label-wrapper .bk-tab-extension-controller:hover, .bk-tab-label-wrapper .bk-tab-add-controller:hover{
             color:#3a84ff;
         }
-.bk-tab-label-wrapper .bk-tab-add-controller.left-border{
+.bk-tab-label-wrapper .bk-tab-extension-controller.left-border, .bk-tab-label-wrapper .bk-tab-add-controller.left-border{
             border-left:1px solid #dcdee5;
         }
 .bk-tab-label-wrapper .bk-tab-add-custom{