bkui-vue 0.0.1-beta.33 → 0.0.1-beta.330

package/lib/button/button.css

@@ -1,14 +1,11 @@
 .bk-button {
-  display: inline-block;
+  display: inline-flex;
   height: 32px;
-  min-width: 64px;
-  padding: 0 15px;
+  padding: 5px 12px;
   font-size: 14px;
   color: #63656e;
-  text-align: center;
   text-decoration: none;
   white-space: nowrap;
-  vertical-align: middle;
   cursor: pointer;
   background-color: white;
   border: 1px solid #c4c6cc;
@@ -17,6 +14,8 @@
   box-sizing: border-box;
   transition: background-color ease 0.3s;
   appearance: none;
+  align-items: center;
+  justify-content: center;
 }
 .bk-button.bk-button-primary {
   background-color: #3a84ff;
@@ -32,10 +31,6 @@
   border-color: #2c77f4;
   color: white;
 }
-.bk-button.bk-button-primary.is-disabled {
-  background-color: #dcdee5;
-  border-color: #dcdee5;
-}
 .bk-button.bk-button-primary.is-outline {
   color: #3a84ff;
   border-color: #3a84ff;
@@ -48,12 +43,21 @@
 }
 .bk-button.bk-button-primary.is-text {
   color: #3a84ff;
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-primary.is-text:hover {
+.bk-button.bk-button-primary.is-text:not(.is-disabled):hover {
   color: #5594fa;
 }
+.bk-button.bk-button-primary.is-disabled {
+  color: #dcdee5;
+  cursor: not-allowed;
+}
+.bk-button.bk-button-primary.is-disabled:not(.is-text) {
+  background-color: #dcdee5;
+  color: white;
+  border-color: #dcdee5;
+}
 .bk-button.bk-button-hover-primary:hover {
   background-color: #5594fa;
   border-color: #5594fa;
@@ -73,10 +77,6 @@
   border-color: #eb9000;
   color: white;
 }
-.bk-button.bk-button-warning.is-disabled {
-  background-color: #dcdee5;
-  border-color: #dcdee5;
-}
 .bk-button.bk-button-warning.is-outline {
   color: #ff9c01;
   border-color: #ff9c01;
@@ -89,12 +89,21 @@
 }
 .bk-button.bk-button-warning.is-text {
   color: #ff9c01;
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-warning.is-text:hover {
+.bk-button.bk-button-warning.is-text:not(.is-disabled):hover {
   color: #ffb848;
 }
+.bk-button.bk-button-warning.is-disabled {
+  color: #dcdee5;
+  cursor: not-allowed;
+}
+.bk-button.bk-button-warning.is-disabled:not(.is-text) {
+  background-color: #dcdee5;
+  color: white;
+  border-color: #dcdee5;
+}
 .bk-button.bk-button-hover-warning:hover {
   background-color: #ffb848;
   border-color: #ffb848;
@@ -114,10 +123,6 @@
   border-color: #1ab943;
   color: white;
 }
-.bk-button.bk-button-success.is-disabled {
-  background-color: #dcdee5;
-  border-color: #dcdee5;
-}
 .bk-button.bk-button-success.is-outline {
   color: #2dcb56;
   border-color: #2dcb56;
@@ -130,12 +135,21 @@
 }
 .bk-button.bk-button-success.is-text {
   color: #2dcb56;
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-success.is-text:hover {
+.bk-button.bk-button-success.is-text:not(.is-disabled):hover {
   color: #45e35f;
 }
+.bk-button.bk-button-success.is-disabled {
+  color: #dcdee5;
+  cursor: not-allowed;
+}
+.bk-button.bk-button-success.is-disabled:not(.is-text) {
+  background-color: #dcdee5;
+  color: white;
+  border-color: #dcdee5;
+}
 .bk-button.bk-button-hover-success:hover {
   background-color: #45e35f;
   border-color: #45e35f;
@@ -155,10 +169,6 @@
   border-color: #db2626;
   color: white;
 }
-.bk-button.bk-button-danger.is-disabled {
-  background-color: #dcdee5;
-  border-color: #dcdee5;
-}
 .bk-button.bk-button-danger.is-outline {
   color: #ea3636;
   border-color: #ea3636;
@@ -171,31 +181,49 @@
 }
 .bk-button.bk-button-danger.is-text {
   color: #ea3636;
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-danger.is-text:hover {
+.bk-button.bk-button-danger.is-text:not(.is-disabled):hover {
   color: #ff5656;
 }
+.bk-button.bk-button-danger.is-disabled {
+  color: #dcdee5;
+  cursor: not-allowed;
+}
+.bk-button.bk-button-danger.is-disabled:not(.is-text) {
+  background-color: #dcdee5;
+  color: white;
+  border-color: #dcdee5;
+}
 .bk-button.bk-button-hover-danger:hover {
   background-color: #ff5656;
   border-color: #ff5656;
   color: white;
 }
 .bk-button.bk-button-small {
-  min-width: 48px;
   height: 26px;
-  line-height: 26px;
-  padding: 0 12px;
+  padding: 3px 12px;
+  font-size: 12px;
 }
 .bk-button.bk-button-large {
-  min-width: 74px;
   height: 38px;
-  line-height: 38px;
-  padding: 0 20px;
+  padding: 8px 20px;
+  font-size: 16px;
 }
-.bk-button .bk-button-loading:not(:last-child) {
-  margin-right: 12px;
+.bk-button .bk-button-text {
+  display: inline-flex;
+  align-items: center;
+  line-height: 1;
+}
+.bk-button.is-loading {
+  position: relative;
+}
+.bk-button.is-loading .bk-button-loading:not(:last-child) {
+  position: absolute;
+}
+.bk-button.is-loading .bk-button-text {
+  visibility: hidden;
 }
 .bk-button:hover {
   border-color: #979ba5;
@@ -204,37 +232,38 @@
   color: #3a84ff;
   border-color: #3a84ff;
 }
-.bk-button.is-disabled {
-  color: #dcdee5;
-  cursor: auto;
-  border-color: #dcdee5;
-}
 .bk-button.is-text {
-  font-size: 14px;
+  height: auto;
+  padding: 0;
+  font-size: inherit;
   color: #63656e;
   text-decoration: none;
   cursor: pointer;
-  background: none;
+  background-color: transparent;
   border: none;
   outline: none;
 }
+.bk-button.is-disabled {
+  color: #dcdee5;
+  cursor: not-allowed;
+  border-color: #dcdee5;
+}
 .bk-button-group {
   display: inline-block;
   font-size: 0;
 }
 .bk-button-group.bk-button-group-small .bk-button {
-  min-width: 48px;
   height: 26px;
-  padding: 0 12px;
+  padding: 3px 12px;
+  font-size: 12px;
 }
 .bk-button-group.bk-button-group-large .bk-button {
-  min-width: 74px;
   height: 38px;
-  padding: 0 20px;
+  padding: 8px 20px;
+  font-size: 16px;
 }
 .bk-button-group .bk-button {
   height: 32px;
-  min-width: 64px;
   margin: 0 0 0 -1px;
   border-radius: 0;
 }
@@ -243,6 +272,9 @@
   background-color: white;
   border-color: #c4c6cc;
 }
+.bk-button-group .bk-button.is-disabled {
+  color: #c4c6cc;
+}
 .bk-button-group .bk-button:first-child {
   border-radius: 2px 0 0 2px;
 }
@@ -260,3 +292,9 @@
   background-color: white;
   border-color: #3a84ff;
 }
+.bk-button-group .bk-button.is-selected:not(.is-disabled) {
+  background-color: #e1ecff;
+}
+.bk-button-group .bk-button.is-selected.is-disabled {
+  background-color: #f0f1f5;
+}

package/lib/button/button.d.ts

@@ -32,7 +32,9 @@ declare const buttonProps: {
     hoverTheme: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
-    size: import("vue-types").VueTypeDef<string>;
+    size: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     title: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -48,15 +50,19 @@ declare const buttonProps: {
     loading: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
-    laodingMode: import("vue-types").VueTypeDef<string>;
+    loadingMode: import("vue-types").VueTypeDef<string>;
     outline: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
     text: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
+    selected: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
     nativeType: {
         type: IButtonNativeType;
+        default: string;
     };
 };
 export declare type ButtonPropTypes = ExtractPropTypes<typeof buttonProps>;
@@ -67,7 +73,9 @@ declare const _default: import("vue").DefineComponent<{
     hoverTheme: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
-    size: import("vue-types").VueTypeDef<string>;
+    size: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     title: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -83,15 +91,19 @@ declare const _default: import("vue").DefineComponent<{
     loading: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
-    laodingMode: import("vue-types").VueTypeDef<string>;
+    loadingMode: import("vue-types").VueTypeDef<string>;
     outline: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
     text: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
+    selected: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
     nativeType: {
         type: IButtonNativeType;
+        default: string;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("click" | "mouseover")[], "click" | "mouseover", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     theme: import("vue-types").VueTypeDef<string> & {
@@ -100,7 +112,9 @@ declare const _default: import("vue").DefineComponent<{
     hoverTheme: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
-    size: import("vue-types").VueTypeDef<string>;
+    size: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
     title: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -116,15 +130,19 @@ declare const _default: import("vue").DefineComponent<{
     loading: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
-    laodingMode: import("vue-types").VueTypeDef<string>;
+    loadingMode: import("vue-types").VueTypeDef<string>;
     outline: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
     text: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
+    selected: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
     nativeType: {
         type: IButtonNativeType;
+        default: string;
     };
 }>> & {
     onClick?: (...args: any[]) => any;
@@ -133,11 +151,14 @@ declare const _default: import("vue").DefineComponent<{
     title: string;
     text: boolean;
     theme: string;
+    disabled: boolean;
+    size: string;
     icon: string;
     outline: boolean;
-    disabled: boolean;
     loading: boolean;
     hoverTheme: string;
     iconRight: string;
+    selected: boolean;
+    nativeType: "button" | "reset" | "submit";
 }>;
 export default _default;

package/lib/button/button.less

@@ -1,32 +1,28 @@
 @import '../styles/themes/themes.less';
 
-@btnMinWidth: 64px;
 @btnHeight: 32px;
-@btnPadding: 15px;
+@btnPadding: 5px 12px;
 @btnBorderRadius: 2px;
 
-@smallBtnMinWidth: 48px;
 @smallBtnHeight: 26px;
-@smallBtnPadding: 12px;
+@smallBtnPadding: 3px 12px;
+@smallBtnFontSize: @font-size-base;
 
-@largeBtnMinWidth: 74px;
 @largeBtnHeight: 38px;
-@largeBtnPadding: 20px;
+@largeBtnPadding: 8px 20px;
+@largeBtnFontSize: @font-size-large;
 
 @themeSelectors: primary, warning, success, danger;
 @sizeSelectors: small, large;
 
 .@{bk-prefix}-button {
-  display: inline-block;
+  display: inline-flex;
   height: @btnHeight;
-  min-width: @btnMinWidth;
-  padding: 0 @btnPadding;
+  padding: @btnPadding;
   font-size: @font-size-medium;
   color: @default-color;
-  text-align: center;
   text-decoration: none;
   white-space: nowrap;
-  vertical-align: middle;
   cursor: pointer;
   background-color: @white-color;
   border: 1px solid @light-gray;
@@ -35,6 +31,8 @@
   box-sizing: border-box;
   transition: background-color ease .3s;
   appearance: none;
+  align-items: center;
+  justify-content: center;
   
   each(@themeSelectors, {
     @color: '@{value}-color';
@@ -56,10 +54,6 @@
         color: @white-color;
       }
 
-      &.is-disabled {
-        background-color: @disable-color;
-        border-color: @disable-color;
-      }
       &.is-outline {
         color: @@color;
         border-color: @@color;
@@ -74,12 +68,21 @@
 
       &.is-text {
         color: @@color;
-        background: none;
+        background-color: transparent;
         border: none;
-        &:hover {
+        &:not(.is-disabled):hover {
           color: @@hoverColor;
         }
       }
+      &.is-disabled {
+        &:not(.is-text) {
+          background-color: @disable-color;
+          color: @white-color;
+          border-color: @disable-color;
+        }
+        color: @disable-color;
+        cursor: not-allowed;
+      }
     }
 
     &.@{bk-prefix}-button-hover-@{value} {
@@ -93,21 +96,31 @@
 
   
     each(@sizeSelectors, {
-    @sizeBtnMinWidth: '@{value}BtnMinWidth';
     @sizeBtnHeight: '@{value}BtnHeight';
     @sizeBtnPadding: '@{value}BtnPadding';
+    @sizeBtnFontSize: '@{value}BtnFontSize';
     &.@{bk-prefix}-button-@{value} {
-      min-width: @@sizeBtnMinWidth;
       height: @@sizeBtnHeight;
-      line-height: @@sizeBtnHeight;
-      padding: 0 @@sizeBtnPadding;
+      padding: @@sizeBtnPadding;
+      font-size: @@sizeBtnFontSize;
     }
-  })
-;
+  });
 
-  .@{bk-prefix}-button-loading {
-    &:not(:last-child) {
-      margin-right: @smallBtnPadding;
+  .@{bk-prefix}-button-text {
+    display: inline-flex;
+    align-items: center;
+    line-height: 1;
+  }
+
+  &.is-loading {
+    position: relative;
+    .@{bk-prefix}-button-loading {
+      &:not(:last-child) {
+        position: absolute;
+      }
+    }
+    .@{bk-prefix}-button-text {
+      visibility: hidden;
     }
   }
 
@@ -120,35 +133,45 @@
     border-color: @primary-color;
   }
 
-  &.is-disabled {
-    color: @disable-color;
-    cursor: auto;
-    border-color: @disable-color;
-  }
-
   &.is-text {
-    font-size: @font-size-medium;
+    height: auto;
+    padding: 0;
+    font-size: inherit;
     color: @default-color;
     text-decoration: none;
     cursor: pointer;
-    background: none;
+    background-color: transparent;
     border: none;
     outline: none;
-  }}
+  }
+
+  &.is-disabled {
+    color: @disable-color;
+    cursor: not-allowed;
+    border-color: @disable-color;
+  }
+
+  // &.is-circle {
+  //   padding: 8px;
+  //   line-height: 1;
+  //   border-radius: 50%;
+  // }
+}
+
 
 .@{bk-prefix}-button-group {
   display: inline-block;
   font-size: 0;
-
+  
   each(@sizeSelectors, {
-    @sizeBtnMinWidth: '@{value}BtnMinWidth';
     @sizeBtnHeight: '@{value}BtnHeight';
     @sizeBtnPadding: '@{value}BtnPadding';
+    @sizeBtnFontSize: '@{value}BtnFontSize';
     &.@{bk-prefix}-button-group-@{value} {
       .@{bk-prefix}-button {
-        min-width: @@sizeBtnMinWidth;
         height: @@sizeBtnHeight;
-        padding: 0 @@sizeBtnPadding;
+        padding: @@sizeBtnPadding;
+        font-size: @@sizeBtnFontSize;
       }
     }
   })
@@ -156,7 +179,6 @@
 
   .@{bk-prefix}-button {
     height: @btnHeight;
-    min-width: @btnMinWidth;
     margin: 0 0 0 -1px;
     border-radius: 0;
 
@@ -165,10 +187,13 @@
       background-color: @white-color;
       border-color: @light-gray;
     }
+
+    &.is-disabled {
+      color: @light-gray;
+    }
     
     &:first-child {
       border-radius: @btnBorderRadius 0 0 @btnBorderRadius;
-        
     }
 
     &:last-child {
@@ -188,5 +213,13 @@
       border-color: @primary-color;
     }
 
+    &.is-selected:not(.is-disabled) {
+      background-color: @button-selected-bg-color;
+    }
+
+    &.is-selected.is-disabled {
+      background-color: @button-disabled-selected-bg-color;
+    }
+
   }
 }