bkui-vue 0.0.1-beta.14 → 0.0.1-beta.17

package/lib/switcher/switcher.css

@@ -22,181 +22,181 @@
 .bk-switcher {
   position: relative;
   display: inline-block;
-  /* 默认尺寸 */
-  width: 36px;
   height: 20px;
+  /* 默认尺寸 */
+  min-width: 36px;
+  padding: 0;
+  margin: 0;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   vertical-align: middle;
+  list-style: none;
+  cursor: pointer;
   background-color: #c4c6cc;
+  border: 1px solid transparent;
   border-radius: 50px;
+  border-radius: 100px;
+  box-sizing: border-box;
   transition: all 0.4s ease;
+  transition: all 0.36s;
+  user-select: none;
   /* 显示文本时固定尺寸 */
 }
-.bk-switcher:focus {
-  box-shadow: 0px 0px 6px #c4c6cc;
-}
 .bk-switcher:after {
   position: absolute;
-  top: 2px;
-  left: 2px;
-  display: block;
-  width: 24px;
-  height: 24px;
+  top: 1px;
+  left: 1px;
+  width: 16px;
+  height: 16px;
   cursor: pointer;
   background: #fff;
-  border-radius: 100px;
-  content: '';
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
+  background-color: #fff;
+  border-radius: 18px;
+  content: ' ';
   transition: all 0.3s ease;
 }
-.bk-switcher:not(.show-label):after {
-  width: 16px;
-  height: 16px;
-}
-.bk-switcher:not(.show-label).is-checked:after {
-  margin-left: -18px;
-}
-.bk-switcher.is-loading {
-  cursor: defalt;
+.bk-switcher .switcher-text {
+  display: block;
+  margin-right: 6px;
+  margin-left: 28px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #fff;
+  text-align: center;
+  transition: all 0.3s ease;
 }
-.bk-switcher.is-loading input[type=checkbox] {
-  cursor: default;
+.bk-switcher .animating-node {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: block;
+  pointer-events: none;
+  border-radius: inherit;
+  content: '';
+  opacity: 0.2;
+  box-shadow: 0 0 0 0 #1890ff;
+  animation: fadeEffect 2s cubic-bezier(0.08, 0.82, 0.17, 1), waveEffect 0.4s cubic-bezier(0.08, 0.82, 0.17, 1);
+  animation-fill-mode: forwards;
 }
 .bk-switcher .bk-switcher-loading {
   position: absolute;
-  top: 50%;
+  top: 1px;
   left: 1px;
-  z-index: 10;
-  display: flex;
-  width: 18px;
-  height: 18px;
-  transform: translateY(-50%);
+  z-index: 1;
+  width: 16px;
+  height: 16px;
+  font-size: 12px;
+  color: #c4c6cc;
+  cursor: pointer;
+  background: transparent;
+  border-radius: 16px;
+  content: ' ';
+  transition: all 0.36s cubic-bezier(0.78, 0.14, 0.15, 0.86);
 }
 .bk-switcher .bk-switcher-loading svg {
-  color: #3a84ff;
-}
-.bk-switcher .switcher-label {
-  display: none;
-  width: 30px;
-  height: 28px;
-  margin: 0 0 0 26px;
-  font-size: 12px;
-  font-weight: normal;
-  color: #fff;
-  text-align: center;
-  vertical-align: top;
-  transition: all ease 0.3s;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  animation: loading 1s linear infinite;
 }
-.bk-switcher .switcher-label .on-text {
-  display: none;
+.bk-switcher.is-loading {
+  cursor: defalt;
 }
-.bk-switcher .switcher-label .off-text {
-  display: inline-block;
+.bk-switcher.is-loading input[type=checkbox] {
+  cursor: default;
 }
 .bk-switcher.show-label {
-  width: 60px;
   height: 28px;
+  min-width: 60px;
   line-height: 28px;
 }
-.bk-switcher.show-label .switcher-label {
-  display: inline-block;
+.bk-switcher.show-label::after {
+  width: 24px;
+  height: 24px;
 }
 .bk-switcher.show-label .bk-switcher-loading {
-  width: 26px;
-  height: 26px;
-  align-items: center;
-  justify-content: center;
+  width: 24px;
+  height: 24px;
+  font-size: 20px;
 }
-.bk-switcher.show-label .bk-switcher-loading svg {
-  font-size: 24px;
+.bk-switcher.show-label.is-checked .bk-switcher-loading {
+  left: 100%;
+  margin-left: -25px;
 }
 .bk-switcher.is-disabled {
-  cursor: default;
-  /* background-color: #eee !important; */
+  cursor: not-allowed;
   opacity: 0.3;
 }
-.bk-switcher.is-disabled input[type=checkbox] {
+.bk-switcher.is-disabled .bk-switcher-loading {
+  cursor: not-allowed;
+}
+.bk-switcher.is-disabled::after {
   cursor: not-allowed;
 }
 .bk-switcher.is-checked {
   background: #2dcb56;
 }
-.bk-switcher.is-checked:focus {
-  box-shadow: 0px 0px 6px #2dcb56;
+.bk-switcher.is-checked .bk-switcher-loading svg {
+  color: #2dcb56;
 }
-.bk-switcher.is-checked.primary {
+.bk-switcher.is-checked:not(.bk-switcher-outline).bk-switcher.is-checked.primary {
   background: #3a84ff;
 }
-.bk-switcher.is-checked.primary:focus {
-  box-shadow: 0px 0px 6px #3a84ff;
+.bk-switcher.is-checked:not(.bk-switcher-outline).bk-switcher.is-checked.primary .bk-switcher-loading svg {
+  color: #3a84ff;
 }
 .bk-switcher.is-checked:after {
-  top: 2px;
   left: 100%;
-  margin-left: -26px;
+  margin-left: -1px;
+  transform: translateX(-100%);
 }
-.bk-switcher.is-checked .switcher-label {
-  margin-left: 4px;
+.bk-switcher.is-checked .switcher-text {
+  margin-right: 28px;
+  margin-left: 6px;
 }
-.bk-switcher.is-checked .switcher-label .on-text {
-  display: inline-block;
-}
-.bk-switcher.is-checked .switcher-label .off-text {
-  display: none;
-}
-.bk-switcher.is-checked .bk-switcher-loading {
-  right: 1px;
-  left: auto;
+.bk-switcher:not(.show-label).is-checked .bk-switcher-loading {
+  left: 100%;
+  margin-left: -17px;
 }
 .bk-switcher.bk-switcher-outline {
   background: #fff;
   border: 1px solid #c4c6cc;
 }
 .bk-switcher.bk-switcher-outline:after {
-  width: 22px;
-  height: 22px;
+  width: 24px;
+  height: 24px;
   background-color: #c4c6cc;
   box-shadow: none;
 }
-.bk-switcher.bk-switcher-outline .switcher-label {
-  height: 26px;
-  margin-left: 24px;
+.bk-switcher.bk-switcher-outline .switcher-text {
   color: #c4c6cc;
 }
-.bk-switcher.bk-switcher-outline .bk-switcher-loading {
-  width: 22px;
-  height: 22px;
-  align-items: center;
-  justify-content: center;
-}
 .bk-switcher.bk-switcher-outline.is-checked {
   border: 1px solid #2dcb56;
 }
 .bk-switcher.bk-switcher-outline.is-checked:after {
-  margin-left: -24px;
   background-color: #2dcb56;
 }
-.bk-switcher.bk-switcher-outline.is-checked .switcher-label {
-  margin-left: 4px;
+.bk-switcher.bk-switcher-outline.is-checked .switcher-text {
   color: #2dcb56;
 }
-.bk-switcher.bk-switcher-outline.is-disabled {
-  background-color: #fff;
-  border-color: #eee;
-}
-.bk-switcher.bk-switcher-outline.is-disabled .switcher-label {
-  color: #eee;
+.bk-switcher.bk-switcher-outline .bk-switcher-loading svg {
+  color: #fff;
 }
-.bk-switcher.bk-switcher-outline.is-disabled:after {
-  background-color: #eee;
+.bk-switcher.bk-switcher-outline.bk-switcher.primary.is-checked {
+  border: 1px solid #3a84ff;
 }
-.bk-switcher.bk-switcher-outline.bk-switcher-large:after {
-  width: 18px;
-  height: 18px;
+.bk-switcher.bk-switcher-outline.bk-switcher.primary.is-checked:after {
+  background: #3a84ff;
 }
-.bk-switcher.bk-switcher-outline.bk-switcher-large.is-checked:after {
-  margin-left: -20px;
+.bk-switcher.bk-switcher-outline.bk-switcher.primary.is-checked .switcher-text {
+  color: #3a84ff;
 }
 .bk-switcher.bk-switcher-square {
   border-radius: 2px;
@@ -204,55 +204,69 @@
 .bk-switcher.bk-switcher-square:after {
   border-radius: 2px;
 }
-.bk-switcher.bk-switcher-square .switcher-label {
-  width: 35px;
-}
 .bk-switcher.bk-switcher-large {
-  width: 42px;
   height: 24px;
+  min-width: 42px;
   line-height: 22px;
-  border-radius: 12px;
 }
 .bk-switcher.bk-switcher-large:after {
   width: 20px;
   height: 20px;
 }
-.bk-switcher.bk-switcher-large.is-checked:after {
-  top: 2px;
-  left: 100%;
-  margin-left: -22px;
-}
 .bk-switcher.bk-switcher-large .bk-switcher-loading {
-  width: 22px;
-  height: 22px;
+  width: 20px;
+  height: 20px;
+  font-size: 16px;
+}
+.bk-switcher.bk-switcher-large.is-checked .bk-switcher-loading {
+  margin-left: -21px;
 }
 .bk-switcher.bk-switcher-small {
-  width: 26px;
   height: 16px;
+  min-width: 26px;
   line-height: 22px;
 }
 .bk-switcher.bk-switcher-small:after {
   width: 12px;
   height: 12px;
 }
-.bk-switcher.bk-switcher-small.is-checked:after {
-  top: 2px;
-  left: 100%;
-  margin-left: -14px;
-}
 .bk-switcher.bk-switcher-small .bk-switcher-loading {
-  width: 14px;
-  height: 14px;
+  width: 12px;
+  height: 12px;
+  font-weight: 700;
+  transform: scale(0.66667);
 }
-.bk-switcher input[type=checkbox],
-.bk-switcher input[type=radio] {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  cursor: pointer;
-  opacity: 0;
+.bk-switcher.bk-switcher-small.is-checked .bk-switcher-loading {
+  margin-left: -13px;
+}
+:not(.show-label).bk-switcher-nomal.bk-switcher-outline::after {
+  width: 16px;
+  height: 16px;
+}
+:not(.show-label).bk-switcher-outline.is-checked.bk-switcher-small::after {
+  width: 12px;
+  height: 12px;
+}
+:not(.show-label).bk-switcher-outline.is-checked.bk-switcher-large::after {
+  width: 20px;
+  height: 20px;
+}
+:not(.show-label).bk-switcher-outline.is-checked::after {
+  width: 16px;
+  height: 16px;
+}
+@keyframes fadeEffect {
+  100% {
+    opacity: 0;
+  }
+}
+@keyframes waveEffect {
+  100% {
+    box-shadow: 0 0 0 #1890ff;
+  }
+}
+@keyframes loading {
+  100% {
+    transform: rotate(1turn);
+  }
 }

package/lib/switcher/switcher.d.ts

@@ -45,38 +45,54 @@ declare const _default: import("vue").DefineComponent<{
     modelValue: import("vue-types").VueTypeDef<string | number | boolean> & {
         default: string | number | boolean;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "update:modelValue")[], "change" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
-    theme?: unknown;
-    size?: unknown;
-    disabled?: unknown;
-    showText?: unknown;
-    isOutline?: unknown;
-    onText?: unknown;
-    offText?: unknown;
-    isSquare?: unknown;
-    extCls?: unknown;
-    preCheck?: unknown;
-    trueValue?: unknown;
-    falseValue?: unknown;
-    value?: unknown;
-    modelValue?: unknown;
-} & {
-    theme: string;
-    value: string | number | boolean;
-    extCls: string;
-    disabled: boolean;
-    modelValue: string | number | boolean;
-    showText: boolean;
-    isOutline: boolean;
-    onText: string;
-    offText: string;
-    isSquare: boolean;
-    trueValue: string | number | boolean;
-    falseValue: string | number | boolean;
-} & {
-    size?: string;
-    preCheck?: (...args: any[]) => any;
-}> & {
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "update:modelValue")[], "change" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    theme: import("vue-types").VueTypeDef<string> & {
+        default: string;
+    };
+    size: import("vue-types").VueTypeDef<string>;
+    disabled: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
+    showText: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
+    isOutline: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
+    onText: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
+    offText: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
+    isSquare: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    };
+    extCls: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    };
+    preCheck: import("vue-types").VueTypeValidableDef<(...args: any[]) => any> & {
+        default: (...args: any[]) => any;
+    } & {
+        default: (...args: any[]) => any;
+    };
+    trueValue: import("vue-types").VueTypeDef<string | number | boolean> & {
+        default: string | number | boolean;
+    };
+    falseValue: import("vue-types").VueTypeDef<string | number | boolean> & {
+        default: string | number | boolean;
+    };
+    value: import("vue-types").VueTypeDef<string | number | boolean> & {
+        default: string | number | boolean;
+    };
+    modelValue: import("vue-types").VueTypeDef<string | number | boolean> & {
+        default: string | number | boolean;
+    };
+}>> & {
     onChange?: (...args: any[]) => any;
     "onUpdate:modelValue"?: (...args: any[]) => any;
 }, {