bkui-vue 0.0.1-beta.126 → 0.0.1-beta.129

package/lib/select/select.less

@@ -99,7 +99,7 @@
   &.is-focus.normal {
     .bk-select-trigger .bk-select-tag {
       border-color: @primary-color;
-      box-shadow: 0px 0px 3px 0px #a3c5fd; 
+      box-shadow: 0px 0px 3px 0px #a3c5fd;
     }
   }
 
@@ -131,7 +131,7 @@
 
       &.is-focused {
         .active();
-    
+
         &.is-simplicity {
           border-color: transparent;
           border-bottom-color: @primary-color;
@@ -195,139 +195,149 @@
   }
 }
 
-.bk-popover2.bk-select-popover {
-  padding: 0;
-
-  .bk-select-content {
-    .bk-select-empty {
-      .flex-center();
-      height: 56px;
-      color: #63656e;
-  
-      .spinner {
-        display: flex;
-        width: 14px;
-        height: 14px;
-        margin-right: 4px;
-        font-size: 14px;
-        color: #c4c6cc;
-        align-items: center;
-        justify-content: center;
-      }
+.@{bk-prefix}-popover2 {
+  &.@{bk-prefix}-pop2-content {
+    &.bk-select-popover {
+      padding: 0;
+
+      .bk-select-content {
+        .bk-select-empty {
+          .flex-center();
+          height: 56px;
+          color: #63656e;
+
+          .spinner {
+            display: flex;
+            width: 14px;
+            height: 14px;
+            margin-right: 4px;
+            font-size: 14px;
+            color: #c4c6cc;
+            align-items: center;
+            justify-content: center;
+          }
 
-      span {
-        .icon-text()
-      }
-    }
+          span {
+            .icon-text()
+          }
+        }
 
-    .bk-select-dropdown {
-      overflow: auto;
-    }
+        .bk-select-dropdown {
+          overflow: auto;
+        }
 
-    .bk-select-extension {
-      display: flex;
-      height: 40px;
-      background-color: #fafbfd;
-      align-items: center;
-    }
+        .bk-select-extension {
+          display: flex;
+          height: 40px;
+          background-color: #fafbfd;
+          align-items: center;
+          border-top: 1px solid #dcdee5;
+          border-radius: 0 0 2px 2px;
+        }
 
-    .bk-select-options {
-      padding: 8px 0;
-    }
+        .bk-select-options {
+          padding: 8px 0;
+        }
 
-    .bk-select-option {
-      position: relative;
-      height: 32px;
-      padding: 0 12px;
-      line-height: 32px;
-      color: #63656e;
-      text-align: left;
-      cursor: pointer;
-      user-select: none;
-  
-      .ellipsis();
-  
-      &-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-      }
-      
-      &:hover,
-      &.is-hover {
-        color: #3a84ff;
-        background-color: #f5f7fa;
-      }
-  
-      &.is-selected {
-        color: #3a84ff;
-      }
-  
-      &.is-disabled {
-        color: #c4c6cc;
-        cursor: not-allowed;
-        background-color: transparent;
-      }
-  
-    }
+        .bk-select-option {
+          position: relative;
+          height: 32px;
+          padding: 0 12px;
+          line-height: 32px;
+          color: #63656e;
+          text-align: left;
+          cursor: pointer;
+          user-select: none;
 
-    .bk-select-options-loading {
-      .flex-center();
+          .ellipsis();
 
-      span {
-        .icon-text()
-      }
-    }
+          &-item {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          }
 
-    .bk-option-group {
-      &-label {
-        height: 32px;
-        padding: 0 8px;
-        line-height: 32px;
-        color: #979ba5;
-        text-align: left;
-  
-        &.collapsible {
-          cursor: pointer;
-        }
-      }
-  
-      &.collapsible {
-        .bk-select-option {
-          padding-left: 40px;
+          // &.is-hover {
+          //   color: #3a84ff;
+          //   background-color: #f5f7fa;
+          // }
+
+          &:hover {
+            color: #63656e;
+            background-color: #f5f7fa;
+          }
+
+          &.is-selected {
+            color: #3a84ff;
+            background-color: #e1ecff;
+          }
+
+          &.is-disabled {
+            color: #c4c6cc;
+            cursor: not-allowed;
+            background-color: transparent;
+          }
         }
-      }
-  
-      &.disabled {
-        .default-group-label {
-          color: #c4c6cc;
-          cursor: not-allowed;
+
+        .bk-select-options-loading {
+          .flex-center();
+
+          span {
+            .icon-text()
+          }
         }
-      }
-  
-      .default-group-label {
-        display: flex;
-        user-select: none;
-        align-items: center;
-  
-        &-icon {
-          display: flex;
-          width: 12px;
-          height: 12px;
-          margin-right: 8px;
-          transition: all .1s;
-          align-items: center;
-          justify-content: center;
-  
-          &.collapse {
-            transform: rotate(-90deg);
+
+        .bk-option-group {
+          &-label {
+            height: 32px;
+            padding: 0 8px;
+            line-height: 32px;
+            color: #979ba5;
+            text-align: left;
+
+            &.collapsible {
+              cursor: pointer;
+            }
+          }
+
+          &.collapsible {
+            .bk-select-option {
+              padding-left: 40px;
+            }
+          }
+
+          &.disabled {
+            .default-group-label {
+              color: #c4c6cc;
+              cursor: not-allowed;
+            }
+          }
+
+          .default-group-label {
+            display: flex;
+            user-select: none;
+            align-items: center;
+
+            &-icon {
+              display: flex;
+              width: 12px;
+              height: 12px;
+              margin-right: 8px;
+              transition: all .1s;
+              align-items: center;
+              justify-content: center;
+
+              &.collapse {
+                transform: rotate(-90deg);
+              }
+            }
+          }
+
+          .bk-select-option {
+            padding-left: 24px;
           }
         }
       }
-  
-      .bk-select-option {
-        padding-left: 24px;
-      }
     }
   }
 }

package/lib/select/select.variable.css

@@ -297,17 +297,17 @@
   align-items: center;
   justify-content: center;
 }
-.bk-popover2.bk-select-popover {
+.bk-popover2.bk-pop2-content.bk-select-popover {
   padding: 0;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-empty {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-empty {
   display: flex;
   align-items: center;
   justify-content: center;
   height: 56px;
   color: #63656e;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-empty .spinner {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-empty .spinner {
   display: flex;
   width: 14px;
   height: 14px;
@@ -317,23 +317,25 @@
   align-items: center;
   justify-content: center;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-empty span {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-empty span {
   margin-left: 4px;
   line-height: 18px;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-dropdown {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-dropdown {
   overflow: auto;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-extension {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-extension {
   display: flex;
   height: 40px;
   background-color: #fafbfd;
   align-items: center;
+  border-top: 1px solid #dcdee5;
+  border-radius: 0 0 2px 2px;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-options {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-options {
   padding: 8px 0;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-option {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-option {
   position: relative;
   height: 32px;
   padding: 0 12px;
@@ -346,56 +348,56 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-option-item {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-option-item {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-option:hover,
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-option.is-hover {
-  color: #3a84ff;
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-option:hover {
+  color: #63656e;
   background-color: #f5f7fa;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-option.is-selected {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-option.is-selected {
   color: #3a84ff;
+  background-color: #e1ecff;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-option.is-disabled {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-option.is-disabled {
   color: #c4c6cc;
   cursor: not-allowed;
   background-color: transparent;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-options-loading {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-options-loading {
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-select-options-loading span {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-select-options-loading span {
   margin-left: 4px;
   line-height: 18px;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group-label {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group-label {
   height: 32px;
   padding: 0 8px;
   line-height: 32px;
   color: #979ba5;
   text-align: left;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group-label.collapsible {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group-label.collapsible {
   cursor: pointer;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group.collapsible .bk-select-option {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group.collapsible .bk-select-option {
   padding-left: 40px;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group.disabled .default-group-label {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group.disabled .default-group-label {
   color: #c4c6cc;
   cursor: not-allowed;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group .default-group-label {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group .default-group-label {
   display: flex;
   user-select: none;
   align-items: center;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group .default-group-label-icon {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group .default-group-label-icon {
   display: flex;
   width: 12px;
   height: 12px;
@@ -404,9 +406,9 @@
   align-items: center;
   justify-content: center;
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group .default-group-label-icon.collapse {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group .default-group-label-icon.collapse {
   transform: rotate(-90deg);
 }
-.bk-popover2.bk-select-popover .bk-select-content .bk-option-group .bk-select-option {
+.bk-popover2.bk-pop2-content.bk-select-popover .bk-select-content .bk-option-group .bk-select-option {
   padding-left: 24px;
 }

package/lib/table/const.d.ts

@@ -51,3 +51,8 @@ export declare const TABLE_ROW_ATTRIBUTE: {
  * Y 轴滚动条宽度
  */
 export declare const SCROLLY_WIDTH = 4;
+export declare const SETTING_SIZE: {
+    large: number;
+    default: number;
+    small: number;
+};

package/lib/table/index.d.ts

@@ -22,7 +22,7 @@ declare const BkTable: {
             virtualEnabled: boolean;
             remotePagination: boolean;
             emptyText: string;
-            settings: any;
+            settings: boolean | import("./props").Settings;
             rowClass: any;
             rowStyle: any;
             cellStyle: any;
@@ -88,8 +88,8 @@ declare const BkTable: {
             } & {
                 default: string;
             };
-            settings: import("vue-types").VueTypeDef<any> & {
-                default: any;
+            settings: import("vue-types").VueTypeDef<boolean | import("./props").Settings> & {
+                default: boolean | (() => import("./props").Settings);
             };
             rowClass: import("vue-types").VueTypeDef<any> & {
                 default: any;
@@ -202,8 +202,8 @@ declare const BkTable: {
             } & {
                 default: string;
             };
-            settings: import("vue-types").VueTypeDef<any> & {
-                default: any;
+            settings: import("vue-types").VueTypeDef<boolean | import("./props").Settings> & {
+                default: boolean | (() => import("./props").Settings);
             };
             rowClass: import("vue-types").VueTypeDef<any> & {
                 default: any;
@@ -274,7 +274,7 @@ declare const BkTable: {
             virtualEnabled: boolean;
             remotePagination: boolean;
             emptyText: string;
-            settings: any;
+            settings: boolean | import("./props").Settings;
             rowClass: any;
             rowStyle: any;
             cellStyle: any;
@@ -360,8 +360,8 @@ declare const BkTable: {
         } & {
             default: string;
         };
-        settings: import("vue-types").VueTypeDef<any> & {
-            default: any;
+        settings: import("vue-types").VueTypeDef<boolean | import("./props").Settings> & {
+            default: boolean | (() => import("./props").Settings);
         };
         rowClass: import("vue-types").VueTypeDef<any> & {
             default: any;
@@ -464,8 +464,8 @@ declare const BkTable: {
     } & {
         default: string;
     };
-    settings: import("vue-types").VueTypeDef<any> & {
-        default: any;
+    settings: import("vue-types").VueTypeDef<boolean | import("./props").Settings> & {
+        default: boolean | (() => import("./props").Settings);
     };
     rowClass: import("vue-types").VueTypeDef<any> & {
         default: any;
@@ -536,7 +536,7 @@ declare const BkTable: {
     virtualEnabled: boolean;
     remotePagination: boolean;
     emptyText: string;
-    settings: any;
+    settings: boolean | import("./props").Settings;
     rowClass: any;
     rowStyle: any;
     cellStyle: any;