bkui-vue 2.0.1-beta.11 → 2.0.1-beta.111

package/lib/button/button.css

@@ -17,307 +17,351 @@
   align-items: center;
   justify-content: center;
 }
-.bk-button.bk-button-primary {
+.bk-button.bk-button-small {
+  height: 26px;
+  padding: 0 12px;
+  font-size: 12px;
+}
+.bk-button.bk-button-large {
+  height: 40px;
+  padding: 0 16px;
+  font-size: 16px;
+}
+.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;
+}
+.bk-button:active {
+  color: #3a84ff;
+  border-color: #3a84ff;
+}
+.bk-button.is-text {
+  height: auto;
+  padding: 0;
+  font-size: inherit;
+  color: #63656e;
+  text-decoration: none;
+  cursor: pointer;
+  background-color: transparent;
+  border: none;
+  outline: none;
+}
+.bk-button.is-disabled {
+  color: #dcdee5;
+  cursor: not-allowed;
+  border-color: #dcdee5;
+}
+.bk-button.is-disabled:not(.is-text) {
+  background-color: #f9fafd;
+}
+.bk-button-group {
+  display: inline-block;
+  font-size: 0;
+}
+.bk-button-group.bk-button-group-small .bk-button {
+  height: 26px;
+  padding: 0 12px;
+  font-size: 12px;
+}
+.bk-button-group.bk-button-group-large .bk-button {
+  height: 40px;
+  padding: 0 16px;
+  font-size: 16px;
+}
+.bk-button-group .bk-button {
+  height: 32px;
+  margin: 0 0 0 -1px;
+  border-radius: 0;
+}
+.bk-button-group .bk-button:not(.is-disabled) {
+  color: #63656e;
+  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;
+}
+.bk-button-group .bk-button:last-child {
+  border-radius: 0 2px 2px 0;
+}
+.bk-button-group .bk-button:only-child {
+  border-radius: 2px;
+}
+.bk-button-group .bk-button:hover:not(.is-disabled),
+.bk-button-group .bk-button.is-selected:not(.is-disabled) {
+  position: relative;
+  z-index: 1;
+  color: #3a84ff;
+  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;
+}
+.bk-button.bk-button-primary,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary {
   background-color: #3a84ff;
   color: white;
   border-color: #3a84ff;
 }
-.bk-button.bk-button-primary:hover {
+.bk-button.bk-button-primary:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary:hover {
   background-color: #5594fa;
   border-color: #5594fa;
 }
-.bk-button.bk-button-primary:active {
+.bk-button.bk-button-primary:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary:active {
   background-color: #2c77f4;
   border-color: #2c77f4;
   color: white;
 }
-.bk-button.bk-button-primary.is-outline {
+.bk-button.bk-button-primary.is-outline,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-outline {
   color: #3a84ff;
   border-color: #3a84ff;
   background-color: white;
 }
-.bk-button.bk-button-primary.is-outline:hover {
+.bk-button.bk-button-primary.is-outline:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-outline:hover {
   background-color: #5594fa;
   border-color: #5594fa;
   color: white;
 }
-.bk-button.bk-button-primary.is-outline:active {
+.bk-button.bk-button-primary.is-outline:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-outline:active {
   background-color: #2c77f4;
   border-color: #2c77f4;
   color: white;
 }
-.bk-button.bk-button-primary.is-text {
+.bk-button.bk-button-primary.is-text,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-text {
   color: #3a84ff;
   background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-primary.is-text:not(.is-disabled):hover {
+.bk-button.bk-button-primary.is-text:not(.is-disabled):hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-text:not(.is-disabled):hover {
   color: #5594fa;
 }
-.bk-button.bk-button-primary.is-disabled {
+.bk-button.bk-button-primary.is-disabled,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-disabled {
   color: #dcdee5;
   cursor: not-allowed;
 }
-.bk-button.bk-button-primary.is-disabled:not(.is-text) {
+.bk-button.bk-button-primary.is-disabled:not(.is-text),
+.bk-button-group .is-selected:not(.is-disabled).bk-button-primary.is-disabled:not(.is-text) {
   background-color: #dcdee5;
   color: white;
   border-color: #dcdee5;
 }
-.bk-button.bk-button-hover-primary:hover {
+.bk-button.bk-button-hover-primary:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-hover-primary:hover {
   background-color: #5594fa;
   border-color: #5594fa;
   color: white;
 }
-.bk-button.bk-button-warning {
+.bk-button.bk-button-warning,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning {
   background-color: #ff9c01;
   color: white;
   border-color: #ff9c01;
 }
-.bk-button.bk-button-warning:hover {
+.bk-button.bk-button-warning:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning:hover {
   background-color: #ffb848;
   border-color: #ffb848;
 }
-.bk-button.bk-button-warning:active {
+.bk-button.bk-button-warning:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning:active {
   background-color: #eb9000;
   border-color: #eb9000;
   color: white;
 }
-.bk-button.bk-button-warning.is-outline {
+.bk-button.bk-button-warning.is-outline,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-outline {
   color: #ff9c01;
   border-color: #ff9c01;
   background-color: white;
 }
-.bk-button.bk-button-warning.is-outline:hover {
+.bk-button.bk-button-warning.is-outline:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-outline:hover {
   background-color: #ffb848;
   border-color: #ffb848;
   color: white;
 }
-.bk-button.bk-button-warning.is-outline:active {
+.bk-button.bk-button-warning.is-outline:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-outline:active {
   background-color: #eb9000;
   border-color: #eb9000;
   color: white;
 }
-.bk-button.bk-button-warning.is-text {
+.bk-button.bk-button-warning.is-text,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-text {
   color: #ff9c01;
   background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-warning.is-text:not(.is-disabled):hover {
+.bk-button.bk-button-warning.is-text:not(.is-disabled):hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-text:not(.is-disabled):hover {
   color: #ffb848;
 }
-.bk-button.bk-button-warning.is-disabled {
+.bk-button.bk-button-warning.is-disabled,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-disabled {
   color: #dcdee5;
   cursor: not-allowed;
 }
-.bk-button.bk-button-warning.is-disabled:not(.is-text) {
+.bk-button.bk-button-warning.is-disabled:not(.is-text),
+.bk-button-group .is-selected:not(.is-disabled).bk-button-warning.is-disabled:not(.is-text) {
   background-color: #dcdee5;
   color: white;
   border-color: #dcdee5;
 }
-.bk-button.bk-button-hover-warning:hover {
+.bk-button.bk-button-hover-warning:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-hover-warning:hover {
   background-color: #ffb848;
   border-color: #ffb848;
   color: white;
 }
-.bk-button.bk-button-success {
+.bk-button.bk-button-success,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success {
   background-color: #2dcb56;
   color: white;
   border-color: #2dcb56;
 }
-.bk-button.bk-button-success:hover {
+.bk-button.bk-button-success:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success:hover {
   background-color: #45e35f;
   border-color: #45e35f;
 }
-.bk-button.bk-button-success:active {
+.bk-button.bk-button-success:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success:active {
   background-color: #1ab943;
   border-color: #1ab943;
   color: white;
 }
-.bk-button.bk-button-success.is-outline {
+.bk-button.bk-button-success.is-outline,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-outline {
   color: #2dcb56;
   border-color: #2dcb56;
   background-color: white;
 }
-.bk-button.bk-button-success.is-outline:hover {
+.bk-button.bk-button-success.is-outline:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-outline:hover {
   background-color: #45e35f;
   border-color: #45e35f;
   color: white;
 }
-.bk-button.bk-button-success.is-outline:active {
+.bk-button.bk-button-success.is-outline:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-outline:active {
   background-color: #1ab943;
   border-color: #1ab943;
   color: white;
 }
-.bk-button.bk-button-success.is-text {
+.bk-button.bk-button-success.is-text,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-text {
   color: #2dcb56;
   background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-success.is-text:not(.is-disabled):hover {
+.bk-button.bk-button-success.is-text:not(.is-disabled):hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-text:not(.is-disabled):hover {
   color: #45e35f;
 }
-.bk-button.bk-button-success.is-disabled {
+.bk-button.bk-button-success.is-disabled,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-disabled {
   color: #dcdee5;
   cursor: not-allowed;
 }
-.bk-button.bk-button-success.is-disabled:not(.is-text) {
+.bk-button.bk-button-success.is-disabled:not(.is-text),
+.bk-button-group .is-selected:not(.is-disabled).bk-button-success.is-disabled:not(.is-text) {
   background-color: #dcdee5;
   color: white;
   border-color: #dcdee5;
 }
-.bk-button.bk-button-hover-success:hover {
+.bk-button.bk-button-hover-success:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-hover-success:hover {
   background-color: #45e35f;
   border-color: #45e35f;
   color: white;
 }
-.bk-button.bk-button-danger {
+.bk-button.bk-button-danger,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger {
   background-color: #ea3636;
   color: white;
   border-color: #ea3636;
 }
-.bk-button.bk-button-danger:hover {
+.bk-button.bk-button-danger:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger:hover {
   background-color: #ff5656;
   border-color: #ff5656;
 }
-.bk-button.bk-button-danger:active {
+.bk-button.bk-button-danger:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger:active {
   background-color: #db2626;
   border-color: #db2626;
   color: white;
 }
-.bk-button.bk-button-danger.is-outline {
+.bk-button.bk-button-danger.is-outline,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-outline {
   color: #ea3636;
   border-color: #ea3636;
   background-color: white;
 }
-.bk-button.bk-button-danger.is-outline:hover {
+.bk-button.bk-button-danger.is-outline:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-outline:hover {
   background-color: #ff5656;
   border-color: #ff5656;
   color: white;
 }
-.bk-button.bk-button-danger.is-outline:active {
+.bk-button.bk-button-danger.is-outline:active,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-outline:active {
   background-color: #db2626;
   border-color: #db2626;
   color: white;
 }
-.bk-button.bk-button-danger.is-text {
+.bk-button.bk-button-danger.is-text,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-text {
   color: #ea3636;
   background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-danger.is-text:not(.is-disabled):hover {
+.bk-button.bk-button-danger.is-text:not(.is-disabled):hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-text:not(.is-disabled):hover {
   color: #ff5656;
 }
-.bk-button.bk-button-danger.is-disabled {
+.bk-button.bk-button-danger.is-disabled,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-disabled {
   color: #dcdee5;
   cursor: not-allowed;
 }
-.bk-button.bk-button-danger.is-disabled:not(.is-text) {
+.bk-button.bk-button-danger.is-disabled:not(.is-text),
+.bk-button-group .is-selected:not(.is-disabled).bk-button-danger.is-disabled:not(.is-text) {
   background-color: #dcdee5;
   color: white;
   border-color: #dcdee5;
 }
-.bk-button.bk-button-hover-danger:hover {
+.bk-button.bk-button-hover-danger:hover,
+.bk-button-group .is-selected:not(.is-disabled).bk-button-hover-danger:hover {
   background-color: #ff5656;
   border-color: #ff5656;
   color: white;
 }
-.bk-button.bk-button-small {
-  height: 26px;
-  padding: 0 12px;
-  font-size: 12px;
-}
-.bk-button.bk-button-large {
-  height: 40px;
-  padding: 0 16px;
-  font-size: 16px;
-}
-.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;
-}
-.bk-button:active {
-  color: #3a84ff;
-  border-color: #3a84ff;
-}
-.bk-button.is-text {
-  height: auto;
-  padding: 0;
-  font-size: inherit;
-  color: #63656e;
-  text-decoration: none;
-  cursor: pointer;
-  background-color: transparent;
-  border: none;
-  outline: none;
-}
-.bk-button.is-disabled {
-  color: #dcdee5;
-  cursor: not-allowed;
-  border-color: #dcdee5;
-}
-.bk-button.is-disabled:not(.is-text) {
-  background-color: #f9fafd;
-}
-.bk-button-group {
-  display: inline-block;
-  font-size: 0;
-}
-.bk-button-group.bk-button-group-small .bk-button {
-  height: 26px;
-  padding: 0 12px;
-  font-size: 12px;
-}
-.bk-button-group.bk-button-group-large .bk-button {
-  height: 40px;
-  padding: 0 16px;
-  font-size: 16px;
-}
-.bk-button-group .bk-button {
-  height: 32px;
-  margin: 0 0 0 -1px;
-  border-radius: 0;
-}
-.bk-button-group .bk-button:not(.is-disabled) {
-  color: #63656e;
-  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;
-}
-.bk-button-group .bk-button:last-child {
-  border-radius: 0 2px 2px 0;
-}
-.bk-button-group .bk-button:only-child {
-  border-radius: 2px;
-}
-.bk-button-group .bk-button:hover:not(.is-disabled),
-.bk-button-group .bk-button.is-selected:not(.is-disabled) {
-  position: relative;
-  z-index: 1;
-  color: #3a84ff;
-  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

@@ -24,10 +24,10 @@
  * IN THE SOFTWARE.
  */
 import { ExtractPropTypes, PropType } from 'vue';
-type IButtonNativeType = PropType<'button' | 'submit' | 'reset'>;
+type IButtonNativeType = PropType<'button' | 'reset' | 'submit'>;
 declare const buttonProps: {
-    theme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
-    hoverTheme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
+    theme: import("vue-types").VueTypeDef<"danger" | "primary" | "success" | "warning">;
+    hoverTheme: import("vue-types").VueTypeDef<"danger" | "primary" | "success" | "warning">;
     size: {
         type: PropType<"" | "small" | "large">;
         default: "";
@@ -67,8 +67,8 @@ declare const buttonProps: {
 };
 export type ButtonPropTypes = ExtractPropTypes<typeof buttonProps>;
 declare const _default: import("vue").DefineComponent<{
-    theme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
-    hoverTheme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
+    theme: import("vue-types").VueTypeDef<"danger" | "primary" | "success" | "warning">;
+    hoverTheme: import("vue-types").VueTypeDef<"danger" | "primary" | "success" | "warning">;
     size: {
         type: PropType<"" | "small" | "large">;
         default: "";
@@ -106,8 +106,8 @@ declare const _default: import("vue").DefineComponent<{
         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<"success" | "warning" | "danger" | "primary">;
-    hoverTheme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
+    theme: import("vue-types").VueTypeDef<"danger" | "primary" | "success" | "warning">;
+    hoverTheme: import("vue-types").VueTypeDef<"danger" | "primary" | "success" | "warning">;
     size: {
         type: PropType<"" | "small" | "large">;
         default: "";
@@ -150,13 +150,13 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     title: string;
     text: boolean;
-    size: "" | "small" | "large";
     disabled: boolean;
-    icon: string;
     loading: boolean;
+    size: "" | "small" | "large";
+    icon: string;
+    outline: boolean;
     iconRight: string;
     loadingMode: "default" | "spin";
-    outline: boolean;
     selected: boolean;
     nativeType: "reset" | "submit" | "button";
 }, {}>;

package/lib/button/button.less

@@ -34,77 +34,7 @@
   align-items: center;
   justify-content: center;
 
-  each(@themeSelectors, {
-    @color: '@{value}-color';
-    @hoverColor: 'button-@{value}-hover-color';
-    @activeColor: 'button-@{value}-active-color';
-
-    &.@{bk-prefix}-button-@{value} {
-      background-color: @@color;
-      color: @white-color;
-      border-color: @@color;
-
-      &:hover {
-        background-color: @@hoverColor;
-        border-color: @@hoverColor;
-      }
-
-      &:active {
-        background-color: @@activeColor;
-        border-color: @@activeColor;
-        color: @white-color;
-      }
-
-      &.is-outline {
-        color: @@color;
-        border-color: @@color;
-        background-color: @white-color;
-
-        &:hover {
-          background-color: @@hoverColor;
-          border-color: @@hoverColor;
-          color: @white-color;
-        }
-
-        &:active {
-          background-color: @@activeColor;
-          border-color: @@activeColor;
-          color: @white-color;
-        }
-      }
-
-      &.is-text {
-        color: @@color;
-        background-color: transparent;
-        border: none;
-
-        &: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} {
-      &:hover {
-        background-color: @@hoverColor;
-        border-color: @@hoverColor;
-        color: @white-color;
-      }
-    }
-  })
-
-    each(@sizeSelectors, {
+  each(@sizeSelectors, {
     @sizeBtnHeight: '@{value}BtnHeight';
     @sizeBtnPadding: '@{value}BtnPadding';
     @sizeBtnFontSize: '@{value}BtnFontSize';
@@ -239,3 +169,76 @@
 
   }
 }
+
+.@{bk-prefix}-button,
+.@{bk-prefix}-button-group .is-selected:not(.is-disabled) {
+  each(@themeSelectors, {
+    @color: '@{value}-color';
+    @hoverColor: 'button-@{value}-hover-color';
+    @activeColor: 'button-@{value}-active-color';
+
+    &.@{bk-prefix}-button-@{value} {
+      background-color: @@color;
+      color: @white-color;
+      border-color: @@color;
+
+      &:hover {
+        background-color: @@hoverColor;
+        border-color: @@hoverColor;
+      }
+
+      &:active {
+        background-color: @@activeColor;
+        border-color: @@activeColor;
+        color: @white-color;
+      }
+
+      &.is-outline {
+        color: @@color;
+        border-color: @@color;
+        background-color: @white-color;
+
+        &:hover {
+          background-color: @@hoverColor;
+          border-color: @@hoverColor;
+          color: @white-color;
+        }
+
+        &:active {
+          background-color: @@activeColor;
+          border-color: @@activeColor;
+          color: @white-color;
+        }
+      }
+
+      &.is-text {
+        color: @@color;
+        background-color: transparent;
+        border: none;
+
+        &: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} {
+      &:hover {
+        background-color: @@hoverColor;
+        border-color: @@hoverColor;
+        color: @white-color;
+      }
+    }
+  })
+}